diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 74cbc187023..2ebce94a334 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -6,7 +6,7 @@ concurrency: on: workflow_dispatch: # Frontier: re-enabled autopublish - schedule: + schedule: - cron: '0 10 * * *' jobs: diff --git a/Content.IntegrationTests/PoolSettings.cs b/Content.IntegrationTests/PoolSettings.cs index 187af4569f9..5cebda0bfa1 100644 --- a/Content.IntegrationTests/PoolSettings.cs +++ b/Content.IntegrationTests/PoolSettings.cs @@ -1,4 +1,4 @@ -#nullable enable +#nullable enable using Robust.Shared.Random; @@ -93,7 +93,7 @@ public sealed class PoolSettings /// /// Frontier: the preset to run the game in. /// Set to secret for upstream tests to mimic upstream behaviour. - /// If you need to check adventure game rule things, set this to Adventure. + /// If you need to check adventure game rule things, set this to nfadventure or nfpirate. /// public string GameLobbyDefaultPreset { get; set; } = "secret"; diff --git a/Content.IntegrationTests/Tests/EntityTest.cs b/Content.IntegrationTests/Tests/EntityTest.cs index 0a69fdc71c7..4eda3dd8501 100644 --- a/Content.IntegrationTests/Tests/EntityTest.cs +++ b/Content.IntegrationTests/Tests/EntityTest.cs @@ -351,7 +351,8 @@ public async Task AllComponentsOneToOneDeleteTest() "DebrisFeaturePlacerController", // Above. "LoadedChunk", // Worldgen chunk loading malding. "BiomeSelection", // Whaddya know, requires config. - "ActivatableUI", // Requires enum key + "ActivatableUI", // Frontier: Requires enum key + "AlertLevel", // Frontier: requires alert set }; // TODO TESTS diff --git a/Content.Server/AlertLevel/AlertLevelDisplaySystem.cs b/Content.Server/AlertLevel/AlertLevelDisplaySystem.cs index 3dd216c5dce..f604d810ffa 100644 --- a/Content.Server/AlertLevel/AlertLevelDisplaySystem.cs +++ b/Content.Server/AlertLevel/AlertLevelDisplaySystem.cs @@ -2,6 +2,7 @@ using Content.Server.Station.Systems; using Content.Shared.AlertLevel; using Content.Shared.Power; +using Content.Server._NF.SectorServices; // Frontier namespace Content.Server.AlertLevel; @@ -9,6 +10,7 @@ public sealed class AlertLevelDisplaySystem : EntitySystem { [Dependency] private readonly StationSystem _stationSystem = default!; [Dependency] private readonly SharedAppearanceSystem _appearance = default!; + [Dependency] private readonly SectorServiceSystem _sectorService = default!; // Frontier public override void Initialize() { @@ -30,8 +32,9 @@ private void OnDisplayInit(EntityUid uid, AlertLevelDisplayComponent alertLevelD { if (TryComp(uid, out AppearanceComponent? appearance)) { - var stationUid = _stationSystem.GetOwningStation(uid); - if (stationUid != null && TryComp(stationUid, out AlertLevelComponent? alert)) + //var stationUid = _stationSystem.GetOwningStation(uid); // Frontier: sector-wide alerts + var stationUid = _sectorService.GetServiceEntity(); // Frontier: sector-wide alerts + if (stationUid.Valid && TryComp(stationUid, out AlertLevelComponent? alert)) // Frontier: uid != null < uid.Valid { _appearance.SetData(uid, AlertLevelDisplay.CurrentLevel, alert.CurrentLevel, appearance); } diff --git a/Content.Server/AlertLevel/AlertLevelSystem.cs b/Content.Server/AlertLevel/AlertLevelSystem.cs index 0b49d7e4bfa..71ad018603a 100644 --- a/Content.Server/AlertLevel/AlertLevelSystem.cs +++ b/Content.Server/AlertLevel/AlertLevelSystem.cs @@ -6,6 +6,9 @@ using Robust.Shared.Audio.Systems; using Robust.Shared.Configuration; using Robust.Shared.Prototypes; +using Content.Server.GameTicking; // Frontier +using Robust.Shared.Player; // Frontier +using Content.Server._NF.SectorServices; // Frontier namespace Content.Server.AlertLevel; @@ -16,13 +19,16 @@ public sealed class AlertLevelSystem : EntitySystem [Dependency] private readonly ChatSystem _chatSystem = default!; [Dependency] private readonly SharedAudioSystem _audio = default!; [Dependency] private readonly StationSystem _stationSystem = default!; + [Dependency] private readonly GameTicker _ticker = default!; // Frontier + [Dependency] private readonly SectorServiceSystem _sectorService = default!; // Until stations are a prototype, this is how it's going to have to be. public const string DefaultAlertLevelSet = "stationAlerts"; public override void Initialize() { - SubscribeLocalEvent(OnStationInitialize); + //SubscribeLocalEvent(OnStationInitialize); // Frontier: sector-wide services + SubscribeLocalEvent(OnInit); // Frontier: sector-wide services SubscribeLocalEvent(OnPrototypeReload); } @@ -46,6 +52,8 @@ public override void Update(float time) } } + // Frontier: sector-wide services + /* private void OnStationInitialize(StationInitializedEvent args) { if (!TryComp(args.Station, out var alertLevelComponent)) @@ -66,6 +74,26 @@ private void OnStationInitialize(StationInitializedEvent args) SetLevel(args.Station, defaultLevel, false, false, true); } + */ + + private void OnInit(EntityUid uid, AlertLevelComponent comp, ComponentInit args) + { + if (!_prototypeManager.TryIndex(comp.AlertLevelPrototype, out AlertLevelPrototype? alerts)) + { + return; + } + + comp.AlertLevels = alerts; + + var defaultLevel = comp.AlertLevels.DefaultLevel; + if (string.IsNullOrEmpty(defaultLevel)) + { + defaultLevel = comp.AlertLevels.Levels.Keys.First(); + } + + SetLevel(uid, defaultLevel, false, false, true); + } + // End Frontier private void OnPrototypeReload(PrototypesReloadedEventArgs args) { @@ -98,20 +126,30 @@ private void OnPrototypeReload(PrototypesReloadedEventArgs args) public string GetLevel(EntityUid station, AlertLevelComponent? alert = null) { - if (!Resolve(station, ref alert)) - { + // Frontier: sector-wide alarms + if (!TryComp(_sectorService.GetServiceEntity(), out alert)) return string.Empty; - } + + // if (!Resolve(station, ref alert)) + // { + // return string.Empty; + // } + // End Frontier return alert.CurrentLevel; } public float GetAlertLevelDelay(EntityUid station, AlertLevelComponent? alert = null) { - if (!Resolve(station, ref alert)) - { + // Frontier: sector-wide alarms + if (!TryComp(_sectorService.GetServiceEntity(), out alert)) return float.NaN; - } + + // if (!Resolve(station, ref alert)) + // { + // return float.NaN; + // } + // End Frontier return alert.CurrentDelay; } @@ -128,8 +166,13 @@ public float GetAlertLevelDelay(EntityUid station, AlertLevelComponent? alert = public void SetLevel(EntityUid station, string level, bool playSound, bool announce, bool force = false, bool locked = false, MetaDataComponent? dataComponent = null, AlertLevelComponent? component = null) { - if (!Resolve(station, ref component, ref dataComponent) - || component.AlertLevels == null + // Frontier: sector-wide alerts + EntityUid sectorEnt = _sectorService.GetServiceEntity(); + if (!TryComp(sectorEnt, out component)) + return; + // End Frontier + + if (component.AlertLevels == null // Frontier: remove component, resolve station to data component later || !component.AlertLevels.Levels.TryGetValue(level, out var detail) || component.CurrentLevel == level) { @@ -152,7 +195,7 @@ public void SetLevel(EntityUid station, string level, bool playSound, bool annou component.CurrentLevel = level; component.IsLevelLocked = locked; - var stationName = dataComponent.EntityName; + //var stationName = dataComponent.EntityName; // Frontier: remove station name var name = level.ToLower(); @@ -177,7 +220,9 @@ public void SetLevel(EntityUid station, string level, bool playSound, bool annou { if (detail.Sound != null) { - var filter = _stationSystem.GetInOwningStation(station); + //var filter = _stationSystem.GetInOwningStation(station); // Frontier: global alerts + var filter = Filter.Empty(); // Frontier + filter.AddInMap(_ticker.DefaultMap, EntityManager); // Frontier _audio.PlayGlobal(detail.Sound, filter, true, detail.Sound.Params); } else @@ -186,13 +231,14 @@ public void SetLevel(EntityUid station, string level, bool playSound, bool annou } } - if (announce) + if (announce && Resolve(station, ref dataComponent)) // Frontier: add Resolve for dataComponent { + var stationName = dataComponent.EntityName; // Frontier: moved down _chatSystem.DispatchStationAnnouncement(station, announcementFull, playDefaultSound: playDefault, colorOverride: detail.Color, sender: stationName); } - RaiseLocalEvent(new AlertLevelChangedEvent(station, level)); + RaiseLocalEvent(new AlertLevelChangedEvent(EntityUid.Invalid, level)); // Frontier: pass invalid, we have no station } } diff --git a/Content.Server/AlertLevel/Commands/SetAlertLevelCommand.cs b/Content.Server/AlertLevel/Commands/SetAlertLevelCommand.cs index 405500442f7..e8648b12152 100644 --- a/Content.Server/AlertLevel/Commands/SetAlertLevelCommand.cs +++ b/Content.Server/AlertLevel/Commands/SetAlertLevelCommand.cs @@ -1,4 +1,5 @@ using System.Linq; +using Content.Server._NF.SectorServices; using Content.Server.Administration; using Content.Server.Station.Systems; using Content.Shared.Administration; @@ -21,11 +22,14 @@ public override CompletionResult GetCompletion(IConsoleShell shell, string[] arg var player = shell.Player; if (player?.AttachedEntity != null) { - var stationUid = _entitySystems.GetEntitySystem().GetOwningStation(player.AttachedEntity.Value); - if (stationUid != null) - { - levelNames = GetStationLevelNames(stationUid.Value); - } + // Frontier: sector-wide alerts + levelNames = GetSectorLevelNames(); + // var stationUid = _entitySystems.GetEntitySystem().GetOwningStation(player.AttachedEntity.Value); + // if (stationUid != null) + // { + // levelNames = GetStationLevelNames(stationUid.Value); + // } + // End Frontier } return args.Length switch @@ -68,7 +72,7 @@ public override void Execute(IConsoleShell shell, string argStr, string[] args) } var level = args[0]; - var levelNames = GetStationLevelNames(stationUid.Value); + var levelNames = GetSectorLevelNames(); if (!levelNames.Contains(level)) { shell.WriteLine(LocalizationManager.GetString("cmd-setalertlevel-invalid-level")); @@ -78,10 +82,12 @@ public override void Execute(IConsoleShell shell, string argStr, string[] args) _entitySystems.GetEntitySystem().SetLevel(stationUid.Value, level, true, true, true, locked); } - private string[] GetStationLevelNames(EntityUid station) + // Frontier: sector-wide alert level names + private string[] GetSectorLevelNames() { + var sectorServiceUid = _entitySystems.GetEntitySystem().GetServiceEntity(); var entityManager = IoCManager.Resolve(); - if (!entityManager.TryGetComponent(station, out var alertLevelComp)) + if (!entityManager.TryGetComponent(sectorServiceUid, out var alertLevelComp)) return new string[]{}; if (alertLevelComp.AlertLevels == null) @@ -89,5 +95,6 @@ private string[] GetStationLevelNames(EntityUid station) return alertLevelComp.AlertLevels.Levels.Keys.ToArray(); } + // End Frontier } } diff --git a/Content.Server/Botany/Systems/BotanySystem.Seed.cs b/Content.Server/Botany/Systems/BotanySystem.Seed.cs index 51f526063dc..6e11d578cd8 100644 --- a/Content.Server/Botany/Systems/BotanySystem.Seed.cs +++ b/Content.Server/Botany/Systems/BotanySystem.Seed.cs @@ -15,6 +15,7 @@ using Robust.Shared.Random; using System.Diagnostics.CodeAnalysis; using System.Linq; +using Content.Server._NF.Contraband.Systems; // Frontier namespace Content.Server.Botany.Systems; @@ -30,6 +31,7 @@ public sealed partial class BotanySystem : EntitySystem [Dependency] private readonly MetaDataSystem _metaData = default!; [Dependency] private readonly FixtureSystem _fixtureSystem = default!; [Dependency] private readonly RandomHelperSystem _randomHelper = default!; + [Dependency] private readonly ContrabandTurnInSystem _contraband = default!; // Frontier public override void Initialize() { @@ -101,6 +103,7 @@ private void OnExamined(EntityUid uid, SeedComponent component, ExaminedEvent ar public EntityUid SpawnSeedPacket(SeedData proto, EntityCoordinates coords, EntityUid user, float? healthOverride = null) { var seed = SpawnAtPosition(proto.PacketPrototype, coords); // Frontier: Spawn(seed); seedComp.Seed = proto; seedComp.HealthOverride = healthOverride; @@ -160,6 +163,7 @@ public IEnumerable GenerateProduct(SeedData proto, EntityCoordinates var product = _robustRandom.Pick(proto.ProductPrototypes); var entity = SpawnAtPosition(product, position); // Frontier: Spawn + /// Frontier: the number of storage slots a machine with base parts should have. + /// + [DataField] + public int BaseNumStorageSlots = 25; + + /// + /// Frontier: the number of extra slots a machine gets per tier of upgrades. + /// + [DataField] + public int ExtraSlotsPerTier = 5; + + /// + /// Frontier: the machine part type that upgrades the number of slots in the machine. + /// + [DataField] + public ProtoId SlotUpgradeMachinePart = "MatterBin"; } } diff --git a/Content.Server/Chemistry/EntitySystems/ReagentDispenserSystem.cs b/Content.Server/Chemistry/EntitySystems/ReagentDispenserSystem.cs index f8d4a7efcd5..26a3c3657f3 100644 --- a/Content.Server/Chemistry/EntitySystems/ReagentDispenserSystem.cs +++ b/Content.Server/Chemistry/EntitySystems/ReagentDispenserSystem.cs @@ -13,6 +13,13 @@ using Robust.Shared.Containers; using Robust.Shared.Prototypes; using Content.Shared.Labels.Components; +using Content.Shared.Chemistry.Components.SolutionManager; // Frontier +using Content.Shared.Chemistry.Components; // Frontier +using Content.Shared.Chemistry.Reagent; // Frontier +using Content.Server.Labels; // Frontier +using Content.Shared.Verbs; // Frontier +using Content.Shared.Examine; // Frontier +using Content.Server.Construction; // Frontier namespace Content.Server.Chemistry.EntitySystems { @@ -30,6 +37,7 @@ public sealed class ReagentDispenserSystem : EntitySystem [Dependency] private readonly UserInterfaceSystem _userInterfaceSystem = default!; [Dependency] private readonly IPrototypeManager _prototypeManager = default!; [Dependency] private readonly OpenableSystem _openable = default!; + [Dependency] private readonly LabelSystem _label = default!; // Frontier public override void Initialize() { @@ -37,10 +45,15 @@ public override void Initialize() SubscribeLocalEvent(SubscribeUpdateUiState); SubscribeLocalEvent(SubscribeUpdateUiState); - SubscribeLocalEvent(SubscribeUpdateUiState); + SubscribeLocalEvent(OnEntInserted); // Frontier: SubscribeUpdateUiState < OnEntInserted SubscribeLocalEvent(SubscribeUpdateUiState); SubscribeLocalEvent(SubscribeUpdateUiState); + SubscribeLocalEvent>(OnAlternateVerb); // Frontier + SubscribeLocalEvent(OnExamined); // Frontier + SubscribeLocalEvent(OnRefreshParts); // Frontier + SubscribeLocalEvent(OnUpgradeExamine); // Frontier + SubscribeLocalEvent(OnSetDispenseAmountMessage); SubscribeLocalEvent(OnDispenseReagentMessage); SubscribeLocalEvent(OnClearContainerSolutionMessage); @@ -53,6 +66,64 @@ private void SubscribeUpdateUiState(Entity ent, re UpdateUiState(ent); } + // Frontier: auto-label on insert + private void OnEntInserted(Entity ent, ref EntInsertedIntoContainerMessage ev) + { + if (ent.Comp.AutoLabel && _solutionContainerSystem.TryGetDrainableSolution(ev.Entity, out _, out var sol)) + { + ReagentId? reagentId = sol.GetPrimaryReagentId(); + if (reagentId != null && _prototypeManager.TryIndex(reagentId.Value.Prototype, out var reagent)) + { + var reagentQuantity = sol.GetReagentQuantity(reagentId.Value); + var totalQuantity = sol.Volume; + if (reagentQuantity == totalQuantity) + _label.Label(ev.Entity, reagent.LocalizedName); + else + _label.Label(ev.Entity, Loc.GetString("reagent-dispenser-component-impure-auto-label", ("reagent", reagent.LocalizedName), ("purity", 100.0f * reagentQuantity / totalQuantity))); + } + } + + UpdateUiState(ent); + } + + private void OnAlternateVerb(Entity ent, ref GetVerbsEvent args) + { + if (!ent.Comp.CanAutoLabel) + return; + + args.Verbs.Add(new AlternativeVerb() + { + Act = () => + { + SetAutoLabel(ent, !ent.Comp.AutoLabel); + }, + Text = ent.Comp.AutoLabel ? + Loc.GetString("reagent-dispenser-component-set-auto-label-off-verb") + : Loc.GetString("reagent-dispenser-component-set-auto-label-on-verb"), + Priority = -1, //Not important, low priority. + }); + } + + private void SetAutoLabel(Entity ent, bool autoLabel) + { + if (!ent.Comp.CanAutoLabel) + return; + + ent.Comp.AutoLabel = autoLabel; + } + + private void OnExamined(Entity ent, ref ExaminedEvent args) + { + if (!args.IsInDetailsRange || !ent.Comp.CanAutoLabel) + return; + + if (ent.Comp.AutoLabel) + args.PushMarkup(Loc.GetString("reagent-dispenser-component-examine-auto-label-on")); + else + args.PushMarkup(Loc.GetString("reagent-dispenser-component-examine-auto-label-off")); + } + // End Frontier + private void UpdateUiState(Entity reagentDispenser) { var outputContainer = _itemSlotsSystem.GetItemOrNull(reagentDispenser, SharedReagentDispenser.OutputSlotName); @@ -168,6 +239,10 @@ private void ClickSound(Entity reagentDispenser) /// private void OnMapInit(EntityUid uid, ReagentDispenserComponent component, MapInitEvent args) { + // Frontier: set auto-labeller + component.AutoLabel = component.CanAutoLabel; + + /* // Frontier: no need to change slots, already done through RefreshParts // Get list of pre-loaded containers List preLoad = new List(); if (component.PackPrototypeId is not null @@ -194,8 +269,59 @@ private void OnMapInit(EntityUid uid, ReagentDispenserComponent component, MapIn component.StorageSlots[i].Name = "Storage Slot " + (i+1); _itemSlotsSystem.AddItemSlot(uid, component.StorageSlotIds[i], component.StorageSlots[i]); } + */ // End Frontier: no need to change slots, already done through RefreshParts _itemSlotsSystem.AddItemSlot(uid, SharedReagentDispenser.OutputSlotName, component.BeakerSlot); + + // Frontier: spawn slot contents + if (component.PackPrototypeId is not null + && _prototypeManager.TryIndex(component.PackPrototypeId, out ReagentDispenserInventoryPrototype? packPrototype)) + { + for (var i = 0; i < packPrototype.Inventory.Count && i < component.StorageSlots.Count; i++) + { + var item = Spawn(packPrototype.Inventory[i], Transform(uid).Coordinates); + if (!_itemSlotsSystem.TryInsert(uid, component.StorageSlots[i].ID!, item, null, excludeUserAudio: true)) + QueueDel(item); + } + } + // End Frontier + } + + // Frontier: upgradable parts + private void OnRefreshParts(EntityUid uid, ReagentDispenserComponent component, RefreshPartsEvent args) + { + if (!args.PartRatings.TryGetValue(component.SlotUpgradeMachinePart, out float partRating)) + partRating = 1.0f; + + component.NumSlots = component.BaseNumStorageSlots + (int)(component.ExtraSlotsPerTier * (partRating - 1.0f)); + // Not enough? + for (int i = component.StorageSlots.Count; i < component.NumSlots; i++) + { + var storageSlotId = ReagentDispenserComponent.BaseStorageSlotId + i; + + ItemSlot storageComponent = new(); + storageComponent.Whitelist = component.StorageWhitelist; + storageComponent.Swap = false; + storageComponent.EjectOnBreak = true; + + component.StorageSlotIds.Add(storageSlotId); + component.StorageSlots.Add(storageComponent); + component.StorageSlots[i].Name = "Storage Slot " + (i+1); + _itemSlotsSystem.AddItemSlot(uid, component.StorageSlotIds[i], component.StorageSlots[i]); + } + // Too many? + for (int i = component.StorageSlots.Count - 1; i >= component.NumSlots; i--) + { + _itemSlotsSystem.RemoveItemSlot(uid, component.StorageSlots[i]); + component.StorageSlotIds.RemoveAt(i); + component.StorageSlots.RemoveAt(i); + } + } + + private void OnUpgradeExamine(EntityUid uid, ReagentDispenserComponent component, UpgradeExamineEvent args) + { + args.AddNumberUpgrade("reagent-dispenser-component-examine-extra-slots", component.NumSlots - component.BaseNumStorageSlots); } + // End Frontier } } diff --git a/Content.Server/Communications/CommunicationsConsoleSystem.cs b/Content.Server/Communications/CommunicationsConsoleSystem.cs index 6c320edb23c..09c12e58703 100644 --- a/Content.Server/Communications/CommunicationsConsoleSystem.cs +++ b/Content.Server/Communications/CommunicationsConsoleSystem.cs @@ -21,6 +21,7 @@ using Content.Shared.Popups; using Robust.Server.GameObjects; using Robust.Shared.Configuration; +using Content.Server._NF.SectorServices; // Frontier namespace Content.Server.Communications { @@ -37,6 +38,7 @@ public sealed class CommunicationsConsoleSystem : EntitySystem [Dependency] private readonly UserInterfaceSystem _uiSystem = default!; [Dependency] private readonly IConfigurationManager _cfg = default!; [Dependency] private readonly IAdminLogManager _adminLogger = default!; + [Dependency] private readonly SectorServiceSystem _sectorService = default!; // Frontier: sector-wide alerts private const float UIUpdateInterval = 5.0f; @@ -110,9 +112,9 @@ private void OnAlertLevelChanged(AlertLevelChangedEvent args) var query = EntityQueryEnumerator(); while (query.MoveNext(out var uid, out var comp)) { - var entStation = _stationSystem.GetOwningStation(uid); - if (args.Station == entStation) - UpdateCommsConsoleInterface(uid, comp); + // var entStation = _stationSystem.GetOwningStation(uid); // Frontier: sector-wide alerts + // if (args.Station == entStation) // Frontier: sector-wide alerts + UpdateCommsConsoleInterface(uid, comp); } } @@ -133,14 +135,15 @@ public void UpdateCommsConsoleInterface() /// public void UpdateCommsConsoleInterface(EntityUid uid, CommunicationsConsoleComponent comp) { - var stationUid = _stationSystem.GetOwningStation(uid); + //var stationUid = _stationSystem.GetOwningStation(uid); // Frontier: sector-wide alerts + var stationUid = _sectorService.GetServiceEntity(); // Frontier: sector-wide alerts List? levels = null; string currentLevel = default!; float currentDelay = 0; - if (stationUid != null) + if (stationUid.Valid) // Frontier: != null < .Valid { - if (TryComp(stationUid.Value, out AlertLevelComponent? alertComp) && + if (TryComp(stationUid, out AlertLevelComponent? alertComp) && // Frontier: stationUid.Value(OnMindRemoved); SubscribeLocalEvent(OnCryoBeforeMindRemoved); SubscribeLocalEvent(OnCryoWakeUp); + SubscribeLocalEvent(OnRoundRestart); // Frontier _admin.OnPermsChanged += OnAdminPermsChanged; // Frontier _player.PlayerStatusChanged += PlayerStatusChanged; // Frontier @@ -115,7 +117,7 @@ private void OnAdminPermsChanged(AdminPermsChangedEventArgs args) } } - // Frontier: respawn handler: adjusts + // Frontier: respawn handler: adjusts respawn and cryo timers. public void Respawn(ICommonSession session) { var respawnData = GetRespawnData(session.UserId); @@ -187,5 +189,11 @@ private void PlayerStatusChanged(object? _, SessionStatusEventArgs args) RaiseNetworkEvent(new RespawnResetEvent(_respawnInfo[session.UserId].RespawnTime), session); } } + + // Frontier: reset game state, we have a new round. + private void OnRoundRestart(RoundRestartCleanupEvent ev) + { + _respawnInfo.Clear(); + } // End Frontier } diff --git a/Content.Server/EntityEffects/Effects/MakeSentient.cs b/Content.Server/EntityEffects/Effects/MakeSentient.cs index a037ca4f225..cbca3e546f3 100644 --- a/Content.Server/EntityEffects/Effects/MakeSentient.cs +++ b/Content.Server/EntityEffects/Effects/MakeSentient.cs @@ -50,5 +50,6 @@ public override void Effect(EntityEffectBaseArgs args) var entityData = entityManager.GetComponent(uid); ghostRole.RoleName = entityData.EntityName; ghostRole.RoleDescription = Loc.GetString("ghost-role-information-cognizine-description"); + ghostRole.RoleRules = Loc.GetString("ghost-role-information-freeagent-rules"); // Frontier } } diff --git a/Content.Server/Fluids/EntitySystems/AbsorbentSystem.cs b/Content.Server/Fluids/EntitySystems/AbsorbentSystem.cs index d41c72f3057..3222beecabb 100644 --- a/Content.Server/Fluids/EntitySystems/AbsorbentSystem.cs +++ b/Content.Server/Fluids/EntitySystems/AbsorbentSystem.cs @@ -255,6 +255,11 @@ private bool TryTwoWayAbsorbentRefillableTransfer( { _popups.PopupEntity(Loc.GetString("mopping-system-full", ("used", target)), user, user); } + // Frontier: out-only refillable solutions + else if (TryComp(refillableSoln.Owner, out var refillableSolnComp) && refillableSolnComp.PreventTransferOut) + { + } + // End Frontier else { // transfer as much contaminants to refillable as will fit diff --git a/Content.Server/Fluids/EntitySystems/PuddleSystem.Transfers.cs b/Content.Server/Fluids/EntitySystems/PuddleSystem.Transfers.cs index 04bbf55c581..aeffb41dbf5 100644 --- a/Content.Server/Fluids/EntitySystems/PuddleSystem.Transfers.cs +++ b/Content.Server/Fluids/EntitySystems/PuddleSystem.Transfers.cs @@ -14,6 +14,11 @@ private void InitializeTransfers() private void OnRefillableDragged(Entity entity, ref DragDropDraggedEvent args) { + // Frontier: silently prevent non-transferrable solution + if (entity.Comp.PreventTransferOut) + return; + // End Frontier + if (!_solutionContainerSystem.TryGetSolution(entity.Owner, entity.Comp.Solution, out var soln, out var solution) || solution.Volume == FixedPoint2.Zero) { _popups.PopupEntity(Loc.GetString("mopping-system-empty", ("used", entity.Owner)), entity, args.User); diff --git a/Content.Server/Lathe/LatheSystem.cs b/Content.Server/Lathe/LatheSystem.cs index 4078f543cc8..17cde762c2e 100644 --- a/Content.Server/Lathe/LatheSystem.cs +++ b/Content.Server/Lathe/LatheSystem.cs @@ -30,6 +30,9 @@ using Robust.Shared.Audio.Systems; using Robust.Shared.Prototypes; using Robust.Shared.Timing; +using Content.Shared.Cargo.Components; // Frontier +using Content.Server._NF.Contraband.Systems; // Frontier +using Robust.Shared.Containers; // Frontier namespace Content.Server.Lathe { @@ -51,6 +54,7 @@ public sealed class LatheSystem : SharedLatheSystem [Dependency] private readonly SharedSolutionContainerSystem _solution = default!; [Dependency] private readonly StackSystem _stack = default!; [Dependency] private readonly TransformSystem _transform = default!; + [Dependency] private readonly ContrabandTurnInSystem _contraband = default!; // Frontier /// /// Per-tick cache @@ -75,7 +79,7 @@ public override void Initialize() SubscribeLocalEvent(GetEmagLatheRecipes); SubscribeLocalEvent(OnHeatStartPrinting); - //Frontier Upgrade Code Restore + //Frontier: upgradeable parts SubscribeLocalEvent(OnPartsRefresh); SubscribeLocalEvent(OnUpgradeExamine); } @@ -234,6 +238,16 @@ public void FinishProducing(EntityUid uid, LatheComponent? comp = null, LathePro if (comp.CurrentRecipe.Result is { } resultProto) { var result = Spawn(resultProto, Transform(uid).Coordinates); + + // Frontier: adjust price before merge (stack prices changed once) + if (result.Valid) + { + ModifyPrintedEntityPrice(uid, comp, result); + + _contraband.ClearContrabandValue(result); + } + // End Frontier + _stack.TryMergeToContacts(result); } @@ -425,6 +439,39 @@ private void OnUpgradeExamine(EntityUid uid, LatheComponent component, UpgradeEx args.AddPercentageUpgrade("lathe-component-upgrade-speed", 1 / component.FinalTimeMultiplier); args.AddPercentageUpgrade("lathe-component-upgrade-material-use", component.FinalMaterialUseMultiplier); } - // End of modified code + + // Frontier: modify item value + private void ModifyPrintedEntityPrice(EntityUid uid, LatheComponent component, EntityUid target) + { + // Cannot reduce value, leave item as-is + if (component.ProductValueModifier == null + || !float.IsFinite(component.ProductValueModifier.Value) + || component.ProductValueModifier < 0f) + return; + + if (TryComp(target, out var stackPrice)) + { + if (stackPrice.Price > 0) + stackPrice.Price *= component.ProductValueModifier.Value; + } + if (TryComp(target, out var staticPrice)) + { + if (staticPrice.Price > 0) + staticPrice.Price *= component.ProductValueModifier.Value; + } + + // Recurse into contained entities + if (TryComp(target, out var containers)) + { + foreach (var container in containers.Containers.Values) + { + foreach (var ent in container.ContainedEntities) + { + ModifyPrintedEntityPrice(uid, component, ent); + } + } + } + } + // End Frontier } } diff --git a/Content.Server/Light/EntitySystems/EmergencyLightSystem.cs b/Content.Server/Light/EntitySystems/EmergencyLightSystem.cs index 6bd5750460a..633a027ef8f 100644 --- a/Content.Server/Light/EntitySystems/EmergencyLightSystem.cs +++ b/Content.Server/Light/EntitySystems/EmergencyLightSystem.cs @@ -11,6 +11,7 @@ using Content.Shared.Station.Components; using Robust.Server.GameObjects; using Color = Robust.Shared.Maths.Color; +using Content.Server._NF.SectorServices; // Frontier: sector services namespace Content.Server.Light.EntitySystems; @@ -21,6 +22,7 @@ public sealed class EmergencyLightSystem : SharedEmergencyLightSystem [Dependency] private readonly PointLightSystem _pointLight = default!; [Dependency] private readonly SharedAppearanceSystem _appearance = default!; [Dependency] private readonly StationSystem _station = default!; + [Dependency] private readonly SectorServiceSystem _sectorService = default!; // Frontier: sector-wide alerts public override void Initialize() { @@ -30,6 +32,8 @@ public override void Initialize() SubscribeLocalEvent(OnAlertLevelChanged); SubscribeLocalEvent(OnEmergencyExamine); SubscribeLocalEvent(OnEmergencyPower); + + SubscribeLocalEvent(OnMapInit); // Frontier } private void OnEmergencyPower(Entity entity, ref PowerChangedEvent args) @@ -56,8 +60,10 @@ private void OnEmergencyExamine(EntityUid uid, EmergencyLightComponent component Loc.GetString(component.BatteryStateText[component.State])))); // Show alert level on the light itself. - if (!TryComp(_station.GetOwningStation(uid), out var alerts)) + // Frontier: sector-wide alerts + if (!TryComp(_sectorService.GetServiceEntity(), out var alerts)) return; + // End Frontier: sector-wide alerts if (alerts.AlertLevels == null) return; @@ -94,8 +100,12 @@ private void OnEmergencyLightEvent(EntityUid uid, EmergencyLightComponent compon private void OnAlertLevelChanged(AlertLevelChangedEvent ev) { - if (!TryComp(ev.Station, out var alert)) + // Frontier: sector-wide alerts + // if (!TryComp(ev.Station, out var alert)) + // return; + if (!TryComp(_sectorService.GetServiceEntity(), out var alert)) return; + // End Frontier if (alert.AlertLevels == null || !alert.AlertLevels.Levels.TryGetValue(ev.AlertLevel, out var details)) return; @@ -103,8 +113,8 @@ private void OnAlertLevelChanged(AlertLevelChangedEvent ev) var query = EntityQueryEnumerator(); while (query.MoveNext(out var uid, out var light, out var pointLight, out var appearance, out var xform)) { - if (CompOrNull(xform.GridUid)?.Station != ev.Station) - continue; + // if (CompOrNull(xform.GridUid)?.Station != ev.Station) // Frontier: sector-wide alerts + // continue; // Frontier: sector-wide alerts _pointLight.SetColor(uid, details.EmergencyLightColor, pointLight); _appearance.SetData(uid, EmergencyLightVisuals.Color, details.EmergencyLightColor, appearance); @@ -237,4 +247,21 @@ private void TurnOn(Entity entity, Color color) _appearance.SetData(entity.Owner, EmergencyLightVisuals.On, true); _ambient.SetAmbience(entity.Owner, true); } + + // Frontier: ensure the lights are accurate to the station + private void OnMapInit(Entity entity, ref MapInitEvent ev) + { + if (!TryComp(_sectorService.GetServiceEntity(), out var alert)) + return; + + if (alert.AlertLevels == null || !alert.AlertLevels.Levels.TryGetValue(alert.CurrentLevel, out var details)) + return; + + entity.Comp.ForciblyEnabled = details.ForceEnableEmergencyLights; + if (details.ForceEnableEmergencyLights) + TurnOn(entity, details.EmergencyLightColor); + else + TurnOff(entity, details.EmergencyLightColor); + } + // End Frontier } diff --git a/Content.Server/PDA/PdaSystem.cs b/Content.Server/PDA/PdaSystem.cs index 09e0fb0c073..4e77fccef94 100644 --- a/Content.Server/PDA/PdaSystem.cs +++ b/Content.Server/PDA/PdaSystem.cs @@ -25,6 +25,7 @@ using Content.Shared.Bank.Components; // Frontier using Content.Shared.Shipyard.Components; // Frontier using Content.Server.Shipyard.Systems; // Frontier +using Content.Server._NF.SectorServices; // Frontier namespace Content.Server.PDA { @@ -39,6 +40,7 @@ public sealed class PdaSystem : SharedPdaSystem [Dependency] private readonly UserInterfaceSystem _ui = default!; [Dependency] private readonly UnpoweredFlashlightSystem _unpoweredFlashlight = default!; [Dependency] private readonly ContainerSystem _containerSystem = default!; + [Dependency] private readonly SectorServiceSystem _sectorService = default!; public override void Initialize() { @@ -295,7 +297,8 @@ private void UpdateStationName(EntityUid uid, PdaComponent pda) private void UpdateAlertLevel(EntityUid uid, PdaComponent pda) { - var station = _station.GetOwningStation(uid); + //var station = _station.GetOwningStation(uid); // Frontier + var station = _sectorService.GetServiceEntity(); // Frontier if (!TryComp(station, out AlertLevelComponent? alertComp) || alertComp.AlertLevels == null) return; diff --git a/Content.Server/Power/Generator/GeneratorSystem.cs b/Content.Server/Power/Generator/GeneratorSystem.cs index cbe454f69a9..111cf363636 100644 --- a/Content.Server/Power/Generator/GeneratorSystem.cs +++ b/Content.Server/Power/Generator/GeneratorSystem.cs @@ -68,21 +68,7 @@ private void OnEjectFuel(EntityUid uid, FuelGeneratorComponent component, Portab private void SolidEmpty(EntityUid uid, SolidFuelGeneratorAdapterComponent component, GeneratorEmpty args) { - // Frontier: eject fuel-grade material - if (component.EjectedFuelProtoId == null) - _materialStorage.EjectAllMaterial(uid); - else - { - int materialAmount = _materialStorage.GetMaterialAmount(uid, component.FuelMaterial); - if (materialAmount <= 0) // No fuel? Job done. - return; - _materialStorage.TryChangeMaterialAmount(uid, component.FuelMaterial, -materialAmount); - - var ejectedUid = Spawn(component.EjectedFuelProtoId, Transform(uid).Coordinates); - if (TryComp(ejectedUid, out var phys)) - phys.MaterialComposition[component.FuelMaterial] = materialAmount; - } - // End Frontier + _materialStorage.EjectAllMaterial(uid); } private void ChemicalEmpty(Entity entity, ref GeneratorEmpty args) diff --git a/Content.Server/Power/Generator/SolidFuelGeneratorAdapterComponent.cs b/Content.Server/Power/Generator/SolidFuelGeneratorAdapterComponent.cs index 0274f8fe42a..ccb2210fa40 100644 --- a/Content.Server/Power/Generator/SolidFuelGeneratorAdapterComponent.cs +++ b/Content.Server/Power/Generator/SolidFuelGeneratorAdapterComponent.cs @@ -38,11 +38,4 @@ public sealed partial class SolidFuelGeneratorAdapterComponent : Component /// [DataField("multiplier"), ViewVariables(VVAccess.ReadWrite)] public float Multiplier; - - /// - /// Frontier: entity to spawn for ejected fuel. If null, will spawn material stacks as normal. - /// - [DataField(customTypeSerializer: typeof(PrototypeIdSerializer))] - [ViewVariables(VVAccess.ReadWrite)] - public string? EjectedFuelProtoId; } diff --git a/Content.Server/RoundEnd/RoundEndSystem.cs b/Content.Server/RoundEnd/RoundEndSystem.cs index bb5934f3f08..53433f523db 100644 --- a/Content.Server/RoundEnd/RoundEndSystem.cs +++ b/Content.Server/RoundEnd/RoundEndSystem.cs @@ -22,6 +22,7 @@ using Robust.Shared.Prototypes; using Robust.Shared.Timing; using Timer = Robust.Shared.Timing.Timer; +using Content.Server._NF.SectorServices; // Frontier namespace Content.Server.RoundEnd { @@ -42,6 +43,7 @@ public sealed class RoundEndSystem : EntitySystem [Dependency] private readonly EmergencyShuttleSystem _shuttle = default!; [Dependency] private readonly SharedAudioSystem _audio = default!; [Dependency] private readonly StationSystem _stationSystem = default!; + [Dependency] private readonly SectorServiceSystem _sectorService = default!; // Frontier: sector-wide alerts public TimeSpan DefaultCooldownDuration { get; set; } = TimeSpan.FromSeconds(30); @@ -131,7 +133,8 @@ public void RequestRoundEnd(EntityUid? requester = null, bool checkCooldown = tr if (requester != null) { - var stationUid = _stationSystem.GetOwningStation(requester.Value); + var stationUid = _sectorService.GetServiceEntity(); // Frontier: sector-wide alerts + // var stationUid = _stationSystem.GetOwningStation(requester.Value); // Frontier: sector-wide alerts if (TryComp(stationUid, out var alertLevel)) { duration = _protoManager diff --git a/Content.Server/Shipyard/Systems/ShipyardSystem.Consoles.cs b/Content.Server/Shipyard/Systems/ShipyardSystem.Consoles.cs index 62d225badd7..923371f3b1e 100644 --- a/Content.Server/Shipyard/Systems/ShipyardSystem.Consoles.cs +++ b/Content.Server/Shipyard/Systems/ShipyardSystem.Consoles.cs @@ -3,7 +3,6 @@ using Content.Server.Radio.EntitySystems; using Content.Server._NF.Bank; using Content.Server.Shipyard.Components; -using Content.Shared._NF.GameRule; using Content.Shared.Bank.Components; using Content.Shared.Shipyard.Events; using Content.Shared.Shipyard.BUI; diff --git a/Content.Server/Station/Systems/StationSpawningSystem.cs b/Content.Server/Station/Systems/StationSpawningSystem.cs index f6f238ad902..12cd4d2b1d2 100644 --- a/Content.Server/Station/Systems/StationSpawningSystem.cs +++ b/Content.Server/Station/Systems/StationSpawningSystem.cs @@ -133,6 +133,7 @@ public EntityUid SpawnPlayerMob( { loadout = new RoleLoadout(jobLoadout); loadout.SetDefault(profile, _actors.GetSession(entity), _prototypeManager); + loadout.EnsureValid(profile!, session, _dependencyCollection); // Frontier - profile must not be null, but if it was, TryGetValue above should fail } } @@ -182,8 +183,8 @@ public EntityUid SpawnPlayerMob( if (loadout != null) { + /// Frontier: overwriting EquipRoleLoadout //EquipRoleLoadout(entity.Value, loadout, roleProto!); - // Frontier: overwriting EquipRoleLoadout var initialBankBalance = profile!.BankBalance; //Frontier var bankBalance = profile!.BankBalance; //Frontier bool hasBalance = false; // Frontier @@ -254,7 +255,6 @@ public EntityUid SpawnPlayerMob( break; } } - // End Frontier } // Frontier: do not re-equip roleLoadout, make sure we equip job startingGear, @@ -268,7 +268,7 @@ public EntityUid SpawnPlayerMob( { _bank.TryBankWithdraw(session!, prefs!, profile!, initialBankBalance - bankBalance, out var newBalance); } - // End Frontier + /// End Frontier: overwriting EquipRoleLoadout } var gearEquippedEv = new StartingGearEquippedEvent(entity.Value); diff --git a/Content.Server/StationEvents/Events/AlertLevelInterceptionRule.cs b/Content.Server/StationEvents/Events/AlertLevelInterceptionRule.cs index 916d7d16883..150517374a2 100644 --- a/Content.Server/StationEvents/Events/AlertLevelInterceptionRule.cs +++ b/Content.Server/StationEvents/Events/AlertLevelInterceptionRule.cs @@ -15,6 +15,7 @@ protected override void Started(EntityUid uid, AlertLevelInterceptionRuleCompone if (!TryGetRandomStation(out var chosenStation)) return; + // Frontier - note: levels are globally set/gotten, regardless of arg if (_alertLevelSystem.GetLevel(chosenStation.Value) != "green") return; diff --git a/Content.Server/VendingMachines/VendingMachineSystem.cs b/Content.Server/VendingMachines/VendingMachineSystem.cs index 687bd925ebc..1f117f63620 100644 --- a/Content.Server/VendingMachines/VendingMachineSystem.cs +++ b/Content.Server/VendingMachines/VendingMachineSystem.cs @@ -35,6 +35,7 @@ using Content.Server.Administration.Logs; // Frontier using Content.Shared.Database; // Frontier using Content.Shared._NF.Bank.BUI; // Frontier +using Content.Server._NF.Contraband.Systems; // Frontier namespace Content.Server.VendingMachines { @@ -53,6 +54,7 @@ public sealed class VendingMachineSystem : SharedVendingMachineSystem [Dependency] private readonly BankSystem _bankSystem = default!; // Frontier [Dependency] private readonly PopupSystem _popupSystem = default!; // Frontier [Dependency] private readonly IAdminLogManager _adminLogger = default!; // Frontier + [Dependency] private readonly ContrabandTurnInSystem _contraband = default!; // Frontier private const float WallVendEjectDistanceFromWall = 1f; @@ -507,6 +509,8 @@ private void EjectItem(EntityUid uid, VendingMachineComponent? vendComponent = n var ent = Spawn(vendComponent.NextItemToEject, spawnCoordinates); + _contraband.ClearContrabandValue(ent); // Frontier + if (vendComponent.ThrowNextItem) { var range = vendComponent.NonLimitedEjectRange; diff --git a/Content.Server/_NF/GameRule/Components/AdventureRuleComponent.cs b/Content.Server/_NF/GameRule/Components/NFAdventureRuleComponent.cs similarity index 58% rename from Content.Server/_NF/GameRule/Components/AdventureRuleComponent.cs rename to Content.Server/_NF/GameRule/Components/NFAdventureRuleComponent.cs index fc85a5209c6..2ea4339bb70 100644 --- a/Content.Server/_NF/GameRule/Components/AdventureRuleComponent.cs +++ b/Content.Server/_NF/GameRule/Components/NFAdventureRuleComponent.cs @@ -1,10 +1,7 @@ -using Content.Shared.Procedural; -using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List; - namespace Content.Server._NF.GameRule.Components; -[RegisterComponent, Access(typeof(NfAdventureRuleSystem))] -public sealed partial class AdventureRuleComponent : Component +[RegisterComponent, Access(typeof(NFAdventureRuleSystem))] +public sealed partial class NFAdventureRuleComponent : Component { public List NFPlayerMinds = new(); public List CargoDepots = new(); diff --git a/Content.Server/_NF/GameRule/NfAdventureRuleSystem.cs b/Content.Server/_NF/GameRule/NfAdventureRuleSystem.cs index 5ee7e6e8b7a..68062cdb598 100644 --- a/Content.Server/_NF/GameRule/NfAdventureRuleSystem.cs +++ b/Content.Server/_NF/GameRule/NfAdventureRuleSystem.cs @@ -1,24 +1,15 @@ using System.Linq; using System.Net.Http; -using System.Numerics; using System.Text; using System.Text.Json; using System.Text.Json.Serialization; using System.Threading.Tasks; -using Content.Shared._NF.GameRule; using Content.Server._NF.GameTicking.Events; -using Robust.Server.GameObjects; -using Robust.Server.Maps; using Content.Shared.GameTicking.Components; -using Robust.Shared.Map; using Robust.Shared.Prototypes; -using Robust.Shared.Random; -using Content.Server.Shuttles.Systems; using Content.Server.Cargo.Components; using Content.Server.GameTicking; using Content.Server.GameTicking.Rules; -using Content.Server.Maps; -using Content.Server.Station.Systems; using Content.Shared._NF.CCVar; // Frontier using Robust.Shared.Configuration; using Content.Shared._NF.Bank; @@ -29,26 +20,19 @@ using Content.Shared.GameTicking; using Robust.Shared.Enums; using Robust.Server.Player; -using Content.Server.Warps; namespace Content.Server._NF.GameRule; /// /// This handles the dungeon and trading post spawning, as well as round end capitalism summary /// -public sealed class NfAdventureRuleSystem : GameRuleSystem +public sealed class NFAdventureRuleSystem : GameRuleSystem { [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly IRobustRandom _random = default!; [Dependency] private readonly IConfigurationManager _configurationManager = default!; [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly MapLoaderSystem _map = default!; - [Dependency] private readonly MetaDataSystem _meta = default!; - [Dependency] private readonly StationSystem _station = default!; - [Dependency] private readonly ShuttleSystem _shuttle = default!; - [Dependency] private readonly PhysicsSystem _physics = default!; [Dependency] private readonly BankSystem _bank = default!; - [Dependency] private readonly StationRenameWarpsSystems _renameWarps = default!; + [Dependency] private readonly PointOfInterestSystem _poi = default!; private readonly HttpClient _httpClient = new(); @@ -77,11 +61,6 @@ public PlayerRoundBankInformation(int startBalance, string name, NetUserId userI [ViewVariables] private Dictionary _players = new(); - private float _distanceOffset = 1f; - private List _stationCoords = new(); - - private MapId _mapId; - /// public override void Initialize() { @@ -92,7 +71,7 @@ public override void Initialize() _playerManager.PlayerStatusChanged += PlayerManagerOnPlayerStatusChanged; } - protected override void AppendRoundEndText(EntityUid uid, AdventureRuleComponent component, GameRuleComponent gameRule, ref RoundEndTextAppendEvent ev) + protected override void AppendRoundEndText(EntityUid uid, NFAdventureRuleComponent component, GameRuleComponent gameRule, ref RoundEndTextAppendEvent ev) { ev.AddLine(Loc.GetString("adventure-list-start")); var allScore = new List>(); @@ -206,12 +185,9 @@ private void OnRoundRestart(RoundRestartCleanupEvent ev) _players.Clear(); } - protected override void Started(EntityUid uid, AdventureRuleComponent component, GameRuleComponent gameRule, GameRuleStartedEvent args) + protected override void Started(EntityUid uid, NFAdventureRuleComponent component, GameRuleComponent gameRule, GameRuleStartedEvent args) { - _mapId = GameTicker.DefaultMap; - - _distanceOffset = _configurationManager.GetCVar(NFCCVars.POIDistanceModifier); - _stationCoords = new List(); + var mapUid = GameTicker.DefaultMap; //First, we need to grab the list and sort it into its respective spawning logics List depotProtos = new(); @@ -237,11 +213,11 @@ protected override void Started(EntityUid uid, AdventureRuleComponent component, remainingUniqueProtosBySpawnGroup[location.SpawnGroup].Add(location); } } - GenerateDepots(depotProtos, out component.CargoDepots); - GenerateMarkets(marketProtos, out component.MarketStations); - GenerateRequireds(requiredProtos, out component.RequiredPois); - GenerateOptionals(optionalProtos, out component.OptionalPois); - GenerateUniques(remainingUniqueProtosBySpawnGroup, out component.UniquePois); + _poi.GenerateDepots(mapUid, depotProtos, out component.CargoDepots); + _poi.GenerateMarkets(mapUid, marketProtos, out component.MarketStations); + _poi.GenerateRequireds(mapUid, requiredProtos, out component.RequiredPois); + _poi.GenerateOptionals(mapUid, optionalProtos, out component.OptionalPois); + _poi.GenerateUniques(mapUid, remainingUniqueProtosBySpawnGroup, out component.UniquePois); base.Started(uid, component, gameRule, args); @@ -249,223 +225,6 @@ protected override void Started(EntityUid uid, AdventureRuleComponent component, RaiseLocalEvent(EntityUid.Invalid, new StationsGeneratedEvent(), broadcast: true); // TODO: attach this to a meaningful entity. } - private void GenerateDepots(List depotPrototypes, out List depotStations) - { - //For depots, we want them to fill a circular type dystance formula to try to keep them as far apart as possible - //Therefore, we will be taking our range properties and treating them as magnitudes of a direction vector divided - //by the number of depots set in our corresponding cvar - - depotStations = new List(); - var depotCount = _configurationManager.GetCVar(NFCCVars.CargoDepots); - var rotation = 2 * Math.PI / depotCount; - var rotationOffset = _random.NextAngle() / depotCount; - - for (int i = 0; i < depotCount && depotPrototypes.Count > 0; i++) - { - var proto = _random.Pick(depotPrototypes); - Vector2i offset = new Vector2i((int) (_random.Next(proto.MinimumDistance, proto.MaximumDistance) * _distanceOffset), 0); - offset = offset.Rotate(rotationOffset); - rotationOffset += rotation; - // Append letter to depot name. - - string overrideName = proto.Name; - if (i < 26) - overrideName += $" {(char) ('A' + i)}"; // " A" ... " Z" - else - overrideName += $" {i + 1}"; // " 27", " 28"... - if (TrySpawnPoiGrid(proto, offset, out var depotUid, overrideName: overrideName) && depotUid is { Valid: true } depot) - { - depotStations.Add(depot); - AddStationCoordsToSet(offset); // adjust list of actual station coords - } - } - } - - private void GenerateMarkets(List marketPrototypes, out List marketStations) - { - //For market stations, we are going to allow for a bit of randomness and a different offset configuration. We dont - //want copies of this one, since these can be more themed and duplicate names, for instance, can make for a less - //ideal world - - marketStations = new List(); - var marketCount = _configurationManager.GetCVar(NFCCVars.MarketStations); - _random.Shuffle(marketPrototypes); - int marketsAdded = 0; - foreach (var proto in marketPrototypes) - { - if (marketsAdded >= marketCount) - break; - - var offset = GetRandomPOICoord(proto.MinimumDistance, proto.MaximumDistance, true); - - if (TrySpawnPoiGrid(proto, offset, out var marketUid) && marketUid is { Valid: true } market) - { - marketStations.Add(market); - marketsAdded++; - AddStationCoordsToSet(offset); - } - } - } - - private void GenerateOptionals(List optionalPrototypes, out List optionalStations) - { - //Stations that do not have a defined grouping in their prototype get a default of "Optional" and get put into the - //generic random rotation of POIs. This should include traditional places like Tinnia's rest, the Science Lab, The Pit, - //and most RP places. This will essentially put them all into a pool to pull from, and still does not use the RNG function. - - optionalStations = new List(); - var optionalCount = _configurationManager.GetCVar(NFCCVars.OptionalStations); - _random.Shuffle(optionalPrototypes); - int optionalsAdded = 0; - foreach (var proto in optionalPrototypes) - { - if (optionalsAdded >= optionalCount) - break; - - var offset = GetRandomPOICoord(proto.MinimumDistance, proto.MaximumDistance, true); - - if (TrySpawnPoiGrid(proto, offset, out var optionalUid) && optionalUid is { Valid: true } uid) - { - optionalStations.Add(uid); - AddStationCoordsToSet(offset); - } - } - } - - private void GenerateRequireds(List requiredPrototypes, out List requiredStations) - { - //Stations are required are ones that are vital to function but otherwise still follow a generic random spawn logic - //Traditionally these would be stations like Expedition Lodge, NFSD station, Prison/Courthouse POI, etc. - //There are no limit to these, and any prototype marked alwaysSpawn = true will get pulled out of any list that isnt Markets/Depots - //And will always appear every time, and also will not be included in other optional/dynamic lists - - requiredStations = new List(); - foreach (var proto in requiredPrototypes) - { - var offset = GetRandomPOICoord(proto.MinimumDistance, proto.MaximumDistance, true); - - if (TrySpawnPoiGrid(proto, offset, out var requiredUid) && requiredUid is { Valid: true } uid) - { - requiredStations.Add(uid); - AddStationCoordsToSet(offset); - } - } - } - - private void GenerateUniques(Dictionary> uniquePrototypes, out List uniqueStations) - { - //Unique locations are semi-dynamic groupings of POIs that rely each independantly on the SpawnChance per POI prototype - //Since these are the remainder, and logically must have custom-designated groupings, we can then know to subdivide - //our random pool into these found groups. - //To do this with an equal distribution on a per-POI, per-round percentage basis, we are going to ensure a random - //pick order of which we analyze our weighted chances to spawn, and if successful, remove every entry of that group - //entirely. - - uniqueStations = new List(); - foreach (var prototypeList in uniquePrototypes.Values) - { - // Try to spawn - _random.Shuffle(prototypeList); - foreach (var proto in prototypeList) - { - var chance = _random.NextFloat(0, 1); - if (chance <= proto.SpawnChance) - { - var offset = GetRandomPOICoord(proto.MinimumDistance, proto.MaximumDistance, true); - - if (TrySpawnPoiGrid(proto, offset, out var optionalUid) && optionalUid is { Valid: true } uid) - { - uniqueStations.Add(uid); - AddStationCoordsToSet(offset); - break; - } - } - } - } - } - - private bool TrySpawnPoiGrid(PointOfInterestPrototype proto, Vector2 offset, out EntityUid? gridUid, string? overrideName = null) - { - gridUid = null; - if (_map.TryLoad(_mapId, proto.GridPath.ToString(), out var mapUids, - new MapLoadOptions - { - Offset = offset, - Rotation = _random.NextAngle() - })) - { - - string stationName = string.IsNullOrEmpty(overrideName) ? proto.Name : overrideName; - - EntityUid? stationUid = null; - if (_prototypeManager.TryIndex(proto.ID, out var stationProto)) - { - stationUid = _station.InitializeNewStation(stationProto.Stations[proto.ID], mapUids, stationName); - } - - foreach (var grid in mapUids) - { - var meta = EnsureComp(grid); - _meta.SetEntityName(grid, stationName, meta); - - EntityManager.AddComponents(grid, proto.AddComponents); - } - - // Rename warp points after set up if needed - if (proto.NameWarp) - { - bool? hideWarp = proto.HideWarp ? true : null; - if (stationUid != null) - _renameWarps.SyncWarpPointsToStation(stationUid.Value, forceAdminOnly: hideWarp); - else - _renameWarps.SyncWarpPointsToGrids(mapUids, forceAdminOnly: hideWarp); - } - - gridUid = mapUids[0]; - return true; - } - - return false; - } - - private Vector2 GetRandomPOICoord(float unscaledMinRange, float unscaledMaxRange, bool scaleRange) - { - int numRetries = int.Max(_configurationManager.GetCVar(NFCCVars.POIPlacementRetries), 0); - float minDistance = float.Max(_configurationManager.GetCVar(NFCCVars.MinPOIDistance), 0); // Constant at the end to avoid NaN weirdness - - Vector2 coords = _random.NextVector2(unscaledMinRange, unscaledMaxRange); - if (scaleRange) - coords *= _distanceOffset; - for (int i = 0; i < numRetries; i++) - { - bool positionIsValid = true; - foreach (var station in _stationCoords) - { - if (Vector2.Distance(station, coords) < minDistance) - { - positionIsValid = false; - break; - } - } - - // We have a valid position - if (positionIsValid) - break; - - // No vector yet, get next value. - coords = _random.NextVector2(unscaledMinRange, unscaledMaxRange); - if (scaleRange) - coords *= _distanceOffset; - } - - return coords; - } - - private void AddStationCoordsToSet(Vector2 coords) - { - _stationCoords.Add(coords); - } - private async Task ReportRound(string message, int color = 0x77DDE7) { Logger.InfoS("discord", message); diff --git a/Content.Shared/_NF/GameRule/PointOfInterestPrototype.cs b/Content.Server/_NF/GameRule/PointOfInterestPrototype.cs similarity index 83% rename from Content.Shared/_NF/GameRule/PointOfInterestPrototype.cs rename to Content.Server/_NF/GameRule/PointOfInterestPrototype.cs index b1b11cd5963..f29cf76474e 100644 --- a/Content.Shared/_NF/GameRule/PointOfInterestPrototype.cs +++ b/Content.Server/_NF/GameRule/PointOfInterestPrototype.cs @@ -1,8 +1,8 @@ +using Content.Server.GameTicking.Presets; using Robust.Shared.Prototypes; -using Robust.Shared.Serialization; using Robust.Shared.Utility; -namespace Content.Shared._NF.GameRule; +namespace Content.Server._NF.GameRule; /// /// Describes information for a single point of interest to be spawned in the world @@ -11,7 +11,6 @@ namespace Content.Shared._NF.GameRule; [Serializable] public sealed partial class PointOfInterestPrototype : IPrototype { - /// [IdDataField] public string ID { get; private set; } = default!; @@ -22,13 +21,13 @@ public sealed partial class PointOfInterestPrototype : IPrototype public string Name { get; private set; } = ""; /// - /// Should we set the warppoint name based on the grid name. + /// Should we set the warppoint name based on the grid name. /// [DataField] public bool NameWarp { get; set; } = true; /// - /// If true, makes the warp point admin-only (hiding it for players). + /// If true, makes the warp point admin-only (hiding it for players). /// [DataField] public bool HideWarp { get; set; } = false; @@ -46,11 +45,17 @@ public sealed partial class PointOfInterestPrototype : IPrototype public int MaximumDistance { get; private set; } = 10000; /// - /// Components to be added to any spawned grids. + /// Components to be added to any spawned grids. /// [DataField] public ComponentRegistry AddComponents { get; set; } = new(); + /// + /// What gamepresets ID this POI is allowed to spawn on. + /// + [DataField] + public ProtoId[] SpawnGamePreset { get; private set; } = []; + /// /// If the POI does not belong to a pre-defined group, it will default to the "unique" internal category and will /// use this float from 0-1 as a raw chance to spawn each round. diff --git a/Content.Server/_NF/GameRule/PointOfInterestSystem.cs b/Content.Server/_NF/GameRule/PointOfInterestSystem.cs new file mode 100644 index 00000000000..d58a70b924a --- /dev/null +++ b/Content.Server/_NF/GameRule/PointOfInterestSystem.cs @@ -0,0 +1,299 @@ +using System.Linq; +using System.Numerics; +using Robust.Server.GameObjects; +using Robust.Server.Maps; +using Robust.Shared.Configuration; +using Robust.Shared.Map; +using Robust.Shared.Prototypes; +using Robust.Shared.Random; +using Content.Server.Maps; +using Content.Server.Station.Systems; +using Content.Server.GameTicking; +using Content.Shared._NF.CCVar; +using Content.Shared.GameTicking; + +namespace Content.Server._NF.GameRule; + +/// +/// This handles the dungeon and trading post spawning, as well as round end capitalism summary +/// +//[Access(typeof(NfAdventureRuleSystem))] +public sealed class PointOfInterestSystem : EntitySystem +{ + [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private readonly IConfigurationManager _configurationManager = default!; + [Dependency] private readonly MapLoaderSystem _map = default!; + [Dependency] private readonly MetaDataSystem _meta = default!; + [Dependency] private readonly StationSystem _station = default!; + [Dependency] private readonly StationRenameWarpsSystems _renameWarps = default!; + [Dependency] private readonly GameTicker _ticker = default!; + + private List _stationCoords = new(); + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnRoundRestart); + } + + private void OnRoundRestart(RoundRestartCleanupEvent ev) + { + _stationCoords.Clear(); + } + + private void AddStationCoordsToSet(Vector2 coords) + { + _stationCoords.Add(coords); + } + + public void GenerateDepots(MapId mapUid, List depotPrototypes, out List depotStations) + { + //For depots, we want them to fill a circular type dystance formula to try to keep them as far apart as possible + //Therefore, we will be taking our range properties and treating them as magnitudes of a direction vector divided + //by the number of depots set in our corresponding cvar + + depotStations = new List(); + var depotCount = _configurationManager.GetCVar(NFCCVars.CargoDepots); + var rotation = 2 * Math.PI / depotCount; + var rotationOffset = _random.NextAngle() / depotCount; + + if (_ticker.CurrentPreset is null) + return; + + var currentPreset = _ticker.CurrentPreset.ID; + + for (int i = 0; i < depotCount && depotPrototypes.Count > 0; i++) + { + var proto = _random.Pick(depotPrototypes); + + if (!proto.SpawnGamePreset.Contains(currentPreset)) + continue; + + Vector2i offset = new Vector2i((int) _random.Next(proto.MinimumDistance, proto.MaximumDistance), 0); + offset = offset.Rotate(rotationOffset); + rotationOffset += rotation; + // Append letter to depot name. + + string overrideName = proto.Name; + if (i < 26) + overrideName += $" {(char)('A' + i)}"; // " A" ... " Z" + else + overrideName += $" {i + 1}"; // " 27", " 28"... + if (TrySpawnPoiGrid(mapUid, proto, offset, out var depotUid, overrideName: overrideName) && depotUid is { Valid: true } depot) + { + depotStations.Add(depot); + AddStationCoordsToSet(offset); // adjust list of actual station coords + } + } + } + + public void GenerateMarkets(MapId mapUid, List marketPrototypes, out List marketStations) + { + //For market stations, we are going to allow for a bit of randomness and a different offset configuration. We dont + //want copies of this one, since these can be more themed and duplicate names, for instance, can make for a less + //ideal world + + marketStations = new List(); + var marketCount = _configurationManager.GetCVar(NFCCVars.MarketStations); + _random.Shuffle(marketPrototypes); + int marketsAdded = 0; + + if (_ticker.CurrentPreset is null) + return; + var currentPreset = _ticker.CurrentPreset.ID; + + foreach (var proto in marketPrototypes) + { + if (!proto.SpawnGamePreset.Contains(currentPreset)) + continue; + + if (marketsAdded >= marketCount) + break; + + var offset = GetRandomPOICoord(proto.MinimumDistance, proto.MaximumDistance); + + if (TrySpawnPoiGrid(mapUid, proto, offset, out var marketUid) && marketUid is { Valid: true } market) + { + marketStations.Add(market); + marketsAdded++; + AddStationCoordsToSet(offset); + } + } + } + + public void GenerateOptionals(MapId mapUid, List optionalPrototypes, out List optionalStations) + { + //Stations that do not have a defined grouping in their prototype get a default of "Optional" and get put into the + //generic random rotation of POIs. This should include traditional places like Tinnia's rest, the Science Lab, The Pit, + //and most RP places. This will essentially put them all into a pool to pull from, and still does not use the RNG function. + + optionalStations = new List(); + var optionalCount = _configurationManager.GetCVar(NFCCVars.OptionalStations); + _random.Shuffle(optionalPrototypes); + int optionalsAdded = 0; + + if (_ticker.CurrentPreset is null) + return; + var currentPreset = _ticker.CurrentPreset.ID; + + foreach (var proto in optionalPrototypes) + { + if (!proto.SpawnGamePreset.Contains(currentPreset)) + continue; + + if (optionalsAdded >= optionalCount) + break; + + var offset = GetRandomPOICoord(proto.MinimumDistance, proto.MaximumDistance); + + if (TrySpawnPoiGrid(mapUid, proto, offset, out var optionalUid) && optionalUid is { Valid: true } uid) + { + optionalStations.Add(uid); + AddStationCoordsToSet(offset); + } + } + } + + public void GenerateRequireds(MapId mapUid, List requiredPrototypes, out List requiredStations) + { + //Stations are required are ones that are vital to function but otherwise still follow a generic random spawn logic + //Traditionally these would be stations like Expedition Lodge, NFSD station, Prison/Courthouse POI, etc. + //There are no limit to these, and any prototype marked alwaysSpawn = true will get pulled out of any list that isnt Markets/Depots + //And will always appear every time, and also will not be included in other optional/dynamic lists + + requiredStations = new List(); + + if (_ticker.CurrentPreset is null) + return; + var currentPreset = _ticker.CurrentPreset!.ID; + + foreach (var proto in requiredPrototypes) + { + if (!proto.SpawnGamePreset.Contains(currentPreset)) + continue; + + var offset = GetRandomPOICoord(proto.MinimumDistance, proto.MaximumDistance); + + if (TrySpawnPoiGrid(mapUid, proto, offset, out var requiredUid) && requiredUid is { Valid: true } uid) + { + requiredStations.Add(uid); + AddStationCoordsToSet(offset); + } + } + } + + public void GenerateUniques(MapId mapUid, Dictionary> uniquePrototypes, out List uniqueStations) + { + //Unique locations are semi-dynamic groupings of POIs that rely each independantly on the SpawnChance per POI prototype + //Since these are the remainder, and logically must have custom-designated groupings, we can then know to subdivide + //our random pool into these found groups. + //To do this with an equal distribution on a per-POI, per-round percentage basis, we are going to ensure a random + //pick order of which we analyze our weighted chances to spawn, and if successful, remove every entry of that group + //entirely. + + uniqueStations = new List(); + + if (_ticker.CurrentPreset is null) + return; + var currentPreset = _ticker.CurrentPreset!.ID; + + foreach (var prototypeList in uniquePrototypes.Values) + { + // Try to spawn + _random.Shuffle(prototypeList); + foreach (var proto in prototypeList) + { + if (!proto.SpawnGamePreset.Contains(currentPreset)) + continue; + + var chance = _random.NextFloat(0, 1); + if (chance <= proto.SpawnChance) + { + var offset = GetRandomPOICoord(proto.MinimumDistance, proto.MaximumDistance); + + if (TrySpawnPoiGrid(mapUid, proto, offset, out var optionalUid) && optionalUid is { Valid: true } uid) + { + uniqueStations.Add(uid); + AddStationCoordsToSet(offset); + break; + } + } + } + } + } + + private bool TrySpawnPoiGrid(MapId mapUid, PointOfInterestPrototype proto, Vector2 offset, out EntityUid? gridUid, string? overrideName = null) + { + gridUid = null; + if (_map.TryLoad(mapUid, proto.GridPath.ToString(), out var mapUids, + new MapLoadOptions + { + Offset = offset, + Rotation = _random.NextAngle() + })) + { + + string stationName = string.IsNullOrEmpty(overrideName) ? proto.Name : overrideName; + + EntityUid? stationUid = null; + if (_prototypeManager.TryIndex(proto.ID, out var stationProto)) + { + stationUid = _station.InitializeNewStation(stationProto.Stations[proto.ID], mapUids, stationName); + } + + foreach (var grid in mapUids) + { + var meta = EnsureComp(grid); + _meta.SetEntityName(grid, stationName, meta); + + EntityManager.AddComponents(grid, proto.AddComponents); + } + + // Rename warp points after set up if needed + if (proto.NameWarp) + { + bool? hideWarp = proto.HideWarp ? true : null; + if (stationUid != null) + _renameWarps.SyncWarpPointsToStation(stationUid.Value, forceAdminOnly: hideWarp); + else + _renameWarps.SyncWarpPointsToGrids(mapUids, forceAdminOnly: hideWarp); + } + + gridUid = mapUids[0]; + return true; + } + + return false; + } + + private Vector2 GetRandomPOICoord(float unscaledMinRange, float unscaledMaxRange) + { + int numRetries = int.Max(_configurationManager.GetCVar(NFCCVars.POIPlacementRetries), 0); + float minDistance = float.Max(_configurationManager.GetCVar(NFCCVars.MinPOIDistance), 0); // Constant at the end to avoid NaN weirdness + + Vector2 coords = _random.NextVector2(unscaledMinRange, unscaledMaxRange); + for (int i = 0; i < numRetries; i++) + { + bool positionIsValid = true; + foreach (var station in _stationCoords) + { + if (Vector2.Distance(station, coords) < minDistance) + { + positionIsValid = false; + break; + } + } + + // We have a valid position + if (positionIsValid) + break; + + // No vector yet, get next value. + coords = _random.NextVector2(unscaledMinRange, unscaledMaxRange); + } + + return coords; + } +} diff --git a/Content.Server/_NF/Power/Generator/FuelGradeAdapterComponent.cs b/Content.Server/_NF/Power/Generator/FuelGradeAdapterComponent.cs new file mode 100644 index 00000000000..e508025100b --- /dev/null +++ b/Content.Server/_NF/Power/Generator/FuelGradeAdapterComponent.cs @@ -0,0 +1,14 @@ +using Content.Shared.Materials; +using Robust.Shared.Prototypes; // Frontier + +namespace Content.Server._NF.Power.Generator; + +[RegisterComponent] +public sealed partial class FuelGradeAdapterComponent : Component +{ + [DataField] + public ProtoId InputMaterial = "Plasma"; + + [DataField] + public ProtoId OutputMaterial = "FuelGradePlasma"; +} diff --git a/Content.Server/_NF/Power/Generator/FuelGradeAdapterSystem.cs b/Content.Server/_NF/Power/Generator/FuelGradeAdapterSystem.cs new file mode 100644 index 00000000000..2b8c4d1e8fa --- /dev/null +++ b/Content.Server/_NF/Power/Generator/FuelGradeAdapterSystem.cs @@ -0,0 +1,31 @@ +using Content.Server.Materials; +using Content.Shared.Materials; + +namespace Content.Server._NF.Power.Generator; + +public sealed class FuelGradeAdapterSystem : EntitySystem +{ + [Dependency] private readonly MaterialStorageSystem _materialStorage = default!; + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnMaterialEntityInserted); + } + + public void OnMaterialEntityInserted(Entity entity, ref MaterialEntityInsertedEvent args) + { + // Convert all of the input material in the material storage into output material + if (!TryComp(entity.Owner, out var materialStorage)) + return; + + var inputAmount = _materialStorage.GetMaterialAmount(entity.Owner, entity.Comp.InputMaterial, materialStorage); + if (inputAmount > 0) + { + _materialStorage.TryChangeMaterialAmount(entity.Owner, entity.Comp.InputMaterial, -inputAmount, materialStorage, dirty: false); + _materialStorage.TryChangeMaterialAmount(entity.Owner, entity.Comp.OutputMaterial, inputAmount, materialStorage, dirty: true); + } + } +} + diff --git a/Content.Server/_NF/Salvage/SalvageMobRestrictionsSystem.cs b/Content.Server/_NF/Salvage/SalvageMobRestrictionsSystem.cs index 7aa7227975a..f98cf302e74 100644 --- a/Content.Server/_NF/Salvage/SalvageMobRestrictionsSystem.cs +++ b/Content.Server/_NF/Salvage/SalvageMobRestrictionsSystem.cs @@ -117,7 +117,8 @@ private void OnParentChanged(EntityUid uid, NFSalvageMobRestrictionsComponent co if (actor.PlayerSession.AttachedEntity == null) return; - _adminLogger.Add(LogType.AdminMessage, LogImpact.Low, $"{ToPrettyString(actor.PlayerSession.AttachedEntity.Value):player} returned to dungeon grid"); + if (component.DespawnIfOffLinkedGrid) + _adminLogger.Add(LogType.AdminMessage, LogImpact.Low, $"{ToPrettyString(actor.PlayerSession.AttachedEntity.Value):player} returned to dungeon grid"); } else { @@ -130,8 +131,11 @@ private void OnParentChanged(EntityUid uid, NFSalvageMobRestrictionsComponent co if (actor.PlayerSession.AttachedEntity == null) return; - _adminLogger.Add(LogType.AdminMessage, LogImpact.Low, $"{ToPrettyString(actor.PlayerSession.AttachedEntity.Value):player} left the dungeon grid"); - _popupSystem.PopupEntity(popupMessage, actor.PlayerSession.AttachedEntity.Value, actor.PlayerSession, PopupType.MediumCaution); + if (component.DespawnIfOffLinkedGrid) + { + _adminLogger.Add(LogType.AdminMessage, LogImpact.Low, $"{ToPrettyString(actor.PlayerSession.AttachedEntity.Value):player} left the dungeon grid"); + _popupSystem.PopupEntity(popupMessage, actor.PlayerSession.AttachedEntity.Value, actor.PlayerSession, PopupType.MediumCaution); + } } } diff --git a/Content.Server/_NF/Smuggling/DeadDropSystem.cs b/Content.Server/_NF/Smuggling/DeadDropSystem.cs index feed41ed4ff..6c658e2a661 100644 --- a/Content.Server/_NF/Smuggling/DeadDropSystem.cs +++ b/Content.Server/_NF/Smuggling/DeadDropSystem.cs @@ -590,15 +590,26 @@ private void SendDeadDrop(EntityUid uid, DeadDropComponent component, EntityUid output = Loc.GetString(messageLoc, ("location", MetaData(sender).EntityName)); break; case SmugglingReportMessageType.DeadDropStationWithRandomAlt: + var actualStationName = MetaData(sender).EntityName; if (sectorDeadDrop is not null) { - string[] names = [MetaData(sender).EntityName, _random.Pick(sectorDeadDrop.DeadDropStationNames.Values)]; - _random.Shuffle(names); - output = Loc.GetString(messageLoc, ("location1", names[0]), ("location2", names[1])); + var otherStationList = sectorDeadDrop.DeadDropStationNames.Values.Where(x => x != actualStationName).ToList(); + if (otherStationList.Count > 0) + { + string[] names = [actualStationName, _random.Pick(otherStationList)]; + _random.Shuffle(names); + output = Loc.GetString(messageLoc, ("location1", names[0]), ("location2", names[1])); + } + else + { + // No valid alternate, just output where the dead drop is + output = Loc.GetString(messageLoc, ("location1", actualStationName)); + } } else { - output = Loc.GetString(messageLoc, ("location1", MetaData(sender).EntityName)); // Looks strange, but still has a proper value. + // No valid alternate, just output where the dead drop is + output = Loc.GetString(messageLoc, ("location1", actualStationName)); } break; case SmugglingReportMessageType.PodLocation: diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs index 6427dbbf734..790b77e1d11 100644 --- a/Content.Shared/CCVar/CCVars.cs +++ b/Content.Shared/CCVar/CCVars.cs @@ -163,7 +163,7 @@ public static readonly CVarDef /// Controls the default game preset. /// public static readonly CVarDef - GameLobbyDefaultPreset = CVarDef.Create("game.defaultpreset", "adventure", CVar.ARCHIVE); // Frontier: secret /// Controls if the game can force a different preset if the current preset's criteria are not met. diff --git a/Content.Shared/Chemistry/Components/RefillableSolutionComponent.cs b/Content.Shared/Chemistry/Components/RefillableSolutionComponent.cs index 245b7398a7e..47637de05cc 100644 --- a/Content.Shared/Chemistry/Components/RefillableSolutionComponent.cs +++ b/Content.Shared/Chemistry/Components/RefillableSolutionComponent.cs @@ -22,4 +22,10 @@ public sealed partial class RefillableSolutionComponent : Component /// [DataField, ViewVariables(VVAccess.ReadWrite)] public FixedPoint2? MaxRefill = null; + + /// + /// Frontier: prevent transferring solution out into others + /// + [DataField, ViewVariables(VVAccess.ReadWrite)] + public bool PreventTransferOut = false; } diff --git a/Content.Shared/Clothing/EntitySystems/FactionClothingSystem.cs b/Content.Shared/Clothing/EntitySystems/FactionClothingSystem.cs index cbc7cf724ca..39b94804028 100644 --- a/Content.Shared/Clothing/EntitySystems/FactionClothingSystem.cs +++ b/Content.Shared/Clothing/EntitySystems/FactionClothingSystem.cs @@ -3,6 +3,10 @@ using Content.Shared.NPC.Components; using Content.Shared.NPC.Systems; using Robust.Shared.Player; // Frontier - Dont edit AI factions +using Content.Shared.Inventory; // Frontier +using Content.Shared.NPC.Prototypes; // Frontier +using Robust.Shared.Prototypes; // Frontier +using Content.Shared.Mind.Components; // Frontier namespace Content.Shared.Clothing.EntitySystems; @@ -12,6 +16,7 @@ namespace Content.Shared.Clothing.EntitySystems; public sealed class FactionClothingSystem : EntitySystem { [Dependency] private readonly NpcFactionSystem _faction = default!; + [Dependency] private readonly InventorySystem _inventory = default!; // Frontier public override void Initialize() { @@ -19,31 +24,98 @@ public override void Initialize() SubscribeLocalEvent(OnEquipped); SubscribeLocalEvent(OnUnequipped); + SubscribeLocalEvent(OnPlayerAttached); // Frontier + SubscribeLocalEvent(OnPlayerDetached); // Frontier } + // Frontier: rewritten from scratch private void OnEquipped(Entity ent, ref GotEquippedEvent args) { - if (!HasComp(args.Equipee)) // Frontier - Dont edit AI factions - return; // Frontier - Dont edit AI factions + var alreadyMember = CheckEntityEquipmentForFaction(args.Equipee, ent.Comp.Faction, args.Equipment); + if (alreadyMember is null) + { + TryComp(args.Equipee, out var factionComp); + var faction = (args.Equipee, factionComp); + ent.Comp.AlreadyMember = _faction.IsMember(faction, ent.Comp.Faction); - TryComp(args.Equipee, out var factionComp); - var faction = (args.Equipee, factionComp); - ent.Comp.AlreadyMember = _faction.IsMember(faction, ent.Comp.Faction); + // Do not edit factions on AI controlled mobs + if (!HasComp(args.Equipee)) + return; - _faction.AddFaction(faction, ent.Comp.Faction); + if (!ent.Comp.AlreadyMember) + _faction.AddFaction(faction, ent.Comp.Faction); + } + else + { + ent.Comp.AlreadyMember = alreadyMember.Value; + } } private void OnUnequipped(Entity ent, ref GotUnequippedEvent args) { - if (!HasComp(args.Equipee)) // Frontier - Dont edit AI factions - return; // Frontier - Dont edit AI factions - + // Reset the component, should be false when unworn. if (ent.Comp.AlreadyMember) { ent.Comp.AlreadyMember = false; return; } - _faction.RemoveFaction(args.Equipee, ent.Comp.Faction); + // Do not edit factions on AI controlled mobs + if (!HasComp(args.Equipee)) + return; + + var alreadyMember = CheckEntityEquipmentForFaction(args.Equipee, ent.Comp.Faction, args.Equipment); + if (alreadyMember is null) + { + _faction.RemoveFaction(args.Equipee, ent.Comp.Faction); + } + } + + public bool? CheckEntityEquipmentForFaction(EntityUid ent, ProtoId prototype, EntityUid? skipEnt = null) + { + var enumerator = _inventory.GetSlotEnumerator(ent); + while (enumerator.NextItem(out var item)) + { + if (!TryComp(item, out var faction)) + continue; + if (faction.Faction == prototype && item != skipEnt) + return faction.AlreadyMember; + } + return null; + } + + private void OnPlayerAttached(Entity ent, ref PlayerAttachedEvent args) + { + // Iterate through all items, add factions for any items found where AlreadyMember is false + List> factions = new(); + var enumerator = _inventory.GetSlotEnumerator(ent.Owner); + while (enumerator.NextItem(out var item)) + { + if (!TryComp(item, out var faction)) + continue; + if (!faction.AlreadyMember && !factions.Contains(faction.Faction)) + { + _faction.AddFaction((ent.Owner, ent.Comp), faction.Faction); + factions.Add(faction.Faction); + } + } + } + + private void OnPlayerDetached(Entity ent, ref PlayerDetachedEvent args) + { + // Iterate through all items, remove factions for any items found where AlreadyMember is true + List> factions = new(); + var enumerator = _inventory.GetSlotEnumerator(ent.Owner); + while (enumerator.NextItem(out var item)) + { + if (!TryComp(item, out var faction)) + continue; + if (!faction.AlreadyMember && !factions.Contains(faction.Faction)) + { + _faction.RemoveFaction((ent.Owner, ent.Comp), faction.Faction); + factions.Add(faction.Faction); + } + } } + // End Frontier } diff --git a/Content.Shared/Clothing/LoadoutSystem.cs b/Content.Shared/Clothing/LoadoutSystem.cs index 2a686efd4ff..88907087ae4 100644 --- a/Content.Shared/Clothing/LoadoutSystem.cs +++ b/Content.Shared/Clothing/LoadoutSystem.cs @@ -23,6 +23,7 @@ public sealed class LoadoutSystem : EntitySystem [Dependency] private readonly SharedStationSpawningSystem _station = default!; [Dependency] private readonly IPrototypeManager _protoMan = default!; [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private readonly IDependencyCollection _dependencies = default!; // Frontier public override void Initialize() { @@ -160,7 +161,12 @@ public void Equip(EntityUid uid, List>? startingG var id = _random.Pick(loadoutGroups); var proto = _protoMan.Index(id); var loadout = new RoleLoadout(id); - loadout.SetDefault(GetProfile(uid), _actors.GetSession(uid), _protoMan, true); + // Frontier: cache, ensure valid loadouts. + var profile = GetProfile(uid); + var session = _actors.GetSession(uid); + loadout.SetDefault(profile, session, _protoMan, true); + loadout.EnsureValid(profile, session, _dependencies); + // End Frontier _station.EquipRoleLoadout(uid, loadout, proto); GearEquipped(uid); diff --git a/Content.Shared/EntityTable/EntitySelectors/EntSelector.cs b/Content.Shared/EntityTable/EntitySelectors/EntSelector.cs index eea4dd85a77..6b43d9a98f6 100644 --- a/Content.Shared/EntityTable/EntitySelectors/EntSelector.cs +++ b/Content.Shared/EntityTable/EntitySelectors/EntSelector.cs @@ -20,7 +20,7 @@ protected override IEnumerable GetSpawnsImplementation(System.Random IEntityManager entMan, IPrototypeManager proto) { - var num = (int) Math.Round(Amount.Get(rand, entMan, proto)); + var num = (int) Math.Floor(Amount.Get(rand, entMan, proto)); // Frontier: Round GetSpawns(System.Random rand, IEntityManager entMan, IPrototypeManager proto) { - var rolls = Rolls.Get(rand, entMan, proto); + var rolls = Math.Floor(Rolls.Get(rand, entMan, proto)); // Frontier: add Math.Floor for (var i = 0; i < rolls; i++) { if (!rand.Prob(Prob)) diff --git a/Content.Shared/EntityTable/ValueSelector/RangeNumberSelector.cs b/Content.Shared/EntityTable/ValueSelector/RangeNumberSelector.cs index e8356fcbb72..ea8ddcc370d 100644 --- a/Content.Shared/EntityTable/ValueSelector/RangeNumberSelector.cs +++ b/Content.Shared/EntityTable/ValueSelector/RangeNumberSelector.cs @@ -7,6 +7,9 @@ namespace Content.Shared.EntityTable.ValueSelector; /// /// Gives a value between the two numbers specified, inclusive. /// +/// +/// Frontier: output must be floored to have this behaviour +/// public sealed partial class RangeNumberSelector : NumberSelector { [DataField] diff --git a/Content.Shared/Fluids/SharedPuddleSystem.cs b/Content.Shared/Fluids/SharedPuddleSystem.cs index f573c042c55..edd18c5ddb4 100644 --- a/Content.Shared/Fluids/SharedPuddleSystem.cs +++ b/Content.Shared/Fluids/SharedPuddleSystem.cs @@ -55,7 +55,7 @@ private void OnDumpCanDropTarget(Entity entity, ref C private void OnDrainCanDropTarget(Entity entity, ref CanDropTargetEvent args) { - if (HasComp(args.Dragged)) + if (TryComp(args.Dragged, out var refillable) && !refillable.PreventTransferOut) // Frontier: HasComp enti { if (!HasComp(args.Target) && !HasComp(args.Target)) return; + if (entity.Comp.PreventTransferOut) // Frontier + return; // Frontier args.CanDrop = true; args.Handled = true; diff --git a/Content.Shared/Lathe/LatheComponent.cs b/Content.Shared/Lathe/LatheComponent.cs index 9ba2af10c32..34e9552c3bc 100644 --- a/Content.Shared/Lathe/LatheComponent.cs +++ b/Content.Shared/Lathe/LatheComponent.cs @@ -115,6 +115,14 @@ public sealed partial class LatheComponent : Component [DataField] public float PartRatingMaterialUseMultiplier = DefaultPartRatingMaterialUseMultiplier; // End Frontier + + // Frontier: restored for machine part upgrades + /// + /// If not null, finite and non-negative, modifies values on spawned items + /// + [DataField] + public float? ProductValueModifier = 0.3f; + // End Frontier #endregion } diff --git a/Content.Shared/Lathe/SharedLatheSystem.cs b/Content.Shared/Lathe/SharedLatheSystem.cs index dd251ed18b3..727b6edcb99 100644 --- a/Content.Shared/Lathe/SharedLatheSystem.cs +++ b/Content.Shared/Lathe/SharedLatheSystem.cs @@ -39,6 +39,10 @@ private void OnExamined(Entity ent, ref ExaminedEvent args) if (ent.Comp.ReagentOutputSlotId != null) args.PushMarkup(Loc.GetString("lathe-menu-reagent-slot-examine")); + + if (ent.Comp.ProductValueModifier != null) // Frontier + args.PushMarkup(Loc.GetString($"lathe-product-value-modifier", ("modifier", ent.Comp.ProductValueModifier))); // Frontier + } [PublicAPI] diff --git a/Content.Shared/Preferences/Loadouts/RoleLoadout.cs b/Content.Shared/Preferences/Loadouts/RoleLoadout.cs index 7368cc58ce3..606fc38c07d 100644 --- a/Content.Shared/Preferences/Loadouts/RoleLoadout.cs +++ b/Content.Shared/Preferences/Loadouts/RoleLoadout.cs @@ -48,7 +48,7 @@ public RoleLoadout Clone() /// /// Ensures all prototypes exist and effects can be applied. /// - public void EnsureValid(HumanoidCharacterProfile profile, ICommonSession session, IDependencyCollection collection) + public void EnsureValid(HumanoidCharacterProfile profile, ICommonSession? session, IDependencyCollection collection) // Frontier: nullable session { var groupRemove = new ValueList(); var protoManager = collection.Resolve(); diff --git a/Content.Shared/_NF/Contraband/SharedContrabandTurnInSystem.cs b/Content.Shared/_NF/Contraband/SharedContrabandTurnInSystem.cs index 4a4d9242452..50a7c049815 100644 --- a/Content.Shared/_NF/Contraband/SharedContrabandTurnInSystem.cs +++ b/Content.Shared/_NF/Contraband/SharedContrabandTurnInSystem.cs @@ -1,3 +1,5 @@ +using Content.Shared.Contraband; +using Robust.Shared.Containers; using Robust.Shared.Serialization; namespace Content.Shared._NF.Contraband; @@ -8,4 +10,29 @@ public enum ContrabandPalletConsoleUiKey : byte Contraband } -public abstract class SharedContrabandTurnInSystem : EntitySystem {} +public abstract class SharedContrabandTurnInSystem : EntitySystem +{ + public void ClearContrabandValue(EntityUid item) + { + // Clear contraband value for printed items + if (TryComp(item, out var contraband)) + { + foreach (var valueKey in contraband.TurnInValues.Keys) + { + contraband.TurnInValues[valueKey] = 0; + } + } + + // Recurse into contained entities + if (TryComp(item, out var containers)) + { + foreach (var container in containers.Containers.Values) + { + foreach (var ent in container.ContainedEntities) + { + ClearContrabandValue(ent); + } + } + } + } +} diff --git a/Resources/Audio/_NF/Items/Gavel/attributions.yml b/Resources/Audio/_NF/Items/Gavel/attributions.yml new file mode 100644 index 00000000000..40567c28c71 --- /dev/null +++ b/Resources/Audio/_NF/Items/Gavel/attributions.yml @@ -0,0 +1,4 @@ +- files: ["gavel1.ogg", "gavel2.ogg", "gavel3.ogg", "gavel4.ogg"] + license: "CC-BY-3.0" + copyright: "craigsmith (FreeSound), released under CC-0" + source: "https://freesound.org/people/craigsmith/sounds/675979/" diff --git a/Resources/Audio/_NF/Items/Gavel/gavel1.ogg b/Resources/Audio/_NF/Items/Gavel/gavel1.ogg new file mode 100644 index 00000000000..f1f9d5e2867 Binary files /dev/null and b/Resources/Audio/_NF/Items/Gavel/gavel1.ogg differ diff --git a/Resources/Audio/_NF/Items/Gavel/gavel2.ogg b/Resources/Audio/_NF/Items/Gavel/gavel2.ogg new file mode 100644 index 00000000000..80e9793baba Binary files /dev/null and b/Resources/Audio/_NF/Items/Gavel/gavel2.ogg differ diff --git a/Resources/Audio/_NF/Items/Gavel/gavel3.ogg b/Resources/Audio/_NF/Items/Gavel/gavel3.ogg new file mode 100644 index 00000000000..ce6621ad43f Binary files /dev/null and b/Resources/Audio/_NF/Items/Gavel/gavel3.ogg differ diff --git a/Resources/Audio/_NF/Items/Gavel/gavel4.ogg b/Resources/Audio/_NF/Items/Gavel/gavel4.ogg new file mode 100644 index 00000000000..8dfdd145dbb Binary files /dev/null and b/Resources/Audio/_NF/Items/Gavel/gavel4.ogg differ diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index ffadf37ec4d..3b8cffce1e6 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -5811,3 +5811,257 @@ Entries: up. id: 5572 time: '2024-12-10T22:51:40.0000000+00:00' +- author: Myzumi + changes: [] + id: 5573 + time: '2024-12-11T14:22:50.0000000+00:00' +- author: whatston3 + changes: + - type: Tweak + message: >- + Chem, booze and soda dispenser construction now require one matter bin + and no capacitors. + - type: Add + message: >- + Reagent dispenser can be upgraded to increase the number of slots in the + dispenser. + id: 5574 + time: '2024-12-11T22:54:12.0000000+00:00' +- author: whatston3 + changes: + - type: Add + message: >- + Added 1000u bluespace jugs, unlocked through the Bluespace Chemistry + tech. + id: 5575 + time: '2024-12-11T22:54:20.0000000+00:00' +- author: whatston3 + changes: + - type: Add + message: >- + The chemical dispenser has a togglable auto-labeler that labels inserted + jugs. + id: 5576 + time: '2024-12-11T23:55:17.0000000+00:00' +- author: dvir001 + changes: + - type: Tweak + message: Wrecks have new, interesting things on them. + id: 5577 + time: '2024-12-12T01:47:23.0000000+00:00' +- author: whatston3 + changes: + - type: Fix + message: Clugg is no longer prompted to return to the cave if leaving. + id: 5578 + time: '2024-12-12T01:51:46.0000000+00:00' +- author: Radezolid and Stop-Signs + changes: + - type: Add + message: The syringe gun and mini syringes are now accessible through research. + id: 5579 + time: '2024-12-12T17:54:21.0000000+00:00' +- author: lermal + changes: + - type: Fix + message: Fixed MapRenderer rendering for all shuttles + id: 5580 + time: '2024-12-13T17:35:18.0000000+00:00' +- author: dvir001 + changes: + - type: Fix + message: Fixed a few issues with exped/vgroid configs & maps. + id: 5581 + time: '2024-12-13T22:15:43.0000000+00:00' +- author: whatston3 + changes: + - type: Fix + message: Clarpy no longer attacks pirates, Clippy no longer attacks pirates. + - type: Tweak + message: The CDET now only targets entities wearing contraband clothing. + - type: Tweak + message: >- + Clugg now has a caveman accent; Clarpy, a pirate accent; Cappy, a + southern accent if cognizined. + id: 5582 + time: '2024-12-14T02:06:42.0000000+00:00' +- author: whatston3 + changes: + - type: Fix + message: >- + Fixed a case where existing characters can spawn without gear when the + role changes. + id: 5583 + time: '2024-12-14T14:00:02.0000000+00:00' +- author: whatston3 + changes: + - type: Tweak + message: >- + Grown items, seeds, printed items, and vended items have no contraband + value. + - type: Tweak + message: Items printed from most lathes have a market value of 30%. + id: 5584 + time: '2024-12-14T14:01:28.0000000+00:00' +- author: whatston3 + changes: + - type: Fix + message: The cargo pallet in the NFSD Outpost now works properly. + id: 5585 + time: '2024-12-14T22:28:35.0000000+00:00' +- author: dvir001 + changes: + - type: Tweak + message: Blue wrecks should now have more interesting loot. + id: 5586 + time: '2024-12-14T22:31:21.0000000+00:00' +- author: whatston3 + changes: + - type: Fix + message: >- + Deconstructing a portable generator with fuel now returns fuel-grade + material. + - type: Add + message: Fuel-grade materials now have sprites from GhostPrince. + id: 5587 + time: '2024-12-15T09:42:28.0000000+00:00' +- author: dustylens + changes: + - type: Add + message: >- + Wassail is now craftable by bartenders. Check your guidebook for a + recipe. + id: 5588 + time: '2024-12-15T13:11:51.0000000+00:00' +- author: dustylens + changes: + - type: Tweak + message: >- + Slight adjustments to Salicylic Acid recipe, additional recipe for + Aloxadone and 2 point buff to Aloxadone caustic damage heal. + id: 5589 + time: '2024-12-15T13:12:59.0000000+00:00' +- author: Leander + changes: + - type: Tweak + message: Cognizined creatures will show more unpredictable behavior. + id: 5590 + time: '2024-12-15T13:13:11.0000000+00:00' +- author: dustylens + changes: + - type: Tweak + message: >- + Adjust base plastic cost for jugs in the medical techfab from 4 to 2 + sheets. + id: 5591 + time: '2024-12-15T14:42:26.0000000+00:00' +- author: Tych0theSynth + changes: + - type: Fix + message: Fixed a disabled thruster on the Spectre. + id: 5592 + time: '2024-12-15T14:48:51.0000000+00:00' +- author: whatston3 + changes: + - type: Fix + message: Respawn timers are reset on a new round. + id: 5593 + time: '2024-12-17T13:47:19.0000000+00:00' +- author: whatston3 + changes: + - type: Fix + message: Fixed issues with missing department localization strings. + id: 5594 + time: '2024-12-17T19:51:37.0000000+00:00' +- author: dustylens + changes: + - type: Add + message: Added a shuttle map to the Charon guidebook page. + id: 5595 + time: '2024-12-17T21:36:54.0000000+00:00' +- author: whatston3 + changes: + - type: Add + message: Eggnog is now craftable by chefs and bartenders. + id: 5596 + time: '2024-12-18T16:50:26.0000000+00:00' +- author: erhardsteinhauer + changes: + - type: Tweak + message: Hostile faction bosses can now be encountered on VGroids. + id: 5597 + time: '2024-12-18T19:00:32.0000000+00:00' +- author: whatston3 + changes: + - type: Fix + message: >- + Faction-associated items of clothing should be properly tracked, the + CDET should only attack players wearing contraband. + id: 5598 + time: '2024-12-20T17:28:19.0000000+00:00' +- author: erhardsteinhauer + changes: + - type: Add + message: >- + Added the blood cult cat ghost role (for players to pledge their + allegiance to). + id: 5599 + time: '2024-12-20T18:08:59.0000000+00:00' +- author: whatston3 and leonardo-dabepis + changes: + - type: Add + message: Added a gavel, gavel block, powdered wig to the courthouse. + - type: Tweak + message: Remodeled the Courthouse slightly. + id: 5600 + time: '2024-12-20T18:11:32.0000000+00:00' +- author: whatston3 + changes: + - type: Fix + message: Removed duplicate location hints from NFSD radio callouts. + id: 5601 + time: '2024-12-20T18:16:13.0000000+00:00' +- author: whatston3 + changes: + - type: Fix + message: >- + Reagents in food solutions cannot be transferred out, e.g. into a + ChemMaster. + id: 5602 + time: '2024-12-20T22:55:17.0000000+00:00' +- author: dustylens + changes: + - type: Add + message: Adds a pair of plushies from Lvl 1 Eevee + id: 5603 + time: '2024-12-21T00:50:56.0000000+00:00' +- author: whatston3 + changes: + - type: Tweak + message: Alert levels are now sector-wide, with appropriate announcements. + id: 5604 + time: '2024-12-21T01:12:26.0000000+00:00' +- author: whatston3 + changes: + - type: Fix + message: Emergency lights start in their appropriate state when built. + id: 5605 + time: '2024-12-21T20:28:31.0000000+00:00' +- author: dustylens + changes: + - type: Remove + message: >- + majority of chemistry jugs removed from sale, to be replaced with new + barrels. + id: 5606 + time: '2024-12-21T23:05:32.0000000+00:00' +- author: dvir001 + changes: + - type: Add + message: >- + Added barrels of chems, oil, water, fuel, booze, etc. to wrecks, rare + chems to cargo. + - type: Tweak + message: The ChefVend now contains one jar of each oil. + id: 5607 + time: '2024-12-21T23:06:11.0000000+00:00' diff --git a/Resources/IgnoredPrototypes/ignoredPrototypes.yml b/Resources/IgnoredPrototypes/ignoredPrototypes.yml index c6b5e86417d..561620ac53a 100644 --- a/Resources/IgnoredPrototypes/ignoredPrototypes.yml +++ b/Resources/IgnoredPrototypes/ignoredPrototypes.yml @@ -7,7 +7,7 @@ # - /Prototypes/Guidebook # - /Prototypes/Catalog/uplink_catalog.yml - /Prototypes/GameRules/events.yml # Frontier - Fuck this file - - /Prototypes/Procedural/Themes/vgroidinterior.yml - - /Prototypes/Procedural/vgroid.yml - - /Prototypes/Procedural/salvage_loot.yml - - /Prototypes/Procedural/salvage_rewards.yml \ No newline at end of file + - /Prototypes/Procedural/Themes # Frontier + - /Prototypes/Procedural/vgroid.yml # Frontier + - /Prototypes/Procedural/salvage_loot.yml # Frontier + - /Prototypes/Procedural/salvage_rewards.yml # Frontier diff --git a/Resources/Locale/en-US/_NF/accent/caveman.ftl b/Resources/Locale/en-US/_NF/accent/caveman.ftl index d9b48fa123b..4fcbda05f89 100644 --- a/Resources/Locale/en-US/_NF/accent/caveman.ftl +++ b/Resources/Locale/en-US/_NF/accent/caveman.ftl @@ -6,16 +6,15 @@ accent-caveman-forbidden-4 = at accent-caveman-forbidden-5 = am accent-caveman-forbidden-6 = as accent-caveman-forbidden-7 = is -accent-caveman-forbidden-8 = it -accent-caveman-forbidden-9 = do -accent-caveman-forbidden-10 = does -accent-caveman-forbidden-11 = did -accent-caveman-forbidden-12 = just -accent-caveman-forbidden-13 = are -accent-caveman-forbidden-14 = was -accent-caveman-forbidden-15 = the -accent-caveman-forbidden-16 = it's -accent-caveman-forbidden-17 = its +accent-caveman-forbidden-8 = do +accent-caveman-forbidden-9 = does +accent-caveman-forbidden-10 = did +accent-caveman-forbidden-11 = just +accent-caveman-forbidden-12 = are +accent-caveman-forbidden-13 = was +accent-caveman-forbidden-14 = the +accent-caveman-forbidden-15 = it's +accent-caveman-forbidden-16 = its accent-caveman-forbidden-empty = {""} accent-caveman-numbers-0 = no diff --git a/Resources/Locale/en-US/_NF/adventure/adventure.ftl b/Resources/Locale/en-US/_NF/adventure/adventure.ftl index 3e1a1268163..9ee3991db5d 100644 --- a/Resources/Locale/en-US/_NF/adventure/adventure.ftl +++ b/Resources/Locale/en-US/_NF/adventure/adventure.ftl @@ -11,8 +11,12 @@ adventure-webhook-top-loss = lost a total of {$amount}. adventure-webhook-ledger-start = Ledger Summary -adventure-title = New Frontier Adventure Mode -adventure-description = Join a ship crew or buy your own and explore, research, salvage, or haul your way to riches! +nf-adventure-title = Adventure +nf-adventure-description = Join a ship crew or buy your own and explore, research, salvage, or haul your way to riches! + +nf-pirate-title = Pirates +nf-pirate-description = A gang of pirates is on the loose! Take care out in space and try not to get plundered! + currency = Spesos shipyard-rules-default1 = diff --git a/Resources/Locale/en-US/_NF/chemistry/components/reagent-dispenser-component.ftl b/Resources/Locale/en-US/_NF/chemistry/components/reagent-dispenser-component.ftl new file mode 100644 index 00000000000..5f86ca7320c --- /dev/null +++ b/Resources/Locale/en-US/_NF/chemistry/components/reagent-dispenser-component.ftl @@ -0,0 +1,8 @@ +# Frontier +reagent-dispenser-component-impure-auto-label = {$reagent} ({$purity}%) +reagent-dispenser-component-set-auto-label-on-verb = Turn on auto-labeler +reagent-dispenser-component-set-auto-label-off-verb = Turn off auto-labeler +reagent-dispenser-component-examine-auto-label-on = The auto-labeler is turned [color=darkgreen]on[/color]. +reagent-dispenser-component-examine-auto-label-off = The auto-labeler is turned [color=red]off[/color]. + +reagent-dispenser-component-examine-extra-slots = Number of jug slots diff --git a/Resources/Locale/en-US/_NF/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/_NF/flavors/flavor-profiles.ftl index 0c07a8261c8..bd350a7b5bb 100644 --- a/Resources/Locale/en-US/_NF/flavors/flavor-profiles.ftl +++ b/Resources/Locale/en-US/_NF/flavors/flavor-profiles.ftl @@ -9,3 +9,4 @@ flavor-complex-greed = like greed flavor-complex-blast = like jungle warfare flavor-complex-torpedo = like convoy raiding flavor-complex-bees = like buzzing and honey +flavor-complex-wassail = warm and comforting diff --git a/Resources/Locale/en-US/_NF/ghost/roles/ghost-role-component.ftl b/Resources/Locale/en-US/_NF/ghost/roles/ghost-role-component.ftl index a0035770418..a60dfba3622 100644 --- a/Resources/Locale/en-US/_NF/ghost/roles/ghost-role-component.ftl +++ b/Resources/Locale/en-US/_NF/ghost/roles/ghost-role-component.ftl @@ -15,6 +15,13 @@ ghost-role-information-clarpy-name = Clarpy ghost-role-information-clarpy-description = Avast ye mail! wanted by Nanotrasen for crimes against mice. ghost-role-information-clarpy-rules = You are a [color=red][bold]Team Antagonist[/bold][/color] with all other pirates. +ghost-role-information-cult-cat-name = Blood Cult Cat +ghost-role-information-cult-cat-description = Founded the Blood Cult out of boredom. +ghost-role-information-cult-cat-rules = You are a [color=red][bold]Free Agent[/bold][/color] and free to choose your course of actions. + Please note that [color=yellow]all server rules still apply.[/color] Additionally: + - [color=red]DO NOT[/color] damage player shuttles or their contents. + - [color=red]DO NOT[/color] gib players. Once they're dead, leave them be. + ghost-role-information-cappy-name = Cappy ghost-role-information-cappy-description = Stop resisting! Certified in lethal-force and defensive tactics. diff --git a/Resources/Locale/en-US/_NF/job/department.ftl b/Resources/Locale/en-US/_NF/job/department.ftl index 0c87707cad9..092c89a1906 100644 --- a/Resources/Locale/en-US/_NF/job/department.ftl +++ b/Resources/Locale/en-US/_NF/job/department.ftl @@ -1,4 +1,5 @@ -department-NF = Frontier -department-NFAntag = Criminals -department-NFCommand = Frontier Command -department-NFSecurity = New Frontier Sheriff's Department \ No newline at end of file +# Below: Department name - should match department.ID, may collide with upstream definitions +department-Antag = Criminals +department-Command = Frontier Command +department-Frontier = Frontier +department-Security = New Frontier Sheriff's Department diff --git a/Resources/Locale/en-US/_NF/lathe/ui/lathe-menu.ftl b/Resources/Locale/en-US/_NF/lathe/ui/lathe-menu.ftl new file mode 100644 index 00000000000..8b2abe707ab --- /dev/null +++ b/Resources/Locale/en-US/_NF/lathe/ui/lathe-menu.ftl @@ -0,0 +1 @@ +lathe-product-value-modifier = Printed items sell at [color=red]{NATURALFIXED($modifier, 2)}x[/color] market rate. \ No newline at end of file diff --git a/Resources/Locale/en-US/_NF/medical/medicine.ftl b/Resources/Locale/en-US/_NF/medical/medicine.ftl new file mode 100644 index 00000000000..7cff79196e8 --- /dev/null +++ b/Resources/Locale/en-US/_NF/medical/medicine.ftl @@ -0,0 +1 @@ +medicine-label-mannitol-clarpy = Clarpy's prescription diff --git a/Resources/Locale/en-US/_NF/reagents/drinks.ftl b/Resources/Locale/en-US/_NF/reagents/drinks.ftl new file mode 100644 index 00000000000..24f7e19c2ad --- /dev/null +++ b/Resources/Locale/en-US/_NF/reagents/drinks.ftl @@ -0,0 +1 @@ +drinks-effect-nf-wassail = You feel relaxed and festive. diff --git a/Resources/Locale/en-US/_NF/reagents/labels.ftl b/Resources/Locale/en-US/_NF/reagents/labels.ftl new file mode 100644 index 00000000000..981cbabf836 --- /dev/null +++ b/Resources/Locale/en-US/_NF/reagents/labels.ftl @@ -0,0 +1,49 @@ +# Labels for reagent barrels +# Elements & basic reagents +reagent-label-aluminium = [bold]Aluminium[/bold] +reagent-label-carbon = [bold]Carbon[/bold] +reagent-label-chlorine = [bold]Chlorine[/bold] +reagent-label-copper = [bold]Copper[/bold] +reagent-label-ethanol = [bold]Ethanol[/bold] +reagent-label-fluorine = [bold]Fluorine[/bold] +reagent-label-gold = [bold]Gold[/bold] +reagent-label-hydrogen = [bold]Hydrogen[/bold] +reagent-label-iodine = [bold]Iodine[/bold] +reagent-label-iron = [bold]Iron[/bold] +reagent-label-lithium = [bold]Lithium[/bold] +reagent-label-mercury = [bold]Mercury[/bold] +reagent-label-nitrogen = [bold]Nitrogen[/bold] +reagent-label-oxygen = [bold]Oxygen[/bold] +reagent-label-phosphorus = [bold]Phosphorus[/bold] +reagent-label-potassium = [bold]Potassium[/bold] +reagent-label-radium = [bold]Radium[/bold] +reagent-label-silicon = [bold]Silicon[/bold] +reagent-label-silver = [bold]Silver[/bold] +reagent-label-sodium = [bold]Sodium[/bold] +reagent-label-sugar = [bold]Sugar[/bold] +reagent-label-sulfur = [bold]Sulfur[/bold] +# Service & other reagents +reagent-label-cornoil = [bold]Corn Oil[/bold] +reagent-label-diethylamine = [bold]Diethylamine[/bold] +reagent-label-ketchup = [bold]Ketchup[/bold] +reagent-label-mayo = [bold]Mayonnaise[/bold] +reagent-label-mustard = [bold]Mustard[/bold] +reagent-label-oil = [bold]Oil[/bold] +reagent-label-oil-olive = [bold]Olive Oil[/bold] +reagent-label-space-cleaner = [bold]Space Cleaner[/bold] +reagent-label-space-lube = [bold]Space Lube[/bold] +reagent-label-welding-fuel = [bold]Welding Fuel[/bold] +# Drinks +reagent-label-absinthe = [bold]Absinthe[/bold] +reagent-label-ale = [bold]Ale[/bold] +reagent-label-beer = [bold]Beer[/bold] +reagent-label-coffeeliqueur = [bold]Coffee Liqueur[/bold] +reagent-label-cognac = [bold]Cognac[/bold] +reagent-label-gin = [bold]Gin[/bold] +reagent-label-rum = [bold]Rum[/bold] +reagent-label-tequila = [bold]Tequila[/bold] +reagent-label-vermouth = [bold]Vermouth[/bold] +reagent-label-vodka = [bold]Vodka[/bold] +reagent-label-water = [bold]Water[/bold] +reagent-label-whiskey = [bold]Whiskey[/bold] +reagent-label-wine = [bold]Wine[/bold] diff --git a/Resources/Locale/en-US/_NF/reagents/meta/consumable/drink/drinks.ftl b/Resources/Locale/en-US/_NF/reagents/meta/consumable/drink/drinks.ftl index b922b8b51a9..4e0579e00e3 100644 --- a/Resources/Locale/en-US/_NF/reagents/meta/consumable/drink/drinks.ftl +++ b/Resources/Locale/en-US/_NF/reagents/meta/consumable/drink/drinks.ftl @@ -24,3 +24,9 @@ reagent-desc-honey = Thick, golden and sticky, the original sweetener. reagent-name-honey-iced-tea = honey iced tea reagent-desc-honey-iced-tea = Tea with a splash of honey. + +reagent-name-wassail = wassail +reagent-desc-wassail = Hot mulled ale. + +reagent-name-eggnog = eggnog +reagent-desc-eggnog = Creamy, sweet, and slightly boozy. Fully nogged. diff --git a/Resources/Locale/en-US/_NF/reagents/meta/narcotics.ftl b/Resources/Locale/en-US/_NF/reagents/meta/narcotics.ftl index 20bf64bcc81..701a033110e 100644 --- a/Resources/Locale/en-US/_NF/reagents/meta/narcotics.ftl +++ b/Resources/Locale/en-US/_NF/reagents/meta/narcotics.ftl @@ -3,3 +3,6 @@ reagent-desc-rock-dust = A blend of finely pulverized rock minerals suspended in reagent-name-shroom-mix = shroom mix reagent-desc-shroom-mix = A blend of cut, chewed and ground partially dried shrooms, suspended in mopwata. + +# Missing upstream definition +reagent-name-hyperzine = hyperzine diff --git a/Resources/Locale/en-US/alert-levels/alert-level-command.ftl b/Resources/Locale/en-US/alert-levels/alert-level-command.ftl index dda4c0cbc64..c0d9c463935 100644 --- a/Resources/Locale/en-US/alert-levels/alert-level-command.ftl +++ b/Resources/Locale/en-US/alert-levels/alert-level-command.ftl @@ -1,4 +1,5 @@ -cmd-setalertlevel-desc = Set current station alert level for grid on which the player is standing. +# Frontier: station [locked] cmd-setalertlevel-invalid-grid = You must be on grid of station code that you are going to change. cmd-setalertlevel-invalid-level = Specified alert level does not exist on that grid. diff --git a/Resources/Locale/en-US/alert-levels/alert-levels.ftl b/Resources/Locale/en-US/alert-levels/alert-levels.ftl index 9476a95a209..a290b59194a 100644 --- a/Resources/Locale/en-US/alert-levels/alert-levels.ftl +++ b/Resources/Locale/en-US/alert-levels/alert-levels.ftl @@ -1,36 +1,57 @@ -alert-level-announcement = Attention! Station alert level is now {$name}! {$announcement} +# Frontier: Station- - It provides the following protection: - - - [color=yellow]Blunt[/color] damage reduced by [color=lightblue]40%[/color]. - - - [color=yellow]Slash[/color] damage reduced by [color=lightblue]40%[/color]. - - - [color=yellow]Piercing[/color] damage reduced by [color=lightblue]50%[/color]. - - - [color=yellow]Heat[/color] damage reduced by [color=lightblue]30%[/color]. - - - [color=yellow]Caustic[/color] damage reduced by [color=lightblue]25%[/color]. - - - [color=orange]Explosion[/color] damage reduced by [color=lightblue]30%[/color]. - priority: 0 - component: Armor - title: null - - uid: 1069 - components: - - type: Transform - pos: 30.708948,8.655076 - parent: 588 - - type: GroupExamine - group: - - hoverMessage: "" - contextText: verb-examine-group-other - icon: /Textures/Interface/examine-star.png - components: - - Armor - - ClothingSpeedModifier - entries: - - message: This decreases your speed by [color=yellow]10%[/color]. - priority: 0 - component: ClothingSpeedModifier - - message: >- - It provides the following protection: - - - [color=yellow]Blunt[/color] damage reduced by [color=lightblue]40%[/color]. - - - [color=yellow]Slash[/color] damage reduced by [color=lightblue]40%[/color]. - - - [color=yellow]Piercing[/color] damage reduced by [color=lightblue]50%[/color]. - - - [color=yellow]Heat[/color] damage reduced by [color=lightblue]30%[/color]. - - - [color=yellow]Caustic[/color] damage reduced by [color=lightblue]25%[/color]. - - - [color=orange]Explosion[/color] damage reduced by [color=lightblue]30%[/color]. - priority: 0 - component: Armor - title: null + pos: 13.396446,12.479115 + parent: 588 - proto: ClothingOuterRobesJudge entities: - uid: 370 @@ -7200,6 +7359,20 @@ entities: - type: Transform pos: 27.40101,3.677678 parent: 588 +- proto: ClothingShoesBootsCombatFilled + entities: + - uid: 1036 + components: + - type: Transform + pos: 12.582174,25.636528 + parent: 588 +- proto: ClothingShoesBootsLaceup + entities: + - uid: 372 + components: + - type: Transform + pos: 18.586912,0.70824456 + parent: 588 - proto: ClothingUniformJumpskirtColorMaroon entities: - uid: 1714 @@ -7330,6 +7503,13 @@ entities: - type: Transform pos: 25.5,43.5 parent: 588 +- proto: CrateHydroponicsSeedsExotic + entities: + - uid: 1660 + components: + - type: Transform + pos: 31.5,22.5 + parent: 588 - proto: CrayonBox entities: - uid: 1057 @@ -7337,6 +7517,11 @@ entities: - type: Transform pos: 20.47107,24.608877 parent: 588 + - uid: 1116 + components: + - type: Transform + pos: 20.607256,14.646415 + parent: 588 - proto: CryoPod entities: - uid: 1395 @@ -7368,6 +7553,13 @@ entities: - type: Transform pos: 32.5,24.5 parent: 588 +- proto: DiceBag + entities: + - uid: 552 + components: + - type: Transform + pos: 20.294882,15.426926 + parent: 588 - proto: DiseaseDiagnoser entities: - uid: 1424 @@ -7397,6 +7589,18 @@ entities: - type: Transform pos: 22.5,38.5 parent: 588 +- proto: DonkpocketBoxSpawner + entities: + - uid: 526 + components: + - type: Transform + pos: 16.5,13.5 + parent: 588 + - uid: 723 + components: + - type: Transform + pos: 18.5,21.5 + parent: 588 - proto: DoorElectronics entities: - uid: 659 @@ -7437,6 +7641,32 @@ entities: - type: Transform pos: 13.5,34.5 parent: 588 +- proto: DrinkDetFlask + entities: + - uid: 1577 + components: + - type: Transform + pos: 12.606661,13.037249 + parent: 588 +- proto: DrinkMugMetal + entities: + - uid: 1294 + components: + - type: Transform + pos: 22.442232,12.514399 + parent: 588 +- proto: DrinkMugRed + entities: + - uid: 721 + components: + - type: Transform + pos: 22.448559,18.561966 + parent: 588 + - uid: 1293 + components: + - type: Transform + pos: 22.328642,12.741456 + parent: 588 - proto: DrinkShinyFlask entities: - uid: 1874 @@ -7444,8 +7674,25 @@ entities: - type: Transform pos: 6.890398,22.663696 parent: 588 +- proto: DrinkShotGlass + entities: + - uid: 578 + components: + - type: Transform + pos: 12.412022,12.535878 + parent: 588 + - uid: 579 + components: + - type: Transform + pos: 12.539811,12.748745 + parent: 588 - proto: DrinkWaterCup entities: + - uid: 722 + components: + - type: Transform + pos: 18.373508,18.661304 + parent: 588 - uid: 762 components: - type: Transform @@ -7466,7 +7713,6 @@ entities: parent: 588 - type: PointLight enabled: True - - type: ActiveEmergencyLight - uid: 1717 components: - type: Transform @@ -7474,7 +7720,6 @@ entities: parent: 588 - type: PointLight enabled: True - - type: ActiveEmergencyLight - uid: 1718 components: - type: Transform @@ -7482,7 +7727,6 @@ entities: parent: 588 - type: PointLight enabled: True - - type: ActiveEmergencyLight - uid: 1719 components: - type: Transform @@ -7491,7 +7735,6 @@ entities: parent: 588 - type: PointLight enabled: True - - type: ActiveEmergencyLight - uid: 1720 components: - type: Transform @@ -7500,7 +7743,6 @@ entities: parent: 588 - type: PointLight enabled: True - - type: ActiveEmergencyLight - uid: 1721 components: - type: Transform @@ -7509,7 +7751,6 @@ entities: parent: 588 - type: PointLight enabled: True - - type: ActiveEmergencyLight - uid: 1722 components: - type: Transform @@ -7517,7 +7758,6 @@ entities: parent: 588 - type: PointLight enabled: True - - type: ActiveEmergencyLight - uid: 1723 components: - type: Transform @@ -7525,7 +7765,6 @@ entities: parent: 588 - type: PointLight enabled: True - - type: ActiveEmergencyLight - uid: 1724 components: - type: Transform @@ -7534,7 +7773,6 @@ entities: parent: 588 - type: PointLight enabled: True - - type: ActiveEmergencyLight - uid: 1726 components: - type: Transform @@ -7543,7 +7781,6 @@ entities: parent: 588 - type: PointLight enabled: True - - type: ActiveEmergencyLight - uid: 1727 components: - type: Transform @@ -7552,7 +7789,6 @@ entities: parent: 588 - type: PointLight enabled: True - - type: ActiveEmergencyLight - uid: 1728 components: - type: Transform @@ -7561,7 +7797,6 @@ entities: parent: 588 - type: PointLight enabled: True - - type: ActiveEmergencyLight - uid: 1729 components: - type: Transform @@ -7570,7 +7805,6 @@ entities: parent: 588 - type: PointLight enabled: True - - type: ActiveEmergencyLight - uid: 1730 components: - type: Transform @@ -7579,7 +7813,6 @@ entities: parent: 588 - type: PointLight enabled: True - - type: ActiveEmergencyLight - uid: 1731 components: - type: Transform @@ -7588,7 +7821,6 @@ entities: parent: 588 - type: PointLight enabled: True - - type: ActiveEmergencyLight - uid: 1732 components: - type: Transform @@ -7597,7 +7829,6 @@ entities: parent: 588 - type: PointLight enabled: True - - type: ActiveEmergencyLight - uid: 1733 components: - type: Transform @@ -7606,7 +7837,6 @@ entities: parent: 588 - type: PointLight enabled: True - - type: ActiveEmergencyLight - uid: 1734 components: - type: Transform @@ -7614,7 +7844,6 @@ entities: parent: 588 - type: PointLight enabled: True - - type: ActiveEmergencyLight - uid: 1735 components: - type: Transform @@ -7623,7 +7852,6 @@ entities: parent: 588 - type: PointLight enabled: True - - type: ActiveEmergencyLight - uid: 1736 components: - type: Transform @@ -7631,7 +7859,6 @@ entities: parent: 588 - type: PointLight enabled: True - - type: ActiveEmergencyLight - uid: 1737 components: - type: Transform @@ -7640,7 +7867,6 @@ entities: parent: 588 - type: PointLight enabled: True - - type: ActiveEmergencyLight - uid: 1738 components: - type: Transform @@ -7649,7 +7875,6 @@ entities: parent: 588 - type: PointLight enabled: True - - type: ActiveEmergencyLight - uid: 1739 components: - type: Transform @@ -7658,7 +7883,6 @@ entities: parent: 588 - type: PointLight enabled: True - - type: ActiveEmergencyLight - uid: 1740 components: - type: Transform @@ -7667,7 +7891,6 @@ entities: parent: 588 - type: PointLight enabled: True - - type: ActiveEmergencyLight - uid: 1742 components: - type: Transform @@ -7676,7 +7899,6 @@ entities: parent: 588 - type: PointLight enabled: True - - type: ActiveEmergencyLight - uid: 1744 components: - type: Transform @@ -7685,7 +7907,6 @@ entities: parent: 588 - type: PointLight enabled: True - - type: ActiveEmergencyLight - uid: 1745 components: - type: Transform @@ -7694,7 +7915,6 @@ entities: parent: 588 - type: PointLight enabled: True - - type: ActiveEmergencyLight - uid: 1746 components: - type: Transform @@ -7703,7 +7923,6 @@ entities: parent: 588 - type: PointLight enabled: True - - type: ActiveEmergencyLight - uid: 1747 components: - type: Transform @@ -7712,7 +7931,6 @@ entities: parent: 588 - type: PointLight enabled: True - - type: ActiveEmergencyLight - uid: 1748 components: - type: Transform @@ -7721,7 +7939,6 @@ entities: parent: 588 - type: PointLight enabled: True - - type: ActiveEmergencyLight - uid: 1749 components: - type: Transform @@ -7730,7 +7947,6 @@ entities: parent: 588 - type: PointLight enabled: True - - type: ActiveEmergencyLight - uid: 1750 components: - type: Transform @@ -7739,7 +7955,6 @@ entities: parent: 588 - type: PointLight enabled: True - - type: ActiveEmergencyLight - uid: 1751 components: - type: Transform @@ -7747,7 +7962,6 @@ entities: parent: 588 - type: PointLight enabled: True - - type: ActiveEmergencyLight - uid: 1752 components: - type: Transform @@ -7756,7 +7970,6 @@ entities: parent: 588 - type: PointLight enabled: True - - type: ActiveEmergencyLight - uid: 1832 components: - type: Transform @@ -7765,7 +7978,18 @@ entities: parent: 588 - type: PointLight enabled: True - - type: ActiveEmergencyLight +- proto: EmergencyRollerBed + entities: + - uid: 1141 + components: + - type: Transform + pos: 30.5,25.5 + parent: 588 + - uid: 1142 + components: + - type: Transform + pos: 30.5,24.5 + parent: 588 - proto: ExtinguisherCabinetFilled entities: - uid: 867 @@ -7836,6 +8060,13 @@ entities: - type: Transform pos: 10.726851,19.047483 parent: 588 +- proto: FlashlightSeclite + entities: + - uid: 374 + components: + - type: Transform + pos: 13.377204,0.54605544 + parent: 588 - proto: FloodlightBroken entities: - uid: 1193 @@ -8199,6 +8430,27 @@ entities: rot: -1.5707963267948966 rad pos: 2.5,43.5 parent: 588 +- proto: FoodBowlBigTrash + entities: + - uid: 1840 + components: + - 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 + components: + - type: Transform + pos: 17.462528,12.615073 + parent: 588 - proto: FoodPlateTrash entities: - uid: 1692 @@ -8206,6 +8458,20 @@ entities: - type: Transform pos: 28.80027,47.44947 parent: 588 +- proto: ForensicPad + entities: + - uid: 761 + components: + - type: Transform + pos: 7.562898,22.48225 + parent: 588 +- proto: ForkPlastic + entities: + - uid: 531 + components: + - type: Transform + pos: 17.405733,12.600882 + parent: 588 - proto: GasFilter entities: - uid: 1415 @@ -8425,12 +8691,19 @@ entities: rot: -1.5707963267948966 rad pos: 27.5,39.5 parent: 588 -- proto: GunSafeShuttleT3Spawner +- proto: Handcuffs entities: - - uid: 396 + - uid: 1614 components: - type: Transform - pos: 28.5,8.5 + pos: 22.608034,10.659381 + parent: 588 +- proto: Hemostat + entities: + - uid: 1471 + components: + - type: Transform + pos: 8.51377,43.004257 parent: 588 - proto: HighSecArmoryLocked entities: @@ -8534,6 +8807,44 @@ entities: rot: 1.5707963267948966 rad pos: 24.5,42.5 parent: 588 +- proto: HydroponicsToolHatchet + entities: + - uid: 1844 + components: + - type: Transform + pos: 29.538284,44.04174 + parent: 588 + - uid: 1851 + components: + - type: Transform + pos: 30.630798,21.602604 + parent: 588 +- proto: HydroponicsToolMiniHoe + entities: + - uid: 1837 + components: + - type: Transform + pos: 30.099596,43.446724 + parent: 588 + - uid: 1841 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 33.38517,20.601 + parent: 588 +- proto: HydroponicsToolSpade + entities: + - uid: 1838 + components: + - type: Transform + pos: 29.95761,43.361576 + parent: 588 + - uid: 1842 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 33.42777,20.58681 + parent: 588 - proto: hydroponicsTray entities: - uid: 796 @@ -8573,6 +8884,49 @@ entities: - type: Transform pos: 30.5,42.5 parent: 588 +- proto: IngotGold + entities: + - uid: 952 + components: + - type: Transform + pos: 11.069347,39.504154 + parent: 588 +- proto: KitchenMicrowave + entities: + - uid: 524 + components: + - type: Transform + pos: 16.5,12.5 + parent: 588 + - uid: 709 + components: + - type: Transform + pos: 18.5,22.5 + parent: 588 + - uid: 1785 + components: + - type: Transform + pos: 29.5,48.5 + parent: 588 +- proto: KitchenReagentGrinder + entities: + - uid: 1786 + components: + - type: Transform + pos: 30.5,47.5 + parent: 588 +- proto: KnifePlastic + entities: + - uid: 530 + components: + - type: Transform + pos: 17.249546,12.643455 + parent: 588 + - uid: 1836 + components: + - type: Transform + pos: 30.241585,48.271698 + parent: 588 - proto: Lamp entities: - uid: 581 @@ -8654,17 +9008,19 @@ entities: - type: Transform pos: 16.5,22.5 parent: 588 -- proto: LockerSecurityFilled +- proto: LockerMedicineFilled entities: - - uid: 416 + - uid: 1152 components: - type: Transform - pos: 20.5,6.5 + pos: 28.5,27.5 parent: 588 - - uid: 1011 +- proto: LockerSecurityFilled + entities: + - uid: 416 components: - type: Transform - pos: 12.5,28.5 + pos: 20.5,6.5 parent: 588 - proto: LockerSyndicatePersonal entities: @@ -8673,12 +9029,12 @@ entities: - type: Transform pos: 6.5,12.5 parent: 588 -- proto: MagazinePistolSubMachineGunPractice +- proto: MachineFrame entities: - - uid: 376 + - uid: 400 components: - type: Transform - pos: 26.585018,35.00363 + pos: 26.5,8.5 parent: 588 - proto: MaintenanceFluffSpawner entities: @@ -8777,6 +9133,20 @@ entities: - type: Transform pos: 28.5,25.5 parent: 588 +- proto: MedkitAdvancedFilled + entities: + - uid: 1153 + components: + - type: Transform + pos: 30.614443,28.392822 + parent: 588 +- proto: MedkitCombatFilled + entities: + - uid: 1154 + components: + - type: Transform + pos: 30.40146,28.066427 + parent: 588 - proto: OperatingTable entities: - uid: 1389 @@ -8796,6 +9166,33 @@ entities: - type: Transform pos: 20.669853,24.52373 parent: 588 +- proto: PaperOffice + entities: + - uid: 327 + components: + - type: Transform + pos: 21.415642,4.0728827 + parent: 588 + - uid: 328 + components: + - type: Transform + pos: 21.586027,4.0019264 + parent: 588 + - uid: 1113 + components: + - type: Transform + pos: 20.706646,15.341779 + parent: 588 + - uid: 1114 + components: + - type: Transform + pos: 20.465267,15.185677 + parent: 588 + - uid: 1115 + components: + - type: Transform + pos: 20.30908,14.603841 + parent: 588 - proto: PartRodMetal1 entities: - uid: 1071 @@ -8809,6 +9206,35 @@ entities: - type: Transform pos: 25.36965,28.11408 parent: 588 +- proto: Pen + entities: + - uid: 366 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 21.352327,3.9473093 + parent: 588 + - uid: 367 + components: + - type: Transform + pos: 18.75395,1.1232786 + parent: 588 + - uid: 368 + components: + - type: Transform + pos: 24.788435,1.4496742 + parent: 588 + - uid: 731 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 10.36841,19.019064 + parent: 588 + - uid: 732 + components: + - type: Transform + pos: 7.4631767,22.637186 + parent: 588 - proto: PhoneInstrument entities: - uid: 371 @@ -8816,6 +9242,25 @@ entities: - type: Transform pos: 25.484175,4.4865713 parent: 588 +- proto: PillCanister + entities: + - uid: 1481 + components: + - type: Transform + pos: 14.438607,42.637726 + parent: 588 +- proto: PillSpaceDrugs + entities: + - uid: 1479 + components: + - type: Transform + pos: 14.438607,42.96412 + parent: 588 + - uid: 1480 + components: + - type: Transform + pos: 14.537998,42.878975 + parent: 588 - proto: PlushieNuke entities: - uid: 1850 @@ -8943,6 +9388,18 @@ entities: - type: Transform pos: 22.5,40.5 parent: 588 +- proto: PowerCellHyper + entities: + - uid: 469 + components: + - type: Transform + pos: 12.355853,25.41643 + parent: 588 + - uid: 590 + components: + - type: Transform + pos: 5.381793,16.642464 + parent: 588 - proto: PowerCellRecharger entities: - uid: 1103 @@ -9649,6 +10106,11 @@ entities: - type: Transform pos: 19.5,4.5 parent: 588 + - uid: 396 + components: + - type: Transform + pos: 28.5,8.5 + parent: 588 - uid: 401 components: - type: Transform @@ -9739,11 +10201,6 @@ entities: rot: -1.5707963267948966 rad pos: 18.5,24.5 parent: 588 - - uid: 1068 - components: - - type: Transform - pos: 30.5,8.5 - parent: 588 - uid: 1111 components: - type: Transform @@ -10131,6 +10588,13 @@ entities: - type: Transform pos: 5.5,43.5 parent: 588 +- proto: RandomDrinkBottle + entities: + - uid: 580 + components: + - type: Transform + pos: 12.5,12.5 + parent: 588 - proto: RandomFoodSingle entities: - uid: 764 @@ -10199,6 +10663,13 @@ entities: - type: Transform pos: 8.5,24.5 parent: 588 +- proto: RandomVending + entities: + - uid: 539 + components: + - type: Transform + pos: 17.5,16.5 + parent: 588 - proto: ReinforcedWindow entities: - uid: 214 @@ -10261,1074 +10732,350 @@ entities: - type: Transform pos: 15.5,34.5 parent: 588 -- proto: ScalpelShiv +- proto: RemoteSignaller entities: - - uid: 1592 + - uid: 593 components: - type: Transform - pos: 10.50393,24.491432 + pos: 34.361877,24.623777 parent: 588 -- proto: SeedExtractor - entities: - - uid: 802 + - type: DeviceLinkSource + linkedPorts: + 1238: + - Pressed: Toggle + 1239: + - Pressed: Toggle + 1237: + - Pressed: Toggle + - uid: 1104 components: - type: Transform - pos: 33.5,21.5 + pos: 25.24476,30.698978 parent: 588 - - uid: 1776 + - uid: 1105 components: - type: Transform - pos: 28.5,42.5 + pos: 25.443544,30.613832 parent: 588 -- proto: ShowcaseRobot - entities: - - uid: 1621 + - uid: 1106 components: - type: Transform - pos: 16.5,10.5 + pos: 5.677143,16.762346 parent: 588 - - uid: 1622 +- proto: RiotLaserShield + entities: + - uid: 1618 components: - type: Transform - pos: 18.5,6.5 + pos: 12.616156,10.534842 parent: 588 -- proto: ShuttersNormal +- proto: RiotShield entities: - - uid: 1237 + - uid: 600 components: - type: Transform - pos: 34.5,27.5 + pos: 1.3209407,16.656654 parent: 588 - - uid: 1238 + - uid: 601 components: - type: Transform - pos: 32.5,27.5 + pos: 1.5481212,16.543125 parent: 588 -- proto: ShuttersWindow +- proto: SalvageCanisterSpawner entities: - - uid: 1239 + - uid: 998 components: - type: Transform - pos: 33.5,27.5 + pos: 22.5,30.5 parent: 588 -- proto: SignCloning - entities: - - uid: 1484 + - uid: 1009 components: - type: Transform - pos: 12.5,43.5 + pos: 19.5,30.5 parent: 588 -- proto: SignPrison - entities: - - uid: 1792 + - uid: 1025 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 6.5,3.5 - parent: 588 - - uid: 1793 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 10.5,1.5 - parent: 588 - - uid: 1794 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 1.5,21.5 - parent: 588 - - uid: 1795 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 3.5,19.5 - parent: 588 - - uid: 1796 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 0.5,46.5 - parent: 588 - - uid: 1797 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 6.5,44.5 - parent: 588 -- proto: SignSecurity - entities: - - uid: 1798 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 22.5,1.5 - parent: 588 -- proto: SignSurgery - entities: - - uid: 1483 - components: - - type: Transform - pos: 10.5,43.5 - parent: 588 -- proto: Sink - entities: - - uid: 935 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 10.5,25.5 - parent: 588 -- proto: SinkStemlessWater - entities: - - uid: 1461 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 9.5,42.5 - parent: 588 - - uid: 1462 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 13.5,42.5 - parent: 588 -- proto: SMESBasic - entities: - - uid: 46 - components: - - type: Transform - pos: 26.5,13.5 - parent: 588 - - uid: 56 - components: - - type: Transform - pos: 28.5,13.5 - parent: 588 - - uid: 747 - components: - - type: Transform - pos: 26.5,19.5 - parent: 588 - - uid: 1506 - components: - - type: Transform - pos: 18.5,46.5 - parent: 588 - - uid: 1507 - components: - - type: Transform - pos: 20.5,46.5 - parent: 588 -- proto: SoapSyndie - entities: - - uid: 1856 - components: - - type: Transform - pos: 10.4890785,27.46785 - parent: 588 -- proto: SpawnDungeonClutterMedical - entities: - - uid: 368 - components: - - type: Transform - pos: 14.464357,43.03244 - parent: 588 - - uid: 372 - components: - - type: Transform - pos: 14.417482,42.87619 - parent: 588 - - uid: 1108 - components: - - type: Transform - pos: 14.589357,42.610565 - parent: 588 - - uid: 1120 - components: - - type: Transform - pos: 14.542482,43.25119 - parent: 588 - - uid: 1141 - components: - - type: Transform - pos: 12.321655,44.516815 - parent: 588 - - uid: 1142 - components: - - type: Transform - pos: 14.354982,43.40744 - parent: 588 - - uid: 1195 - components: - - type: Transform - pos: 12.52478,44.62619 - parent: 588 -- proto: SpawnDungeonClutterPatientTransport - entities: - - uid: 726 - components: - - type: Transform - pos: 30.529268,25.626429 - parent: 588 - - uid: 727 - components: - - type: Transform - pos: 30.513643,24.642054 - parent: 588 -- proto: SpawnDungeonLootArmoryClutterSec - entities: - - uid: 265 - components: - - type: Transform - pos: 3.481042,0.55812025 - parent: 588 - - uid: 374 - components: - - type: Transform - pos: 1.35179,16.461943 - parent: 588 - - uid: 375 - components: - - type: Transform - pos: 12.868824,25.464571 - parent: 588 - - uid: 469 - components: - - type: Transform - pos: 18.577902,24.730196 - parent: 588 - - uid: 573 - components: - - type: Transform - pos: 12.469565,6.590061 - parent: 588 - - uid: 574 - components: - - type: Transform - pos: 18.577902,24.558321 - parent: 588 - - uid: 577 - components: - - type: Transform - pos: 5.398665,12.743193 - parent: 588 - - uid: 578 - components: - - type: Transform - pos: 22.3696,6.6631455 - parent: 588 - - uid: 579 - components: - - type: Transform - pos: 15.478392,0.62062025 - parent: 588 - - uid: 580 - components: - - type: Transform - pos: 12.556324,25.558321 - parent: 588 - - uid: 590 - components: - - type: Transform - pos: 22.58835,10.480686 - parent: 588 - - uid: 593 - components: - - type: Transform - pos: 15.744017,0.46437025 - parent: 588 - - uid: 600 - components: - - type: Transform - pos: 12.323845,12.540068 - parent: 588 - - uid: 601 - components: - - type: Transform - pos: 18.406027,25.620821 - parent: 588 - - uid: 602 - components: - - type: Transform - pos: 18.624777,25.527071 - parent: 588 - - uid: 603 - components: - - type: Transform - pos: 5.66429,12.602568 - parent: 588 - - uid: 604 - components: - - type: Transform - pos: 12.438315,6.715061 - parent: 588 - - uid: 606 - components: - - type: Transform - pos: 1.648665,16.540068 - parent: 588 - - uid: 988 - components: - - type: Transform - pos: 12.384449,24.636446 - parent: 588 - - uid: 1027 - components: - - type: Transform - pos: 12.43322,12.868193 - parent: 588 - - uid: 1028 - components: - - type: Transform - pos: 13.49572,13.665068 - parent: 588 - - uid: 1029 - components: - - type: Transform - pos: 12.93322,13.586943 - parent: 588 - - uid: 1030 - components: - - type: Transform - pos: 13.400267,0.55812025 - parent: 588 - - uid: 1032 - components: - - type: Transform - pos: 22.353975,10.574436 - parent: 588 - - uid: 1036 - components: - - type: Transform - pos: 12.603199,24.558321 - parent: 588 - - uid: 1106 - components: - - type: Transform - pos: 5.66429,16.493193 - parent: 588 - - uid: 1156 - components: - - type: Transform - pos: 13.511345,12.571318 - parent: 588 - - uid: 1480 - components: - - type: Transform - pos: 12.594565,10.511936 - parent: 588 - - uid: 1481 - components: - - type: Transform - pos: 1.38304,12.727568 - parent: 588 - - uid: 1563 - components: - - type: Transform - pos: 1.679915,12.540068 - parent: 588 - - uid: 1577 - components: - - type: Transform - pos: 12.750815,6.496311 - parent: 588 - - uid: 1613 - components: - - type: Transform - pos: 12.605095,12.524443 - parent: 588 - - uid: 1614 - components: - - type: Transform - pos: 5.434167,0.52687025 - parent: 588 - - uid: 1615 - components: - - type: Transform - pos: 18.613144,1.0893703 - parent: 588 - - uid: 1616 - components: - - type: Transform - pos: 26.523903,3.6206203 - parent: 588 - - uid: 1617 - components: - - type: Transform - pos: 1.63304,12.758818 - parent: 588 -- proto: SpawnDungeonLootArmoryGuns - entities: - - uid: 511 - components: - - type: Transform - pos: 12.573845,13.149443 - parent: 588 - - uid: 1296 - components: - - type: Transform - pos: 1.52317,0.58291197 - parent: 588 - - uid: 1297 - components: - - type: Transform - pos: 26.491337,36.55478 - parent: 588 - - uid: 1298 - components: - - type: Transform - pos: 26.678837,36.30478 - parent: 588 - - uid: 1611 - components: - - type: Transform - pos: 12.510225,10.52252 - parent: 588 - - uid: 1612 - components: - - type: Transform - pos: 22.6821,6.4756455 - parent: 588 -- proto: SpawnDungeonLootBureaucracy - entities: - - uid: 328 - components: - - type: Transform - pos: 24.93235,1.6214004 - parent: 588 - - uid: 329 - components: - - type: Transform - pos: 7.422515,22.667841 - parent: 588 - - uid: 362 - components: - - type: Transform - pos: 28.4636,1.6214004 - parent: 588 - - uid: 363 - components: - - type: Transform - pos: 10.34439,19.355341 - parent: 588 - - uid: 364 - components: - - type: Transform - pos: 18.516119,0.71515036 - parent: 588 - - uid: 365 - components: - - type: Transform - pos: 25.2136,1.4964004 - parent: 588 - - uid: 366 - components: - - type: Transform - pos: 24.604225,1.4651504 - parent: 588 - - uid: 367 - components: - - type: Transform - pos: 7.672515,22.480341 - parent: 588 - - uid: 561 - components: - - type: Transform - pos: 19.609869,0.55890036 - parent: 588 - - uid: 649 - components: - - type: Transform - pos: 20.602207,15.576639 - parent: 588 - - uid: 656 - components: - - type: Transform - pos: 20.570957,14.779764 - parent: 588 - - uid: 732 - components: - - type: Transform - pos: 10.797515,19.495966 - parent: 588 - - uid: 1105 - components: - - type: Transform - pos: 21.391119,4.0432754 - parent: 588 - - uid: 1107 - components: - - type: Transform - pos: 21.734869,3.8401504 - parent: 588 - - uid: 1109 - components: - - type: Transform - pos: 20.477207,14.436014 - parent: 588 - - uid: 1110 - components: - - type: Transform - pos: 20.399082,15.264139 - parent: 588 - - uid: 1113 - components: - - type: Transform - pos: 21.422369,3.6057754 - parent: 588 - - uid: 1114 - components: - - type: Transform - pos: 18.828619,0.52765036 - parent: 588 - - uid: 1115 - components: - - type: Transform - pos: 27.916725,1.4807754 - parent: 588 - - uid: 1116 - components: - - type: Transform - pos: 7.328765,22.355341 - parent: 588 - - uid: 1119 - components: - - type: Transform - pos: 10.328765,19.652216 - parent: 588 -- proto: SpawnDungeonLootCanister - entities: - - uid: 1210 - components: - - type: Transform - pos: 19.5,30.5 - parent: 588 - - uid: 1217 - components: - - type: Transform - pos: 22.5,30.5 - parent: 588 - - uid: 1218 - components: - - type: Transform - pos: 21.5,30.5 - parent: 588 - - uid: 1236 - components: - - type: Transform - pos: 9.5,36.5 - parent: 588 - - uid: 1241 - components: - - type: Transform - pos: 13.5,48.5 - parent: 588 - - uid: 1242 - components: - - type: Transform - pos: 9.5,48.5 - parent: 588 - - uid: 1243 - components: - - type: Transform - pos: 12.5,48.5 - parent: 588 -- proto: SpawnDungeonLootChemsHydroponics - entities: - - uid: 1329 - components: - - type: Transform - pos: 33.533516,20.62025 - parent: 588 -- proto: SpawnDungeonLootCircuitBoard - entities: - - uid: 1478 - components: - - type: Transform - pos: 32.402702,8.382084 - parent: 588 -- proto: SpawnDungeonLootClutterEngi - entities: - - uid: 552 - components: - - type: Transform - pos: 25.329813,30.721416 - parent: 588 - - uid: 1152 - components: - - type: Transform - pos: 25.517313,30.518291 - parent: 588 - - uid: 1153 - components: - - type: Transform - pos: 25.720438,30.752666 - parent: 588 - - uid: 1157 - components: - - type: Transform - pos: 34.401733,24.67827 - parent: 588 - - uid: 1479 - components: - - type: Transform - pos: 5.304915,16.524443 - parent: 588 -- proto: SpawnDungeonLootClutterKitchen - entities: - - uid: 327 - components: - - type: Transform - pos: 30.661781,48.478493 - parent: 588 - - uid: 731 - components: - - type: Transform - pos: 17.570957,12.529764 - parent: 588 - - uid: 761 - components: - - type: Transform - pos: 17.383457,12.514139 - parent: 588 - - uid: 968 - components: - - type: Transform - pos: 30.552406,48.572243 - parent: 588 - - uid: 997 - components: - - type: Transform - pos: 30.239906,48.587868 - parent: 588 - - uid: 1007 - components: - - type: Transform - pos: 17.258457,12.654764 - parent: 588 - - uid: 1216 - components: - - type: Transform - pos: 30.458656,48.244118 - parent: 588 -- proto: SpawnDungeonLootFood - entities: - - uid: 699 - components: - - type: Transform - pos: 16.492832,13.529764 - parent: 588 - - uid: 709 - components: - - type: Transform - pos: 18.409803,21.792841 - parent: 588 -- proto: SpawnDungeonLootKitchenTabletop - entities: - - uid: 728 - components: - - type: Transform - pos: 30.5,47.5 - parent: 588 - - uid: 950 - components: - - type: Transform - pos: 16.5,12.5 - parent: 588 - - uid: 954 - components: - - type: Transform - pos: 18.5,22.5 - parent: 588 - - uid: 1010 - components: - - type: Transform - pos: 29.5,48.5 - parent: 588 -- proto: SpawnDungeonLootKitsFirstAid - entities: - - uid: 1102 - components: - - type: Transform - pos: 30.498018,28.517054 - parent: 588 - - uid: 1104 - components: - - type: Transform - pos: 30.388643,28.110804 - parent: 588 - - uid: 1194 - components: - - type: Transform - pos: 30.544893,27.642054 - parent: 588 -- proto: SpawnDungeonLootLathe - entities: - - uid: 1070 - components: - - type: Transform - pos: 26.5,8.5 - parent: 588 -- proto: SpawnDungeonLootLockersEngi - entities: - - uid: 538 - components: - - type: Transform - pos: 14.5,30.5 - parent: 588 -- proto: SpawnDungeonLootLockersMed - entities: - - uid: 1035 - components: - - type: Transform - pos: 28.5,27.5 - parent: 588 -- proto: SpawnDungeonLootLockersProtectiveGear - entities: - - uid: 398 - components: - - type: Transform - pos: 14.5,6.5 - parent: 588 - - uid: 400 - components: - - type: Transform - pos: 0.5,32.5 - parent: 588 - - uid: 413 - components: - - type: Transform - pos: 12.5,30.5 - parent: 588 - - uid: 415 - components: - - type: Transform - pos: 1.5,7.5 - parent: 588 - - uid: 424 - components: - - type: Transform - pos: 9.5,7.5 - parent: 588 - - uid: 524 - components: - - type: Transform - pos: 9.5,9.5 - parent: 588 - - uid: 526 - components: - - type: Transform - pos: 1.5,9.5 - parent: 588 - - uid: 529 - components: - - type: Transform - pos: 0.5,38.5 - parent: 588 - - uid: 530 - components: - - type: Transform - pos: 6.5,40.5 - parent: 588 - - uid: 531 - components: - - type: Transform - pos: 20.5,10.5 - parent: 588 -- proto: SpawnDungeonLootMaterialsBasicFull - entities: - - uid: 1160 - components: - - type: Transform - pos: 26.513111,32.51829 - parent: 588 - - uid: 1191 - components: - - type: Transform - pos: 14.419361,32.596416 - parent: 588 - - uid: 1192 - components: - - type: Transform - pos: 29.431097,40.491657 - parent: 588 -- proto: SpawnDungeonLootMaterialsValuableFull - entities: - - uid: 1161 - components: - - type: Transform - pos: 2.4952426,34.536057 - parent: 588 - - uid: 1162 - components: - - type: Transform - pos: 17.49705,47.59487 - parent: 588 - - uid: 1267 - components: - - type: Transform - pos: 11.029299,39.508804 - parent: 588 - - uid: 1292 - components: - - type: Transform - pos: 12.560549,39.68068 - parent: 588 - - uid: 1293 - components: - - type: Transform - pos: 10.482424,39.571304 - parent: 588 -- proto: SpawnDungeonLootMugs - entities: - - uid: 720 - components: - - type: Transform - pos: 22.742832,12.451639 - parent: 588 - - uid: 721 - components: - - type: Transform - pos: 18.487928,18.605341 + pos: 21.5,30.5 parent: 588 - - uid: 722 + - uid: 1190 components: - type: Transform - pos: 22.399082,12.717264 + pos: 9.5,36.5 parent: 588 - - uid: 723 + - uid: 1210 components: - type: Transform - pos: 22.487928,18.464716 + pos: 9.5,48.5 parent: 588 -- proto: SpawnDungeonLootPowerCell - entities: - - uid: 1031 + - uid: 1413 components: - type: Transform - pos: 5.53929,16.571318 + pos: 13.5,48.5 parent: 588 - - uid: 1618 + - uid: 1470 components: - type: Transform - pos: 12.463861,25.629824 + pos: 12.5,48.5 parent: 588 -- proto: SpawnDungeonLootSeed +- proto: SawAdvanced entities: - - uid: 583 + - uid: 1468 components: - type: Transform - pos: 29.296295,44.152103 + pos: 8.527969,43.529327 parent: 588 - - uid: 1413 +- proto: ScalpelLaser + entities: + - uid: 1472 components: - type: Transform - pos: 30.78067,44.152103 + pos: 8.485372,43.131977 parent: 588 - - uid: 1468 +- proto: ScalpelShiv + entities: + - uid: 708 components: - type: Transform - pos: 30.43692,42.495853 + pos: 16.074419,18.727995 parent: 588 - - uid: 1470 + - uid: 1592 components: - type: Transform - pos: 29.62442,42.51148 + pos: 10.50393,24.491432 parent: 588 - - uid: 1471 +- proto: SeedExtractor + entities: + - uid: 802 components: - type: Transform - pos: 31.758577,21.18776 + pos: 33.5,21.5 parent: 588 - - uid: 1472 + - uid: 1776 components: - type: Transform - pos: 31.492952,21.140884 + pos: 28.5,42.5 parent: 588 - - uid: 1473 +- proto: SheetGlass + entities: + - uid: 649 components: - type: Transform - pos: 31.367952,20.43776 + pos: 14.3137455,32.471424 parent: 588 - - uid: 1474 +- proto: SheetPlasteel + entities: + - uid: 866 components: - type: Transform - pos: 31.586702,19.390884 + pos: 2.412651,34.456436 parent: 588 - - uid: 1475 +- proto: SheetPlastic + entities: + - uid: 398 components: - type: Transform - pos: 34.36795,18.484634 + pos: 20.04785,45.07574 parent: 588 - - uid: 1476 +- proto: SheetSteel + entities: + - uid: 656 components: - type: Transform - pos: 31.727327,22.56276 + pos: 26.36062,32.5183 parent: 588 - - uid: 1477 + - uid: 699 components: - type: Transform - pos: 31.258577,22.297134 + pos: 29.259031,40.432583 parent: 588 -- proto: SpawnDungeonLootSpesos +- proto: ShowcaseRobot entities: - - uid: 547 + - uid: 1621 components: - type: Transform - pos: 11.498049,39.71193 + pos: 16.5,10.5 parent: 588 - - uid: 708 + - uid: 1622 components: - type: Transform - pos: 11.638674,39.49318 + pos: 18.5,6.5 parent: 588 - - uid: 1025 +- proto: ShuttersNormal + entities: + - uid: 1237 components: - type: Transform - pos: 11.873049,39.821304 + pos: 34.5,27.5 parent: 588 - - uid: 1284 + - type: DeviceLinkSink + links: + - 593 + - uid: 1238 components: - type: Transform - pos: 12.388674,39.49318 + pos: 32.5,27.5 parent: 588 - - uid: 1285 + - type: DeviceLinkSink + links: + - 593 +- proto: ShuttersWindow + entities: + - uid: 1239 components: - type: Transform - pos: 12.326174,39.758804 + pos: 33.5,27.5 parent: 588 - - uid: 1294 + - type: DeviceLinkSink + links: + - 593 +- proto: SignCloning + entities: + - uid: 1484 components: - type: Transform - pos: 11.982424,39.508804 + pos: 12.5,43.5 parent: 588 -- proto: SpawnDungeonLootToolsBasicEngineering +- proto: SignPrison entities: - - uid: 1207 + - uid: 1792 components: - type: Transform - pos: 15.481861,32.533916 + rot: -1.5707963267948966 rad + pos: 6.5,3.5 parent: 588 -- proto: SpawnDungeonLootToolsHydroponics - entities: - - uid: 399 + - uid: 1793 components: - type: Transform - pos: 29.608795,43.745853 + rot: -1.5707963267948966 rad + pos: 10.5,1.5 parent: 588 - - uid: 539 + - uid: 1794 components: - type: Transform - pos: 30.961702,21.672134 + rot: -1.5707963267948966 rad + pos: 1.5,21.5 parent: 588 - - uid: 765 + - uid: 1795 components: - type: Transform - pos: 30.18692,43.558353 + rot: -1.5707963267948966 rad + pos: 3.5,19.5 parent: 588 - - uid: 930 + - uid: 1796 components: - type: Transform - pos: 30.492952,21.765884 + rot: -1.5707963267948966 rad + pos: 0.5,46.5 parent: 588 - - uid: 931 + - uid: 1797 components: - type: Transform - pos: 30.46817,42.98023 + rot: -1.5707963267948966 rad + pos: 6.5,44.5 parent: 588 - - uid: 952 +- proto: SignSecurity + entities: + - uid: 1798 components: - type: Transform - pos: 33.39289,20.698376 + rot: -1.5707963267948966 rad + pos: 22.5,1.5 parent: 588 - - uid: 998 +- proto: SignSurgery + entities: + - uid: 1483 components: - type: Transform - pos: 29.483795,42.85523 + pos: 10.5,43.5 parent: 588 - - uid: 1009 +- proto: Sink + entities: + - uid: 935 components: - type: Transform - pos: 33.533516,20.573376 + rot: -1.5707963267948966 rad + pos: 10.5,25.5 parent: 588 -- proto: SpawnDungeonLootToolsSurgeryAdvanced +- proto: SinkStemlessWater entities: - - uid: 373 + - uid: 1461 components: - type: Transform - pos: 8.477286,43.610565 + rot: 3.141592653589793 rad + pos: 9.5,42.5 parent: 588 - - uid: 866 + - uid: 1462 components: - type: Transform - pos: 8.461661,43.360565 + rot: 3.141592653589793 rad + pos: 13.5,42.5 parent: 588 - - uid: 1154 +- proto: SMESBasic + entities: + - uid: 46 components: - type: Transform - pos: 8.477286,42.81369 + pos: 26.5,13.5 parent: 588 - - uid: 1155 + - uid: 56 components: - type: Transform - pos: 8.477286,43.12619 + pos: 28.5,13.5 parent: 588 -- proto: SpawnDungeonLootToolsSurgeryCrude - entities: - - uid: 1244 + - uid: 747 components: - type: Transform - pos: 16.224228,18.705944 + pos: 26.5,19.5 parent: 588 -- proto: SpawnDungeonLootVaultGuns - entities: - - uid: 1299 + - uid: 1506 components: - type: Transform - pos: 26.599047,35.444897 + pos: 18.5,46.5 parent: 588 - - uid: 1660 + - uid: 1507 components: - type: Transform - pos: 11.198751,39.646996 + pos: 20.5,46.5 parent: 588 -- proto: SpawnDungeonVendomatsRecreational +- proto: SoapSyndie entities: - - uid: 1190 + - uid: 1856 components: - type: Transform - pos: 17.5,16.5 + pos: 10.4890785,27.46785 parent: 588 - - uid: 1196 +- proto: SpaceCash100 + entities: + - uid: 1243 components: - type: Transform - pos: 22.5,22.5 + pos: 11.887424,39.621456 parent: 588 - - uid: 1197 + - uid: 1244 components: - type: Transform - pos: 18.5,40.5 + pos: 11.759636,39.479546 parent: 588 - - uid: 1203 + - uid: 1296 components: - type: Transform - pos: 16.5,16.5 + pos: 12.100407,39.465355 parent: 588 - - uid: 1204 + - uid: 1297 components: - type: Transform - pos: 17.5,40.5 + pos: 12.100407,39.80594 parent: 588 - - uid: 1205 + - uid: 1298 components: - type: Transform - pos: 21.5,12.5 + pos: 11.688642,39.720795 parent: 588 - - uid: 1295 + - uid: 1299 components: - type: Transform - pos: 10.5,22.5 + pos: 11.4330635,39.57888 parent: 588 - proto: Spear entities: @@ -11337,6 +11084,13 @@ 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 @@ -11344,6 +11098,13 @@ entities: - type: Transform pos: 13.5,43.5 parent: 588 +- proto: StimkitFilled + entities: + - uid: 561 + components: + - type: Transform + pos: 30.39083,27.514402 + parent: 588 - proto: StimpackMini entities: - uid: 1879 @@ -11425,6 +11186,13 @@ entities: - type: Transform pos: 19.5,32.5 parent: 588 +- proto: SyringeEphedrine + entities: + - uid: 1475 + components: + - type: Transform + pos: 14.472328,42.917698 + parent: 588 - proto: Table entities: - uid: 525 @@ -11868,6 +11636,25 @@ entities: - type: Transform pos: 18.5,12.5 parent: 588 +- proto: VendingMachineCigs + entities: + - uid: 720 + components: + - type: Transform + pos: 22.5,22.5 + parent: 588 +- proto: VendingMachineCoffee + entities: + - uid: 765 + components: + - type: Transform + pos: 10.5,22.5 + parent: 588 + - uid: 1285 + components: + - type: Transform + pos: 18.5,40.5 + parent: 588 - proto: VendingMachineDetDrobe entities: - uid: 582 @@ -11882,6 +11669,13 @@ entities: - type: Transform pos: 30.5,46.5 parent: 588 +- proto: VendingMachineDonut + entities: + - uid: 538 + components: + - type: Transform + pos: 16.5,16.5 + parent: 588 - proto: VendingMachineLawDrobe entities: - uid: 319 @@ -11903,13 +11697,6 @@ entities: - type: Transform pos: 14.5,27.5 parent: 588 -- proto: VendingMachineSecDrobe - entities: - - uid: 1022 - components: - - type: Transform - pos: 16.5,25.5 - parent: 588 - proto: VendingMachineSeedsUnlocked entities: - uid: 800 @@ -12493,6 +12280,16 @@ entities: - type: Transform pos: 19.5,22.5 parent: 588 + - uid: 1284 + components: + - type: Transform + pos: 17.5,40.5 + parent: 588 + - uid: 1292 + components: + - type: Transform + pos: 21.5,12.5 + parent: 588 - proto: WaterTankHighCapacity entities: - uid: 801 @@ -12528,6 +12325,42 @@ entities: - type: Transform pos: 16.5,24.5 parent: 588 +- proto: WeaponDisablerPractice + entities: + - uid: 547 + components: + - type: Transform + pos: 1.4370823,0.5241035 + parent: 588 + - uid: 930 + components: + - type: Transform + pos: 26.440151,36.61676 + parent: 588 + - uid: 1611 + components: + - type: Transform + pos: 12.371853,10.605072 + parent: 588 +- proto: WeaponLaserCarbinePractice + entities: + - uid: 931 + components: + - type: Transform + pos: 26.596338,36.36132 + parent: 588 + - uid: 1612 + components: + - type: Transform + pos: 22.543945,6.5464144 + parent: 588 +- proto: WeaponShotgunKammerer + entities: + - uid: 583 + components: + - type: Transform + pos: 26.57963,35.4414 + parent: 588 - proto: WindoorAssemblySecure entities: - uid: 696 @@ -13142,6 +12975,20 @@ entities: - type: Transform pos: 13.5,44.5 parent: 588 +- proto: Wrench + entities: + - uid: 424 + components: + - type: Transform + pos: 15.156982,32.526764 + parent: 588 +- proto: Zipties + entities: + - uid: 1156 + components: + - type: Transform + pos: 15.332411,0.52492684 + parent: 588 - proto: ZiptiesBroken entities: - uid: 48 diff --git a/Resources/Maps/Dungeon/mineshaft.yml b/Resources/Maps/Dungeon/mineshaft.yml index 053a22337aa..898b7e8ff20 100644 --- a/Resources/Maps/Dungeon/mineshaft.yml +++ b/Resources/Maps/Dungeon/mineshaft.yml @@ -537,12 +537,12 @@ entities: - type: Transform pos: 43.60813,21.699238 parent: 2 -- proto: BorgModuleMining +- proto: BorgModuleL6C entities: - - uid: 272 + - uid: 802 components: - type: Transform - pos: 43.492916,20.446398 + pos: 43.64335,20.440603 parent: 2 - proto: BorgModuleRCD entities: @@ -1637,6 +1637,13 @@ entities: rot: 3.141592653589793 rad pos: 32.5,8.5 parent: 2 +- proto: CigPackSyndicate + entities: + - uid: 592 + components: + - type: Transform + pos: 28.687122,30.357244 + parent: 2 - proto: ClosetMaintenanceFilledRandom entities: - uid: 453 @@ -2299,6 +2306,128 @@ entities: - type: Transform pos: 36.5,33.5 parent: 2 +- proto: FloorChasmEntity + entities: + - uid: 1 + components: + - type: Transform + pos: 6.5,9.5 + parent: 2 + - uid: 7 + components: + - type: Transform + pos: 5.5,8.5 + parent: 2 + - uid: 93 + components: + - type: Transform + pos: 4.5,7.5 + parent: 2 + - uid: 95 + components: + - type: Transform + pos: 3.5,7.5 + parent: 2 + - uid: 113 + components: + - type: Transform + pos: 13.5,27.5 + parent: 2 + - uid: 132 + components: + - type: Transform + pos: 4.5,6.5 + parent: 2 + - uid: 136 + components: + - type: Transform + pos: 6.5,8.5 + parent: 2 + - uid: 155 + components: + - type: Transform + pos: 7.5,9.5 + parent: 2 + - uid: 156 + components: + - type: Transform + pos: 5.5,7.5 + parent: 2 + - uid: 163 + components: + - type: Transform + pos: 5.5,9.5 + parent: 2 + - uid: 164 + components: + - type: Transform + pos: 4.5,8.5 + parent: 2 + - uid: 312 + components: + - type: Transform + pos: 3.5,6.5 + parent: 2 + - uid: 313 + components: + - type: Transform + pos: 2.5,6.5 + parent: 2 + - uid: 410 + components: + - type: Transform + pos: 9.5,20.5 + parent: 2 + - uid: 411 + components: + - type: Transform + pos: 9.5,21.5 + parent: 2 + - uid: 412 + components: + - type: Transform + pos: 8.5,19.5 + parent: 2 + - uid: 413 + components: + - type: Transform + pos: 8.5,20.5 + parent: 2 + - uid: 414 + components: + - type: Transform + pos: 8.5,21.5 + parent: 2 + - uid: 415 + components: + - type: Transform + pos: 7.5,19.5 + parent: 2 + - uid: 416 + components: + - type: Transform + pos: 7.5,20.5 + parent: 2 + - uid: 417 + components: + - type: Transform + pos: 7.5,21.5 + parent: 2 + - uid: 574 + components: + - type: Transform + pos: 14.5,28.5 + parent: 2 + - uid: 575 + components: + - type: Transform + pos: 13.5,28.5 + parent: 2 + - uid: 576 + components: + - type: Transform + pos: 12.5,27.5 + parent: 2 - proto: FloorLavaEntity entities: - uid: 103 @@ -2570,111 +2699,6 @@ entities: parent: 2 - proto: FloorWaterEntity entities: - - uid: 1 - components: - - type: Transform - pos: 6.5,9.5 - parent: 2 - - uid: 7 - components: - - type: Transform - pos: 5.5,8.5 - parent: 2 - - uid: 93 - components: - - type: Transform - pos: 4.5,7.5 - parent: 2 - - uid: 95 - components: - - type: Transform - pos: 3.5,7.5 - parent: 2 - - uid: 113 - components: - - type: Transform - pos: 13.5,27.5 - parent: 2 - - uid: 132 - components: - - type: Transform - pos: 4.5,6.5 - parent: 2 - - uid: 136 - components: - - type: Transform - pos: 6.5,8.5 - parent: 2 - - uid: 155 - components: - - type: Transform - pos: 7.5,9.5 - parent: 2 - - uid: 156 - components: - - type: Transform - pos: 5.5,7.5 - parent: 2 - - uid: 163 - components: - - type: Transform - pos: 5.5,9.5 - parent: 2 - - uid: 164 - components: - - type: Transform - pos: 4.5,8.5 - parent: 2 - - uid: 312 - components: - - type: Transform - pos: 3.5,6.5 - parent: 2 - - uid: 313 - components: - - type: Transform - pos: 2.5,6.5 - parent: 2 - - uid: 410 - components: - - type: Transform - pos: 9.5,20.5 - parent: 2 - - uid: 411 - components: - - type: Transform - pos: 9.5,21.5 - parent: 2 - - uid: 412 - components: - - type: Transform - pos: 8.5,19.5 - parent: 2 - - uid: 413 - components: - - type: Transform - pos: 8.5,20.5 - parent: 2 - - uid: 414 - components: - - type: Transform - pos: 8.5,21.5 - parent: 2 - - uid: 415 - components: - - type: Transform - pos: 7.5,19.5 - parent: 2 - - uid: 416 - components: - - type: Transform - pos: 7.5,20.5 - parent: 2 - - uid: 417 - components: - - type: Transform - pos: 7.5,21.5 - parent: 2 - uid: 449 components: - type: Transform @@ -2770,21 +2794,6 @@ entities: - type: Transform pos: 26.5,28.5 parent: 2 - - uid: 574 - components: - - type: Transform - pos: 14.5,28.5 - parent: 2 - - uid: 575 - components: - - type: Transform - pos: 13.5,28.5 - parent: 2 - - uid: 576 - components: - - type: Transform - pos: 12.5,27.5 - parent: 2 - proto: FloraRockSolid01 entities: - uid: 205 @@ -3353,21 +3362,11 @@ entities: parent: 2 - proto: MiningDrill entities: - - uid: 271 - components: - - type: Transform - pos: 20.534552,0.5729167 - parent: 2 - uid: 404 components: - type: Transform pos: 27.48866,15.5502 parent: 2 - - uid: 570 - components: - - type: Transform - pos: 2.52707,15.593962 - parent: 2 - proto: MiningWindow entities: - uid: 102 @@ -4201,6 +4200,14 @@ entities: - type: Transform pos: 41.5,13.5 parent: 2 +- proto: RandomRockAnomalySpawner + entities: + - uid: 585 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 36.5,22.5 + parent: 2 - proto: RandomWoodenSupport entities: - uid: 939 @@ -4322,6 +4329,13 @@ entities: - type: Transform pos: 19.5,32.5 parent: 2 +- proto: SalvageLootSpawner + entities: + - uid: 207 + components: + - type: Transform + pos: 18.5,7.5 + parent: 2 - proto: SalvageMaterialCrateSpawner entities: - uid: 308 @@ -4339,12 +4353,47 @@ entities: - type: Transform pos: 1.5,33.5 parent: 2 -- proto: SalvagePartsT3Spawner +- proto: SeismicCharge entities: - - uid: 207 + - uid: 271 components: - type: Transform - pos: 18.5,7.5 + pos: 20.302504,0.69014454 + parent: 2 + - uid: 272 + components: + - type: Transform + pos: 20.607191,0.479207 + parent: 2 + - uid: 403 + components: + - type: Transform + pos: 27.344437,13.639372 + parent: 2 + - uid: 569 + components: + - type: Transform + pos: 25.394873,28.386763 + parent: 2 + - uid: 570 + components: + - type: Transform + pos: 9.34093,26.582075 + parent: 2 + - uid: 571 + components: + - type: Transform + pos: 9.5987425,26.886763 + parent: 2 + - uid: 650 + components: + - type: Transform + pos: 2.4223385,15.630526 + parent: 2 + - uid: 651 + components: + - type: Transform + pos: 2.6098385,15.560213 parent: 2 - proto: SheetGlass entities: @@ -5995,18 +6044,6 @@ entities: - type: Transform pos: 38.5,34.5 parent: 2 -- proto: WeaponLaserGun - entities: - - uid: 403 - components: - - type: Transform - pos: 9.592981,26.744059 - parent: 2 - - uid: 569 - components: - - type: Transform - pos: 9.478398,26.452393 - parent: 2 - proto: WeaponPistolCHIMP entities: - uid: 617 diff --git a/Resources/Maps/Dungeon/snowy_labs.yml b/Resources/Maps/Dungeon/snowy_labs.yml index e98a0377d99..27e4fe1c079 100644 --- a/Resources/Maps/Dungeon/snowy_labs.yml +++ b/Resources/Maps/Dungeon/snowy_labs.yml @@ -156,2716 +156,2715 @@ entities: color: '#FFFFFFFF' id: Arrows decals: - 176: 40,39 - 271: 10,35 - 428: 17,25 - 429: 17,26 - 430: 17,27 + 231: 40,39 + 326: 10,35 + 483: 17,25 + 484: 17,26 + 485: 17,27 - node: color: '#FFFFFFFF' id: Arrows decals: - 778: 41,14 + 941: 41,14 - node: angle: 1.5707963267948966 rad color: '#FFFFFFFF' id: Arrows decals: - 177: 46,39 - 272: 0,35 + 232: 46,39 + 327: 0,35 - node: color: '#FFFFFFFF' id: Bot decals: - 425: 16,25 - 426: 16,26 - 427: 16,27 - 453: 0,6 - 454: 0,7 - 455: 7,10 - 456: 8,10 - 457: 9,10 - 846: 3,14 - 1649: 3,7 - 1650: 3,6 - 1651: 34,28 + 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 - node: cleanable: True color: '#FFFFFFFF' id: BotLeft decals: - 416: 14,42 + 471: 14,42 - node: color: '#8BDA8EB4' id: Box decals: - 1162: 45,12 + 1339: 45,12 - node: color: '#8BDA8EFF' id: Box decals: - 1430: 51,14 + 1633: 51,14 - node: color: '#8BDABA6F' id: BrickCornerOverlayNE decals: - 1025: 22,10 + 1202: 22,10 - node: color: '#8BDABA6F' id: BrickCornerOverlayNW decals: - 1024: 12,10 + 1201: 12,10 - node: color: '#8BDABA6F' id: BrickCornerOverlaySE decals: - 1019: 22,6 + 1196: 22,6 - node: color: '#8BDABA6F' id: BrickCornerOverlaySW decals: - 1020: 12,6 + 1197: 12,6 - node: color: '#8BDABA6F' id: BrickLineOverlayE decals: - 1035: 22,9 - 1036: 22,8 - 1037: 22,7 + 1212: 22,9 + 1213: 22,8 + 1214: 22,7 - node: color: '#8BDB9B85' id: BrickLineOverlayE decals: - 1209: 18,4 - 1210: 18,2 - 1211: 18,1 - 1212: 18,0 + 1386: 18,4 + 1387: 18,2 + 1388: 18,1 + 1389: 18,0 - node: color: '#8BDABA6F' id: BrickLineOverlayN decals: - 1026: 13,10 - 1027: 14,10 - 1028: 15,10 - 1029: 16,10 - 1030: 17,10 - 1031: 18,10 - 1032: 19,10 - 1033: 20,10 - 1034: 21,10 + 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 - node: color: '#8BDABA6F' id: BrickLineOverlayS decals: - 1010: 13,6 - 1011: 14,6 - 1012: 15,6 - 1013: 16,6 - 1014: 17,6 - 1015: 18,6 - 1016: 19,6 - 1017: 20,6 - 1018: 21,6 + 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 - node: color: '#8BDABA6F' id: BrickLineOverlayW decals: - 1021: 12,7 - 1022: 12,8 - 1023: 12,9 + 1198: 12,7 + 1199: 12,8 + 1200: 12,9 - node: color: '#8BDB9B85' id: BrickLineOverlayW decals: - 1205: 34,2 - 1206: 34,1 - 1207: 34,0 - 1208: 34,4 + 1382: 34,2 + 1383: 34,1 + 1384: 34,0 + 1385: 34,4 - node: color: '#8BDA8EFF' id: BrickTileSteelCornerNe decals: - 1408: 30,24 - 1431: 54,16 - 1536: 38,16 + 1611: 30,24 + 1634: 54,16 + 1746: 38,16 - node: color: '#D381C996' id: BrickTileSteelCornerNe decals: - 561: 14,16 - 670: 22,10 + 618: 14,16 + 805: 22,10 - node: color: '#FFFFFFFF' id: BrickTileSteelCornerNe decals: - 1428: 34,27 + 1631: 34,27 - node: color: '#8BDA8EFF' id: BrickTileSteelCornerNw decals: - 1410: 28,24 - 1434: 48,16 - 1535: 32,16 + 1613: 28,24 + 1637: 48,16 + 1745: 32,16 - node: color: '#D381C996' id: BrickTileSteelCornerNw decals: - 562: 8,16 - 671: 12,10 + 619: 8,16 + 806: 12,10 - node: color: '#FFFFFFFF' id: BrickTileSteelCornerNw decals: - 1426: 32,27 + 1629: 32,27 - node: color: '#8BDA8EFF' id: BrickTileSteelCornerSe decals: - 1413: 30,28 - 1432: 54,12 - 1537: 38,12 + 1616: 30,28 + 1635: 54,12 + 1747: 38,12 - node: color: '#D381C996' id: BrickTileSteelCornerSe decals: - 669: 22,6 + 804: 22,6 - node: color: '#FFFFFFFF' id: BrickTileSteelCornerSe decals: - 1424: 34,25 + 1627: 34,25 - node: color: '#8BDA8EFF' id: BrickTileSteelCornerSw decals: - 1411: 28,28 - 1433: 48,12 - 1534: 32,12 + 1614: 28,28 + 1636: 48,12 + 1744: 32,12 - node: color: '#D381C996' id: BrickTileSteelCornerSw decals: - 668: 12,6 + 803: 12,6 - node: color: '#FFFFFFFF' id: BrickTileSteelCornerSw decals: - 1423: 32,25 + 1626: 32,25 - node: color: '#FFFFFFFF' id: BrickTileSteelEndN decals: - 480: 1,7 - 481: 4,7 + 537: 1,7 + 538: 4,7 - node: color: '#8BDA8EFF' id: BrickTileSteelLineE decals: - 1443: 54,15 - 1444: 54,14 - 1445: 54,13 - 1538: 38,13 - 1539: 38,14 - 1540: 38,15 + 1646: 54,15 + 1647: 54,14 + 1648: 54,13 + 1748: 38,13 + 1749: 38,14 + 1750: 38,15 - node: color: '#D381C996' id: BrickTileSteelLineE decals: - 662: 22,7 - 663: 22,8 - 664: 22,9 + 797: 22,7 + 798: 22,8 + 799: 22,9 - node: color: '#FFFFFFFF' id: BrickTileSteelLineE decals: - 482: 4,6 - 483: 1,6 - 1358: 36,9 - 1360: 41,9 - 1364: 41,7 - 1365: 36,7 - 1398: 25,24 - 1399: 25,25 - 1400: 25,26 - 1401: 25,27 - 1402: 25,28 - 1429: 34,26 + 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 - node: color: '#8BDA8EFF' id: BrickTileSteelLineN decals: - 1409: 29,24 - 1438: 49,16 - 1439: 50,16 - 1440: 51,16 - 1441: 52,16 - 1442: 53,16 - 1541: 37,16 - 1542: 36,16 - 1543: 35,16 - 1544: 34,16 - 1545: 33,16 + 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 - node: color: '#D381C996' id: BrickTileSteelLineN decals: - 556: 11,16 - 557: 10,16 - 558: 9,16 - 559: 12,16 - 560: 13,16 - 653: 21,10 - 654: 20,10 - 655: 18,10 - 656: 19,10 - 657: 17,10 - 658: 16,10 - 659: 15,10 - 660: 13,10 - 661: 14,10 + 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 - node: color: '#FFFFFFFF' id: BrickTileSteelLineN decals: - 672: 21,6 - 673: 20,6 - 674: 19,6 - 675: 17,6 - 676: 18,6 - 677: 16,6 - 678: 15,6 - 679: 14,6 - 680: 13,6 - 1382: 37,8 - 1383: 38,8 - 1384: 39,8 - 1385: 40,8 - 1386: 42,8 - 1387: 43,8 - 1388: 44,8 - 1389: 45,8 - 1390: 45,6 - 1391: 44,6 - 1392: 43,6 - 1393: 42,6 - 1394: 40,6 - 1395: 39,6 - 1396: 38,6 - 1397: 37,6 - 1427: 33,27 + 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 - node: color: '#8BDA8EFF' id: BrickTileSteelLineS decals: - 1412: 29,28 - 1446: 53,12 - 1447: 52,12 - 1448: 51,12 - 1449: 50,12 - 1450: 49,12 - 1546: 33,12 - 1547: 34,12 - 1548: 35,12 - 1549: 36,12 - 1550: 37,12 + 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 - node: color: '#D381C996' id: BrickTileSteelLineS decals: - 644: 21,6 - 645: 20,6 - 646: 18,6 - 647: 19,6 - 648: 17,6 - 649: 16,6 - 650: 15,6 - 651: 14,6 - 652: 13,6 + 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 - node: color: '#FFFFFFFF' id: BrickTileSteelLineS decals: - 681: 21,10 - 682: 20,10 - 683: 19,10 - 684: 18,10 - 685: 17,10 - 686: 16,10 - 687: 15,10 - 688: 14,10 - 689: 13,10 - 1366: 37,8 - 1367: 38,8 - 1368: 39,8 - 1369: 40,8 - 1370: 42,8 - 1371: 43,8 - 1372: 44,8 - 1373: 45,8 - 1374: 45,10 - 1375: 44,10 - 1376: 43,10 - 1377: 42,10 - 1378: 40,10 - 1379: 39,10 - 1380: 38,10 - 1381: 37,10 - 1422: 33,25 + 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 - node: color: '#8BDA8EFF' id: BrickTileSteelLineW decals: - 1435: 48,13 - 1436: 48,14 - 1437: 48,15 - 1529: 32,15 - 1530: 32,14 - 1531: 32,14 - 1532: 32,12 - 1533: 32,13 + 1638: 48,13 + 1639: 48,14 + 1640: 48,15 + 1739: 32,15 + 1740: 32,14 + 1741: 32,14 + 1742: 32,12 + 1743: 32,13 - node: color: '#D381C996' id: BrickTileSteelLineW decals: - 553: 8,13 - 554: 8,14 - 555: 8,15 - 665: 12,7 - 666: 12,8 - 667: 12,9 + 610: 8,13 + 611: 8,14 + 612: 8,15 + 800: 12,7 + 801: 12,8 + 802: 12,9 - node: color: '#FFFFFFFF' id: BrickTileSteelLineW decals: - 484: 4,6 - 485: 1,6 - 1359: 41,9 - 1361: 46,9 - 1362: 46,7 - 1363: 41,7 - 1403: 25,24 - 1404: 25,25 - 1405: 25,26 - 1406: 25,27 - 1407: 25,28 - 1425: 32,26 + 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 - node: color: '#8BDA8EB4' id: BrickTileWhiteBox decals: - 1143: 32,20 + 1320: 32,20 - node: color: '#8BDA8EB4' id: BrickTileWhiteCornerNe decals: - 1136: 34,22 - 1147: 33,21 + 1313: 34,22 + 1324: 33,21 - node: color: '#8BDA8EFF' id: BrickTileWhiteCornerNe decals: - 862: 14,16 - 1340: 46,10 - 1414: 30,27 - 1467: 15,4 - 1468: 16,3 - 1595: 6,48 + 1025: 14,16 + 1543: 46,10 + 1617: 30,27 + 1672: 15,4 + 1673: 16,3 + 1836: 6,48 - node: color: '#EFB34196' id: BrickTileWhiteCornerNe decals: - 845: 6,28 + 1008: 6,28 - node: color: '#FFFFFFFF' id: BrickTileWhiteCornerNe decals: - 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 - 591: 38,4 - 594: 54,4 + 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 - node: color: '#8BDA8EB4' id: BrickTileWhiteCornerNw decals: - 1130: 30,22 - 1146: 31,21 - 1155: 0,16 + 1307: 30,22 + 1323: 31,21 + 1332: 0,16 - node: color: '#8BDA8EFF' id: BrickTileWhiteCornerNw decals: - 868: 8,16 - 1330: 36,10 - 1415: 28,27 - 1451: 1,4 - 1452: 0,3 - 1594: 0,48 + 1031: 8,16 + 1533: 36,10 + 1618: 28,27 + 1656: 1,4 + 1657: 0,3 + 1835: 0,48 - node: color: '#EFB34196' id: BrickTileWhiteCornerNw decals: - 513: 24,22 - 836: 4,28 + 570: 24,22 + 999: 4,28 - node: color: '#FFFFFFFF' id: BrickTileWhiteCornerNw decals: - 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 - 589: 52,4 - 590: 36,4 + 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 - node: color: '#8BDA8EB4' id: BrickTileWhiteCornerSe decals: - 1135: 34,18 - 1149: 33,19 + 1312: 34,18 + 1326: 33,19 - node: color: '#8BDA8EFF' id: BrickTileWhiteCornerSe decals: - 858: 14,12 - 1344: 46,6 - 1417: 30,25 - 1469: 16,1 - 1470: 15,0 - 1597: 6,42 + 1021: 14,12 + 1547: 46,6 + 1620: 30,25 + 1674: 16,1 + 1675: 15,0 + 1838: 6,42 - node: color: '#EFB34196' id: BrickTileWhiteCornerSe decals: - 841: 6,24 + 1004: 6,24 - node: color: '#FFFFFFFF' id: BrickTileWhiteCornerSe decals: - 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 - 587: 38,0 - 588: 54,0 - 639: 46,0 + 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 - node: color: '#8BDA8EB4' id: BrickTileWhiteCornerSw decals: - 1134: 30,18 - 1145: 31,19 - 1159: 0,12 + 1311: 30,18 + 1322: 31,19 + 1336: 0,12 - node: color: '#8BDA8EFF' id: BrickTileWhiteCornerSw decals: - 872: 8,12 - 1354: 36,6 - 1418: 28,25 - 1471: 1,0 - 1472: 0,1 - 1596: 0,42 + 1035: 8,12 + 1557: 36,6 + 1621: 28,25 + 1677: 1,0 + 1678: 0,1 + 1837: 0,42 - node: color: '#EFB34196' id: BrickTileWhiteCornerSw decals: - 517: 24,18 - 840: 4,24 + 574: 24,18 + 1003: 4,24 - node: color: '#FFFFFFFF' id: BrickTileWhiteCornerSw decals: - 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 - 592: 36,0 - 593: 52,0 - 640: 44,0 + 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 - node: color: '#8BDABAFF' id: BrickTileWhiteEndE decals: - 909: 9,39 - 929: 26,39 + 1072: 9,39 + 1092: 26,39 - node: color: '#D381C996' id: BrickTileWhiteEndE decals: - 47: 9,39 + 102: 9,39 - node: color: '#8BDABAFF' id: BrickTileWhiteEndW decals: - 910: 13,39 - 930: 28,39 + 1073: 13,39 + 1093: 28,39 - node: color: '#D381C996' id: BrickTileWhiteEndW decals: - 46: 13,39 - 130: 28,39 + 101: 13,39 + 185: 28,39 - node: color: '#8BDA8E88' id: BrickTileWhiteInnerNe decals: - 1642: 0,42 + 1884: 0,42 - node: color: '#8BDA8EB4' id: BrickTileWhiteInnerNe decals: - 1113: 21,21 - 1123: 9,21 + 1290: 21,21 + 1300: 9,21 - node: color: '#8BDA8EFF' id: BrickTileWhiteInnerNe decals: - 1475: 15,3 + 1681: 15,3 - node: color: '#8BDABAFF' id: BrickTileWhiteInnerNe decals: - 905: 9,38 - 934: 25,39 + 1068: 9,38 + 1097: 25,39 - node: color: '#9FED5896' id: BrickTileWhiteInnerNe decals: - 852: 1,12 + 1015: 1,12 - node: color: '#D381C996' id: BrickTileWhiteInnerNe decals: - 51: 9,38 - 133: 25,39 - 138: 25,38 - 505: 21,21 + 106: 9,38 + 188: 25,39 + 193: 25,38 + 562: 21,21 - node: color: '#D4D4D4FF' id: BrickTileWhiteInnerNe decals: - 1524: 32,14 - 1525: 32,12 + 1734: 32,14 + 1735: 32,12 - node: color: '#FFFFFFFF' id: BrickTileWhiteInnerNe decals: - 638: 38,2 + 695: 38,2 - node: color: '#8BDA8E88' id: BrickTileWhiteInnerNw decals: - 1641: 6,42 + 1883: 6,42 - node: color: '#8BDA8EB4' id: BrickTileWhiteInnerNw decals: - 1114: 19,21 - 1124: 7,21 + 1291: 19,21 + 1301: 7,21 - node: color: '#8BDA8EFF' id: BrickTileWhiteInnerNw decals: - 1453: 1,3 + 1658: 1,3 - node: color: '#8BDABAFF' id: BrickTileWhiteInnerNw decals: - 904: 13,38 - 933: 29,39 + 1067: 13,38 + 1096: 29,39 - node: color: '#D381C996' id: BrickTileWhiteInnerNw decals: - 50: 13,38 - 134: 29,39 - 137: 29,38 - 504: 19,21 + 105: 13,38 + 189: 29,39 + 192: 29,38 + 561: 19,21 - node: color: '#D4D4D4FF' id: BrickTileWhiteInnerNw decals: - 1522: 38,12 - 1523: 38,14 + 1732: 38,12 + 1733: 38,14 - node: color: '#FFFFFFFF' id: BrickTileWhiteInnerNw decals: - 637: 52,2 + 694: 52,2 - node: color: '#8BDA8E88' id: BrickTileWhiteInnerSe decals: - 1640: 0,48 + 1882: 0,48 - node: color: '#8BDA8EB4' id: BrickTileWhiteInnerSe decals: - 1112: 21,19 - 1126: 9,19 + 1289: 21,19 + 1303: 9,19 - node: color: '#8BDA8EFF' id: BrickTileWhiteInnerSe decals: - 1474: 15,1 + 1680: 15,1 - node: color: '#8BDABAFF' id: BrickTileWhiteInnerSe decals: - 908: 9,40 - 932: 25,39 + 1071: 9,40 + 1095: 25,39 - node: color: '#D381C996' id: BrickTileWhiteInnerSe decals: - 49: 9,40 - 132: 25,39 - 136: 25,40 - 506: 21,19 + 104: 9,40 + 187: 25,39 + 191: 25,40 + 563: 21,19 - node: color: '#D4D4D4FF' id: BrickTileWhiteInnerSe decals: - 1518: 32,16 - 1519: 32,14 + 1728: 32,16 + 1729: 32,14 - node: color: '#8BDA8E88' id: BrickTileWhiteInnerSw decals: - 1639: 6,48 + 1881: 6,48 - node: color: '#8BDA8EB4' id: BrickTileWhiteInnerSw decals: - 1125: 7,19 + 1302: 7,19 - node: color: '#8BDA8EFF' id: BrickTileWhiteInnerSw decals: - 1473: 1,1 + 1679: 1,1 - node: color: '#8BDABAFF' id: BrickTileWhiteInnerSw decals: - 903: 13,40 - 931: 29,39 + 1066: 13,40 + 1094: 29,39 - node: color: '#D381C996' id: BrickTileWhiteInnerSw decals: - 48: 13,40 - 131: 29,39 - 135: 29,40 + 103: 13,40 + 186: 29,39 + 190: 29,40 - node: color: '#D4D4D4FF' id: BrickTileWhiteInnerSw decals: - 1520: 38,16 - 1521: 38,14 + 1730: 38,16 + 1731: 38,14 - node: color: '#8BDA8E88' id: BrickTileWhiteLineE decals: - 1619: 0,47 - 1620: 0,46 - 1621: 0,45 - 1622: 0,44 - 1623: 0,43 + 1860: 0,47 + 1861: 0,46 + 1862: 0,45 + 1863: 0,44 + 1864: 0,43 - node: color: '#8BDA8EB4' id: BrickTileWhiteLineE decals: - 1106: 21,22 - 1107: 21,18 - 1120: 9,18 - 1122: 9,22 - 1137: 34,21 - 1138: 34,20 - 1139: 34,19 - 1150: 33,20 + 1283: 21,22 + 1284: 21,18 + 1297: 9,18 + 1299: 9,22 + 1314: 34,21 + 1315: 34,20 + 1316: 34,19 + 1327: 33,20 - node: color: '#8BDA8EFF' id: BrickTileWhiteLineE decals: - 859: 14,13 - 860: 14,14 - 861: 14,15 - 1341: 46,9 - 1342: 46,8 - 1343: 46,7 - 1416: 30,26 - 1476: 16,2 - 1614: 6,47 - 1615: 6,46 - 1616: 6,45 - 1617: 6,44 - 1618: 6,43 + 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 - node: color: '#9FED5896' id: BrickTileWhiteLineE decals: - 847: 1,13 - 848: 1,14 - 849: 1,15 + 1010: 1,13 + 1011: 1,14 + 1012: 1,15 - node: color: '#D381C996' id: BrickTileWhiteLineE decals: - 498: 21,22 - 499: 21,18 - 730: 18,0 - 731: 18,1 - 732: 18,2 - 733: 18,4 + 555: 21,22 + 556: 21,18 + 865: 18,0 + 866: 18,1 + 867: 18,2 + 868: 18,4 - node: color: '#D4D4D4FF' id: BrickTileWhiteLineE decals: - 1502: 32,13 - 1504: 32,15 + 1712: 32,13 + 1714: 32,15 - node: color: '#EFB34196' id: BrickTileWhiteLineE decals: - 507: 28,19 - 508: 28,20 - 509: 28,21 - 842: 6,25 - 843: 6,26 - 844: 6,27 + 564: 28,19 + 565: 28,20 + 566: 28,21 + 1005: 6,25 + 1006: 6,26 + 1007: 6,27 - node: color: '#FFFFFFFF' id: BrickTileWhiteLineE decals: - 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 - 598: 38,1 - 599: 38,3 - 600: 54,1 - 601: 54,2 - 602: 54,3 - 642: 46,1 - 1561: 7,19 - 1562: 7,21 - 1564: 6,20 + 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 - node: color: '#8BDA8E88' id: BrickTileWhiteLineN decals: - 1624: 1,42 - 1625: 2,42 - 1626: 3,42 - 1627: 4,42 - 1628: 5,42 + 1865: 1,42 + 1866: 2,42 + 1867: 3,42 + 1868: 4,42 + 1869: 5,42 - node: color: '#8BDA8EB4' id: BrickTileWhiteLineN decals: - 1108: 18,21 - 1109: 22,21 - 1115: 6,21 - 1121: 10,21 - 1127: 31,22 - 1128: 32,22 - 1129: 33,22 - 1148: 32,21 - 1156: 1,16 - 1157: 4,16 - 1158: 5,16 + 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 - node: color: '#8BDA8EFF' id: BrickTileWhiteLineN decals: - 863: 13,16 - 864: 12,16 - 865: 11,16 - 866: 10,16 - 867: 9,16 - 1331: 37,10 - 1332: 38,10 - 1333: 39,10 - 1334: 40,10 - 1335: 41,10 - 1336: 42,10 - 1337: 43,10 - 1338: 44,10 - 1339: 45,10 - 1454: 2,4 - 1455: 3,4 - 1456: 4,4 - 1457: 5,4 - 1458: 6,4 - 1459: 7,4 - 1460: 8,4 - 1461: 9,4 - 1462: 10,4 - 1463: 11,4 - 1464: 12,4 - 1465: 13,4 - 1466: 14,4 - 1609: 1,48 - 1610: 2,48 - 1611: 3,48 - 1612: 4,48 - 1613: 5,48 + 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 - node: color: '#8BDABAFF' id: BrickTileWhiteLineN decals: - 898: 11,38 - 899: 12,38 - 906: 10,38 + 1061: 11,38 + 1062: 12,38 + 1069: 10,38 - node: color: '#9FED5896' id: BrickTileWhiteLineN decals: - 706: 21,6 - 707: 19,6 - 708: 13,6 - 709: 15,6 - 851: 2,12 + 841: 21,6 + 842: 19,6 + 843: 13,6 + 844: 15,6 + 1014: 2,12 - node: color: '#D381C996' id: BrickTileWhiteLineN decals: - 41: 12,38 - 42: 11,38 - 293: 21,34 - 294: 20,34 - 295: 19,34 - 296: 13,34 - 496: 18,21 - 497: 22,21 + 96: 12,38 + 97: 11,38 + 348: 21,34 + 349: 20,34 + 350: 19,34 + 351: 13,34 + 553: 18,21 + 554: 22,21 - node: color: '#D4D4D4FF' id: BrickTileWhiteLineN decals: - 1492: 34,12 - 1493: 35,12 - 1494: 36,12 - 1498: 33,12 - 1499: 37,12 - 1506: 37,14 - 1507: 36,14 - 1508: 36,14 - 1509: 34,14 - 1510: 35,14 - 1511: 33,14 + 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 - node: color: '#EFB34196' id: BrickTileWhiteLineN decals: - 510: 27,22 - 511: 26,22 - 512: 25,22 - 755: 31,9 - 756: 32,9 - 761: 27,9 - 762: 26,9 + 567: 27,22 + 568: 26,22 + 569: 25,22 + 890: 31,9 + 891: 32,9 + 896: 27,9 + 897: 26,9 - node: color: '#FFFFFFFF' id: BrickTileWhiteLineN decals: - 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 - 595: 53,4 - 596: 37,4 - 627: 51,2 - 628: 50,2 - 629: 48,2 - 630: 47,2 - 631: 46,2 - 632: 44,2 - 633: 42,2 - 634: 43,2 - 635: 40,2 - 636: 39,2 - 939: 29,40 - 940: 25,40 - 1560: 8,18 - 1565: 7,19 - 1566: 9,19 + 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 - node: color: '#8BDA8E88' id: BrickTileWhiteLineS decals: - 1634: 5,48 - 1635: 4,48 - 1636: 3,48 - 1637: 2,48 - 1638: 1,48 + 1875: 5,48 + 1876: 4,48 + 1877: 3,48 + 1878: 2,48 + 1880: 1,48 - node: color: '#8BDA8EB4' id: BrickTileWhiteLineS decals: - 1110: 22,19 - 1111: 18,19 - 1118: 6,19 - 1119: 10,19 - 1140: 33,18 - 1141: 32,18 - 1142: 31,18 - 1144: 32,19 - 1160: 1,12 - 1161: 2,12 + 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 - node: color: '#8BDA8EFF' id: BrickTileWhiteLineS decals: - 853: 10,12 - 854: 11,12 - 855: 12,12 - 856: 13,12 - 857: 9,12 - 1345: 45,6 - 1346: 44,6 - 1347: 43,6 - 1348: 42,6 - 1349: 41,6 - 1350: 40,6 - 1351: 39,6 - 1352: 38,6 - 1353: 37,6 - 1477: 14,0 - 1478: 13,0 - 1479: 12,0 - 1480: 11,0 - 1481: 10,0 - 1482: 9,0 - 1483: 7,0 - 1484: 7,0 - 1485: 8,0 - 1486: 6,0 - 1487: 5,0 - 1488: 4,0 - 1489: 3,0 - 1490: 2,0 - 1598: 1,42 - 1599: 2,42 - 1600: 4,42 - 1601: 4,42 - 1602: 3,42 - 1603: 5,42 + 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 - node: color: '#8BDABAFF' id: BrickTileWhiteLineS decals: - 900: 10,40 - 901: 11,40 - 902: 12,40 + 1063: 10,40 + 1064: 11,40 + 1065: 12,40 - node: color: '#9FED5896' id: BrickTileWhiteLineS decals: - 702: 21,10 - 703: 19,10 - 704: 15,10 - 705: 13,10 - 850: 4,16 + 837: 21,10 + 838: 19,10 + 839: 15,10 + 840: 13,10 + 1013: 4,16 - node: color: '#D381C996' id: BrickTileWhiteLineS decals: - 43: 12,40 - 44: 11,40 - 45: 10,40 - 297: 21,36 - 298: 20,36 - 299: 14,36 - 300: 13,36 - 500: 22,19 - 501: 18,19 + 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 - node: color: '#D4D4D4FF' id: BrickTileWhiteLineS decals: - 1495: 34,14 - 1496: 35,14 - 1497: 36,14 - 1500: 37,14 - 1501: 33,14 - 1512: 33,16 - 1513: 34,16 - 1514: 34,16 - 1515: 35,16 - 1516: 36,16 - 1517: 37,16 + 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 - node: color: '#EFB34196' id: BrickTileWhiteLineS decals: - 518: 25,18 - 519: 26,18 - 520: 27,18 - 757: 32,7 - 758: 31,7 - 759: 27,7 - 760: 26,7 + 575: 25,18 + 576: 26,18 + 577: 27,18 + 892: 32,7 + 893: 31,7 + 894: 27,7 + 895: 26,7 - node: color: '#FFFFFFFF' id: BrickTileWhiteLineS decals: - 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 - 597: 37,0 - 603: 53,0 - 641: 45,0 - 907: 10,38 - 941: 25,38 - 942: 29,38 - 1563: 7,21 - 1569: 9,21 - 1570: 8,22 + 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 - node: color: '#8BDA8E88' id: BrickTileWhiteLineW decals: - 1629: 6,43 - 1630: 6,44 - 1631: 6,45 - 1632: 6,46 - 1633: 6,47 + 1870: 6,43 + 1871: 6,44 + 1872: 6,45 + 1873: 6,46 + 1874: 6,47 - node: color: '#8BDA8EB4' id: BrickTileWhiteLineW decals: - 1104: 19,18 - 1105: 19,22 - 1116: 7,22 - 1117: 7,18 - 1131: 30,21 - 1132: 30,20 - 1133: 30,19 - 1151: 31,20 - 1152: 0,13 - 1153: 0,14 - 1154: 0,15 + 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 - node: color: '#8BDA8EFF' id: BrickTileWhiteLineW decals: - 869: 8,14 - 870: 8,15 - 871: 8,13 - 1355: 36,7 - 1356: 36,8 - 1357: 36,9 - 1419: 28,26 - 1491: 0,2 - 1526: 32,14 - 1527: 32,13 - 1528: 32,15 - 1604: 0,43 - 1605: 0,44 - 1606: 0,45 - 1607: 0,46 - 1608: 0,47 + 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 - node: color: '#D381C996' id: BrickTileWhiteLineW decals: - 502: 19,18 - 503: 19,22 - 734: 34,0 - 735: 34,1 - 736: 34,2 - 737: 34,4 + 559: 19,18 + 560: 19,22 + 869: 34,0 + 870: 34,1 + 871: 34,2 + 872: 34,4 - node: color: '#D4D4D4FF' id: BrickTileWhiteLineW decals: - 1503: 38,13 - 1505: 38,15 + 1713: 38,13 + 1715: 38,15 - node: color: '#EFB34196' id: BrickTileWhiteLineW decals: - 514: 24,21 - 515: 24,20 - 516: 24,19 - 837: 4,27 - 838: 4,26 - 839: 4,25 + 571: 24,21 + 572: 24,20 + 573: 24,19 + 1000: 4,27 + 1001: 4,26 + 1002: 4,25 - node: color: '#FFFFFFFF' id: BrickTileWhiteLineW decals: - 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 - 604: 52,1 - 605: 52,3 - 606: 36,1 - 607: 36,2 - 608: 36,3 - 643: 44,1 - 1567: 9,19 - 1568: 10,20 - 1571: 9,21 + 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 - node: cleanable: True color: '#FFFFFFFF' id: Caution decals: - 415: 11,42 + 470: 11,42 - node: color: '#8BDABAFF' id: CheckerNESW decals: - 911: 17,39 - 912: 18,39 - 913: 19,39 - 914: 20,39 - 915: 21,39 - 1073: 20,20 - 1074: 21,20 - 1075: 20,21 - 1076: 20,19 - 1077: 19,20 + 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 - node: color: '#D381C996' id: CheckerNESW decals: - 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 - 490: 19,20 - 491: 20,21 - 492: 20,20 - 493: 21,20 - 494: 20,19 + 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 - node: color: '#EFB34196' id: CheckerNESW decals: - 182: 8,48 + 237: 8,48 - node: color: '#8BDABAFF' id: CheckerNWSE decals: - 883: 3,39 - 884: 2,39 - 885: 1,39 - 886: 4,39 - 887: 5,39 - 952: 45,39 - 953: 44,39 - 954: 43,39 - 955: 42,39 - 956: 41,39 + 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 - node: color: '#D381C996' id: CheckerNWSE decals: - 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 - 609: 37,1 - 610: 37,2 - 611: 37,3 - 612: 53,1 - 613: 53,2 - 614: 53,3 + 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 - node: color: '#EFB34196' id: CheckerNWSE decals: - 183: 14,48 - 830: 5,27 - 831: 5,26 - 832: 5,25 + 238: 14,48 + 993: 5,27 + 994: 5,26 + 995: 5,25 - node: color: '#FFFFFFFF' id: Delivery decals: - 211: 13,47 - 212: 11,47 - 213: 9,47 - 214: 12,43 - 215: 11,43 - 216: 10,43 - 431: 4,22 - 432: 3,22 - 544: 11,13 - 724: 24,2 - 725: 20,2 - 751: 33,7 - 752: 33,9 - 753: 25,7 - 754: 25,9 - 775: 40,16 - 776: 41,15 - 777: 43,16 + 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 - node: color: '#8BDB9BFF' id: DeliveryGreyscale decals: - 1328: 34,35 - 1329: 24,35 + 1531: 34,35 + 1532: 24,35 - node: color: '#79DA8EA1' id: DiagonalCheckerBOverlay decals: - 801: 20,24 - 802: 20,25 - 803: 20,26 - 804: 20,27 - 805: 20,28 - 806: 21,28 - 807: 22,28 - 808: 21,27 - 809: 21,26 - 810: 21,25 - 811: 21,24 - 812: 22,24 + 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 - node: color: '#FFFFFFFF' id: Dirt decals: - 982: 16,48 - 983: 16,48 - 984: 17,48 - 985: 16,47 - 986: 16,46 - 987: 16,45 - 988: 17,44 - 989: 17,42 - 990: 19,42 - 991: 21,42 - 992: 21,47 - 993: 21,47 - 994: 21,47 + 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 - node: cleanable: True color: '#FFFFFFFF' id: Dirt decals: - 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 - 771: 44,12 - 772: 44,15 - 773: 42,16 - 774: 46,14 + 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 - node: color: '#FFFFFFFF' id: DirtLight decals: - 995: 20,47 - 996: 20,47 - 997: 16,48 - 998: 16,46 - 999: 16,45 + 1172: 20,47 + 1173: 20,47 + 1174: 16,48 + 1175: 16,46 + 1176: 16,45 - node: cleanable: True color: '#FFFFFFFF' id: DirtLight decals: - 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 - 527: 21,18 - 528: 22,19 - 529: 21,19 - 530: 19,18 - 531: 18,21 - 532: 25,18 - 533: 24,19 - 534: 28,20 - 535: 26,22 - 536: 14,22 - 537: 15,18 - 538: 16,20 - 539: 4,20 - 540: 2,22 - 541: 2,18 - 542: 0,21 - 543: 0,19 - 767: 30,15 - 768: 28,15 - 769: 27,14 - 770: 33,12 + 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 - node: color: '#FFFFFFFF' id: DirtMedium decals: - 1000: 16,42 - 1001: 16,42 - 1002: 18,42 - 1003: 20,43 - 1004: 22,44 - 1005: 18,48 - 1006: 22,47 - 1007: 16,45 - 1008: 19,42 - 1009: 20,43 + 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 - node: cleanable: True color: '#FFFFFFFF' id: DirtMedium decals: - 87: 17,39 - 225: 11,42 - 227: 8,45 - 308: 12,35 + 142: 17,39 + 280: 11,42 + 282: 8,45 + 363: 12,35 - node: color: '#8BDABA82' id: FullTileOverlayGreyscale decals: - 926: 27,38 - 927: 27,39 - 928: 27,40 + 1089: 27,38 + 1090: 27,39 + 1091: 27,40 - node: color: '#8BDABAFF' id: FullTileOverlayGreyscale decals: - 943: 33,39 - 944: 36,39 - 945: 37,39 + 1106: 33,39 + 1107: 36,39 + 1108: 37,39 - node: color: '#9FED5896' id: FullTileOverlayGreyscale decals: - 690: 21,7 - 691: 21,8 - 692: 21,9 - 693: 19,7 - 694: 19,8 - 695: 19,9 - 696: 15,7 - 697: 15,8 - 698: 15,9 - 699: 13,7 - 700: 13,8 - 701: 13,9 + 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 - node: color: '#D381C996' id: FullTileOverlayGreyscale decals: - 139: 36,39 - 140: 33,39 - 141: 37,39 + 194: 36,39 + 195: 33,39 + 196: 37,39 - node: color: '#52B4E996' id: HalfTileOverlayGreyscale decals: - 764: 28,16 - 765: 29,16 - 1042: 27,16 - 1043: 26,16 - 1044: 25,16 + 900: 28,16 + 901: 29,16 + 1219: 27,16 + 1220: 26,16 + 1221: 25,16 - node: color: '#8BDA8E9B' id: HalfTileOverlayGreyscale decals: - 1190: 30,2 - 1191: 29,2 - 1192: 31,2 - 1193: 27,2 - 1194: 26,2 - 1195: 22,2 - 1196: 33,2 + 1367: 30,2 + 1368: 29,2 + 1369: 31,2 + 1370: 27,2 + 1371: 26,2 + 1372: 22,2 + 1373: 33,2 - node: color: '#8BDA8EB4' id: HalfTileOverlayGreyscale decals: - 1095: 13,22 - 1096: 15,22 - 1097: 14,22 + 1272: 13,22 + 1273: 15,22 + 1274: 14,22 - node: color: '#8BDA8EFF' id: HalfTileOverlayGreyscale decals: - 1179: 24,4 - 1180: 23,4 - 1181: 22,4 - 1182: 21,4 - 1183: 20,4 - 1184: 27,4 - 1185: 28,4 - 1186: 29,4 - 1187: 30,4 - 1188: 31,4 - 1189: 32,4 + 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 - node: color: '#8BDABAFF' id: HalfTileOverlayGreyscale decals: - 946: 33,38 - 947: 34,38 - 948: 35,38 - 951: 37,38 + 1109: 33,38 + 1110: 34,38 + 1111: 35,38 + 1114: 37,38 - node: color: '#8BDB8E99' id: HalfTileOverlayGreyscale decals: - 1197: 25,4 - 1198: 25,4 + 1374: 25,4 + 1375: 25,4 - node: color: '#D381C996' id: HalfTileOverlayGreyscale decals: - 144: 37,38 - 145: 35,38 - 146: 34,38 - 147: 33,38 - 441: 13,22 - 442: 14,22 - 443: 15,22 - 740: 27,4 - 741: 28,4 - 742: 24,4 - 743: 29,4 - 744: 30,4 - 745: 31,4 - 746: 32,4 - 747: 23,4 - 748: 22,4 - 749: 21,4 - 750: 20,4 + 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 - node: color: '#52B4E996' id: HalfTileOverlayGreyscale180 decals: - 1040: 29,12 - 1041: 28,12 + 1217: 29,12 + 1218: 28,12 - node: color: '#8BDA8EB4' id: HalfTileOverlayGreyscale180 decals: - 1098: 15,18 - 1099: 14,18 - 1100: 13,18 + 1275: 15,18 + 1276: 14,18 + 1277: 13,18 - node: color: '#8BDA8EFF' id: HalfTileOverlayGreyscale180 decals: - 1164: 19,3 - 1165: 20,3 - 1166: 21,3 - 1167: 22,3 - 1168: 24,3 - 1169: 23,3 - 1170: 25,3 - 1171: 26,3 - 1172: 27,3 - 1173: 28,3 - 1174: 29,3 - 1175: 30,3 - 1176: 31,3 - 1177: 32,3 - 1178: 33,3 + 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 - node: color: '#8BDABAFF' id: HalfTileOverlayGreyscale180 decals: - 949: 35,40 - 950: 36,40 + 1112: 35,40 + 1113: 36,40 - node: color: '#D381C996' id: HalfTileOverlayGreyscale180 decals: - 142: 36,40 - 143: 35,40 - 438: 13,18 - 439: 14,18 - 440: 15,18 - 710: 19,3 - 711: 20,3 - 712: 21,3 - 713: 22,3 - 714: 23,3 - 715: 24,3 - 716: 26,3 - 717: 25,3 - 718: 28,3 - 719: 29,3 - 720: 30,3 - 721: 31,3 - 722: 32,3 - 723: 33,3 - 1163: 27,3 + 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 - node: color: '#4B709CFF' id: HalfTileOverlayGreyscale270 decals: - 1084: 15,20 + 1261: 15,20 - node: color: '#52B4E996' id: HalfTileOverlayGreyscale270 decals: - 1045: 24,15 + 1222: 24,15 - node: color: '#8BDA8EB4' id: HalfTileOverlayGreyscale270 decals: - 1092: 12,19 - 1093: 12,20 - 1094: 12,21 + 1269: 12,19 + 1270: 12,20 + 1271: 12,21 - node: color: '#D381C996' id: HalfTileOverlayGreyscale270 decals: - 447: 12,19 - 448: 12,20 - 449: 12,21 + 502: 12,19 + 503: 12,20 + 504: 12,21 - node: color: '#4B709CFF' id: HalfTileOverlayGreyscale90 decals: - 1079: 13,20 + 1256: 13,20 - node: color: '#52B4E996' id: HalfTileOverlayGreyscale90 decals: - 766: 30,15 - 1038: 30,14 - 1039: 30,13 + 902: 30,15 + 1215: 30,14 + 1216: 30,13 - node: color: '#8BDA8EB4' id: HalfTileOverlayGreyscale90 decals: - 1089: 16,19 - 1090: 16,20 - 1091: 16,21 + 1266: 16,19 + 1267: 16,20 + 1268: 16,21 - node: color: '#D381C996' id: HalfTileOverlayGreyscale90 decals: - 444: 16,19 - 445: 16,20 - 446: 16,21 + 499: 16,19 + 500: 16,20 + 501: 16,21 - node: color: '#8BDA8EFF' id: MiniTileWhiteCornerNe decals: - 791: 13,28 + 954: 13,28 - node: color: '#D381C996' id: MiniTileWhiteCornerNe decals: - 419: 13,28 + 474: 13,28 - node: color: '#8BDA8EFF' id: MiniTileWhiteCornerNw decals: - 792: 12,28 + 955: 12,28 - node: color: '#D381C996' id: MiniTileWhiteCornerNw decals: - 420: 12,28 + 475: 12,28 - node: color: '#8BDA8EFF' id: MiniTileWhiteCornerSe decals: - 787: 13,24 + 950: 13,24 - node: color: '#D381C996' id: MiniTileWhiteCornerSe decals: - 424: 13,24 + 479: 13,24 - node: color: '#8BDA8EFF' id: MiniTileWhiteCornerSw decals: - 795: 12,24 + 958: 12,24 - node: color: '#D381C996' id: MiniTileWhiteCornerSw decals: - 423: 12,24 + 478: 12,24 - node: color: '#8BDA8EFF' id: MiniTileWhiteLineE decals: - 786: 13,24 - 788: 13,25 - 789: 13,25 - 790: 13,26 + 949: 13,24 + 951: 13,25 + 952: 13,25 + 953: 13,26 - node: color: '#8BDABAFF' id: MiniTileWhiteLineE decals: - 935: 25,38 - 937: 25,40 + 1098: 25,38 + 1100: 25,40 - node: color: '#D381C996' id: MiniTileWhiteLineE decals: - 417: 13,25 - 418: 13,26 + 472: 13,25 + 473: 13,26 - node: color: '#8BDA8EFF' id: MiniTileWhiteLineW decals: - 793: 12,27 - 794: 12,25 + 956: 12,27 + 957: 12,25 - node: color: '#8BDABAFF' id: MiniTileWhiteLineW decals: - 936: 29,38 - 938: 29,40 + 1099: 29,38 + 1101: 29,40 - node: color: '#D381C996' id: MiniTileWhiteLineW decals: - 421: 12,27 - 422: 12,25 + 476: 12,27 + 477: 12,25 - node: color: '#79DA8E6F' id: MonoOverlay decals: - 796: 14,24 - 797: 14,25 - 798: 14,26 - 799: 14,27 - 800: 14,28 + 959: 14,24 + 960: 14,25 + 961: 14,26 + 962: 14,27 + 963: 14,28 - node: color: '#8BDB9BFF' id: MonoOverlay decals: - 1271: 4,34 - 1272: 4,36 - 1273: 6,36 - 1274: 6,34 + 1474: 4,34 + 1475: 4,36 + 1476: 6,36 + 1477: 6,34 - node: color: '#D381C996' id: MonoOverlay decals: - 267: 4,34 - 268: 6,34 - 269: 4,36 - 270: 6,36 + 322: 4,34 + 323: 6,34 + 324: 4,36 + 325: 6,36 - node: color: '#4B709CFF' id: QuarterTileOverlayGreyscale decals: - 1083: 15,19 - 1085: 14,20 + 1260: 15,19 + 1262: 14,20 - node: color: '#8BDABAFF' id: QuarterTileOverlayGreyscale decals: - 893: 1,38 - 894: 2,38 - 895: 3,38 - 896: 4,38 - 897: 5,38 - 957: 41,38 - 958: 42,38 - 959: 42,38 - 960: 43,38 - 961: 44,38 - 962: 45,38 - 968: 8,44 - 969: 8,45 - 970: 8,46 - 971: 8,47 - 972: 8,48 - 973: 9,48 - 974: 10,48 - 1049: 16,16 - 1050: 17,16 - 1051: 18,16 - 1052: 19,16 - 1053: 20,16 - 1054: 21,16 - 1055: 22,16 - 1056: 16,15 - 1057: 16,14 - 1058: 16,13 - 1059: 16,12 + 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 - node: color: '#8BDB9BFF' id: QuarterTileOverlayGreyscale decals: - 1219: 53,1 - 1220: 53,2 - 1221: 53,3 - 1222: 54,3 - 1223: 54,2 - 1224: 54,1 - 1225: 38,2 - 1226: 38,1 - 1227: 38,3 - 1228: 37,3 - 1229: 37,2 - 1230: 37,1 - 1262: 16,32 - 1263: 16,31 - 1264: 16,30 - 1265: 15,30 - 1266: 15,31 - 1267: 15,32 - 1268: 14,32 - 1269: 14,31 - 1270: 14,30 - 1275: 1,35 - 1276: 2,35 - 1277: 3,35 - 1278: 3,34 - 1279: 2,34 - 1280: 1,34 - 1281: 7,34 - 1282: 7,35 - 1283: 8,35 - 1284: 8,34 - 1285: 9,34 - 1286: 9,35 + 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 - node: color: '#9EDA8E28' id: QuarterTileOverlayGreyscale decals: - 1572: 4,45 - 1575: 4,44 - 1576: 4,46 - 1579: 3,45 - 1585: 2,46 + 1813: 4,45 + 1816: 4,44 + 1817: 4,46 + 1820: 3,45 + 1826: 2,46 - node: color: '#D381C996' id: QuarterTileOverlayGreyscale decals: - 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 - 570: 22,16 - 571: 21,16 - 572: 20,16 - 573: 19,16 - 574: 18,16 - 575: 17,16 - 576: 16,16 - 577: 16,15 - 578: 16,14 - 579: 16,13 - 580: 16,12 - 615: 38,1 - 616: 38,3 - 622: 54,1 - 623: 54,2 - 624: 54,3 - 625: 38,2 + 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 - node: color: '#EFB34196' id: QuarterTileOverlayGreyscale decals: - 190: 13,48 - 191: 12,48 + 245: 13,48 + 246: 12,48 - node: color: '#4B709CFF' id: QuarterTileOverlayGreyscale180 decals: - 1081: 13,21 - 1086: 14,20 + 1258: 13,21 + 1263: 14,20 - node: color: '#8BDA8E5D' id: QuarterTileOverlayGreyscale180 decals: - 1592: 4,44 - 1593: 2,44 + 1833: 4,44 + 1834: 2,44 - node: color: '#8BDABAFF' id: QuarterTileOverlayGreyscale180 decals: - 888: 5,40 - 889: 4,40 - 890: 3,40 - 891: 2,40 - 892: 1,40 - 963: 45,40 - 964: 44,40 - 965: 43,40 - 966: 42,40 - 967: 41,40 - 1060: 16,12 - 1061: 17,12 - 1062: 18,12 - 1063: 19,12 - 1064: 20,12 - 1065: 21,12 - 1066: 22,12 - 1067: 22,13 - 1068: 22,14 - 1069: 22,15 - 1070: 22,16 + 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 - node: color: '#8BDB9BFF' id: QuarterTileOverlayGreyscale180 decals: - 1213: 52,2 - 1214: 52,1 - 1215: 52,3 - 1216: 53,3 - 1217: 53,2 - 1218: 53,1 - 1231: 37,3 - 1232: 36,3 - 1233: 36,2 - 1234: 37,2 - 1235: 37,1 - 1236: 36,1 - 1237: 18,32 - 1238: 19,32 - 1239: 20,32 - 1240: 21,32 - 1241: 22,32 - 1242: 24,32 - 1243: 23,32 - 1244: 25,32 - 1253: 14,30 - 1254: 14,31 - 1255: 14,32 - 1256: 15,32 - 1257: 15,31 - 1258: 15,30 - 1259: 16,30 - 1260: 16,31 - 1261: 16,32 - 1287: 7,35 - 1288: 8,35 - 1289: 9,35 - 1290: 9,36 - 1291: 8,36 - 1292: 7,36 - 1293: 3,36 - 1294: 2,36 - 1295: 1,36 - 1296: 1,35 - 1297: 2,35 - 1298: 3,35 + 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 - node: color: '#9EDA8E28' id: QuarterTileOverlayGreyscale180 decals: - 1580: 3,45 - 1583: 2,45 - 1584: 2,46 + 1821: 3,45 + 1824: 2,45 + 1825: 2,46 - node: color: '#D381C996' id: QuarterTileOverlayGreyscale180 decals: - 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 - 565: 22,12 - 566: 22,13 - 567: 22,14 - 568: 22,15 - 569: 22,16 - 581: 16,12 - 582: 17,12 - 583: 18,12 - 584: 19,12 - 585: 20,12 - 586: 21,12 - 617: 36,1 - 618: 36,2 - 619: 36,3 - 620: 52,1 - 621: 52,3 - 626: 52,2 + 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 - node: color: '#EFB34196' id: QuarterTileOverlayGreyscale180 decals: - 184: 14,44 - 185: 14,45 - 186: 14,46 - 187: 14,47 + 239: 14,44 + 240: 14,45 + 241: 14,46 + 242: 14,47 - node: color: '#4B709CFF' id: QuarterTileOverlayGreyscale270 decals: - 1082: 15,21 - 1087: 16,21 + 1259: 15,21 + 1264: 16,21 - node: color: '#8BDA8E5D' id: QuarterTileOverlayGreyscale270 decals: - 1589: 2,46 - 1590: 4,44 - 1591: 3,45 + 1830: 2,46 + 1831: 4,44 + 1832: 3,45 - node: color: '#8BDABAFF' id: QuarterTileOverlayGreyscale270 decals: - 921: 21,40 - 922: 20,40 - 923: 18,40 - 924: 19,40 - 925: 17,40 - 1071: 20,19 - 1072: 19,20 - 1078: 21,21 + 1084: 21,40 + 1085: 20,40 + 1086: 18,40 + 1087: 19,40 + 1088: 17,40 + 1248: 20,19 + 1249: 19,20 + 1255: 21,21 - node: color: '#8BDB9BFF' id: QuarterTileOverlayGreyscale270 decals: - 1306: 32,35 - 1307: 31,35 - 1308: 30,35 - 1309: 29,35 - 1310: 28,35 - 1311: 27,35 - 1312: 26,36 - 1313: 26,36 - 1314: 27,36 - 1315: 28,36 - 1316: 29,36 - 1317: 30,36 - 1318: 31,36 - 1325: 32,36 - 1326: 26,35 + 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 - node: color: '#9EDA8E28' id: QuarterTileOverlayGreyscale270 decals: - 1573: 4,45 - 1577: 4,46 - 1587: 3,46 + 1814: 4,45 + 1818: 4,46 + 1828: 3,46 - node: color: '#D381C996' id: QuarterTileOverlayGreyscale270 decals: - 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 - 495: 21,21 + 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 - node: color: '#EFB34196' id: QuarterTileOverlayGreyscale270 decals: - 178: 8,44 - 179: 8,45 - 180: 8,46 - 181: 8,47 + 233: 8,44 + 234: 8,45 + 235: 8,46 + 236: 8,47 - node: color: '#4B709CFF' id: QuarterTileOverlayGreyscale90 decals: - 1080: 13,19 - 1088: 12,19 + 1257: 13,19 + 1265: 12,19 - node: color: '#79DA8EA1' id: QuarterTileOverlayGreyscale90 decals: - 813: 18,24 - 814: 18,25 - 815: 18,26 - 816: 18,27 - 817: 18,28 + 976: 18,24 + 977: 18,25 + 978: 18,26 + 979: 18,27 + 980: 18,28 - node: color: '#8BDA8E5D' id: QuarterTileOverlayGreyscale90 decals: - 1588: 3,44 + 1829: 3,44 - node: color: '#8BDABAFF' id: QuarterTileOverlayGreyscale90 decals: - 916: 17,38 - 917: 18,38 - 918: 19,38 - 919: 20,38 - 920: 21,38 - 975: 12,48 - 976: 13,48 - 977: 14,48 - 978: 14,47 - 979: 14,46 - 980: 14,45 - 981: 14,44 + 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 - node: color: '#8BDB9BFF' id: QuarterTileOverlayGreyscale90 decals: - 1245: 18,30 - 1246: 19,30 - 1247: 20,30 - 1248: 22,30 - 1249: 21,30 - 1250: 23,30 - 1251: 24,30 - 1252: 25,30 - 1299: 26,35 - 1300: 27,35 - 1301: 28,35 - 1302: 30,35 - 1303: 29,35 - 1304: 31,35 - 1305: 32,35 - 1319: 32,34 - 1320: 31,34 - 1321: 30,34 - 1322: 29,34 - 1323: 28,34 - 1324: 27,34 - 1327: 26,34 + 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 - node: color: '#9EDA8E28' id: QuarterTileOverlayGreyscale90 decals: - 1574: 4,44 - 1578: 3,45 - 1581: 2,45 - 1582: 2,44 - 1586: 2,46 + 1815: 4,44 + 1819: 3,45 + 1822: 2,45 + 1823: 2,44 + 1827: 2,46 - node: color: '#D381C996' id: QuarterTileOverlayGreyscale90 decals: - 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 + 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 - node: color: '#EFB34196' id: QuarterTileOverlayGreyscale90 decals: - 188: 9,48 - 189: 10,48 + 243: 9,48 + 244: 10,48 - node: color: '#FFFFFFFF' id: Rock01 decals: - 486: 22,18 + 543: 22,18 - node: color: '#FFFFFFFF' id: Rock03 decals: - 487: 18,18 + 544: 18,18 - node: color: '#FFFFFFFF' id: Rock04 decals: - 489: 18,22 + 546: 18,22 - node: color: '#FFFFFFFF' id: Rock05 decals: - 488: 22,22 + 545: 22,22 - node: color: '#FFFFFFFF' id: StandClear decals: - 217: 11,44 + 272: 11,44 - node: color: '#52B4E996' id: ThreeQuarterTileOverlayGreyscale decals: - 1046: 24,16 + 1223: 24,16 - node: color: '#8BDA8EB4' id: ThreeQuarterTileOverlayGreyscale decals: - 1102: 12,22 + 1279: 12,22 - node: color: '#D381C996' id: ThreeQuarterTileOverlayGreyscale decals: - 452: 12,22 + 507: 12,22 - node: color: '#52B4E996' id: ThreeQuarterTileOverlayGreyscale180 decals: - 1047: 30,12 + 1224: 30,12 - node: color: '#8BDA8EB4' id: ThreeQuarterTileOverlayGreyscale180 decals: - 1103: 16,18 + 1280: 16,18 - node: color: '#D381C996' id: ThreeQuarterTileOverlayGreyscale180 decals: - 450: 16,18 + 505: 16,18 - node: color: '#52B4E996' id: ThreeQuarterTileOverlayGreyscale90 decals: - 763: 30,16 + 899: 30,16 - node: color: '#8BDA8EB4' id: ThreeQuarterTileOverlayGreyscale90 decals: - 1101: 16,22 + 1278: 16,22 - node: color: '#D381C996' id: ThreeQuarterTileOverlayGreyscale90 decals: - 451: 16,22 + 506: 16,22 - node: color: '#79DA8EFF' id: WarnCornerGreyscaleNE decals: - 821: 2,28 + 984: 2,28 - node: color: '#79DA8EFF' id: WarnCornerGreyscaleNW decals: - 823: 0,28 + 986: 0,28 - node: color: '#79DA8EFF' id: WarnCornerGreyscaleSE decals: - 824: 2,24 + 987: 2,24 - node: color: '#79DA8EFF' id: WarnCornerGreyscaleSW decals: - 826: 0,24 + 989: 0,24 - node: color: '#FFFFFFFF' id: WarnCornerNE decals: - 726: 21,2 - 727: 25,2 + 861: 21,2 + 862: 25,2 - node: color: '#FFFFFFFF' id: WarnCornerNW decals: - 728: 23,2 - 729: 19,2 + 863: 23,2 + 864: 19,2 - node: color: '#FFFFFFFF' id: WarnCornerSW decals: - 435: 2,20 + 490: 2,20 - node: color: '#FFFFFFFF' id: WarnCornerSmallNE decals: - 874: 8,12 + 1037: 8,12 - node: color: '#FFFFFFFF' id: WarnCornerSmallNW decals: - 873: 14,12 + 1036: 14,12 - node: color: '#FFFFFFFF' id: WarnCornerSmallSE decals: - 564: 8,16 + 621: 8,16 - node: color: '#FFFFFFFF' id: WarnCornerSmallSW decals: - 563: 14,16 + 620: 14,16 - node: color: '#FFFFFFFF' id: WarnLineE decals: - 276: 6,34 - 277: 6,35 - 278: 6,36 - 550: 8,13 - 551: 8,14 - 552: 8,15 + 331: 6,34 + 332: 6,35 + 333: 6,36 + 607: 8,13 + 608: 8,14 + 609: 8,15 - node: color: '#79DA8EFF' id: WarnLineGreyscaleE decals: - 818: 2,25 - 819: 2,26 - 820: 2,27 + 981: 2,25 + 982: 2,26 + 983: 2,27 - node: color: '#8BDB8E99' id: WarnLineGreyscaleE decals: - 1201: 18,3 - 1202: 18,3 + 1378: 18,3 + 1379: 18,3 - node: color: '#8BDB8EFF' id: WarnLineGreyscaleE decals: - 1203: 18,3 + 1380: 18,3 - node: color: '#D381C996' id: WarnLineGreyscaleE decals: - 739: 18,3 + 874: 18,3 - node: color: '#52B4E996' id: WarnLineGreyscaleN decals: - 1048: 27,15 + 1225: 27,15 - node: color: '#79DA8EFF' id: WarnLineGreyscaleN decals: - 822: 1,28 + 985: 1,28 - node: color: '#8BDA8EFF' id: WarnLineGreyscaleN decals: - 1421: 29,27 + 1624: 29,27 - node: color: '#8BDB8E99' id: WarnLineGreyscaleN decals: - 1199: 26,4 - 1200: 26,4 + 1376: 26,4 + 1377: 26,4 - node: color: '#DABC8BFF' id: WarnLineGreyscaleN decals: - 833: 5,28 + 996: 5,28 - node: color: '#79DA8EFF' id: WarnLineGreyscaleS decals: - 825: 1,24 + 988: 1,24 - node: color: '#8BDA8EFF' id: WarnLineGreyscaleS decals: - 1420: 29,25 + 1623: 29,25 - node: color: '#DABC8BFF' id: WarnLineGreyscaleS decals: - 834: 5,24 - 835: 5,24 + 997: 5,24 + 998: 5,24 - node: color: '#79DA8EFF' id: WarnLineGreyscaleW decals: - 827: 0,25 - 828: 0,26 - 829: 0,27 + 990: 0,25 + 991: 0,26 + 992: 0,27 - node: color: '#8BDB8EFF' id: WarnLineGreyscaleW decals: - 1204: 34,3 + 1381: 34,3 - node: color: '#D381C996' id: WarnLineGreyscaleW decals: - 738: 34,3 + 873: 34,3 - node: color: '#FFFFFFFF' id: WarnLineN decals: - 209: 12,47 - 210: 10,47 - 433: 4,20 - 434: 3,20 - 524: 27,22 - 525: 26,22 - 526: 25,22 - 545: 13,16 - 546: 11,16 - 547: 12,16 - 548: 10,16 - 549: 9,16 + 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 - node: color: '#FFFFFFFF' id: WarnLineS decals: - 273: 4,34 - 274: 4,36 - 275: 4,35 - 436: 2,21 - 437: 2,22 - 880: 14,13 - 881: 14,14 - 882: 14,15 + 328: 4,34 + 329: 4,36 + 330: 4,35 + 491: 2,21 + 492: 2,22 + 1043: 14,13 + 1044: 14,14 + 1045: 14,15 - node: color: '#FFFFFFFF' id: WarnLineW decals: - 206: 12,44 - 207: 11,44 - 208: 10,44 - 521: 27,18 - 522: 26,18 - 523: 25,18 - 779: 45,13 - 780: 46,13 - 781: 44,13 - 782: 43,13 - 783: 42,13 - 784: 41,13 - 785: 40,13 - 875: 9,12 - 876: 10,12 - 877: 11,12 - 878: 12,12 - 879: 13,12 + 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 - node: color: '#FFFFFFFF' id: WoodTrimThinCornerNe decals: - 461: 10,9 + 518: 10,9 - node: color: '#FFFFFFFF' id: WoodTrimThinCornerNw decals: - 460: 1,9 + 517: 1,9 - node: color: '#FFFFFFFF' id: WoodTrimThinCornerSe decals: - 458: 10,8 + 515: 10,8 - node: color: '#FFFFFFFF' id: WoodTrimThinCornerSw decals: - 459: 1,8 + 516: 1,8 - node: color: '#FFFFFFFF' id: WoodTrimThinLineN decals: - 462: 9,9 - 463: 8,9 - 464: 7,9 - 465: 6,9 - 466: 5,9 - 467: 4,9 - 468: 3,9 - 469: 2,9 + 519: 9,9 + 520: 8,9 + 521: 7,9 + 522: 6,9 + 523: 5,9 + 524: 4,9 + 525: 3,9 + 526: 2,9 - node: color: '#FFFFFFFF' id: WoodTrimThinLineS decals: - 470: 10,8 - 471: 9,8 - 472: 8,8 - 473: 7,8 - 474: 6,8 - 475: 5,8 - 476: 4,8 - 477: 3,8 - 478: 2,8 - 479: 1,8 + 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 - node: color: '#FFFFFFFF' id: bushsnowa1 decals: - 1558: 34.098167,13.033111 + 1768: 34.098167,13.033111 - node: color: '#FFFFFFFF' id: bushsnowb1 decals: - 1559: 35.707542,12.970611 + 1769: 35.707542,12.970611 - node: color: '#FFFFFFFF' id: chevron decals: - 230: 11,48 + 285: 11,48 - node: color: '#FFFFFFFF' id: grasssnow decals: - 1643: 10.225454,38.990788 - 1644: 11.037954,39.022038 - 1645: 11.834829,39.022038 + 1885: 10.225454,38.990788 + 1886: 11.037954,39.022038 + 1887: 11.834829,39.022038 - node: color: '#FFFFFFFF' id: grasssnow02 decals: - 1552: 34.973167,13.060861 + 1762: 34.973167,13.060861 - node: color: '#FFFFFFFF' id: grasssnow10 decals: - 1551: 34.004417,13.045236 - 1553: 35.316917,13.060861 - 1554: 36.035667,13.029611 - 1555: 34.535667,12.998361 - 1556: 36.129417,13.076486 - 1557: 34.238792,13.076486 - 1646: 10.491079,38.975163 - 1647: 11.600454,38.959538 - 1648: 11.006704,39.178288 + 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 - type: RadiationGridResistance - type: LoadedMap - type: SpreaderGrid @@ -2908,6 +2907,56 @@ entities: - type: Transform pos: 17.5,31.5 parent: 1653 +- proto: AloeSeeds + entities: + - uid: 1078 + components: + - type: Transform + pos: 1.5044713,15.591048 + parent: 1653 + - uid: 1379 + components: + - type: Transform + pos: 16.516748,9.567207 + parent: 1653 +- proto: AmbrosiaVulgarisSeeds + entities: + - uid: 1380 + components: + - type: Transform + pos: 16.688623,9.410957 + parent: 1653 +- proto: AnomalyFloraBulb + entities: + - uid: 105 + components: + - type: Transform + pos: 21.5,44.5 + parent: 1653 + - uid: 110 + components: + - type: Transform + pos: 17.5,44.5 + parent: 1653 + - uid: 624 + components: + - type: Transform + pos: 18.5,47.5 + parent: 1653 +- proto: AnomalyIce + entities: + - uid: 1840 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 45.497818,12.844993 + parent: 1653 + - uid: 2141 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 51.43184,14.455296 + parent: 1653 - proto: AnomalyScanner entities: - uid: 2182 @@ -2995,6 +3044,13 @@ entities: rot: 1.5707963267948966 rad pos: 53.5,14.5 parent: 1653 +- proto: Beaker + entities: + - uid: 1470 + components: + - type: Transform + pos: 21.687025,4.54119 + parent: 1653 - proto: Bed entities: - uid: 1233 @@ -3039,6 +3095,27 @@ entities: - type: Transform pos: 42.5,0.5 parent: 1653 +- proto: BloodTomatoSeeds + entities: + - uid: 792 + components: + - type: Transform + pos: 1.4725559,25.735012 + parent: 1653 +- proto: BluespaceBeaker + entities: + - uid: 1476 + components: + - type: Transform + pos: 21.201073,4.650565 + parent: 1653 +- proto: BookLeafLoversSecret + entities: + - uid: 1419 + components: + - type: Transform + pos: 6.468939,30.545952 + parent: 1653 - proto: Bookshelf entities: - uid: 1241 @@ -3098,6 +3175,28 @@ entities: - type: Transform pos: 2.5,32.5 parent: 1653 +- proto: BoxBeaker + entities: + - uid: 1484 + components: + - type: Transform + pos: 22.482006,0.7443154 + parent: 1653 +- proto: BoxFolderBlue + entities: + - uid: 776 + components: + - type: Transform + pos: 22.48359,30.550323 + parent: 1653 +- proto: BoxFolderGreen + entities: + - uid: 1201 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.6928706,46.564724 + parent: 1653 - proto: BoxFolderWhite entities: - uid: 1003 @@ -3117,6 +3216,42 @@ entities: rot: -1.5707963267948966 rad pos: 25.322851,13.512466 parent: 1653 +- proto: BoxFolderYellow + entities: + - uid: 1714 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.6459956,46.39285 + parent: 1653 +- proto: BoxMouthSwab + entities: + - uid: 796 + components: + - type: Transform + pos: 14.493081,24.60434 + parent: 1653 +- proto: BriefcaseBrown + entities: + - uid: 1699 + components: + - type: Transform + pos: 18.487843,32.40922 + parent: 1653 +- proto: BungoSeeds + entities: + - uid: 1424 + components: + - 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 @@ -3689,11 +3824,6 @@ entities: - type: Transform pos: 1.5,28.5 parent: 1653 - - uid: 162 - components: - - type: Transform - pos: 2.5,1.5 - parent: 1653 - uid: 165 components: - type: Transform @@ -4704,21 +4834,6 @@ entities: - type: Transform pos: 6.5,2.5 parent: 1653 - - uid: 508 - components: - - type: Transform - pos: 2.5,3.5 - parent: 1653 - - uid: 509 - components: - - type: Transform - pos: 2.5,0.5 - parent: 1653 - - uid: 510 - components: - - type: Transform - pos: 2.5,4.5 - parent: 1653 - uid: 514 components: - type: Transform @@ -4729,11 +4844,6 @@ entities: - type: Transform pos: 11.5,2.5 parent: 1653 - - uid: 527 - components: - - type: Transform - pos: 8.5,31.5 - parent: 1653 - uid: 566 components: - type: Transform @@ -4779,11 +4889,6 @@ entities: - type: Transform pos: 27.5,2.5 parent: 1653 - - uid: 719 - components: - - type: Transform - pos: 5.5,31.5 - parent: 1653 - uid: 736 components: - type: Transform @@ -4849,16 +4954,6 @@ entities: - type: Transform pos: 31.5,2.5 parent: 1653 - - uid: 796 - components: - - type: Transform - pos: 7.5,31.5 - parent: 1653 - - uid: 799 - components: - - type: Transform - pos: 4.5,31.5 - parent: 1653 - uid: 906 components: - type: Transform @@ -5189,11 +5284,6 @@ entities: - type: Transform pos: 35.5,12.5 parent: 1653 - - uid: 1327 - components: - - type: Transform - pos: 10.5,31.5 - parent: 1653 - uid: 1393 components: - type: Transform @@ -5219,11 +5309,6 @@ entities: - type: Transform pos: 21.5,45.5 parent: 1653 - - uid: 1419 - components: - - type: Transform - pos: 11.5,31.5 - parent: 1653 - uid: 1439 components: - type: Transform @@ -5459,6 +5544,11 @@ entities: - type: Transform pos: 29.5,13.5 parent: 1653 + - uid: 1875 + components: + - type: Transform + pos: 4.5,3.5 + parent: 1653 - uid: 1876 components: - type: Transform @@ -5469,16 +5559,31 @@ entities: - type: Transform pos: 4.5,2.5 parent: 1653 + - uid: 1878 + components: + - type: Transform + pos: 4.5,1.5 + parent: 1653 - uid: 1879 components: - type: Transform pos: 0.5,2.5 parent: 1653 + - uid: 1880 + components: + - type: Transform + pos: 4.5,0.5 + parent: 1653 - uid: 1881 components: - type: Transform pos: 2.5,2.5 parent: 1653 + - uid: 1882 + components: + - type: Transform + pos: 4.5,4.5 + parent: 1653 - uid: 1888 components: - type: Transform @@ -5499,10 +5604,25 @@ entities: - type: Transform pos: 16.5,2.5 parent: 1653 + - uid: 1892 + components: + - type: Transform + pos: 3.5,3.5 + parent: 1653 + - uid: 1893 + components: + - type: Transform + pos: 3.5,4.5 + parent: 1653 + - uid: 1894 + components: + - type: Transform + pos: 3.5,1.5 + parent: 1653 - uid: 1895 components: - type: Transform - pos: 9.5,31.5 + pos: 3.5,0.5 parent: 1653 - uid: 1961 components: @@ -5584,11 +5704,6 @@ entities: - type: Transform pos: 51.5,38.5 parent: 1653 - - uid: 2009 - components: - - type: Transform - pos: 6.5,31.5 - parent: 1653 - uid: 2031 components: - type: Transform @@ -5734,11 +5849,6 @@ entities: - type: Transform pos: 41.5,6.5 parent: 1653 - - uid: 2061 - components: - - type: Transform - pos: 3.5,31.5 - parent: 1653 - uid: 2188 components: - type: Transform @@ -5779,37 +5889,39 @@ entities: - type: Transform pos: 8.5,0.5 parent: 1653 - - uid: 2240 +- proto: CableApcStack + entities: + - uid: 824 components: - type: Transform - pos: 2.5,31.5 + pos: 6.439933,35.56771 parent: 1653 - - uid: 2241 + - uid: 1541 components: - type: Transform - pos: 1.5,31.5 + pos: 27.694578,8.767019 parent: 1653 - - uid: 2242 +- proto: CableApcStack10 + entities: + - uid: 171 components: - type: Transform - pos: 0.5,31.5 + pos: 4.338315,25.664474 parent: 1653 - - uid: 2243 + - uid: 733 components: - type: Transform - pos: 6.5,30.5 + pos: 4.557065,25.539474 parent: 1653 - - uid: 2244 + - uid: 814 components: - type: Transform - pos: 6.5,32.5 + pos: 6.47894,27.64885 parent: 1653 -- proto: CableApcStack - entities: - - uid: 1541 + - uid: 817 components: - type: Transform - pos: 27.694578,8.767019 + pos: 6.619565,27.508224 parent: 1653 - proto: CableHV entities: @@ -6140,6 +6252,20 @@ entities: rot: 3.141592653589793 rad pos: 30.5,7.5 parent: 1653 +- proto: CannabisSeeds + entities: + - uid: 905 + components: + - type: Transform + pos: 4.5,18.5 + parent: 1653 +- proto: CarbonDioxideCanister + entities: + - uid: 806 + components: + - type: Transform + pos: 16.5,25.5 + parent: 1653 - proto: CarpetGreen entities: - uid: 271 @@ -6279,6 +6405,13 @@ 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 @@ -6682,12 +6815,6 @@ entities: - type: Transform pos: 48.5,40.5 parent: 1653 - - uid: 1956 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 7.5,30.5 - parent: 1653 - proto: ChairFolding entities: - uid: 929 @@ -6811,39 +6938,180 @@ entities: - type: Transform pos: 27.5,14.5 parent: 1653 -- proto: ClosetMaintenanceFilledRandom +- proto: ClosetEmergencyFilledRandom entities: - - uid: 745 + - uid: 899 components: - type: Transform - pos: 14.5,32.5 + pos: 4.5,22.5 parent: 1653 -- proto: ClosetSteelBase +- proto: ClosetFireFilled entities: - - uid: 2010 + - uid: 747 components: - type: Transform - pos: 30.5,25.5 + pos: 1.5,40.5 parent: 1653 - - uid: 2012 + - uid: 900 components: - type: Transform - pos: 28.5,27.5 + pos: 3.5,22.5 parent: 1653 -- proto: ClothingOuterApronBotanist +- proto: ClosetL3ScienceFilled entities: - - uid: 656 + - uid: 1285 components: - type: Transform - pos: 33.50576,36.565666 + pos: 53.5,0.5 parent: 1653 -- proto: ClothingOuterWinterHydro - entities: - - uid: 1077 + - uid: 1286 + components: + - type: Transform + pos: 54.5,0.5 + parent: 1653 +- proto: ClosetMaintenanceFilledRandom + entities: + - uid: 745 + components: + - type: Transform + pos: 14.5,32.5 + parent: 1653 + - uid: 948 + components: + - type: Transform + pos: 5.5,7.5 + parent: 1653 + - uid: 954 + components: + - type: Transform + pos: 0.5,7.5 + parent: 1653 + - uid: 955 + components: + - type: Transform + pos: 0.5,6.5 + parent: 1653 + - uid: 1284 + components: + - type: Transform + pos: 52.5,0.5 + parent: 1653 +- proto: ClosetSteelBase + entities: + - uid: 2010 + components: + - type: Transform + pos: 30.5,25.5 + parent: 1653 + - uid: 2011 + components: + - type: Transform + pos: 28.5,26.5 + parent: 1653 + - uid: 2012 + components: + - type: Transform + pos: 28.5,27.5 + parent: 1653 +- proto: ClosetToolFilled + entities: + - uid: 584 + components: + - type: Transform + pos: 14.5,42.5 + parent: 1653 +- proto: ClothingBackpackDuffelHydroponics + entities: + - uid: 2023 + components: + - type: Transform + pos: 32.47305,27.527536 + parent: 1653 +- proto: ClothingEyesGlassesMeson + entities: + - uid: 591 + components: + - type: Transform + pos: 10.480986,45.607067 + parent: 1653 +- proto: ClothingEyesGlassesThermal + entities: + - uid: 800 + components: + - type: Transform + pos: 6.5116234,25.568321 + parent: 1653 +- proto: ClothingHandsGlovesLeather + entities: + - uid: 719 + components: + - type: Transform + pos: 12.432887,24.48849 + parent: 1653 +- proto: ClothingHeadHatHoodBioVirology + entities: + - uid: 2062 + components: + - type: Transform + pos: 34.71194,26.670929 + parent: 1653 + - uid: 2063 + components: + - type: Transform + pos: 34.321316,26.655304 + parent: 1653 +- proto: ClothingHeadHatWeldingMaskFlame + entities: + - uid: 661 + components: + - type: Transform + pos: 21.418028,36.658634 + parent: 1653 +- proto: ClothingHeadHatWeldingMaskFlameBlue + entities: + - uid: 662 + components: + - type: Transform + pos: 21.605528,36.471134 + parent: 1653 +- proto: ClothingMaskBandBotany + entities: + - uid: 732 + components: + - type: Transform + pos: 12.423744,24.51739 + parent: 1653 +- proto: ClothingOuterApronBotanist + entities: + - uid: 656 + components: + - type: Transform + pos: 33.50576,36.565666 + parent: 1653 +- proto: ClothingOuterBioVirology + entities: + - uid: 2064 + components: + - type: Transform + pos: 34.321316,26.514679 + parent: 1653 + - uid: 2065 + components: + - type: Transform + pos: 34.696316,26.499054 + parent: 1653 +- proto: ClothingOuterWinterHydro + entities: + - uid: 1077 components: - type: Transform pos: 7.484151,6.5991178 parent: 1653 + - uid: 2060 + components: + - type: Transform + pos: 32.374146,26.80749 + parent: 1653 - proto: ClothingShoeSlippersDuck entities: - uid: 2030 @@ -6851,6 +7119,20 @@ entities: - type: Transform pos: 13.532652,9.379251 parent: 1653 +- proto: ClothingUniformJumpsuitHydroponics + entities: + - uid: 2061 + components: + - type: Transform + pos: 32.54602,26.604364 + parent: 1653 +- proto: CocoaSeeds + entities: + - uid: 829 + components: + - type: Transform + pos: 1.5350559,26.594387 + parent: 1653 - proto: ComfyChair entities: - uid: 268 @@ -6859,6 +7141,12 @@ entities: rot: -1.5707963267948966 rad pos: 4.5,30.5 parent: 1653 + - uid: 269 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 7.5,30.5 + parent: 1653 - uid: 313 components: - type: Transform @@ -6900,6 +7188,12 @@ entities: rot: -1.5707963267948966 rad pos: 16.5,19.5 parent: 1653 + - uid: 982 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 5.5,30.5 + parent: 1653 - uid: 987 components: - type: Transform @@ -7141,6 +7435,13 @@ entities: - type: Transform pos: 1.5,39.5 parent: 1653 +- proto: CyberPen + entities: + - uid: 1124 + components: + - type: Transform + pos: 3.5640259,43.59188 + parent: 1653 - proto: DisposalTrunk entities: - uid: 1436 @@ -7177,6 +7478,96 @@ entities: - type: Transform pos: 25.5,2.5 parent: 1653 +- proto: DonkpocketBoxSpawner + entities: + - uid: 962 + components: + - type: Transform + pos: 0.5,9.5 + parent: 1653 +- proto: DrinkGoldenCup + entities: + - uid: 1192 + components: + - type: Transform + pos: 10.500535,32.48345 + parent: 1653 +- proto: DrinkMug + entities: + - uid: 963 + components: + - type: Transform + pos: 1.4545751,10.669063 + parent: 1653 +- proto: DrinkMugDog + entities: + - uid: 452 + components: + - type: Transform + pos: 10.44451,4.54002 + parent: 1653 + - uid: 965 + components: + - type: Transform + pos: 1.4858251,10.465938 + parent: 1653 +- proto: DrinkMugMetal + entities: + - uid: 964 + components: + - type: Transform + pos: 1.6889501,10.590938 + parent: 1653 +- proto: DrinkMugMoebius + entities: + - uid: 466 + components: + - type: Transform + pos: 10.60076,4.711895 + parent: 1653 + - uid: 966 + components: + - type: Transform + pos: 2.173325,10.684688 + parent: 1653 +- proto: DrinkWaterCup + entities: + - uid: 508 + components: + - type: Transform + pos: 20.373915,40.64657 + parent: 1653 + - uid: 509 + components: + - type: Transform + pos: 20.54579,40.724693 + parent: 1653 + - uid: 510 + components: + - type: Transform + pos: 20.592665,40.537193 + parent: 1653 +- proto: Dropper + entities: + - uid: 1471 + components: + - 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 @@ -7202,6 +7593,13 @@ entities: parent: 1653 - type: PointLight enabled: True +- proto: EncryptionKeyService + entities: + - uid: 1205 + components: + - type: Transform + pos: 5.3739185,43.607506 + parent: 1653 - proto: ExtinguisherCabinetFilled entities: - uid: 1287 @@ -7325,6 +7723,27 @@ entities: - type: Transform pos: 21.463976,15.404201 parent: 1653 +- proto: FoodShakerPepper + entities: + - uid: 1327 + components: + - type: Transform + pos: 12.527602,2.6585855 + parent: 1653 +- proto: FoodShakerSalt + entities: + - uid: 1220 + components: + - type: Transform + pos: 12.340102,2.7523355 + parent: 1653 +- proto: FoodSoupChiliCold + entities: + - uid: 1842 + components: + - type: Transform + pos: 41.565323,12.755919 + parent: 1653 - proto: GasCanisterBrokenBase entities: - uid: 287 @@ -7545,6 +7964,27 @@ entities: - type: Transform pos: 20.5,45.5 parent: 1653 +- proto: GunpetInstrument + entities: + - uid: 491 + components: + - type: Transform + pos: 32.456673,4.6502504 + parent: 1653 +- proto: HandLabeler + entities: + - uid: 797 + components: + - type: Transform + pos: 14.461831,28.633146 + parent: 1653 +- proto: HelicopterInstrument + entities: + - uid: 415 + components: + - type: Transform + pos: 31.582432,20.675161 + parent: 1653 - proto: HospitalCurtainsOpen entities: - uid: 270 @@ -7614,14 +8054,47 @@ entities: - type: Transform pos: 21.5,14.5 parent: 1653 -- proto: hydroponicsTray +- proto: HydroponicsToolHatchet entities: - - uid: 159 + - uid: 1959 components: - type: Transform - pos: 22.5,25.5 + pos: 26.521053,26.358747 parent: 1653 - - uid: 417 +- proto: HydroponicsToolMiniHoe + entities: + - uid: 1378 + components: + - type: Transform + pos: 18.469873,9.442207 + parent: 1653 +- proto: HydroponicsToolScythe + entities: + - uid: 1948 + components: + - type: Transform + pos: 53.545364,38.54707 + parent: 1653 +- proto: HydroponicsToolSpade + entities: + - uid: 1998 + components: + - type: Transform + pos: 37.663628,7.3749332 + parent: 1653 +- proto: hydroponicsTray + entities: + - uid: 159 + components: + - type: Transform + pos: 22.5,25.5 + parent: 1653 + - uid: 160 + components: + - type: Transform + pos: 22.5,26.5 + parent: 1653 + - uid: 417 components: - type: Transform rot: 3.141592653589793 rad @@ -7738,6 +8211,11 @@ entities: - type: Transform pos: 26.5,27.5 parent: 1653 + - uid: 1951 + components: + - type: Transform + pos: 26.5,26.5 + parent: 1653 - uid: 1952 components: - type: Transform @@ -7758,6 +8236,11 @@ entities: - type: Transform pos: 24.5,25.5 parent: 1653 + - uid: 1956 + components: + - type: Transform + pos: 24.5,26.5 + parent: 1653 - uid: 1957 components: - type: Transform @@ -7858,6 +8341,18 @@ entities: - type: Transform pos: 50.5,15.5 parent: 1653 +- proto: HydroponicsTrayMachineCircuitboard + entities: + - uid: 168 + components: + - type: Transform + pos: 4.5441585,28.543722 + parent: 1653 + - uid: 170 + components: + - type: Transform + pos: 6.5285335,24.574972 + parent: 1653 - proto: IceCrust entities: - uid: 147 @@ -10101,6 +10596,13 @@ entities: - type: Transform pos: 34.5,15.5 parent: 1653 +- proto: KitchenMicrowave + entities: + - uid: 961 + components: + - type: Transform + pos: 0.5,10.5 + parent: 1653 - proto: KudzuFlowerFriendly entities: - uid: 974 @@ -10135,6 +10637,18 @@ entities: rot: 1.5707963267948966 rad pos: 24.5,32.5 parent: 1653 +- proto: LargeBeaker + entities: + - uid: 1468 + components: + - type: Transform + pos: 21.7339,4.82244 + parent: 1653 + - uid: 1469 + components: + - type: Transform + pos: 21.9839,4.619315 + parent: 1653 - proto: LightTree05 entities: - uid: 125 @@ -10142,27 +10656,36 @@ entities: - type: Transform pos: 19.507784,45.542137 parent: 1653 -- proto: LockerBotanistLoot +- proto: LockerBotanistFilled entities: - - uid: 2027 + - uid: 794 components: - type: Transform - pos: 8.5,25.5 + pos: 10.5,26.5 parent: 1653 - - uid: 2060 + - uid: 2009 components: - type: Transform - pos: 10.5,25.5 + pos: 30.5,26.5 parent: 1653 - - uid: 2065 +- proto: LockerBotanistLoot + entities: + - uid: 650 components: - type: Transform - pos: 8.5,27.5 + pos: 43.5,40.5 + parent: 1653 + - uid: 1088 + components: + - type: Transform + pos: 8.5,26.5 parent: 1653 - - uid: 2248 +- proto: LockerElectricalSuppliesFilled + entities: + - uid: 1533 components: - type: Transform - pos: 45.5,40.5 + pos: 27.5,9.5 parent: 1653 - proto: LockerScienceFilled entities: @@ -10171,6 +10694,21 @@ entities: - type: Transform pos: 14.5,25.5 parent: 1653 +- proto: LockerWeldingSuppliesFilled + entities: + - uid: 1531 + components: + - type: Transform + pos: 31.5,9.5 + parent: 1653 +- proto: LuxuryPen + entities: + - uid: 1328 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 36.487568,15.43374 + parent: 1653 - proto: MachineAPE entities: - uid: 2139 @@ -10224,6 +10762,25 @@ entities: rot: -1.5707963267948966 rad pos: 29.590216,15.590591 parent: 1653 +- proto: MaterialBones1 + entities: + - uid: 2137 + components: + - type: Transform + pos: 49.42443,15.527899 + parent: 1653 + - uid: 2138 + components: + - type: Transform + pos: 49.54943,15.481024 + parent: 1653 +- proto: MaterialWoodPlank + entities: + - uid: 669 + components: + - type: Transform + pos: 20.62062,34.599228 + parent: 1653 - proto: Mirror entities: - uid: 892 @@ -10237,6 +10794,97 @@ entities: rot: -1.5707963267948966 rad pos: 3.5,19.5 parent: 1653 +- proto: ModularGrenade + entities: + - uid: 1634 + components: + - type: Transform + pos: 40.388412,13.373815 + parent: 1653 + - uid: 1635 + components: + - type: Transform + pos: 40.482162,13.57694 + parent: 1653 + - uid: 1636 + components: + - type: Transform + pos: 40.607162,13.405065 + parent: 1653 +- proto: Multitool + entities: + - uid: 1049 + components: + - type: Transform + pos: 27.480967,22.500828 + parent: 1653 +- proto: NettleSeeds + entities: + - uid: 1999 + components: + - type: Transform + pos: 42.384377,9.279519 + parent: 1653 +- proto: OrangeSeeds + entities: + - uid: 819 + components: + - type: Transform + pos: 1.4881809,27.512886 + parent: 1653 +- proto: Paper + entities: + - uid: 490 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 5.4302826,44.545006 + parent: 1653 + - uid: 1127 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 5.4302826,44.545006 + parent: 1653 + - uid: 1131 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 5.4302826,44.545006 + parent: 1653 +- proto: PaperBin5 + entities: + - uid: 785 + components: + - type: Transform + pos: 24.5,31.5 + parent: 1653 + - uid: 1006 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 3.5,47.5 + parent: 1653 + - uid: 1707 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 35.5,14.5 + parent: 1653 +- proto: PartRodMetal1 + entities: + - uid: 531 + components: + - type: Transform + pos: 33.42354,40.437122 + parent: 1653 +- proto: PenCentcom + entities: + - uid: 686 + components: + - type: Transform + pos: 24.75229,32.018597 + parent: 1653 - proto: PercentileDie entities: - uid: 744 @@ -10244,6 +10892,20 @@ entities: - type: Transform pos: 17.44835,14.326076 parent: 1653 +- proto: PineappleSeeds + entities: + - uid: 455 + components: + - type: Transform + pos: 33.566967,20.5998 + parent: 1653 +- proto: PlasmaTankFilled + entities: + - uid: 1473 + components: + - type: Transform + pos: 30.568752,4.54119 + parent: 1653 - proto: PlushieDiona entities: - uid: 653 @@ -10318,6 +10980,20 @@ entities: - type: Transform pos: 12.5,28.5 parent: 1653 +- proto: PowerCellHigh + entities: + - uid: 799 + components: + - type: Transform + pos: 16.534313,24.606636 + parent: 1653 +- proto: PowerCellPotato + entities: + - uid: 862 + components: + - type: Transform + pos: 12.315257,39.398518 + parent: 1653 - proto: PowerCellRecharger entities: - uid: 808 @@ -10330,6 +11006,13 @@ entities: - type: Transform pos: 49.5,13.5 parent: 1653 +- proto: PowerDrill + entities: + - uid: 1050 + components: + - type: Transform + pos: 28.512217,21.547703 + parent: 1653 - proto: Poweredlight entities: - uid: 77 @@ -10344,6 +11027,11 @@ entities: rot: 1.5707963267948966 rad pos: 38.5,13.5 parent: 1653 + - uid: 81 + components: + - type: Transform + pos: 6.5,31.5 + parent: 1653 - uid: 123 components: - type: Transform @@ -10480,12 +11168,6 @@ entities: parent: 1653 - type: ApcPowerReceiver powerLoad: 0 - - uid: 848 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 5.5,31.5 - parent: 1653 - uid: 932 components: - type: Transform @@ -10641,12 +11323,6 @@ entities: rot: -1.5707963267948966 rad pos: 28.5,14.5 parent: 1653 - - uid: 1875 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 28.5,27.5 - parent: 1653 - uid: 1977 components: - type: Transform @@ -10670,11 +11346,17 @@ entities: - type: Transform pos: 33.5,22.5 parent: 1653 - - uid: 2063 + - uid: 2115 components: - type: Transform rot: 1.5707963267948966 rad - pos: 32.5,27.5 + pos: 28.5,26.5 + parent: 1653 + - uid: 2116 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 32.5,26.5 parent: 1653 - uid: 2117 components: @@ -10687,10 +11369,11 @@ entities: - type: Transform pos: 42.5,10.5 parent: 1653 - - uid: 2245 + - uid: 2214 components: - type: Transform - pos: 9.5,32.5 + rot: 3.141592653589793 rad + pos: 5.5,30.5 parent: 1653 - proto: PoweredlightCyan entities: @@ -10902,23 +11585,27 @@ entities: parent: 1653 - proto: PoweredSmallLightEmpty entities: - - uid: 269 + - uid: 737 components: - type: Transform rot: -1.5707963267948966 rad - pos: 22.5,27.5 + pos: 6.5,25.5 parent: 1653 - - uid: 526 + - type: ApcPowerReceiver + powerLoad: 0 + - uid: 848 components: - type: Transform rot: -1.5707963267948966 rad - pos: 18.5,27.5 + pos: 18.5,26.5 parent: 1653 - - uid: 737 + - type: ApcPowerReceiver + powerLoad: 0 + - uid: 849 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 6.5,25.5 + rot: 1.5707963267948966 rad + pos: 20.5,26.5 parent: 1653 - type: ApcPowerReceiver powerLoad: 0 @@ -11028,8 +11715,19 @@ entities: - type: Transform pos: 53.5,38.5 parent: 1653 -- proto: Railing - entities: + - uid: 2027 + components: + - type: Transform + pos: 34.5,26.5 + parent: 1653 +- proto: Railing + entities: + - uid: 527 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 34.5,38.5 + parent: 1653 - uid: 936 components: - type: Transform @@ -11041,12 +11739,6 @@ entities: - type: Transform pos: 12.5,19.5 parent: 1653 - - uid: 2062 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 35.5,38.5 - parent: 1653 - proto: RailingCornerSmall entities: - uid: 528 @@ -11061,25 +11753,43 @@ entities: rot: 1.5707963267948966 rad pos: 35.5,39.5 parent: 1653 + - uid: 530 + components: + - type: Transform + pos: 35.5,38.5 + parent: 1653 - uid: 943 components: - type: Transform rot: 1.5707963267948966 rad pos: 13.5,19.5 parent: 1653 - - uid: 2247 +- proto: RandomFoodMeal + entities: + - uid: 456 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 34.5,38.5 + pos: 10.5,0.5 parent: 1653 -- proto: RandomInstruments + - uid: 993 + components: + - type: Transform + pos: 12.5,22.5 + parent: 1653 + - uid: 1314 + components: + - type: Transform + pos: 4.5,2.5 + parent: 1653 +- proto: RandomFoodSingle entities: - - uid: 1131 + - uid: 403 components: - type: Transform - pos: 31.5,20.5 + pos: 5.5,4.5 parent: 1653 +- proto: RandomInstruments + entities: - uid: 1248 components: - type: Transform @@ -11102,6 +11812,13 @@ entities: - type: Transform pos: 39.5,0.5 parent: 1653 +- proto: RandomSnacks + entities: + - uid: 994 + components: + - type: Transform + pos: 16.5,18.5 + parent: 1653 - proto: RandomSoap entities: - uid: 898 @@ -11141,32 +11858,29 @@ entities: - type: Transform pos: 41.5,40.5 parent: 1653 - - uid: 1894 - components: - - type: Transform - pos: 8.5,31.5 - parent: 1653 - - uid: 2115 +- proto: RandomSpawner100 + entities: + - uid: 1413 components: - type: Transform - pos: 4.5,30.5 + pos: 21.5,43.5 parent: 1653 - - uid: 2246 + - uid: 1456 components: - type: Transform - pos: 1.5,31.5 + pos: 17.5,47.5 parent: 1653 -- proto: RandomSpawner100 +- proto: RandomVending entities: - - uid: 1413 + - uid: 861 components: - type: Transform - pos: 21.5,43.5 + pos: 10.5,22.5 parent: 1653 - - uid: 1456 + - uid: 934 components: - type: Transform - pos: 17.5,47.5 + pos: 16.5,22.5 parent: 1653 - proto: ReinforcedUraniumWindow entities: @@ -11262,6 +11976,30 @@ entities: - type: Transform pos: 17.5,32.5 parent: 1653 +- proto: RemoteSignaller + entities: + - uid: 1628 + components: + - type: Transform + pos: 42.357162,12.70194 + parent: 1653 + - uid: 1629 + components: + - type: Transform + pos: 42.482162,12.85819 + parent: 1653 + - uid: 1630 + components: + - type: Transform + pos: 42.607162,12.70194 + parent: 1653 +- proto: SalvageCanisterSpawner + entities: + - uid: 802 + components: + - type: Transform + pos: 16.5,26.5 + parent: 1653 - proto: SalvageMaterialCrateSpawner entities: - uid: 2024 @@ -11269,6 +12007,13 @@ entities: - type: Transform pos: 34.5,27.5 parent: 1653 +- proto: Screwdriver + entities: + - uid: 727 + components: + - type: Transform + pos: 4.60394,27.528143 + parent: 1653 - proto: SeedExtractor entities: - uid: 810 @@ -11286,6 +12031,13 @@ entities: - type: Transform pos: 41.5,9.5 parent: 1653 +- proto: SeedExtractorMachineCircuitboard + entities: + - uid: 162 + components: + - type: Transform + pos: 22.515446,28.541763 + parent: 1653 - proto: ShardCrystalCyan entities: - uid: 119 @@ -11304,11 +12056,85 @@ entities: - type: Transform pos: 25.848734,36.330853 parent: 1653 + - uid: 1960 + components: + - type: Transform + pos: 24.499039,26.422136 + parent: 1653 - uid: 2082 components: - type: Transform pos: 32.498764,25.506607 parent: 1653 +- proto: ShardGlass + entities: + - uid: 535 + components: + - type: Transform + pos: 37.501663,39.608997 + parent: 1653 + - uid: 613 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 5.581089,35.48234 + parent: 1653 + - uid: 1195 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 22.508757,46.601135 + parent: 1653 +- proto: SheetGlass + entities: + - uid: 717 + components: + - type: Transform + pos: 6.41644,28.543768 + parent: 1653 + - uid: 832 + components: + - type: Transform + pos: 4.557065,24.528143 + parent: 1653 + - uid: 844 + components: + - type: Transform + pos: 53.377705,4.600436 + parent: 1653 +- proto: SheetPlasteel1 + entities: + - uid: 288 + components: + - type: Transform + pos: 1.4974408,26.422686 + parent: 1653 +- proto: SheetPlastic + entities: + - uid: 838 + components: + - type: Transform + pos: 10.278141,7.4876976 + parent: 1653 + - uid: 846 + components: + - type: Transform + pos: 6.3194933,22.541233 + parent: 1653 +- proto: SheetRGlass + entities: + - uid: 1112 + components: + - type: Transform + pos: 20.352413,24.551647 + parent: 1653 +- proto: SheetSteel1 + entities: + - uid: 839 + components: + - type: Transform + pos: 14.465876,24.425442 + parent: 1653 - proto: ShuttersWindow entities: - uid: 580 @@ -11385,1109 +12211,97 @@ entities: parent: 1653 - proto: SignRedOne entities: - - uid: 1249 - components: - - type: Transform - pos: 40.5,3.5 - parent: 1653 -- proto: SignRedThree - entities: - - uid: 1251 - components: - - type: Transform - pos: 48.5,3.5 - parent: 1653 -- proto: SignRedTwo - entities: - - uid: 1250 - components: - - type: Transform - pos: 40.5,1.5 - parent: 1653 -- proto: SignSecureMed - entities: - - uid: 1154 - components: - - type: Transform - pos: 10.5,13.5 - parent: 1653 -- proto: SignShock - entities: - - uid: 1155 - components: - - type: Transform - pos: 12.5,13.5 - parent: 1653 -- proto: SilverDoor - entities: - - uid: 985 - components: - - type: Transform - pos: 11.5,13.5 - parent: 1653 -- proto: SinkWide - entities: - - uid: 890 - components: - - type: Transform - pos: 1.5,20.5 - parent: 1653 - - uid: 891 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 2.5,19.5 - parent: 1653 - - uid: 960 - components: - - type: Transform - pos: 3.5,10.5 - parent: 1653 -- proto: SmartFridge - entities: - - uid: 1458 - components: - - type: Transform - pos: 23.5,4.5 - parent: 1653 -- proto: SMESBasic - entities: - - uid: 262 - components: - - type: Transform - pos: 26.5,20.5 - parent: 1653 - - uid: 539 - components: - - type: Transform - pos: 11.5,45.5 - parent: 1653 - - uid: 1485 - components: - - type: Transform - pos: 28.5,8.5 - parent: 1653 - - uid: 1486 - components: - - type: Transform - pos: 29.5,8.5 - parent: 1653 - - uid: 1487 - components: - - type: Transform - pos: 30.5,8.5 - parent: 1653 -- proto: SpawnDungeonClutterBeakerEmpty - entities: - - uid: 170 - components: - - type: Transform - pos: 22.578753,4.7105246 - parent: 1653 - - uid: 288 - components: - - type: Transform - pos: 20.735003,4.6323996 - parent: 1653 - - uid: 403 - components: - - type: Transform - pos: 22.487473,0.61677456 - parent: 1653 - - uid: 819 - components: - - type: Transform - pos: 21.313128,4.5855246 - parent: 1653 - - uid: 954 - components: - - type: Transform - pos: 22.235003,4.6167746 - parent: 1653 - - uid: 955 - components: - - type: Transform - pos: 22.000628,4.7261496 - parent: 1653 -- proto: SpawnDungeonLootBureaucracy - entities: - - uid: 81 - components: - - type: Transform - pos: 10.518263,32.310562 - parent: 1653 - - uid: 415 - components: - - type: Transform - pos: 24.568518,31.632536 - parent: 1653 - - uid: 452 - components: - - type: Transform - pos: 5.4328747,44.407043 - parent: 1653 - - uid: 455 - components: - - type: Transform - pos: 5.4484997,44.125793 - parent: 1653 - - uid: 456 - components: - - type: Transform - pos: 18.631018,32.398163 - parent: 1653 - - uid: 832 - components: - - type: Transform - pos: 5.3859997,43.57892 - parent: 1653 - - uid: 861 - components: - - type: Transform - pos: 30.753098,4.5073996 - parent: 1653 - - uid: 862 - components: - - type: Transform - pos: 14.480504,28.48407 - parent: 1653 - - uid: 868 - components: - - type: Transform - pos: 10.440138,32.544937 - parent: 1653 - - uid: 963 - components: - - type: Transform - pos: 36.49569,15.514067 - parent: 1653 - - uid: 1006 - components: - - type: Transform - pos: 4.3547497,43.57892 - parent: 1653 - - uid: 1049 - components: - - type: Transform - pos: 3.6516247,43.57892 - parent: 1653 - - uid: 1050 - components: - - type: Transform - pos: 1.4641247,45.688293 - parent: 1653 - - uid: 1078 - components: - - type: Transform - pos: 22.490393,30.64816 - parent: 1653 - - uid: 1112 - components: - - type: Transform - pos: 5.4797497,44.563293 - parent: 1653 - - uid: 1124 - components: - - type: Transform - pos: 35.480064,14.607817 - parent: 1653 - - uid: 1379 - components: - - type: Transform - pos: 1.4328747,46.594543 - parent: 1653 - - uid: 2064 - components: - - type: Transform - pos: 7.502638,30.513687 - parent: 1653 - - uid: 2217 - components: - - type: Transform - pos: 34.448814,15.514067 - parent: 1653 - - uid: 2218 - components: - - type: Transform - pos: 34.948814,15.498442 - parent: 1653 - - uid: 2224 - components: - - type: Transform - pos: 24.990393,31.67941 - parent: 1653 - - uid: 2229 - components: - - type: Transform - pos: 3.5109997,47.563293 - parent: 1653 -- proto: SpawnDungeonLootCanister - entities: - - uid: 584 - components: - - type: Transform - pos: 16.5,25.5 - parent: 1653 - - uid: 1473 - components: - - type: Transform - pos: 16.5,27.5 - parent: 1653 - - uid: 1476 - components: - - type: Transform - pos: 40.5,16.5 - parent: 1653 -- proto: SpawnDungeonLootChems - entities: - - uid: 1168 - components: - - type: Transform - pos: 32.206223,4.5230246 - parent: 1653 -- proto: SpawnDungeonLootCircuitBoard - entities: - - uid: 952 - components: - - type: Transform - pos: 4.503058,28.60907 - parent: 1653 - - uid: 1484 - components: - - type: Transform - pos: 2.6047497,47.563293 - parent: 1653 - - uid: 2025 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 22.448061,28.526066 - parent: 1653 - - uid: 2223 - components: - - type: Transform - pos: 6.581183,24.562195 - parent: 1653 -- proto: SpawnDungeonLootClutterEngi - entities: - - uid: 491 - components: - - type: Transform - pos: 4.737433,25.60907 - parent: 1653 - - uid: 512 - components: - - type: Transform - pos: 6.503058,25.67157 - parent: 1653 - - uid: 522 - components: - - type: Transform - pos: 4.503058,27.54657 - parent: 1653 - - uid: 531 - components: - - type: Transform - pos: 4.721808,27.780945 - parent: 1653 - - uid: 747 - components: - - type: Transform - pos: 6.471808,27.499695 - parent: 1653 - - uid: 948 - components: - - type: Transform - pos: 6.440558,25.499695 - parent: 1653 - - uid: 965 - components: - - type: Transform - pos: 42.636295,12.625773 - parent: 1653 - - uid: 966 - components: - - type: Transform - pos: 42.355045,12.735148 - parent: 1653 - - uid: 967 - components: - - type: Transform - pos: 42.480045,12.875773 - parent: 1653 - - uid: 1328 - components: - - type: Transform - pos: 4.487433,25.57782 - parent: 1653 -- proto: SpawnDungeonLootClutterHydroponics - entities: - - uid: 160 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 12.40123,24.586424 - parent: 1653 - - uid: 650 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 14.573105,24.664549 - parent: 1653 - - uid: 794 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 14.36998,24.602049 - parent: 1653 - - uid: 834 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 32.653194,28.13544 - parent: 1653 - - uid: 839 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 32.38757,28.557316 - parent: 1653 - - uid: 1192 - components: - - type: Transform - pos: 15.14456,32.052025 - parent: 1653 - - uid: 1703 - components: - - type: Transform - pos: 19.472685,30.69265 - parent: 1653 - - uid: 1878 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 5.4273477,45.6148 - parent: 1653 - - uid: 1951 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 32.403194,27.66669 - parent: 1653 - - uid: 2011 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 34.38934,38.48503 - parent: 1653 - - uid: 2116 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 12.65123,24.664549 - parent: 1653 - - uid: 2137 - components: - - type: Transform - pos: 39.424786,9.088586 - parent: 1653 - - uid: 2138 - components: - - type: Transform - pos: 19.969307,8.854211 - parent: 1653 - - uid: 2214 - components: - - type: Transform - pos: 35.28683,15.295544 - parent: 1653 - - uid: 2232 - components: - - type: Transform - pos: 42.617554,13.561169 - parent: 1653 - - uid: 2236 - components: - - type: Transform - pos: 20.1924,13.848073 - parent: 1653 - - uid: 2237 - components: - - type: Transform - pos: 33.63986,20.553396 - parent: 1653 - - uid: 2238 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 32.63757,28.744816 - parent: 1653 - - uid: 2249 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 1.8492227,47.380424 - parent: 1653 - - uid: 2250 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 1.6617227,46.08355 - parent: 1653 - - uid: 2255 - components: - - type: Transform - pos: 20.6022,48.52105 - parent: 1653 - - uid: 2256 - components: - - type: Transform - pos: 0.43621778,10.024246 - parent: 1653 - - uid: 2257 - components: - - type: Transform - pos: 1.2330928,10.617996 - parent: 1653 - - uid: 2258 - components: - - type: Transform - pos: 2.440703,7.2658243 - parent: 1653 - - uid: 2259 - components: - - type: Transform - pos: 7.830083,7.3908243 - parent: 1653 - - uid: 2261 - components: - - type: Transform - pos: 53.629864,15.631865 - parent: 1653 - - uid: 2262 - components: - - type: Transform - pos: 23.43045,2.4296584 - parent: 1653 - - uid: 2263 - components: - - type: Transform - pos: 30.352325,4.7421584 - parent: 1653 - - uid: 2264 - components: - - type: Transform - pos: 31.74295,0.9296584 - parent: 1653 -- proto: SpawnDungeonLootClutterKitchen - entities: - - uid: 838 - components: - - type: Transform - pos: 12.651115,2.5121582 - parent: 1653 - - uid: 844 - components: - - type: Transform - pos: 12.41674,2.6215332 - parent: 1653 -- proto: SpawnDungeonLootFood - entities: - - uid: 846 - components: - - type: Transform - pos: 41.456974,12.607817 - parent: 1653 - - uid: 953 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 0.5,9.5 - parent: 1653 - - uid: 1084 - components: - - type: Transform - pos: 20.377567,40.61003 - parent: 1653 - - uid: 1201 - components: - - type: Transform - pos: 10.576561,0.64632124 - parent: 1653 - - uid: 1205 - components: - - type: Transform - pos: 16.495552,18.596146 - parent: 1653 - - uid: 1220 - components: - - type: Transform - pos: 5.556635,4.5625 - parent: 1653 - - uid: 1257 - components: - - type: Transform - pos: 4.431635,2.609375 - parent: 1653 - - uid: 1277 - components: - - type: Transform - pos: 12.433053,22.58052 - parent: 1653 -- proto: SpawnDungeonLootKitchenTabletop - entities: - - uid: 797 - components: - - type: Transform - pos: 0.5,10.5 - parent: 1653 -- proto: SpawnDungeonLootLockersEngi - entities: - - uid: 727 - components: - - type: Transform - pos: 14.5,42.5 - parent: 1653 - - uid: 961 - components: - - type: Transform - pos: 31.5,9.5 - parent: 1653 - - uid: 962 - components: - - type: Transform - pos: 27.5,9.5 - parent: 1653 -- proto: SpawnDungeonLootLockersGeneral - entities: - - uid: 662 - components: - - type: Transform - pos: 52.5,0.5 - parent: 1653 - - uid: 663 - components: - - type: Transform - pos: 0.5,6.5 - parent: 1653 - - uid: 1470 - components: - - type: Transform - pos: 3.5,6.5 - parent: 1653 - - uid: 1471 - components: - - type: Transform - pos: 3.5,7.5 - parent: 1653 - - uid: 1636 - components: - - type: Transform - pos: 0.5,7.5 - parent: 1653 - - uid: 1647 - components: - - type: Transform - pos: 44.5,4.5 - parent: 1653 -- proto: SpawnDungeonLootLockersProtectiveGear - entities: - - uid: 613 - components: - - type: Transform - pos: 3.5,22.5 - parent: 1653 - - uid: 624 - components: - - type: Transform - pos: 1.5,40.5 - parent: 1653 - - uid: 642 - components: - - type: Transform - pos: 4.5,22.5 - parent: 1653 - - uid: 661 - components: - - type: Transform - pos: 53.5,0.5 - parent: 1653 - - uid: 717 - components: - - type: Transform - pos: 54.5,0.5 - parent: 1653 - - uid: 732 - components: - - type: Transform - pos: 34.5,28.5 - parent: 1653 -- proto: SpawnDungeonLootMaterialsBasicFull - entities: - - uid: 1382 - components: - - type: Transform - pos: 6.471808,28.42157 - parent: 1653 - - uid: 1383 - components: - - type: Transform - pos: 4.518683,24.687195 - parent: 1653 - - uid: 1384 - components: - - type: Transform - pos: 53.51587,4.5073996 - parent: 1653 - - uid: 1468 - components: - - type: Transform - pos: 6.4340506,22.54927 - parent: 1653 - - uid: 1948 - components: - - type: Transform - pos: 31.578455,8.515948 - parent: 1653 - - uid: 2219 - components: - - type: Transform - pos: 6.6371756,22.48677 - parent: 1653 - - uid: 2260 - components: - - type: Transform - pos: 27.429548,8.547074 - parent: 1653 -- proto: SpawnDungeonLootMaterialsBasicSingle - entities: - - uid: 490 - components: - - type: Transform - pos: 5.548265,35.51595 - parent: 1653 - - uid: 1127 - components: - - type: Transform - pos: 32.723152,40.43838 - parent: 1653 - - uid: 1380 - components: - - type: Transform - pos: 6.22014,35.594074 - parent: 1653 - - uid: 1381 - components: - - type: Transform - pos: 22.45877,46.61017 - parent: 1653 - - uid: 2228 - components: - - type: Transform - pos: 37.582527,40.15713 - parent: 1653 -- proto: SpawnDungeonLootMaterialsValuableFull - entities: - - uid: 964 - components: - - type: Transform - pos: 20.544882,34.653225 - parent: 1653 - - uid: 1424 - components: - - type: Transform - pos: 10.458364,7.5208054 - parent: 1653 - - uid: 1469 - components: - - type: Transform - pos: 20.59581,24.60907 - parent: 1653 - - uid: 2221 - components: - - type: Transform - pos: 1.3789663,26.343445 - parent: 1653 - - uid: 2222 - components: - - type: Transform - pos: 1.5977163,26.749695 - parent: 1653 -- proto: SpawnDungeonLootMaterialsValuableSingle - entities: - - uid: 1882 - components: - - type: Transform - pos: 49.337364,15.676198 - parent: 1653 - - uid: 1892 - components: - - type: Transform - pos: 49.54049,15.457448 - parent: 1653 -- proto: SpawnDungeonLootMugs - entities: - - uid: 800 - components: - - type: Transform - pos: 2.2211149,10.534292 - parent: 1653 - - uid: 802 - components: - - type: Transform - pos: 10.69799,4.7152834 - parent: 1653 - - uid: 803 - components: - - type: Transform - pos: 2.6586149,10.643667 - parent: 1653 - - uid: 806 - components: - - type: Transform - pos: 2.0023649,10.737417 - parent: 1653 - - uid: 814 - components: - - type: Transform - pos: 10.401115,4.5277834 - parent: 1653 - - uid: 817 - components: - - type: Transform - pos: 1.6586149,10.471792 - parent: 1653 - - uid: 982 - components: - - type: Transform - pos: 20.768192,40.688156 - parent: 1653 - - uid: 1088 - components: - - type: Transform - pos: 20.611942,40.469406 - parent: 1653 -- proto: SpawnDungeonLootPartsEngi - entities: - - uid: 1285 - components: - - type: Transform - pos: 40.448795,13.313273 - parent: 1653 - - uid: 1286 - components: - - type: Transform - pos: 40.417545,13.547648 - parent: 1653 - - uid: 1314 - components: - - type: Transform - pos: 40.58942,13.438273 - parent: 1653 - - uid: 1531 - components: - - type: Transform - pos: 40.62067,12.625773 - parent: 1653 - - uid: 1533 - components: - - type: Transform - pos: 40.43317,12.547648 - parent: 1653 - - uid: 1628 - components: - - type: Transform - pos: 40.480045,12.813273 - parent: 1653 -- proto: SpawnDungeonLootPowerCell - entities: - - uid: 1195 - components: - - type: Transform - pos: 12.357123,39.50088 - parent: 1653 - - uid: 1893 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 16.464323,24.536814 - parent: 1653 -- proto: SpawnDungeonLootSeed - entities: - - uid: 105 - components: - - type: Transform - pos: 1.511581,15.545317 - parent: 1653 - - uid: 110 - components: - - type: Transform - pos: 16.358246,8.875323 - parent: 1653 - - uid: 168 - components: - - type: Transform - pos: 16.65512,8.578448 - parent: 1653 - - uid: 171 - components: - - type: Transform - pos: 1.6289663,27.60907 - parent: 1653 - - uid: 466 - components: - - type: Transform - pos: 16.420746,9.578448 - parent: 1653 - - uid: 535 - components: - - type: Transform - pos: 4.3876133,18.64302 - parent: 1653 - - uid: 591 - components: - - type: Transform - pos: 16.71762,9.390948 - parent: 1653 - - uid: 792 - components: - - type: Transform - pos: 1.3789663,25.530945 - parent: 1653 - - uid: 899 - components: - - type: Transform - pos: 33.479237,20.569313 - parent: 1653 - - uid: 905 - components: - - type: Transform - pos: 16.40512,7.9846983 - parent: 1653 - - uid: 934 - components: - - type: Transform - pos: 42.505703,9.218622 - parent: 1653 - - uid: 994 - components: - - type: Transform - pos: 1.4258413,27.39032 - parent: 1653 - - uid: 1409 - components: - - type: Transform - pos: 1.6602163,25.718445 - parent: 1653 - - uid: 1632 - components: - - type: Transform - pos: 8.324282,35.59797 - parent: 1653 - - uid: 1842 - components: - - type: Transform - pos: 45.786953,7.218622 - parent: 1653 - - uid: 1959 - components: - - type: Transform - pos: 16.65512,7.7190733 - parent: 1653 - - uid: 1960 - components: - - type: Transform - pos: 19.37387,7.0940733 - parent: 1653 - - uid: 2220 - components: - - type: Transform - pos: 4.5907383,18.48677 - parent: 1653 -- proto: SpawnDungeonLootSpesos - entities: - - uid: 2141 - components: - - type: Transform - pos: 11.152621,14.732817 - parent: 1653 - - uid: 2216 - components: - - type: Transform - pos: 11.402621,14.560942 - parent: 1653 - - uid: 2225 - components: - - type: Transform - pos: 8.714907,35.53547 - parent: 1653 - - uid: 2226 - components: - - type: Transform - pos: 3.3711562,30.738594 - parent: 1653 - - uid: 2227 - components: - - type: Transform - pos: 3.5586562,30.59797 - parent: 1653 - - uid: 2230 - components: - - type: Transform - pos: 9.18618,25.491379 - parent: 1653 - - uid: 2231 - components: - - type: Transform - pos: 30.274536,25.974041 - parent: 1653 - - uid: 2233 - components: - - type: Transform - pos: 48.559433,4.345504 - parent: 1653 - - uid: 2234 - components: - - type: Transform - pos: 48.606308,4.579879 - parent: 1653 - - uid: 2235 - components: - - type: Transform - pos: 48.481308,4.626754 - parent: 1653 - - uid: 2239 - components: - - type: Transform - pos: 32.403194,28.10419 - parent: 1653 -- proto: SpawnDungeonLootToolsAdvancedEngineering - entities: - - uid: 785 - components: - - type: Transform - pos: 20.498007,36.5126 - parent: 1653 - - uid: 968 - components: - - type: Transform - pos: 28.449821,21.564896 - parent: 1653 - - uid: 1197 - components: - - type: Transform - pos: 27.465446,22.564896 - parent: 1653 -- proto: SpawnDungeonLootToolsBasicEngineering - entities: - - uid: 733 - components: - - type: Transform - pos: 10.509762,45.57892 - parent: 1653 - - uid: 776 - components: - - type: Transform - pos: 21.404257,36.559475 - parent: 1653 - - uid: 1840 - components: - - type: Transform - pos: 21.669882,36.4501 - parent: 1653 -- proto: SpawnDungeonLootToolsHydroponics - entities: - - uid: 824 - components: - - type: Transform - pos: 18.31137,9.562823 - parent: 1653 - - uid: 829 - components: - - type: Transform - pos: 18.608246,9.672198 - parent: 1653 - - uid: 900 - components: - - type: Transform - pos: 26.50313,26.29657 - parent: 1653 - - uid: 928 + - uid: 1249 components: - type: Transform - pos: 53.541756,38.679924 + pos: 40.5,3.5 parent: 1653 - - uid: 993 +- proto: SignRedThree + entities: + - uid: 1251 components: - type: Transform - pos: 37.505703,7.421747 + pos: 48.5,3.5 parent: 1653 - - uid: 1378 +- proto: SignRedTwo + entities: + - uid: 1250 components: - type: Transform - pos: 24.59688,27.35907 + pos: 40.5,1.5 parent: 1653 -- proto: SpawnDungeonVendomatsRecreational +- proto: SignSecureMed entities: - - uid: 463 + - uid: 1154 components: - type: Transform - pos: 7.5,35.5 + pos: 10.5,13.5 parent: 1653 - - uid: 1278 +- proto: SignShock + entities: + - uid: 1155 components: - type: Transform - pos: 16.5,22.5 + pos: 12.5,13.5 parent: 1653 - - uid: 1284 +- proto: SilverDoor + entities: + - uid: 985 components: - type: Transform - pos: 10.5,22.5 + pos: 11.5,13.5 parent: 1653 - - uid: 1629 +- proto: SinkWide + entities: + - uid: 890 components: - type: Transform - pos: 10.5,18.5 + pos: 1.5,20.5 parent: 1653 - - uid: 1630 + - uid: 891 components: - type: Transform - pos: 38.5,4.5 + rot: -1.5707963267948966 rad + pos: 2.5,19.5 parent: 1653 - - uid: 1631 + - uid: 960 components: - type: Transform - pos: 29.5,38.5 + pos: 3.5,10.5 parent: 1653 - - uid: 1633 +- proto: SmartFridge + entities: + - uid: 1458 components: - type: Transform - pos: 8.5,10.5 + pos: 23.5,4.5 parent: 1653 - - uid: 1634 +- proto: SMESBasic + entities: + - uid: 262 components: - type: Transform - pos: 37.5,4.5 + pos: 26.5,20.5 parent: 1653 - - uid: 1635 + - uid: 539 components: - type: Transform - pos: 7.5,10.5 + pos: 11.5,45.5 parent: 1653 - - uid: 1699 + - uid: 1485 components: - type: Transform - pos: 11.5,4.5 + pos: 28.5,8.5 parent: 1653 - - uid: 1707 + - uid: 1486 components: - type: Transform - pos: 21.5,40.5 + pos: 29.5,8.5 parent: 1653 - - uid: 1714 + - uid: 1487 components: - type: Transform - pos: 9.5,10.5 + pos: 30.5,8.5 parent: 1653 - proto: SteelBench entities: @@ -12535,18 +12349,6 @@ entities: rot: -1.5707963267948966 rad pos: 9.5,35.5 parent: 1653 - - uid: 669 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 5.4790325,7.6301804 - parent: 1653 - - uid: 686 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 5.4634075,6.6145554 - parent: 1653 - uid: 787 components: - type: Transform @@ -12594,6 +12396,18 @@ entities: rot: -1.5707963267948966 rad pos: 2.5,6.5 parent: 1653 + - uid: 952 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 3.5,6.5 + parent: 1653 + - uid: 953 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 3.5,7.5 + parent: 1653 - uid: 1269 components: - type: Transform @@ -12624,6 +12438,18 @@ entities: rot: -1.5707963267948966 rad pos: 30.5,28.5 parent: 1653 +- proto: StorageCanister + entities: + - uid: 803 + components: + - type: Transform + pos: 16.5,27.5 + parent: 1653 + - uid: 1647 + components: + - type: Transform + pos: 40.5,16.5 + parent: 1653 - proto: SubstationBasic entities: - uid: 559 @@ -12643,6 +12469,13 @@ entities: - type: Transform pos: 29.5,9.5 parent: 1653 +- proto: SurveillanceWirelessCameraAnchoredCircuitboard + entities: + - uid: 1197 + components: + - type: Transform + pos: 2.4925566,47.576256 + parent: 1653 - proto: Table entities: - uid: 145 @@ -12705,10 +12538,10 @@ entities: - type: Transform pos: 37.5,40.5 parent: 1653 - - uid: 530 + - uid: 526 components: - type: Transform - pos: 32.5,28.5 + pos: 35.5,38.5 parent: 1653 - uid: 589 components: @@ -12880,11 +12713,10 @@ entities: - type: Transform pos: 25.5,13.5 parent: 1653 - - uid: 2023 + - uid: 2025 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 34.5,38.5 + pos: 32.5,26.5 parent: 1653 - uid: 2026 components: @@ -12917,6 +12749,11 @@ entities: rot: 3.141592653589793 rad pos: 4.5,43.5 parent: 1653 + - uid: 868 + components: + - type: Transform + pos: 6.5,30.5 + parent: 1653 - uid: 969 components: - type: Transform @@ -13221,6 +13058,23 @@ entities: rot: 1.5707963267948966 rad pos: 45.5,1.5 parent: 1653 +- proto: TimerTrigger + entities: + - uid: 1631 + components: + - type: Transform + pos: 40.404037,12.592565 + parent: 1653 + - uid: 1632 + components: + - type: Transform + pos: 40.575912,12.73319 + parent: 1653 + - uid: 1633 + components: + - type: Transform + pos: 40.654037,12.48319 + parent: 1653 - proto: ToiletEmpty entities: - uid: 889 @@ -13236,10 +13090,10 @@ entities: - type: Transform pos: 0.5,18.5 parent: 1653 - - uid: 1880 + - uid: 1084 components: - type: Transform - pos: 10.31355,27.742674 + pos: 8.512666,27.639019 parent: 1653 - uid: 2028 components: @@ -13344,6 +13198,49 @@ entities: rot: 3.141592653589793 rad pos: 44.5,13.5 parent: 1653 +- proto: VendingMachineCigs + entities: + - uid: 928 + components: + - type: Transform + pos: 10.5,18.5 + parent: 1653 + - uid: 1278 + components: + - type: Transform + pos: 37.5,4.5 + parent: 1653 +- proto: VendingMachineCoffee + entities: + - uid: 522 + components: + - type: Transform + pos: 29.5,38.5 + parent: 1653 + - uid: 642 + components: + - type: Transform + pos: 7.5,35.5 + parent: 1653 + - uid: 968 + components: + - type: Transform + pos: 8.5,10.5 + parent: 1653 +- proto: VendingMachineCola + entities: + - uid: 1277 + components: + - type: Transform + pos: 38.5,4.5 + parent: 1653 +- proto: VendingMachineHydrobe + entities: + - uid: 1409 + components: + - type: Transform + pos: 9.5,10.5 + parent: 1653 - proto: VendingMachineWinter entities: - uid: 1329 @@ -13782,12 +13679,6 @@ entities: rot: 1.5707963267948966 rad pos: 13.5,13.5 parent: 1653 - - uid: 849 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 5.5,30.5 - parent: 1653 - uid: 1330 components: - type: Transform @@ -14057,6 +13948,11 @@ entities: rot: -1.5707963267948966 rad pos: 47.5,4.5 parent: 1653 + - uid: 1703 + components: + - type: Transform + pos: 6.5,32.5 + parent: 1653 - uid: 1704 components: - type: Transform @@ -14099,11 +13995,21 @@ entities: - type: Transform pos: 16.5,32.5 parent: 1653 + - uid: 834 + components: + - type: Transform + pos: 14.5,26.5 + parent: 1653 - uid: 835 components: - type: Transform pos: 14.5,27.5 parent: 1653 + - uid: 1168 + components: + - type: Transform + pos: 5.5,6.5 + parent: 1653 - uid: 2007 components: - type: Transform @@ -14114,6 +14020,30 @@ entities: - type: Transform pos: 30.5,27.5 parent: 1653 +- proto: WardrobeMixedFilled + entities: + - uid: 1257 + components: + - type: Transform + pos: 44.5,4.5 + parent: 1653 +- proto: WaterCooler + entities: + - uid: 463 + components: + - type: Transform + pos: 11.5,4.5 + parent: 1653 + - uid: 512 + components: + - type: Transform + pos: 21.5,40.5 + parent: 1653 + - uid: 967 + components: + - type: Transform + pos: 7.5,10.5 + parent: 1653 - proto: WaterTankFull entities: - uid: 1372 @@ -14138,6 +14068,13 @@ entities: - type: Transform pos: 19.5,15.5 parent: 1653 +- proto: Welder + entities: + - uid: 663 + components: + - type: Transform + pos: 20.605528,36.564884 + parent: 1653 - proto: WeldingFuelTankFull entities: - uid: 881 @@ -14230,29 +14167,6 @@ entities: rot: 3.141592653589793 rad pos: 29.5,27.5 parent: 1653 - - uid: 2251 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 5.5,44.5 - parent: 1653 - - uid: 2252 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 2.5,47.5 - parent: 1653 - - uid: 2253 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 1.5,46.5 - parent: 1653 - - uid: 2254 - components: - - type: Transform - pos: 4.5,43.5 - parent: 1653 - proto: WindoorSecure entities: - uid: 691 @@ -14425,18 +14339,6 @@ entities: - type: Transform pos: 2.5,8.5 parent: 1653 - - uid: 1998 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 2.5,7.5 - parent: 1653 - - uid: 1999 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 2.5,6.5 - parent: 1653 - proto: WindowReinforcedDirectional entities: - uid: 76 diff --git a/Resources/Maps/_NF/Bluespace/bloodmoon.yml b/Resources/Maps/_NF/Bluespace/bloodmoon.yml index c7c93ca0579..c801fdfb124 100644 --- a/Resources/Maps/_NF/Bluespace/bloodmoon.yml +++ b/Resources/Maps/_NF/Bluespace/bloodmoon.yml @@ -1089,8 +1089,6 @@ entities: - type: Transform pos: 11.5,-7.5 parent: 1 - - type: Physics - bodyType: Static - proto: BenchSofaRight entities: - uid: 1079 @@ -1098,8 +1096,6 @@ entities: - type: Transform pos: 10.5,-7.5 parent: 1 - - type: Physics - bodyType: Static - proto: BloodCollector entities: - uid: 1137 @@ -6042,6 +6038,13 @@ entities: rot: 1.5707963267948966 rad pos: 18.5,-11.5 parent: 1 +- proto: SpawnMobCatBloodCult + entities: + - uid: 351 + components: + - type: Transform + pos: 17.5,13.5 + parent: 1 - proto: StructureMeleeWeaponRackBloodCultFilled entities: - uid: 470 diff --git a/Resources/Maps/_NF/Dungeon/cave_factory.yml b/Resources/Maps/_NF/Dungeon/cave_factory.yml index f34864da2f8..f690b4d4c49 100644 --- a/Resources/Maps/_NF/Dungeon/cave_factory.yml +++ b/Resources/Maps/_NF/Dungeon/cave_factory.yml @@ -9289,12 +9289,6 @@ entities: - type: Transform pos: 25.5,47.5 parent: 1 -- proto: MaterialDiamond1 - entities: - - uid: 551 - components: - - type: Transform - parent: 550 - proto: MedicalBed entities: - uid: 1141 @@ -10834,7 +10828,7 @@ entities: - type: Transform pos: 1.5,48.5 parent: 1 -- proto: RandomItem +- proto: SalvageSpawnerTreasure entities: - uid: 347 components: @@ -11132,13 +11126,6 @@ entities: - type: Transform pos: 26.5,32.5 parent: 1 -- proto: SchoolgirlUniformSpawner - entities: - - uid: 548 - components: - - type: Transform - pos: 14.5,34.5 - parent: 1 - proto: ShardGlass entities: - uid: 878 diff --git a/Resources/Maps/_NF/Dungeon/experiment.yml b/Resources/Maps/_NF/Dungeon/experiment.yml index 1f0dab53279..6777e8041f6 100644 --- a/Resources/Maps/_NF/Dungeon/experiment.yml +++ b/Resources/Maps/_NF/Dungeon/experiment.yml @@ -7876,7 +7876,7 @@ entities: - type: Transform pos: 48.5,0.5 parent: 1653 -- proto: RandomItem +- proto: SalvageSpawnerTreasure entities: - uid: 1654 components: diff --git a/Resources/Maps/_NF/Dungeon/haunted.yml b/Resources/Maps/_NF/Dungeon/haunted.yml index 58a7a32b80d..4515b19ee5c 100644 --- a/Resources/Maps/_NF/Dungeon/haunted.yml +++ b/Resources/Maps/_NF/Dungeon/haunted.yml @@ -1518,7 +1518,7 @@ entities: - type: Transform pos: 13.526197,27.541958 parent: 1653 -- proto: PortableGeneratorJrPacman +- proto: PortableGeneratorJrPacmanShuttle entities: - uid: 392 components: diff --git a/Resources/Maps/_NF/Dungeon/snowy_labs.yml b/Resources/Maps/_NF/Dungeon/snowy_labs.yml index 95f6e1ef71f..bfb3b4f561d 100644 --- a/Resources/Maps/_NF/Dungeon/snowy_labs.yml +++ b/Resources/Maps/_NF/Dungeon/snowy_labs.yml @@ -11052,6 +11052,23 @@ entities: - type: Transform pos: 17.5,32.5 parent: 1653 +- proto: SalvageCanisterSpawner + entities: + - uid: 584 + components: + - type: Transform + pos: 16.5,25.5 + parent: 1653 + - uid: 1473 + components: + - type: Transform + pos: 16.5,27.5 + parent: 1653 + - uid: 1476 + components: + - type: Transform + pos: 40.5,16.5 + parent: 1653 - proto: SeedExtractor entities: - uid: 810 @@ -11436,23 +11453,6 @@ entities: - type: Transform pos: 3.5109997,47.563293 parent: 1653 -- proto: SpawnDungeonLootCanister - entities: - - uid: 584 - components: - - type: Transform - pos: 16.5,25.5 - parent: 1653 - - uid: 1473 - components: - - type: Transform - pos: 16.5,27.5 - parent: 1653 - - uid: 1476 - components: - - type: Transform - pos: 40.5,16.5 - parent: 1653 - proto: SpawnDungeonLootChems entities: - uid: 1168 diff --git a/Resources/Maps/_NF/Dungeon/virology_lab.yml b/Resources/Maps/_NF/Dungeon/virology_lab.yml index 7d4b57834cd..1ae768b8422 100644 --- a/Resources/Maps/_NF/Dungeon/virology_lab.yml +++ b/Resources/Maps/_NF/Dungeon/virology_lab.yml @@ -9087,7 +9087,7 @@ entities: - type: Transform pos: 50.5,4.5 parent: 1653 -- proto: RandomItem +- proto: SalvageSpawnerTreasure entities: - uid: 1654 components: diff --git a/Resources/Maps/_NF/Dungeon/wreck.yml b/Resources/Maps/_NF/Dungeon/wreck.yml new file mode 100644 index 00000000000..409d7537309 --- /dev/null +++ b/Resources/Maps/_NF/Dungeon/wreck.yml @@ -0,0 +1,1915 @@ +meta: + format: 6 + postmapinit: false +tilemap: + 0: Space + 2: FloorAsteroidSand + 6: FloorAsteroidSandUnvariantized + 5: FloorAsteroidTile + 10: FloorAstroGrass + 8: FloorBrokenWood + 11: FloorRGlass + 82: FloorShuttleOrange + 1: FloorShuttlePurple + 89: FloorSteel + 9: FloorSteelDamaged + 7: FloorWood + 3: Plating + 4: PlatingAsteroid +entities: +- proto: "" + entities: + - uid: 1 + components: + - type: MetaData + - type: Transform + - type: Map + mapPaused: True + - type: PhysicsMap + - type: GridTree + - type: MovedGrids + - type: Broadphase + - type: OccluderTree + - type: MapGrid + chunks: + -1,-1: + ind: -1,-1 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAA + version: 6 + 0,0: + ind: 0,0 + tiles: UgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAQAAAAADUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAQAAAAADUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAACAAAAAAEBwAAAAABCAAAAAABBwAAAAADAQAAAAADUgAAAAAAWQAAAAACWQAAAAADWQAAAAABUgAAAAAAAQAAAAACWQAAAAACWQAAAAADWQAAAAABWQAAAAABUgAAAAAACAAAAAABBwAAAAABBwAAAAACBwAAAAABAQAAAAADUgAAAAAAWQAAAAACWQAAAAADAwAAAAAAUgAAAAAAAQAAAAAAWQAAAAABAwAAAAAAWQAAAAADAwAAAAAAUgAAAAAABwAAAAADBwAAAAAABwAAAAABCAAAAAAFAQAAAAADUgAAAAAAWQAAAAACAwAAAAAAAwAAAAAAUgAAAAAAAQAAAAAAWQAAAAABWQAAAAABAwAAAAAAAwAAAAAAUgAAAAAABwAAAAADCAAAAAABBwAAAAACCAAAAAAAAQAAAAADUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAQAAAAADUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAQAAAAADAQAAAAACAQAAAAADAQAAAAACAQAAAAACAQAAAAACAQAAAAADAQAAAAADAQAAAAACAQAAAAABAQAAAAAAAQAAAAABAQAAAAABAQAAAAABAQAAAAADAQAAAAABUgAAAAAAAwAAAAAAAwAAAAAACQAAAAAAAwAAAAAAAQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAQAAAAABUgAAAAAAWQAAAAAAWQAAAAACWQAAAAADUgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAACQAAAAAAAQAAAAADAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAQAAAAACWQAAAAACWQAAAAABWQAAAAACWQAAAAACUgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAQAAAAACAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAUgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAWQAAAAACAQAAAAADAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAQAAAAABWQAAAAABWQAAAAADWQAAAAAAWQAAAAAAUgAAAAAAUgAAAAAAAwAAAAAAWQAAAAACWQAAAAABAQAAAAABAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAQAAAAABUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAQAAAAADAQAAAAACAQAAAAAAAQAAAAABAQAAAAADAQAAAAACAQAAAAADAQAAAAABAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAADAQAAAAABAQAAAAAAAQAAAAABUgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAQAAAAACUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAQAAAAABUgAAAAAAAwAAAAAAWQAAAAABWQAAAAACAwAAAAAAAwAAAAAAWQAAAAAAWQAAAAACAwAAAAAAAQAAAAADWQAAAAABWQAAAAABWQAAAAABAwAAAAAAUgAAAAAAAQAAAAACWQAAAAACAwAAAAAAAwAAAAAAWQAAAAACAwAAAAAAAwAAAAAAWQAAAAAAAwAAAAAAAwAAAAAAAQAAAAAAWQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAUgAAAAAAAQAAAAACWQAAAAAAWQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAWQAAAAADAwAAAAAAWQAAAAAAAwAAAAAAAQAAAAADAwAAAAAAWQAAAAAAWQAAAAADWQAAAAADUgAAAAAAAQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAA + version: 6 + 0,1: + ind: 0,1 + tiles: UgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAUgAAAAAAAQAAAAABUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAQAAAAACUgAAAAAAWQAAAAADAwAAAAAAWQAAAAACAQAAAAADAQAAAAABAQAAAAACAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAACAQAAAAABAQAAAAAAAQAAAAADAQAAAAADAQAAAAADAQAAAAABAQAAAAAAAQAAAAABUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAQAAAAAAUgAAAAAAWQAAAAACAwAAAAAAAwAAAAAAUgAAAAAAAQAAAAACUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAwAAAAAAWQAAAAABWQAAAAABUgAAAAAAAQAAAAAAUgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAUgAAAAAAAQAAAAADUgAAAAAAWQAAAAAAWQAAAAABAwAAAAAAUgAAAAAAAwAAAAAAWQAAAAADAwAAAAAAUgAAAAAAAQAAAAACUgAAAAAAAwAAAAAAWQAAAAADWQAAAAADUgAAAAAAAQAAAAAAUgAAAAAAWQAAAAADWQAAAAABWQAAAAAAUgAAAAAAAwAAAAAAAwAAAAAAWQAAAAAAUgAAAAAAAQAAAAADUgAAAAAAAwAAAAAAWQAAAAAAAwAAAAAAUgAAAAAAAQAAAAADUgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAUgAAAAAAAwAAAAAAAwAAAAAAWQAAAAABUgAAAAAAAQAAAAACUgAAAAAAAwAAAAAAWQAAAAACWQAAAAABUgAAAAAAAQAAAAABUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAQAAAAADAQAAAAAAAQAAAAABAQAAAAAAAQAAAAACAQAAAAAAAQAAAAAAAQAAAAACAQAAAAADAQAAAAACAQAAAAAAAQAAAAABAQAAAAAAAQAAAAABAQAAAAACAQAAAAADUgAAAAAAAwAAAAAAAwAAAAAAWQAAAAADUgAAAAAAAQAAAAACUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAQAAAAADUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAWQAAAAACWQAAAAABWQAAAAABUgAAAAAAAQAAAAABUgAAAAAAUgAAAAAACwAAAAAAUgAAAAAAUgAAAAAAAQAAAAAAUgAAAAAAAwAAAAAAWQAAAAACAwAAAAAAUgAAAAAAWQAAAAACWQAAAAAAAwAAAAAAUgAAAAAAAQAAAAADUgAAAAAACwAAAAAACwAAAAADCwAAAAAAUgAAAAAAAQAAAAABUgAAAAAAWQAAAAADWQAAAAACAwAAAAAAUgAAAAAAAwAAAAAAWQAAAAABWQAAAAAAUgAAAAAAAQAAAAAAUgAAAAAAUgAAAAAACwAAAAAAUgAAAAAAUgAAAAAAAQAAAAADUgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAQAAAAADUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAQAAAAABUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAQAAAAADAQAAAAACAQAAAAABAQAAAAAAAQAAAAACAQAAAAADAQAAAAAAAQAAAAABAQAAAAABAQAAAAAAAQAAAAAAAQAAAAACAQAAAAADAQAAAAACAQAAAAAAAQAAAAACAQAAAAAAAQAAAAADAQAAAAACAQAAAAAAAQAAAAACAQAAAAADAQAAAAADAQAAAAADAQAAAAABAQAAAAACAQAAAAAAAQAAAAAAAQAAAAACAQAAAAAAAQAAAAABAQAAAAABAQAAAAADAQAAAAABAQAAAAAAAQAAAAABAQAAAAABAQAAAAABAQAAAAADAQAAAAABAQAAAAABAQAAAAAAAQAAAAADAQAAAAAAAQAAAAACAQAAAAABAQAAAAADAQAAAAAC + version: 6 + 0,-1: + ind: 0,-1 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAADAQAAAAABAQAAAAAAAQAAAAACAQAAAAAAAQAAAAADAQAAAAABAQAAAAACAQAAAAACAQAAAAACAQAAAAABAQAAAAABAQAAAAADAQAAAAACAQAAAAACAQAAAAAD + version: 6 + -1,0: + ind: -1,0 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAA + version: 6 + -1,1: + ind: -1,1 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAD + version: 6 + 1,-1: + ind: 1,-1 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAADAQAAAAACAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAABAQAAAAABAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + 1,0: + ind: 1,0 + tiles: UgAAAAAAAQAAAAABUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAQAAAAABUgAAAAAAWQAAAAACWQAAAAADWQAAAAADWQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAQAAAAACUgAAAAAAWQAAAAADAwAAAAAAWQAAAAABWQAAAAADAQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAQAAAAAAUgAAAAAAAwAAAAAAAwAAAAAAWQAAAAADAwAAAAAAAQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAQAAAAAAUgAAAAAAWQAAAAAAAwAAAAAAWQAAAAACAwAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAACAQAAAAADAQAAAAAAAQAAAAAAAQAAAAABAQAAAAADAQAAAAADAQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAAQAAAAADUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAAQAAAAACUgAAAAAAAwAAAAAAWQAAAAABAwAAAAAAUgAAAAAAAQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAQAAAAADUgAAAAAAWQAAAAABWQAAAAACAwAAAAAAUgAAAAAAAQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAADAQAAAAACUgAAAAAAWQAAAAAAAwAAAAAAAwAAAAAAUgAAAAAAAQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAQAAAAACUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAADAQAAAAACAQAAAAABAQAAAAAAAQAAAAABAQAAAAADAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAQAAAAABUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAQAAAAADUgAAAAAAWQAAAAACAwAAAAAAWQAAAAAAWQAAAAACAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAQAAAAAAUgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAWQAAAAACAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAQAAAAABUgAAAAAAWQAAAAADAwAAAAAAAwAAAAAAAwAAAAAAAQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + 1,1: + ind: 1,1 + tiles: UgAAAAAAAQAAAAABUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAABAQAAAAAAAQAAAAADAQAAAAACAQAAAAACAQAAAAABAQAAAAABAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAQAAAAACUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAQAAAAABUgAAAAAAAwAAAAAAWQAAAAAAWQAAAAACUgAAAAAAAQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAQAAAAACUgAAAAAAWQAAAAAAWQAAAAACWQAAAAADUgAAAAAAAQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAQAAAAACUgAAAAAAAwAAAAAAWQAAAAADAwAAAAAAUgAAAAAAAQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAQAAAAABUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAADAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAACAQAAAAADAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAQAAAAABUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAAQAAAAABUgAAAAAAAwAAAAAAWQAAAAACWQAAAAADUgAAAAAAAQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAQAAAAAAUgAAAAAAWQAAAAABWQAAAAABWQAAAAACUgAAAAAAAQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAQAAAAABUgAAAAAAAwAAAAAAWQAAAAACAwAAAAAAUgAAAAAAAQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAADAQAAAAAAAQAAAAABAQAAAAACAQAAAAAAAQAAAAADAQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAADAQAAAAADAQAAAAABAQAAAAADAQAAAAADAQAAAAABAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAABAQAAAAAAAQAAAAACAQAAAAAAAQAAAAADAQAAAAAAAQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + -1,2: + ind: -1,2 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + 0,2: + ind: 0,2 + tiles: AQAAAAABAQAAAAAAAQAAAAADAQAAAAABAQAAAAAAAQAAAAAAAQAAAAACAQAAAAACAQAAAAACAQAAAAACAQAAAAAAAQAAAAACAQAAAAABAQAAAAABAQAAAAACAQAAAAADAQAAAAACAQAAAAAAAQAAAAADAQAAAAABAQAAAAADAQAAAAABAQAAAAABAQAAAAACAQAAAAACAQAAAAADAQAAAAACAQAAAAAAAQAAAAABAQAAAAACAQAAAAACAQAAAAADAQAAAAADAQAAAAACAQAAAAABAQAAAAACAQAAAAACAQAAAAADAQAAAAACAQAAAAAAAQAAAAAAAQAAAAADAQAAAAACAQAAAAABAQAAAAACAQAAAAAAAQAAAAABAQAAAAADAQAAAAAAAQAAAAACAQAAAAADAQAAAAADAQAAAAADAQAAAAABAQAAAAACAQAAAAACAQAAAAACAQAAAAADAQAAAAAAAQAAAAADAQAAAAABAQAAAAACAQAAAAACAQAAAAAAAQAAAAADAQAAAAADAQAAAAADAQAAAAABAQAAAAABAQAAAAAAAQAAAAACAQAAAAAAAQAAAAADAQAAAAACAQAAAAAAAQAAAAACAQAAAAAAAQAAAAAAAQAAAAABAQAAAAADAQAAAAABAQAAAAABAQAAAAAAAQAAAAADAQAAAAABAQAAAAADAQAAAAABAQAAAAABAQAAAAABAQAAAAACAQAAAAAAAQAAAAAAAQAAAAACAQAAAAADAQAAAAADAQAAAAABAQAAAAACAQAAAAACAQAAAAACAQAAAAABAQAAAAAAAQAAAAADAQAAAAADAQAAAAABAQAAAAAAAQAAAAADAQAAAAABAQAAAAADAQAAAAAAAQAAAAACAQAAAAAAAQAAAAAAAQAAAAABAQAAAAACAQAAAAADAQAAAAACAQAAAAAAAQAAAAADAQAAAAADAQAAAAACAQAAAAADAQAAAAAAAQAAAAABAQAAAAAAAQAAAAAAAQAAAAADAQAAAAADAQAAAAABAQAAAAAAAQAAAAADAQAAAAABAQAAAAAAAQAAAAADAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAADAQAAAAABAQAAAAACAQAAAAAAAQAAAAABAQAAAAACAQAAAAADAQAAAAABAQAAAAADAQAAAAACAQAAAAABAQAAAAADAQAAAAABAQAAAAADAQAAAAABAQAAAAACAQAAAAAAAQAAAAABAQAAAAADAQAAAAAAAQAAAAABAQAAAAAAAQAAAAACAQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + 1,2: + ind: 1,2 + tiles: AQAAAAACAQAAAAACAQAAAAACAQAAAAAAAQAAAAADAQAAAAABAQAAAAADAQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAABAQAAAAADAQAAAAABAQAAAAACAQAAAAAAAQAAAAABAQAAAAAAAQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAABAQAAAAACAQAAAAAAAQAAAAABAQAAAAACAQAAAAACAQAAAAACAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAABAQAAAAABAQAAAAABAQAAAAACAQAAAAAAAQAAAAAAAQAAAAACAQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAACAQAAAAAAAQAAAAADAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAADAQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAACAQAAAAAAAQAAAAADAQAAAAADAQAAAAACAQAAAAAAAQAAAAAAAQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAACAQAAAAABAQAAAAABAQAAAAADAQAAAAADAQAAAAAAAQAAAAACAQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAABAQAAAAADAQAAAAABAQAAAAABAQAAAAAAAQAAAAADAQAAAAABAQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAABAQAAAAACAQAAAAAAAQAAAAADAQAAAAADAQAAAAABAQAAAAADAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAADAQAAAAAAAQAAAAADAQAAAAADAQAAAAAAAQAAAAABAQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + - type: Gravity + gravityShakeSound: !type:SoundPathSpecifier + path: /Audio/Effects/alert.ogg + - type: DecalGrid + chunkCollection: + version: 2 + nodes: + - node: + cleanable: True + color: '#00D4D4FF' + id: Blasto + decals: + 447: 15.750851,6.288084 + - node: + color: '#FFFFFFFF' + id: Bot + decals: + 219: 1,15 + 221: 15,9 + 222: 14,9 + 223: 13,9 + 806: 3,21 + 807: 1,26 + 808: 19,20 + 809: 7,3 + - node: + cleanable: True + color: '#FF5F00FF' + id: Clandestine + decals: + 564: 6,13 + - node: + cleanable: True + color: '#FFFFFF6D' + id: Dirt + decals: + 38: 2,1 + - node: + cleanable: True + color: '#FFFFFFFF' + id: Dirt + decals: + 26: 3,8 + 153: 19,7 + 183: 9,6 + 184: 6,8 + 185: 8,10 + 186: 10,9 + 188: 7,8 + 214: 0,13 + 215: 2,12 + 216: 2,15 + 217: 4,15 + 218: 2,16 + 268: 7,2 + 271: 13,6 + 272: 16,8 + 339: 22,4 + 349: 15,2 + 350: 13,3 + 379: 20,2 + 381: 14,15 + 469: 15,14 + 569: 9,7 + 573: 8,13 + 574: 6,14 + 606: 20,20 + 652: 8,20 + 654: 9,18 + 660: 2,24 + 661: 2,26 + 662: 3,27 + 664: 3,21 + 666: 3,19 + 669: 15,25 + 670: 13,25 + 673: 21,25 + 674: 20,26 + - node: + cleanable: True + color: '#FFFFFFFF' + id: DirtHeavy + decals: + 129: 19,7 + 159: 7,9 + 169: 7,7 + 170: 8,8 + 171: 9,9 + 172: 10,10 + 173: 9,10 + 174: 8,10 + 175: 10,9 + 176: 10,8 + 177: 10,6 + 178: 8,6 + 179: 7,6 + 180: 6,6 + 181: 6,7 + 182: 6,8 + 191: 1,13 + 192: 0,13 + 193: 0,14 + 194: 1,14 + 195: 2,14 + 196: 2,13 + 197: 2,12 + 198: 3,12 + 199: 3,13 + 200: 4,12 + 201: 4,13 + 202: 4,14 + 203: 3,14 + 205: 4,15 + 208: 2,15 + 209: 2,16 + 210: 1,16 + 211: 1,15 + 212: 0,15 + 225: 7,1 + 229: 8,1 + 256: 13,3 + 258: 13,2 + 277: 16,6 + 278: 15,6 + 279: 15,9 + 281: 12,9 + 296: 13,1 + 298: 21,14 + 299: 19,13 + 301: 19,15 + 311: 22,15 + 318: 19,1 + 319: 19,2 + 322: 22,4 + 355: 14,15 + 356: 13,15 + 461: 14,16 + 462: 12,15 + 464: 15,13 + 465: 14,13 + 466: 15,15 + 467: 14,14 + 468: 15,14 + 488: 12,1 + 489: 12,3 + 490: 22,1 + 491: 22,2 + 492: 21,4 + 493: 19,4 + 498: 16,7 + 499: 14,7 + 506: 22,13 + 511: 15,16 + 513: 7,15 + 514: 6,13 + 524: 8,13 + 525: 7,13 + 527: 12,14 + 528: 12,13 + 529: 15,12 + 530: 14,12 + 567: 9,7 + 568: 8,7 + 570: 21,2 + 571: 21,1 + 572: 6,15 + 581: 19,20 + 582: 20,21 + 584: 21,21 + 585: 20,19 + 586: 21,20 + 634: 13,20 + 648: 14,21 + 679: 14,25 + 680: 13,25 + 684: 16,26 + 702: 20,25 + 703: 19,27 + 711: 21,26 + 728: 7,22 + 731: 7,26 + 754: 20,26 + 756: 2,25 + 757: 3,27 + 785: 2,20 + 786: 3,20 + 787: 2,19 + 788: 3,21 + 789: 3,19 + 805: 3,15 + - node: + cleanable: True + color: '#FFFFFFFF' + id: DirtLight + decals: + 17: 4,7 + 18: 4,7 + 19: 4,7 + 23: 3,6 + 24: 2,10 + 25: 2,10 + 144: 20,9 + 145: 21,8 + 148: 21,9 + 168: 6,10 + 232: 9,3 + 241: 7,3 + 243: 7,2 + 244: 8,2 + 245: 9,1 + 248: 3,16 + 291: 16,8 + 293: 13,6 + 294: 14,2 + 295: 14,1 + 336: 20,3 + 337: 20,4 + 518: 7,13 + 519: 6,14 + 520: 8,15 + 521: 9,15 + 551: 3,10 + 552: 4,10 + 553: 4,9 + 554: 12,7 + 559: 21,3 + 562: 22,14 + 565: 2,6 + 566: 8,14 + 624: 8,22 + 625: 9,20 + 626: 9,21 + 701: 14,26 + 722: 21,27 + 751: 8,25 + 752: 8,27 + 775: 2,26 + 776: 3,25 + - node: + cleanable: True + color: '#FFFFFFFF' + id: DirtMedium + decals: + 135: 19,8 + 136: 20,7 + 139: 21,7 + 140: 20,8 + 141: 19,9 + 161: 9,8 + 162: 9,6 + 163: 10,7 + 164: 7,8 + 165: 8,9 + 166: 7,10 + 167: 6,9 + 283: 12,8 + 285: 14,6 + 287: 16,9 + 327: 22,3 + 338: 19,3 + 346: 14,3 + 347: 15,3 + 376: 13,16 + 538: 12,2 + 598: 19,21 + 600: 20,20 + 608: 9,18 + 610: 9,22 + 612: 8,20 + 613: 7,18 + 618: 8,18 + 620: 9,19 + 621: 8,21 + 639: 15,19 + 640: 14,19 + 688: 13,26 + 692: 16,27 + 693: 16,25 + 695: 15,25 + 696: 15,26 + 704: 19,26 + 705: 21,25 + 713: 20,27 + 761: 1,24 + 762: 1,25 + 763: 3,24 + 766: 2,24 + 768: 1,26 + 770: 2,27 + 771: 3,26 + 794: 2,22 + 795: 1,22 + 796: 3,22 + - node: + cleanable: True + color: '#9ABB00FF' + id: Gib + decals: + 449: 19.008198,0.9538171 + - node: + cleanable: True + color: '#D439DBFF' + id: Max + decals: + 450: 13.987783,1.9440596 + - node: + cleanable: True + color: '#6129B0FF' + id: Prima + decals: + 452: 8.033474,8.849318 + - node: + cleanable: True + color: '#D48335FF' + id: Psyke + decals: + 451: 13,16 + - node: + color: '#FFFFFFFF' + id: WoodTrimThinCornerNe + decals: + 106: 4,4 + - node: + color: '#FFFFFFFF' + id: WoodTrimThinCornerNw + decals: + 107: 1,4 + - node: + color: '#FFFFFFFF' + id: WoodTrimThinCornerSe + decals: + 108: 4,1 + - node: + color: '#FFFFFFFF' + id: WoodTrimThinCornerSw + decals: + 99: 1,1 + - node: + color: '#FFFFFFFF' + id: WoodTrimThinLineE + decals: + 109: 4,2 + 110: 4,3 + - node: + color: '#FFFFFFFF' + id: WoodTrimThinLineN + decals: + 111: 2,4 + 112: 3,4 + - node: + color: '#FFFFFFFF' + id: WoodTrimThinLineS + decals: + 103: 2,1 + 104: 3,1 + - node: + color: '#FFFFFFFF' + id: WoodTrimThinLineW + decals: + 100: 1,2 + 101: 1,3 + - node: + cleanable: True + color: '#FF5F6CFF' + id: amyjon + decals: + 563: 22,13 + - node: + cleanable: True + color: '#FFFFFFFF' + id: body + decals: + 157: 19,9 + - node: + cleanable: True + color: '#9D1500FF' + id: engie + decals: + 448: 7.010515,0.8736541 + - node: + cleanable: True + color: '#4D00A1FF' + id: matt + decals: + 86: 4.0649,9.103307 + - node: + cleanable: True + color: '#348800FF' + id: prolizard + decals: + 453: 7.1689034,7.1397905 + - node: + cleanable: True + color: '#503E005B' + id: splatter + decals: + 810: 2.0135477,19.99514 + - type: LoadedMap + - type: SpreaderGrid + - type: GridPathfinding + - type: RadiationGridResistance +- proto: AirCanister + entities: + - uid: 146 + components: + - type: Transform + pos: 15.5,15.5 + parent: 1 +- proto: AltarConvertMaint + entities: + - uid: 3 + components: + - type: Transform + pos: 2.5,14.5 + parent: 1 +- proto: Barricade + entities: + - uid: 122 + components: + - type: Transform + pos: 22.5,15.5 + parent: 1 + - uid: 217 + components: + - type: Transform + pos: 16.5,8.5 + parent: 1 + - uid: 219 + components: + - type: Transform + pos: 8.5,18.5 + parent: 1 + - uid: 223 + components: + - type: Transform + pos: 7.5,22.5 + parent: 1 +- proto: Catwalk + entities: + - uid: 64 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 6.5,6.5 + parent: 1 + - uid: 65 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 6.5,7.5 + parent: 1 + - uid: 66 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 6.5,8.5 + parent: 1 + - uid: 67 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 6.5,9.5 + parent: 1 + - uid: 68 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 6.5,10.5 + parent: 1 + - uid: 69 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 7.5,10.5 + parent: 1 + - uid: 70 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 8.5,10.5 + parent: 1 + - uid: 71 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 9.5,10.5 + parent: 1 + - uid: 72 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 10.5,10.5 + parent: 1 + - uid: 73 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 10.5,9.5 + parent: 1 + - uid: 74 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 10.5,8.5 + parent: 1 + - uid: 75 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 10.5,7.5 + parent: 1 + - uid: 76 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 10.5,6.5 + parent: 1 + - uid: 77 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 9.5,6.5 + parent: 1 + - uid: 78 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 8.5,6.5 + parent: 1 + - uid: 79 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 7.5,6.5 + parent: 1 + - uid: 163 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,12.5 + parent: 1 + - uid: 164 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,12.5 + parent: 1 + - uid: 166 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 4.5,12.5 + parent: 1 + - uid: 167 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 4.5,13.5 + parent: 1 + - uid: 168 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 4.5,14.5 + parent: 1 + - uid: 169 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,16.5 + parent: 1 + - uid: 171 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,16.5 + parent: 1 + - uid: 172 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,14.5 + parent: 1 + - uid: 173 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,13.5 + parent: 1 +- proto: Chair + entities: + - uid: 5 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 19.5,8.5 + parent: 1 + - uid: 6 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 7.5,2.5 + parent: 1 + - uid: 7 + components: + - type: Transform + pos: 13.5,7.5 + parent: 1 + - uid: 45 + components: + - type: Transform + pos: 15.5,7.5 + parent: 1 + - uid: 49 + components: + - type: Transform + pos: 14.5,7.5 + parent: 1 + - uid: 115 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 21.5,8.5 + parent: 1 + - uid: 127 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 19.5,13.5 + parent: 1 + - uid: 153 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 9.5,2.5 + parent: 1 + - uid: 154 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 9.5,1.5 + parent: 1 + - uid: 175 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 13.5,14.5 + parent: 1 +- proto: ChairFolding + entities: + - uid: 82 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 10.5,8.5 + parent: 1 + - uid: 83 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 8.5,6.5 + parent: 1 + - uid: 84 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 6.5,9.5 + parent: 1 + - uid: 94 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 21.59151,2.6490026 + parent: 1 +- proto: ChairFoldingSpawnFolded + entities: + - uid: 85 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 10.5,7.5 + parent: 1 +- proto: ChairOfficeDark + entities: + - uid: 10 + components: + - type: Transform + pos: 14.5,3.5 + parent: 1 + - uid: 53 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 14.5,1.5 + parent: 1 + - uid: 247 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 13.5,26.5 + parent: 1 +- proto: ChairOfficeLight + entities: + - uid: 201 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 20.5,20.5 + parent: 1 + - uid: 208 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 14.5,20.5 + parent: 1 +- proto: ChairWood + entities: + - uid: 2 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,3.5 + parent: 1 + - uid: 16 + components: + - type: Transform + pos: 2.5,15.5 + parent: 1 + - uid: 30 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,1.5 + parent: 1 + - uid: 31 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,3.5 + parent: 1 +- proto: ClosetEmergencyFilledRandom + entities: + - uid: 47 + components: + - type: Transform + pos: 13.5,9.5 + parent: 1 +- proto: ClosetEmergencyN2FilledRandom + entities: + - uid: 11 + components: + - type: Transform + pos: 14.5,9.5 + parent: 1 +- proto: ClosetMaintenanceFilledRandom + entities: + - uid: 17 + components: + - type: Transform + pos: 3.5,21.5 + parent: 1 + - uid: 56 + components: + - type: Transform + pos: 15.5,9.5 + parent: 1 + - uid: 158 + components: + - type: Transform + pos: 7.5,3.5 + parent: 1 + - uid: 161 + components: + - type: Transform + pos: 1.5,15.5 + parent: 1 + - uid: 203 + components: + - type: Transform + pos: 19.5,20.5 + parent: 1 +- proto: ComputerBroken + entities: + - uid: 48 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 13.5,1.5 + parent: 1 + - uid: 207 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 15.5,20.5 + parent: 1 + - uid: 245 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 14.5,25.5 + parent: 1 +- proto: ComputerFrame + entities: + - uid: 51 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 13.5,3.5 + parent: 1 + - uid: 246 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 14.5,26.5 + parent: 1 +- proto: CrateHydroponicsSeeds + entities: + - uid: 23 + components: + - type: Transform + pos: 4.5,10.5 + parent: 1 +- proto: DisposalBend + entities: + - uid: 258 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 3.5,20.5 + parent: 1 + - uid: 263 + components: + - type: Transform + pos: 3.5,22.5 + parent: 1 +- proto: DisposalPipe + entities: + - uid: 260 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,22.5 + parent: 1 + - uid: 261 + components: + - type: Transform + pos: 3.5,21.5 + parent: 1 +- proto: DisposalPipeBroken + entities: + - uid: 262 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,22.5 + parent: 1 +- proto: DisposalTrunk + entities: + - uid: 259 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 2.5,20.5 + parent: 1 +- proto: FolderSpawner + entities: + - uid: 38 + components: + - type: Transform + pos: 14.5,19.5 + parent: 1 +- proto: GasMixerFlipped + entities: + - uid: 177 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 14.5,14.5 + parent: 1 +- proto: GasPipeBend + entities: + - uid: 141 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 13.5,15.5 + parent: 1 + - uid: 178 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 13.5,14.5 + parent: 1 + - uid: 183 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 14.5,13.5 + parent: 1 +- proto: GasPipeStraight + entities: + - uid: 151 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 14.5,15.5 + parent: 1 +- proto: GasPort + entities: + - uid: 145 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 15.5,13.5 + parent: 1 + - uid: 148 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 15.5,15.5 + parent: 1 + - uid: 176 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 15.5,14.5 + parent: 1 +- proto: Girder + entities: + - uid: 50 + components: + - type: Transform + pos: 15.5,8.5 + parent: 1 + - uid: 215 + components: + - type: Transform + pos: 14.5,21.5 + parent: 1 + - uid: 271 + components: + - type: Transform + pos: 15.5,27.5 + parent: 1 +- proto: Grille + entities: + - uid: 98 + components: + - type: Transform + pos: 14.5,8.5 + parent: 1 + - uid: 99 + components: + - type: Transform + pos: 13.5,8.5 + parent: 1 +- proto: GrilleSpawner + entities: + - uid: 44 + components: + - type: Transform + pos: 8.5,14.5 + parent: 1 + - uid: 46 + components: + - type: Transform + pos: 2.5,6.5 + parent: 1 + - uid: 86 + components: + - type: Transform + pos: 2.5,10.5 + parent: 1 + - uid: 87 + components: + - type: Transform + pos: 12.5,8.5 + parent: 1 + - uid: 228 + components: + - type: Transform + pos: 9.5,19.5 + parent: 1 +- proto: hydroponicsTrayAnchored + entities: + - uid: 4 + components: + - type: Transform + pos: 3.5,9.5 + parent: 1 + - uid: 13 + components: + - type: Transform + pos: 1.5,7.5 + parent: 1 +- proto: KitchenReagentGrinder + entities: + - uid: 197 + components: + - type: Transform + pos: 20.5,19.5 + parent: 1 +- proto: LockerElectricalSupplies + entities: + - uid: 180 + components: + - type: Transform + pos: 9.5,15.5 + parent: 1 +- proto: LootSpawnerCableCoil + entities: + - uid: 184 + components: + - type: Transform + pos: 8.5,13.5 + parent: 1 + - uid: 212 + components: + - type: Transform + pos: 13.5,19.5 + parent: 1 +- proto: LootSpawnerIndustrial + entities: + - uid: 32 + components: + - type: Transform + pos: 12.5,14.5 + parent: 1 + - uid: 152 + components: + - type: Transform + pos: 7.5,15.5 + parent: 1 + - uid: 226 + components: + - type: Transform + pos: 8.5,20.5 + parent: 1 +- proto: LootSpawnerIndustrialFluff + entities: + - uid: 109 + components: + - type: Transform + pos: 1.5,14.5 + parent: 1 + - uid: 117 + components: + - type: Transform + pos: 15.5,12.5 + parent: 1 +- proto: LootSpawnerMaterials + entities: + - uid: 227 + components: + - type: Transform + pos: 8.5,21.5 + parent: 1 +- proto: LootSpawnerMedicalMinor + entities: + - uid: 24 + components: + - type: Transform + pos: 20.5,1.5 + parent: 1 + - uid: 42 + components: + - type: Transform + pos: 20.5,2.5 + parent: 1 + - uid: 196 + components: + - type: Transform + pos: 21.5,21.5 + parent: 1 + - uid: 266 + components: + - type: Transform + pos: 3.5,26.5 + parent: 1 + - uid: 267 + components: + - type: Transform + pos: 1.5,24.5 + parent: 1 +- proto: MachineFrame + entities: + - uid: 272 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 16.5,25.5 + parent: 1 +- proto: MaintenanceFluffSpawner + entities: + - uid: 36 + components: + - type: Transform + pos: 16.5,7.5 + parent: 1 + - uid: 97 + components: + - type: Transform + pos: 2.5,3.5 + parent: 1 + - uid: 111 + components: + - type: Transform + pos: 21.5,1.5 + parent: 1 + - uid: 125 + components: + - type: Transform + pos: 3.5,25.5 + parent: 1 + - uid: 134 + components: + - type: Transform + pos: 19.5,15.5 + parent: 1 + - uid: 159 + components: + - type: Transform + pos: 13.5,2.5 + parent: 1 +- proto: MaintenanceToolSpawner + entities: + - uid: 104 + components: + - type: Transform + pos: 15.5,2.5 + parent: 1 + - uid: 130 + components: + - type: Transform + pos: 21.5,14.5 + parent: 1 +- proto: MaintenanceWeaponSpawner + entities: + - uid: 103 + components: + - type: Transform + pos: 9.5,7.5 + parent: 1 + - uid: 114 + components: + - type: Transform + pos: 20.5,8.5 + parent: 1 + - uid: 128 + components: + - type: Transform + pos: 21.5,13.5 + parent: 1 +- proto: Mattress + entities: + - uid: 95 + components: + - type: Transform + pos: 22.5,4.5 + parent: 1 +- proto: OperatingTable + entities: + - uid: 21 + components: + - type: Transform + pos: 1.5,26.5 + parent: 1 +- proto: PortableGeneratorJrPacman + entities: + - uid: 143 + components: + - type: Transform + pos: 7.5,13.5 + parent: 1 +- proto: PosterBroken + entities: + - uid: 239 + components: + - type: Transform + pos: 21.5,15.5 + parent: 1 + - uid: 240 + components: + - type: Transform + pos: 7.5,14.5 + parent: 1 +- proto: PosterContrabandAmbrosiaVulgaris + entities: + - uid: 25 + components: + - type: Transform + pos: 2.5,8.5 + parent: 1 +- proto: PosterContrabandEAT + entities: + - uid: 230 + components: + - type: Transform + pos: 19.5,25.5 + parent: 1 +- proto: Rack + entities: + - uid: 96 + components: + - type: Transform + pos: 16.5,7.5 + parent: 1 + - uid: 105 + components: + - type: Transform + pos: 21.5,1.5 + parent: 1 + - uid: 106 + components: + - type: Transform + pos: 21.5,13.5 + parent: 1 + - uid: 126 + components: + - type: Transform + pos: 21.5,14.5 + parent: 1 + - uid: 133 + components: + - type: Transform + pos: 19.5,15.5 + parent: 1 + - uid: 150 + components: + - type: Transform + pos: 8.5,13.5 + parent: 1 + - uid: 224 + components: + - type: Transform + pos: 8.5,20.5 + parent: 1 + - uid: 225 + components: + - type: Transform + pos: 8.5,21.5 + parent: 1 + - uid: 237 + components: + - type: Transform + pos: 19.5,27.5 + parent: 1 + - uid: 238 + components: + - type: Transform + pos: 19.5,26.5 + parent: 1 + - uid: 264 + components: + - type: Transform + pos: 2.5,19.5 + parent: 1 +- proto: Railing + entities: + - uid: 8 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 7.5,8.5 + parent: 1 + - uid: 61 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 8.5,9.5 + parent: 1 + - uid: 62 + components: + - type: Transform + pos: 8.5,7.5 + parent: 1 + - uid: 63 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 9.5,8.5 + parent: 1 +- proto: RailingCorner + entities: + - uid: 57 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 9.5,9.5 + parent: 1 + - uid: 58 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 7.5,9.5 + parent: 1 + - uid: 59 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 7.5,7.5 + parent: 1 + - uid: 60 + components: + - type: Transform + pos: 9.5,7.5 + parent: 1 +- proto: RandomPosterContraband + entities: + - uid: 89 + components: + - type: Transform + pos: 13.5,21.5 + parent: 1 + - uid: 90 + components: + - type: Transform + pos: 7.5,20.5 + parent: 1 + - uid: 160 + components: + - type: Transform + pos: 8.5,3.5 + parent: 1 + - uid: 204 + components: + - type: Transform + pos: 19.5,19.5 + parent: 1 +- proto: RandomSoap + entities: + - uid: 252 + components: + - type: Transform + pos: 2.5,19.5 + parent: 1 +- proto: SalvagePartsT4Spawner + entities: + - uid: 41 + components: + - type: Transform + pos: 8.5,27.5 + parent: 1 + - uid: 93 + components: + - type: Transform + pos: 8.5,25.5 + parent: 1 +- proto: SalvageSpawnerEquipmentValuable + entities: + - uid: 14 + components: + - type: Transform + pos: 3.5,3.5 + parent: 1 + - uid: 18 + components: + - type: Transform + pos: 8.5,2.5 + parent: 1 + - uid: 34 + components: + - type: Transform + pos: 21.5,20.5 + parent: 1 + - uid: 35 + components: + - type: Transform + pos: 8.5,1.5 + parent: 1 + - uid: 37 + components: + - type: Transform + pos: 2.5,2.5 + parent: 1 +- proto: SalvageSpawnerTreasureValuable + entities: + - uid: 40 + components: + - type: Transform + pos: 7.5,26.5 + parent: 1 + - uid: 80 + components: + - type: Transform + pos: 9.5,26.5 + parent: 1 +- proto: SignBiohazardMed + entities: + - uid: 43 + components: + - type: Transform + pos: 1.5,27.5 + parent: 1 +- proto: SignElectricalMed + entities: + - uid: 149 + components: + - type: Transform + pos: 9.5,14.5 + parent: 1 +- proto: SignFlammableMed + entities: + - uid: 268 + components: + - type: Transform + pos: 13.5,13.5 + parent: 1 +- proto: SignLaserMed + entities: + - uid: 118 + components: + - type: Transform + pos: 13.5,27.5 + parent: 1 +- proto: SignRestroom + entities: + - uid: 265 + components: + - type: Transform + pos: 1.5,20.5 + parent: 1 +- proto: SinkStemless + entities: + - uid: 39 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 2.5,27.5 + parent: 1 +- proto: SpawnDungeonLootKitchenTabletop + entities: + - uid: 20 + components: + - type: Transform + pos: 21.5,25.5 + parent: 1 +- proto: Stool + entities: + - uid: 9 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,13.5 + parent: 1 + - uid: 81 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,13.5 + parent: 1 + - uid: 91 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,13.5 + parent: 1 +- proto: Table + entities: + - uid: 33 + components: + - type: Transform + pos: 21.5,21.5 + parent: 1 + - uid: 52 + components: + - type: Transform + pos: 13.5,2.5 + parent: 1 + - uid: 54 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 15.5,2.5 + parent: 1 + - uid: 55 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 15.5,1.5 + parent: 1 + - uid: 92 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 20.5,1.5 + parent: 1 + - uid: 110 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 20.5,2.5 + parent: 1 + - uid: 116 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 20.5,8.5 + parent: 1 + - uid: 119 + components: + - type: Transform + pos: 21.5,19.5 + parent: 1 + - uid: 120 + components: + - type: Transform + pos: 3.5,25.5 + parent: 1 + - uid: 121 + components: + - type: Transform + pos: 21.5,20.5 + parent: 1 + - uid: 155 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 8.5,1.5 + parent: 1 + - uid: 156 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 8.5,2.5 + parent: 1 + - uid: 162 + components: + - type: Transform + pos: 3.5,26.5 + parent: 1 + - uid: 195 + components: + - type: Transform + pos: 20.5,19.5 + parent: 1 + - uid: 209 + components: + - type: Transform + pos: 15.5,19.5 + parent: 1 + - uid: 210 + components: + - type: Transform + pos: 14.5,19.5 + parent: 1 + - uid: 211 + components: + - type: Transform + pos: 13.5,19.5 + parent: 1 + - uid: 229 + components: + - type: Transform + pos: 20.5,25.5 + parent: 1 + - uid: 235 + components: + - type: Transform + pos: 21.5,25.5 + parent: 1 +- proto: TableCarpet + entities: + - uid: 26 + components: + - type: Transform + pos: 3.5,3.5 + parent: 1 + - uid: 27 + components: + - type: Transform + pos: 3.5,2.5 + parent: 1 + - uid: 28 + components: + - type: Transform + pos: 2.5,3.5 + parent: 1 + - uid: 29 + components: + - type: Transform + pos: 2.5,2.5 + parent: 1 +- proto: TableWood + entities: + - uid: 22 + components: + - type: Transform + pos: 3.5,15.5 + parent: 1 + - uid: 112 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,14.5 + parent: 1 + - uid: 113 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,14.5 + parent: 1 +- proto: ToiletDirtyWater + entities: + - uid: 257 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 2.5,20.5 + parent: 1 +- proto: WallSolid + entities: + - uid: 12 + components: + - type: Transform + pos: 20.5,14.5 + parent: 1 + - uid: 88 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,27.5 + parent: 1 + - uid: 132 + components: + - type: Transform + pos: 21.5,15.5 + parent: 1 + - uid: 136 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 9.5,14.5 + parent: 1 + - uid: 216 + components: + - type: Transform + pos: 13.5,21.5 + parent: 1 + - uid: 221 + components: + - type: Transform + pos: 7.5,20.5 + parent: 1 + - uid: 222 + components: + - type: Transform + pos: 7.5,19.5 + parent: 1 + - uid: 254 + components: + - type: Transform + pos: 1.5,20.5 + parent: 1 + - uid: 255 + components: + - type: Transform + pos: 2.5,21.5 + parent: 1 + - uid: 269 + components: + - type: Transform + pos: 13.5,27.5 + parent: 1 +- proto: WallSolidRust + entities: + - uid: 15 + components: + - type: Transform + pos: 2.5,8.5 + parent: 1 + - uid: 107 + components: + - type: Transform + pos: 19.5,14.5 + parent: 1 + - uid: 108 + components: + - type: Transform + pos: 20.5,13.5 + parent: 1 + - uid: 131 + components: + - type: Transform + pos: 20.5,15.5 + parent: 1 + - uid: 135 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 7.5,14.5 + parent: 1 + - uid: 138 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 9.5,13.5 + parent: 1 + - uid: 147 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 13.5,13.5 + parent: 1 + - uid: 157 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 8.5,3.5 + parent: 1 + - uid: 202 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 19.5,19.5 + parent: 1 + - uid: 214 + components: + - type: Transform + pos: 15.5,21.5 + parent: 1 + - uid: 218 + components: + - type: Transform + pos: 7.5,21.5 + parent: 1 + - uid: 220 + components: + - type: Transform + pos: 8.5,19.5 + parent: 1 + - uid: 234 + components: + - type: Transform + pos: 19.5,25.5 + parent: 1 + - uid: 253 + components: + - type: Transform + pos: 1.5,19.5 + parent: 1 + - uid: 256 + components: + - type: Transform + pos: 1.5,21.5 + parent: 1 + - uid: 270 + components: + - type: Transform + pos: 14.5,27.5 + parent: 1 +- proto: WaterTankFull + entities: + - uid: 19 + components: + - type: Transform + pos: 3.5,6.5 + parent: 1 +- proto: Window + entities: + - uid: 100 + components: + - type: Transform + pos: 14.5,8.5 + parent: 1 + - uid: 101 + components: + - type: Transform + pos: 13.5,8.5 + parent: 1 +- proto: WindowDirectional + entities: + - uid: 123 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 21.5,1.5 + parent: 1 + - uid: 124 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 21.5,2.5 + parent: 1 + - uid: 165 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 12.5,3.5 + parent: 1 + - uid: 170 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 12.5,2.5 + parent: 1 + - uid: 174 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 12.5,1.5 + parent: 1 + - uid: 198 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 21.5,21.5 + parent: 1 + - uid: 199 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 21.5,20.5 + parent: 1 + - uid: 200 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 21.5,19.5 + parent: 1 + - uid: 243 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 15.5,26.5 + parent: 1 + - uid: 244 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 15.5,25.5 + parent: 1 +... diff --git a/Resources/Maps/_NF/POI/courthouse.yml b/Resources/Maps/_NF/POI/courthouse.yml index 7020d0e8226..0baeb12540e 100644 --- a/Resources/Maps/_NF/POI/courthouse.yml +++ b/Resources/Maps/_NF/POI/courthouse.yml @@ -24,7 +24,7 @@ entities: chunks: 0,0: ind: 0,0 - tiles: dwAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAaQAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAegAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAADdwAAAAADdwAAAAADdwAAAAABegAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAegAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAABdwAAAAACdwAAAAADdwAAAAAAegAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAegAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAADdwAAAAADdwAAAAACdwAAAAADegAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAegAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAegAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAegAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAegAAAAAAAgAAAAAAAgAAAAAAegAAAAAAegAAAAAAegAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAdwAAAAAAegAAAAAAAgAAAAAAAgAAAAAAegAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAegAAAAAAAgAAAAAAAgAAAAAAegAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAegAAAAAAAgAAAAAAAgAAAAAAegAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAegAAAAAAAgAAAAAAAgAAAAAAegAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAegAAAAAAAgAAAAAAAgAAAAAAegAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: dwAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAaQAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAegAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAADdwAAAAADdwAAAAADdwAAAAABegAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAegAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAABdwAAAAACdwAAAAADdwAAAAAAegAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAegAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAADdwAAAAADdwAAAAACdwAAAAADegAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAegAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAaQAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAegAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAegAAAAAAAgAAAAAAAgAAAAAAegAAAAAAegAAAAAAegAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAdwAAAAAAegAAAAAAAgAAAAAAAgAAAAAAegAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAegAAAAAAAgAAAAAAAgAAAAAAegAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAaQAAAAAAAgAAAAAAAgAAAAAAegAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAegAAAAAAAgAAAAAAAgAAAAAAegAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAaQAAAAAAAgAAAAAAAgAAAAAAegAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 -1,0: ind: -1,0 @@ -48,11 +48,11 @@ entities: version: 6 1,-2: ind: 1,-2 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 -2,-2: ind: -2,-2 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAegAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAegAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAegAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAegAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 - type: Broadphase - type: Physics @@ -318,7 +318,7 @@ entities: 0,2: 0: 65535 -1,2: - 0: 65535 + 0: 65533 0,3: 1: 3904 -1,3: @@ -490,11 +490,11 @@ entities: 4,-6: 0: 3823 5,-7: - 0: 13056 + 0: 13072 5,-6: 0: 3 -6,-7: - 0: 65484 + 0: 65516 -6,-6: 0: 3279 uniqueMixes: @@ -608,7 +608,7 @@ entities: - 123 - proto: AirlockEngineering entities: - - uid: 92 + - uid: 83 components: - type: Transform pos: 7.5,-6.5 @@ -667,6 +667,16 @@ entities: - type: Transform pos: 4.5,-25.5 parent: 1 + - uid: 84 + components: + - type: Transform + pos: -0.5,-12.5 + parent: 1 + - uid: 92 + components: + - type: Transform + pos: -0.5,-0.5 + parent: 1 - uid: 139 components: - type: Transform @@ -695,21 +705,11 @@ entities: - type: Transform pos: 6.5,-10.5 parent: 1 - - uid: 445 - components: - - type: Transform - pos: -0.5,-12.5 - parent: 1 - uid: 446 components: - type: Transform pos: 2.5,-10.5 parent: 1 - - uid: 712 - components: - - type: Transform - pos: -0.5,-0.5 - parent: 1 - uid: 775 components: - type: Transform @@ -826,33 +826,32 @@ entities: parent: 1 - proto: AirlockNfsdBrigLocked entities: - - uid: 83 + - uid: 419 components: - type: Transform pos: 5.5,-1.5 parent: 1 - - uid: 84 + - uid: 434 components: - type: Transform - rot: 3.141592653589793 rad pos: 4.5,0.5 parent: 1 - - uid: 496 + - uid: 445 components: - type: Transform - pos: 4.5,10.5 + pos: 4.5,8.5 parent: 1 - - uid: 565 + - uid: 496 components: - type: Transform - pos: 4.5,8.5 + pos: 4.5,10.5 parent: 1 - - uid: 714 + - uid: 565 components: - type: Transform pos: 4.5,4.5 parent: 1 - - uid: 1174 + - uid: 712 components: - type: Transform pos: -4.5,-1.5 @@ -1636,32 +1635,24 @@ entities: rot: 3.141592653589793 rad pos: 0.5,2.5 parent: 1 - - type: Physics - bodyType: Static - uid: 974 components: - type: Transform rot: 3.141592653589793 rad pos: -4.5,2.5 parent: 1 - - type: Physics - bodyType: Static - uid: 1047 components: - type: Transform rot: 3.141592653589793 rad pos: 0.5,1.5 parent: 1 - - type: Physics - bodyType: Static - uid: 1414 components: - type: Transform rot: 3.141592653589793 rad pos: -4.5,1.5 parent: 1 - - type: Physics - bodyType: Static - proto: BenchPewMiddle entities: - uid: 439 @@ -1670,32 +1661,24 @@ entities: rot: 3.141592653589793 rad pos: -3.5,2.5 parent: 1 - - type: Physics - bodyType: Static - uid: 475 components: - type: Transform rot: 3.141592653589793 rad pos: 1.5,2.5 parent: 1 - - type: Physics - bodyType: Static - uid: 1106 components: - type: Transform rot: 3.141592653589793 rad pos: 1.5,1.5 parent: 1 - - type: Physics - bodyType: Static - uid: 1176 components: - type: Transform rot: 3.141592653589793 rad pos: -3.5,1.5 parent: 1 - - type: Physics - bodyType: Static - proto: BenchPewRight entities: - uid: 521 @@ -1704,32 +1687,24 @@ entities: rot: 3.141592653589793 rad pos: 2.5,2.5 parent: 1 - - type: Physics - bodyType: Static - uid: 950 components: - type: Transform rot: 3.141592653589793 rad pos: -2.5,2.5 parent: 1 - - type: Physics - bodyType: Static - uid: 1050 components: - type: Transform rot: 3.141592653589793 rad pos: 2.5,1.5 parent: 1 - - type: Physics - bodyType: Static - uid: 1181 components: - type: Transform rot: 3.141592653589793 rad pos: -2.5,1.5 parent: 1 - - type: Physics - bodyType: Static - proto: BenchSteelLeft entities: - uid: 55 @@ -1738,32 +1713,36 @@ entities: rot: 3.141592653589793 rad pos: 2.5,-16.5 parent: 1 - - type: Physics - bodyType: Static - uid: 74 components: - type: Transform rot: 1.5707963267948966 rad pos: -7.5,-20.5 parent: 1 - - type: Physics - bodyType: Static - uid: 125 components: - type: Transform rot: -1.5707963267948966 rad pos: 5.5,-14.5 parent: 1 - - type: Physics - bodyType: Static + - uid: 146 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -7.5,-16.5 + parent: 1 + - uid: 549 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 5.5,-18.5 + parent: 1 - uid: 573 components: - type: Transform rot: 3.141592653589793 rad pos: -3.5,-16.5 parent: 1 - - type: Physics - bodyType: Static - proto: BenchSteelMiddle entities: - uid: 73 @@ -1772,114 +1751,62 @@ entities: rot: 1.5707963267948966 rad pos: -7.5,-19.5 parent: 1 - - type: Physics - bodyType: Static - uid: 128 components: - type: Transform rot: 1.5707963267948966 rad pos: -7.5,-15.5 parent: 1 - - type: Physics - bodyType: Static - - uid: 146 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -7.5,-18.5 - parent: 1 - - type: Physics - bodyType: Static - - uid: 549 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -7.5,-16.5 - parent: 1 - - type: Physics - bodyType: Static - uid: 569 components: - type: Transform rot: -1.5707963267948966 rad pos: 5.5,-19.5 parent: 1 - - type: Physics - bodyType: Static - - uid: 572 + - uid: 1129 components: - type: Transform rot: -1.5707963267948966 rad - pos: 5.5,-16.5 + pos: 5.5,-15.5 parent: 1 - - type: Physics - bodyType: Static - - uid: 899 +- proto: BenchSteelRight + entities: + - uid: 23 components: - type: Transform rot: 1.5707963267948966 rad - pos: -7.5,-17.5 - parent: 1 - - type: Physics - bodyType: Static - - uid: 1128 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 5.5,-18.5 - parent: 1 - - type: Physics - bodyType: Static - - uid: 1129 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 5.5,-15.5 + pos: -7.5,-18.5 parent: 1 - - type: Physics - bodyType: Static - - uid: 1217 + - uid: 637 components: - type: Transform rot: -1.5707963267948966 rad - pos: 5.5,-17.5 + pos: 5.5,-16.5 parent: 1 - - type: Physics - bodyType: Static -- proto: BenchSteelRight - entities: - uid: 942 components: - type: Transform rot: 3.141592653589793 rad pos: -4.5,-16.5 parent: 1 - - type: Physics - bodyType: Static - uid: 1277 components: - type: Transform rot: -1.5707963267948966 rad pos: 5.5,-20.5 parent: 1 - - type: Physics - bodyType: Static - uid: 1401 components: - type: Transform rot: 3.141592653589793 rad pos: 1.5,-16.5 parent: 1 - - type: Physics - bodyType: Static - uid: 1431 components: - type: Transform rot: 1.5707963267948966 rad pos: -7.5,-14.5 parent: 1 - - type: Physics - bodyType: Static - proto: BookshelfFilled entities: - uid: 230 @@ -1922,6 +1849,14 @@ entities: rot: 3.141592653589793 rad pos: -4.5,-10.5 parent: 1 +- proto: BrigTimer + entities: + - uid: 1222 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 4.5,-1.5 + parent: 1 - proto: CableApcExtension entities: - uid: 2 @@ -3770,32 +3705,19 @@ entities: rot: 3.141592653589793 rad pos: 7.5,-5.5 parent: 1 - - type: ContainerContainer - containers: - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - uid: 279 components: - type: Transform rot: 3.141592653589793 rad pos: 3.5,-4.5 parent: 1 - - type: ContainerContainer - containers: - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null +- proto: ClothingHeadHatPwig + entities: + - uid: 1854 + components: + - type: Transform + pos: 0.328125,7.907011 + parent: 1 - proto: ClothingNeckMedalNfsdBloodDrop entities: - uid: 494 @@ -3840,6 +3762,13 @@ entities: - type: Transform pos: -4.5,-5.5 parent: 1 +- proto: ClothingOuterRobesJudge + entities: + - uid: 1855 + components: + - type: Transform + pos: 0.6875,7.768122 + parent: 1 - proto: ComfyChair entities: - uid: 1101 @@ -3887,37 +3816,11 @@ entities: - type: Transform pos: -4.5,-22.5 parent: 1 - - type: ContainerContainer - containers: - board: !type:Container - showEnts: False - occludes: True - ents: [] - bank-ATM-cashSlot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - - type: Physics - canCollide: False - - type: ItemSlots - uid: 934 components: - type: Transform pos: 2.5,-22.5 parent: 1 - - type: ContainerContainer - containers: - board: !type:Container - showEnts: False - occludes: True - ents: [] - bank-ATM-cashSlot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - - type: Physics - canCollide: False - - type: ItemSlots - proto: ConveyorBelt entities: - uid: 239 @@ -5383,6 +5286,14 @@ entities: parent: 1 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 1652 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -3.5,8.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' - proto: GasPipeFourway entities: - uid: 387 @@ -6385,6 +6296,14 @@ entities: parent: 1 - type: AtmosPipeColor color: '#990000FF' + - uid: 966 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,7.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' - uid: 971 components: - type: Transform @@ -7229,13 +7148,6 @@ entities: parent: 1 - type: AtmosPipeColor color: '#990000FF' - - uid: 1570 - components: - - type: Transform - pos: -1.5,8.5 - parent: 1 - - type: AtmosPipeColor - color: '#990000FF' - uid: 1572 components: - type: Transform @@ -7478,6 +7390,14 @@ entities: parent: 1 - type: AtmosPipeColor color: '#990000FF' + - uid: 899 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,8.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' - uid: 972 components: - type: Transform @@ -7539,6 +7459,13 @@ entities: parent: 1 - type: AtmosPipeColor color: '#990000FF' + - uid: 1217 + components: + - type: Transform + pos: -2.5,8.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' - uid: 1223 components: - type: Transform @@ -7605,22 +7532,6 @@ entities: parent: 1 - type: AtmosPipeColor color: '#990000FF' - - uid: 1564 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -2.5,7.5 - parent: 1 - - type: AtmosPipeColor - color: '#990000FF' - - uid: 1569 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -1.5,7.5 - parent: 1 - - type: AtmosPipeColor - color: '#990000FF' - uid: 1571 components: - type: Transform @@ -8045,6 +7956,14 @@ entities: - 1604 - type: AtmosPipeColor color: '#990000FF' + - uid: 963 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -3.5,7.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' - uid: 1082 components: - type: Transform @@ -8073,6 +7992,14 @@ entities: parent: 1 - type: AtmosPipeColor color: '#990000FF' + - uid: 1128 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -2.5,7.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' - uid: 1156 components: - type: Transform @@ -8085,13 +8012,6 @@ entities: - 1610 - type: AtmosPipeColor color: '#990000FF' - - uid: 1222 - components: - - type: Transform - pos: -2.5,8.5 - parent: 1 - - type: AtmosPipeColor - color: '#990000FF' - uid: 1270 components: - type: Transform @@ -8179,14 +8099,6 @@ entities: parent: 1 - type: AtmosPipeColor color: '#990000FF' - - uid: 1583 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -3.5,7.5 - parent: 1 - - type: AtmosPipeColor - color: '#990000FF' - uid: 1598 components: - type: Transform @@ -8203,6 +8115,20 @@ entities: parent: 1 - type: AtmosPipeColor color: '#990000FF' +- proto: Gavel + entities: + - uid: 1023 + components: + - type: Transform + pos: -0.06,7.67 + parent: 1 +- proto: GavelBlock + entities: + - uid: 1853 + components: + - type: Transform + pos: -0.44,7.5 + parent: 1 - proto: GeneratorBasic15kW entities: - uid: 241 @@ -8421,6 +8347,12 @@ entities: - type: Transform pos: -8.5,-18.5 parent: 1 + - uid: 1857 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,8.5 + parent: 1 - proto: GrilleSpawner entities: - uid: 41 @@ -8964,6 +8896,16 @@ entities: - type: Transform pos: -3.5,-0.5 parent: 1 + - uid: 572 + components: + - type: Transform + pos: -7.5,-17.5 + parent: 1 + - uid: 686 + components: + - type: Transform + pos: 5.5,-17.5 + parent: 1 - uid: 1393 components: - type: Transform @@ -9678,13 +9620,11 @@ entities: - type: Transform pos: -11.5,-6.5 parent: 1 -- proto: ScreenTimer - entities: - - uid: 686 + - uid: 1653 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 4.5,-1.5 + rot: 1.5707963267948966 rad + pos: -2.5,8.5 parent: 1 - proto: SellOnlyMothershipComputer entities: @@ -9694,16 +9634,6 @@ entities: rot: -1.5707963267948966 rad pos: 0.5,-26.5 parent: 1 - - type: ContainerContainer - containers: - ShipyardConsole-targetId: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - board: !type:Container - showEnts: False - occludes: True - ents: [] - proto: ShelfRWood entities: - uid: 413 @@ -9816,12 +9746,6 @@ entities: rot: 1.5707963267948966 rad pos: 20.5,-22.5 parent: 1 - - uid: 637 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 20.5,-26.5 - parent: 1 - uid: 638 components: - type: Transform @@ -9834,12 +9758,6 @@ entities: rot: 1.5707963267948966 rad pos: -22.5,-22.5 parent: 1 - - uid: 963 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -22.5,-26.5 - parent: 1 - uid: 964 components: - type: Transform @@ -10034,7 +9952,7 @@ entities: - uid: 1030 components: - type: Transform - pos: -2.5,8.5 + pos: -2.5,7.5 parent: 1 - proto: TableFancyGreen entities: @@ -10262,12 +10180,13 @@ entities: rot: -1.5707963267948966 rad pos: 3.5,-11.5 parent: 1 -- proto: ToyHammer +- proto: TrialTimer entities: - - uid: 1023 + - uid: 1856 components: - type: Transform - pos: -0.41327053,7.5674677 + rot: 1.5707963267948966 rad + pos: -2.5,8.5 parent: 1 - proto: TwoWayLever entities: @@ -10295,15 +10214,15 @@ entities: parent: 1 - proto: VendingMachineFuelVend entities: - - uid: 1652 + - uid: 1570 components: - type: Transform - pos: 18.5,-24.5 + pos: -22.5,-26.5 parent: 1 - - uid: 1653 + - uid: 1583 components: - type: Transform - pos: -20.5,-24.5 + pos: 20.5,-26.5 parent: 1 - proto: VendingMachineLawDrobe entities: @@ -10333,12 +10252,6 @@ entities: rot: -1.5707963267948966 rad pos: 1.5,-12.5 parent: 1 - - uid: 23 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 20.5,-26.5 - parent: 1 - uid: 24 components: - type: Transform @@ -10937,12 +10850,6 @@ entities: rot: -1.5707963267948966 rad pos: 1.5,12.5 parent: 1 - - uid: 966 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 20.5,-27.5 - parent: 1 - uid: 967 components: - type: Transform @@ -11125,8 +11032,8 @@ entities: - uid: 1186 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -22.5,-27.5 + rot: 1.5707963267948966 rad + pos: 20.5,-27.5 parent: 1 - uid: 1187 components: @@ -11343,8 +11250,8 @@ entities: - uid: 1312 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -22.5,-26.5 + rot: 1.5707963267948966 rad + pos: -22.5,-27.5 parent: 1 - uid: 1315 components: @@ -11667,6 +11574,18 @@ entities: rot: 3.141592653589793 rad pos: 6.5,-13.5 parent: 1 + - uid: 1564 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 21.5,-27.5 + parent: 1 + - uid: 1569 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -23.5,-27.5 + parent: 1 - proto: WarpPoint entities: - uid: 1318 @@ -12026,12 +11945,12 @@ entities: parent: 1 - proto: WoodDoor entities: - - uid: 419 + - uid: 714 components: - type: Transform pos: -10.5,-8.5 parent: 1 - - uid: 434 + - uid: 1174 components: - type: Transform pos: -6.5,-8.5 diff --git a/Resources/Maps/_NF/POI/cove.yml b/Resources/Maps/_NF/POI/cove.yml index 1e942244192..9b4abe55df6 100644 --- a/Resources/Maps/_NF/POI/cove.yml +++ b/Resources/Maps/_NF/POI/cove.yml @@ -25,6 +25,7 @@ entities: components: - type: MetaData - type: Transform + parent: invalid - type: MapGrid chunks: 0,0: @@ -4955,31 +4956,11 @@ entities: - type: Transform pos: -0.5,16.5 parent: 1 - - type: ContainerContainer - containers: - ShipyardConsole-targetId: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - board: !type:Container - showEnts: False - occludes: True - ents: [] - uid: 1959 components: - type: Transform pos: -3.5,16.5 parent: 1 - - type: ContainerContainer - containers: - ShipyardConsole-targetId: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - board: !type:Container - showEnts: False - occludes: True - ents: [] - proto: ComputerTabletopIFFPOI entities: - uid: 1920 @@ -5015,18 +4996,6 @@ entities: - type: Transform pos: 5.5,2.5 parent: 1 - - type: ContainerContainer - containers: - bank-ATM-cashSlot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - board: !type:Container - showEnts: False - occludes: True - ents: [] - - type: Physics - canCollide: False - proto: ContrabandPalletPirate entities: - uid: 229 @@ -5233,7 +5202,7 @@ entities: - uid: 2057 components: - type: Transform - pos: -0.37870407,2.5181322 + pos: -0.345032,2.4970655 parent: 1 - proto: DisposalBend entities: @@ -5650,28 +5619,16 @@ entities: - type: Transform pos: -3.015983,26.135101 parent: 1 - - type: ItemSlots - - type: ContainerContainer - containers: - paper_label: !type:ContainerSlot {} - uid: 1113 components: - type: Transform pos: -3.3076496,25.978851 parent: 1 - - type: ItemSlots - - type: ContainerContainer - containers: - paper_label: !type:ContainerSlot {} - uid: 1116 components: - type: Transform pos: 2.508083,11.4275875 parent: 1 - - type: ItemSlots - - type: ContainerContainer - containers: - paper_label: !type:ContainerSlot {} - proto: DrinkPremiumRumBottleFull entities: - uid: 1600 @@ -5899,9 +5856,6 @@ entities: - type: Transform pos: 7.5,28.5 parent: 1 - - type: Door - secondsUntilStateChange: -7306.7144 - state: Opening - proto: FenceWoodSmallCorner entities: - uid: 1763 @@ -7021,6 +6975,30 @@ entities: - type: Transform pos: 2.4660487,-4.2594047 parent: 1 +- proto: FuelPlasma + entities: + - uid: 668 + components: + - type: Transform + pos: -2.5992656,13.75297 + parent: 1 + - uid: 669 + components: + - type: Transform + pos: -2.3700988,13.648731 + parent: 1 +- proto: FuelUranium + entities: + - uid: 670 + components: + - type: Transform + pos: -1.3180155,13.648731 + parent: 1 + - uid: 672 + components: + - type: Transform + pos: -1.5471821,13.75297 + parent: 1 - proto: GasMixerOnFlipped entities: - uid: 901 @@ -7837,13 +7815,6 @@ entities: rot: -1.5707963267948966 rad pos: 4.5,5.5 parent: 1 -- proto: SyndicateKitchenElectricRange - entities: - - uid: 774 - components: - - type: Transform - pos: 0.5,7.5 - parent: 1 - proto: KitchenKnife entities: - uid: 234 @@ -7985,6 +7956,13 @@ entities: - type: Transform pos: 2.5104294,-0.96410155 parent: 1 +- proto: NFPillCanisterMannitol + entities: + - uid: 1911 + components: + - type: Transform + pos: -1.4936128,-1.4300365 + parent: 1 - proto: NitrogenCanister entities: - uid: 2035 @@ -8179,10 +8157,6 @@ entities: - type: Transform pos: 9.5,17.5 parent: 1 - - type: FuelGenerator - on: False - - type: Physics - bodyType: Static - proto: PortableScrubber entities: - uid: 9 @@ -9208,33 +9182,6 @@ entities: - type: Transform pos: -6.5,5.5 parent: 1 -- proto: SheetPlasma - entities: - - uid: 668 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -2.610289,13.663282 - parent: 1 - - uid: 669 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -2.3394558,13.652866 - parent: 1 -- proto: SheetUranium - entities: - - uid: 670 - components: - - type: Transform - pos: -1.7080126,13.6587715 - parent: 1 - - uid: 672 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -1.2977891,13.652866 - parent: 1 - proto: Shovel entities: - uid: 1126 @@ -9757,6 +9704,13 @@ entities: rot: -1.5707963267948966 rad pos: -2.4595704,36.201065 parent: 1 +- proto: SyndicateKitchenElectricRange + entities: + - uid: 774 + components: + - type: Transform + pos: 0.5,7.5 + parent: 1 - proto: SyndicateMicrowave entities: - uid: 149 diff --git a/Resources/Maps/_NF/POI/nfsd.yml b/Resources/Maps/_NF/POI/nfsd.yml index dbd3c288846..d2c8ba9e256 100644 --- a/Resources/Maps/_NF/POI/nfsd.yml +++ b/Resources/Maps/_NF/POI/nfsd.yml @@ -6158,7 +6158,7 @@ entities: - type: Transform pos: 16.5,22.5 parent: 1 -- proto: CargoPallet +- proto: CargoPalletSell entities: - uid: 70 components: diff --git a/Resources/Maps/_NF/POI/northpole.yml b/Resources/Maps/_NF/POI/northpole.yml index afe0e73c041..c41dd498b35 100644 --- a/Resources/Maps/_NF/POI/northpole.yml +++ b/Resources/Maps/_NF/POI/northpole.yml @@ -3983,20 +3983,6 @@ entities: - type: Transform pos: 0.5,18.5 parent: 1 -- proto: SalvagePartsSpawnerLow - entities: - - uid: 738 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -5.5,25.5 - parent: 1 - - uid: 739 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -7.5,26.5 - parent: 1 - proto: Screwdriver entities: - uid: 730 diff --git a/Resources/Maps/_NF/Shuttles/BlackMarket/bocakillo.yml b/Resources/Maps/_NF/Shuttles/BlackMarket/bocakillo.yml index 03e35d4841e..c8ee4aaeb40 100644 --- a/Resources/Maps/_NF/Shuttles/BlackMarket/bocakillo.yml +++ b/Resources/Maps/_NF/Shuttles/BlackMarket/bocakillo.yml @@ -19,6 +19,8 @@ entities: components: - type: MetaData name: Bocakillo + - type: BecomesStation + id: Bocakillo - type: Transform pos: -0.4375,-1.703125 parent: invalid diff --git a/Resources/Maps/_NF/Shuttles/BlackMarket/falcon.yml b/Resources/Maps/_NF/Shuttles/BlackMarket/falcon.yml index ec7d61daf66..dc6c266bef2 100644 --- a/Resources/Maps/_NF/Shuttles/BlackMarket/falcon.yml +++ b/Resources/Maps/_NF/Shuttles/BlackMarket/falcon.yml @@ -28,6 +28,8 @@ entities: components: - type: MetaData name: Falcon + - type: BecomesStation + id: Falcon - type: Transform pos: -1.078125,-0.46875 parent: invalid diff --git a/Resources/Maps/_NF/Shuttles/BlackMarket/menace.yml b/Resources/Maps/_NF/Shuttles/BlackMarket/menace.yml index b75161fa2fd..270e9178285 100644 --- a/Resources/Maps/_NF/Shuttles/BlackMarket/menace.yml +++ b/Resources/Maps/_NF/Shuttles/BlackMarket/menace.yml @@ -15,6 +15,8 @@ entities: components: - type: MetaData name: Menace + - type: BecomesStation + id: Menace - type: Transform pos: -0.48958334,-0.5208333 parent: invalid diff --git a/Resources/Maps/_NF/Shuttles/Expedition/brigand.yml b/Resources/Maps/_NF/Shuttles/Expedition/brigand.yml index 217f1b7819c..da59aa0587d 100644 --- a/Resources/Maps/_NF/Shuttles/Expedition/brigand.yml +++ b/Resources/Maps/_NF/Shuttles/Expedition/brigand.yml @@ -735,7 +735,7 @@ entities: - type: GasTileOverlay - type: RadiationGridResistance - type: BecomesStation - id: brigand + id: Brigand - proto: AirAlarm entities: - uid: 436 diff --git a/Resources/Maps/_NF/Shuttles/Expedition/gasbender.yml b/Resources/Maps/_NF/Shuttles/Expedition/gasbender.yml index 572ac34424d..3c3a5389532 100644 --- a/Resources/Maps/_NF/Shuttles/Expedition/gasbender.yml +++ b/Resources/Maps/_NF/Shuttles/Expedition/gasbender.yml @@ -1017,7 +1017,7 @@ entities: - type: GasTileOverlay - type: RadiationGridResistance - type: BecomesStation - id: gasbender + id: Gasbender - proto: AirAlarm entities: - uid: 214 diff --git a/Resources/Maps/_NF/Shuttles/Expedition/gourd.yml b/Resources/Maps/_NF/Shuttles/Expedition/gourd.yml index cb2b9b260ad..0f1d8a98ca9 100644 --- a/Resources/Maps/_NF/Shuttles/Expedition/gourd.yml +++ b/Resources/Maps/_NF/Shuttles/Expedition/gourd.yml @@ -1259,8 +1259,8 @@ entities: chunkSize: 4 - type: GasTileOverlay - type: RadiationGridResistance - - type: BecomesStation - id: gourd + - type: BecomesStation + id: Gourd - proto: AcousticGuitarInstrument entities: - uid: 1932 diff --git a/Resources/Maps/_NF/Shuttles/Nfsd/broadhead.yml b/Resources/Maps/_NF/Shuttles/Nfsd/broadhead.yml index 7f4e2485d0f..8dab7d7de57 100644 --- a/Resources/Maps/_NF/Shuttles/Nfsd/broadhead.yml +++ b/Resources/Maps/_NF/Shuttles/Nfsd/broadhead.yml @@ -26,6 +26,8 @@ entities: components: - type: MetaData name: Broadhead + - type: BecomesStation + id: Broadhead - type: Transform parent: invalid - type: MapGrid diff --git a/Resources/Maps/_NF/Shuttles/Nfsd/cleric.yml b/Resources/Maps/_NF/Shuttles/Nfsd/cleric.yml index 1bfcb75265d..09f2cf5c487 100644 --- a/Resources/Maps/_NF/Shuttles/Nfsd/cleric.yml +++ b/Resources/Maps/_NF/Shuttles/Nfsd/cleric.yml @@ -13,6 +13,8 @@ entities: components: - type: MetaData name: Cleric + - type: BecomesStation + id: Cleric - type: Transform pos: 0.84375,0.34375 parent: invalid diff --git a/Resources/Maps/_NF/Shuttles/Nfsd/empress.yml b/Resources/Maps/_NF/Shuttles/Nfsd/empress.yml index 0e55998c6c1..6fe57a3c6e6 100644 --- a/Resources/Maps/_NF/Shuttles/Nfsd/empress.yml +++ b/Resources/Maps/_NF/Shuttles/Nfsd/empress.yml @@ -29,6 +29,8 @@ entities: components: - type: MetaData name: Empress + - type: BecomesStation + id: Empress - type: Transform pos: -0.46484375,0.90625 parent: invalid @@ -14806,12 +14808,6 @@ entities: rot: 3.141592653589793 rad pos: 22.5,-12.5 parent: 1 - - uid: 1052 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 22.5,-12.5 - parent: 1 - uid: 1053 components: - type: Transform @@ -14850,12 +14846,6 @@ entities: rot: -1.5707963267948966 rad pos: 24.5,-11.5 parent: 1 - - uid: 1092 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 24.5,-11.5 - parent: 1 - uid: 1128 components: - type: Transform diff --git a/Resources/Maps/_NF/Shuttles/Nfsd/fighter.yml b/Resources/Maps/_NF/Shuttles/Nfsd/fighter.yml index 7d08d8aa038..c8ae0b31e1f 100644 --- a/Resources/Maps/_NF/Shuttles/Nfsd/fighter.yml +++ b/Resources/Maps/_NF/Shuttles/Nfsd/fighter.yml @@ -13,6 +13,8 @@ entities: components: - type: MetaData name: Fighter + - type: BecomesStation + id: Fighter - type: Transform pos: -0.15940452,-1.515625 parent: invalid diff --git a/Resources/Maps/_NF/Shuttles/Nfsd/paladin.yml b/Resources/Maps/_NF/Shuttles/Nfsd/paladin.yml index 254030b38e2..634912c6326 100644 --- a/Resources/Maps/_NF/Shuttles/Nfsd/paladin.yml +++ b/Resources/Maps/_NF/Shuttles/Nfsd/paladin.yml @@ -20,6 +20,8 @@ entities: components: - type: MetaData name: Paladin + - type: BecomesStation + id: Paladin - type: Transform pos: -0.4917612,-0.4486041 parent: invalid @@ -187,8 +189,6 @@ entities: chunkSize: 4 - type: GasTileOverlay - type: RadiationGridResistance - - type: BecomesStation - id: Hospitaller - proto: AirCanister entities: - uid: 120 diff --git a/Resources/Maps/_NF/Shuttles/Nfsd/rogue.yml b/Resources/Maps/_NF/Shuttles/Nfsd/rogue.yml index d5193795948..cc6182e0bc1 100644 --- a/Resources/Maps/_NF/Shuttles/Nfsd/rogue.yml +++ b/Resources/Maps/_NF/Shuttles/Nfsd/rogue.yml @@ -14,6 +14,8 @@ entities: components: - type: MetaData name: Rogue + - type: BecomesStation + id: Rogue - type: Transform pos: 2.2425354,-3.692793 parent: invalid diff --git a/Resources/Maps/_NF/Shuttles/Nfsd/templar.yml b/Resources/Maps/_NF/Shuttles/Nfsd/templar.yml index f5204d7fe40..4ae04e10a28 100644 --- a/Resources/Maps/_NF/Shuttles/Nfsd/templar.yml +++ b/Resources/Maps/_NF/Shuttles/Nfsd/templar.yml @@ -19,6 +19,8 @@ entities: components: - type: MetaData name: Templar + - type: BecomesStation + id: Templar - type: Transform pos: -0.4761362,-0.4642291 parent: invalid @@ -210,8 +212,6 @@ entities: chunkSize: 4 - type: GasTileOverlay - type: RadiationGridResistance - - type: BecomesStation - id: Hospitaller - proto: AirlockGlassShuttleNfsd entities: - uid: 45 diff --git a/Resources/Maps/_NF/Shuttles/Nfsd/wasp.yml b/Resources/Maps/_NF/Shuttles/Nfsd/wasp.yml index dd79abbda5b..c33adbea5a2 100644 --- a/Resources/Maps/_NF/Shuttles/Nfsd/wasp.yml +++ b/Resources/Maps/_NF/Shuttles/Nfsd/wasp.yml @@ -29,6 +29,8 @@ entities: components: - type: MetaData name: Wasp + - type: BecomesStation + id: Wasp - type: Transform pos: 0.22101265,1.687084 parent: invalid diff --git a/Resources/Maps/_NF/Shuttles/Nfsd/wendigo.yml b/Resources/Maps/_NF/Shuttles/Nfsd/wendigo.yml index 37e8521e108..8c16363977d 100644 --- a/Resources/Maps/_NF/Shuttles/Nfsd/wendigo.yml +++ b/Resources/Maps/_NF/Shuttles/Nfsd/wendigo.yml @@ -19,6 +19,8 @@ entities: components: - type: MetaData name: Wendigo + - type: BecomesStation + id: Wendigo - type: Transform parent: invalid - type: MapGrid diff --git a/Resources/Maps/_NF/Shuttles/Scrap/disciple.yml b/Resources/Maps/_NF/Shuttles/Scrap/disciple.yml index 20d2257dfcf..8acde65cd28 100644 --- a/Resources/Maps/_NF/Shuttles/Scrap/disciple.yml +++ b/Resources/Maps/_NF/Shuttles/Scrap/disciple.yml @@ -15,6 +15,8 @@ entities: components: - type: MetaData name: Disciple + - type: BecomesStation + id: Disciple - type: Transform pos: -0.47058776,-0.52941173 parent: invalid @@ -1494,8 +1496,6 @@ entities: - type: Transform pos: 2.5,1.5 parent: 1 - - type: BecomesStation - id: disciple - proto: Window entities: - uid: 18 diff --git a/Resources/Maps/_NF/Shuttles/Scrap/nugget.yml b/Resources/Maps/_NF/Shuttles/Scrap/nugget.yml index 8227e77d8bf..73ed6a2b1be 100644 --- a/Resources/Maps/_NF/Shuttles/Scrap/nugget.yml +++ b/Resources/Maps/_NF/Shuttles/Scrap/nugget.yml @@ -519,7 +519,7 @@ entities: - type: GasTileOverlay - type: RadiationGridResistance - type: BecomesStation - id: svnugget + id: Nugget - proto: Airlock entities: - uid: 2 @@ -1565,38 +1565,6 @@ entities: - type: Transform pos: 2.5,2.5 parent: 1 -- proto: MouseTimedSpawner - entities: - - uid: 146 - components: - - type: Transform - pos: 6.5,-6.5 - parent: 1 - - uid: 147 - components: - - type: Transform - pos: 8.5,-4.5 - parent: 1 - - uid: 148 - components: - - type: Transform - pos: 10.5,-6.5 - parent: 1 - - uid: 149 - components: - - type: Transform - pos: 4.5,-0.5 - parent: 1 - - uid: 150 - components: - - type: Transform - pos: 9.5,-1.5 - parent: 1 - - uid: 151 - components: - - type: Transform - pos: 12.5,-3.5 - parent: 1 - proto: MousetrapArmed entities: - uid: 94 @@ -1746,33 +1714,6 @@ entities: - type: Transform pos: 11.303192,-1.3316066 parent: 1 -- proto: SalvageSeedSpawnerLow - entities: - - uid: 106 - components: - - type: Transform - pos: 7.5,-0.5 - parent: 1 - - uid: 179 - components: - - type: Transform - pos: 9.5,0.5 - parent: 1 - - uid: 180 - components: - - type: Transform - pos: 8.5,-0.5 - parent: 1 - - uid: 181 - components: - - type: Transform - pos: 10.5,0.5 - parent: 1 - - uid: 182 - components: - - type: Transform - pos: 9.5,-1.5 - parent: 1 - proto: ShardGlass entities: - uid: 183 diff --git a/Resources/Maps/_NF/Shuttles/Scrap/orange.yml b/Resources/Maps/_NF/Shuttles/Scrap/orange.yml index 5d231d5303c..a6cd98673eb 100644 --- a/Resources/Maps/_NF/Shuttles/Scrap/orange.yml +++ b/Resources/Maps/_NF/Shuttles/Scrap/orange.yml @@ -546,7 +546,7 @@ entities: - type: GasTileOverlay - type: RadiationGridResistance - type: BecomesStation - id: svorange + id: Orange - proto: AirlockCargoGlass entities: - uid: 2 diff --git a/Resources/Maps/_NF/Shuttles/Scrap/point.yml b/Resources/Maps/_NF/Shuttles/Scrap/point.yml index 3d2d16568da..614d4a09140 100644 --- a/Resources/Maps/_NF/Shuttles/Scrap/point.yml +++ b/Resources/Maps/_NF/Shuttles/Scrap/point.yml @@ -19,6 +19,8 @@ entities: components: - type: MetaData name: Point + - type: BecomesStation + id: Point - type: Transform pos: -0.39584857,-0.47913614 parent: invalid @@ -440,8 +442,6 @@ entities: chunkSize: 4 - type: GasTileOverlay - type: RadiationGridResistance - - type: BecomesStation - id: Sart - proto: AirAlarm entities: - uid: 4 diff --git a/Resources/Maps/_NF/Shuttles/Scrap/scrap-courserx.yml b/Resources/Maps/_NF/Shuttles/Scrap/scrap-courserx.yml index ed9b7f01a22..2b2da744e4f 100644 --- a/Resources/Maps/_NF/Shuttles/Scrap/scrap-courserx.yml +++ b/Resources/Maps/_NF/Shuttles/Scrap/scrap-courserx.yml @@ -2888,13 +2888,6 @@ entities: - type: Transform pos: 0.5,-0.5 parent: 1 -- proto: RandomItem - entities: - - uid: 519 - components: - - type: Transform - pos: 3.5,-4.5 - parent: 1 - proto: RandomSpawner entities: - uid: 25 diff --git a/Resources/Maps/_NF/Shuttles/Scrap/tide.yml b/Resources/Maps/_NF/Shuttles/Scrap/tide.yml index 859b64a4afc..08262021883 100644 --- a/Resources/Maps/_NF/Shuttles/Scrap/tide.yml +++ b/Resources/Maps/_NF/Shuttles/Scrap/tide.yml @@ -575,8 +575,8 @@ entities: type: GridAtmosphere - type: GasTileOverlay - type: RadiationGridResistance - - id: svtide - type: BecomesStation + - type: BecomesStation + id: Tide - proto: Airlock entities: - uid: 2 diff --git a/Resources/Maps/_NF/Shuttles/Sr/bottleneck.yml b/Resources/Maps/_NF/Shuttles/Sr/bottleneck.yml index bc0447aec68..26b3f06d3e6 100644 --- a/Resources/Maps/_NF/Shuttles/Sr/bottleneck.yml +++ b/Resources/Maps/_NF/Shuttles/Sr/bottleneck.yml @@ -18,6 +18,8 @@ entities: components: - type: MetaData name: bottleneck + - type: BecomesStation + id: Bottleneck - type: Transform pos: -0.53125,-0.5 parent: invalid diff --git a/Resources/Maps/_NF/Shuttles/Sr/chauffeur.yml b/Resources/Maps/_NF/Shuttles/Sr/chauffeur.yml new file mode 100644 index 00000000000..433941883b9 --- /dev/null +++ b/Resources/Maps/_NF/Shuttles/Sr/chauffeur.yml @@ -0,0 +1,1561 @@ +meta: + format: 6 + postmapinit: false +tilemap: + 0: Space + 33: FloorDark + 38: FloorDarkMono + 1: FloorGlass + 99: FloorSteelCheckerDark + 112: FloorTechMaint + 126: FloorWood + 129: Lattice + 130: Plating +entities: +- proto: "" + entities: + - uid: 2 + components: + - type: MetaData + name: Chauffeur + - type: Transform + pos: -0.47916666,-0.5364844 + parent: invalid + - type: MapGrid + chunks: + 0,0: + ind: 0,0 + tiles: IQAAAAADfgAAAAADfgAAAAAAfgAAAAACggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIQAAAAAAfgAAAAAAfgAAAAADfgAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJgAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJgAAAAABJgAAAAACggAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIQAAAAAAIQAAAAACggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAggAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + -1,0: + ind: -1,0 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAIQAAAAABggAAAAAAIQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIQAAAAACJgAAAAAAJgAAAAADIQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAggAAAAAAJgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAIQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + -1,-1: + ind: -1,-1 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAggAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAcAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAcAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAggAAAAAAcAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIQAAAAADJgAAAAADJgAAAAABIQAAAAAC + version: 6 + 0,-1: + ind: 0,-1 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAggAAAAAAggAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAYwAAAAADYwAAAAABggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAYwAAAAACYwAAAAACggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAYwAAAAAAYwAAAAABggAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAYwAAAAAAYwAAAAAAggAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIQAAAAAAfgAAAAADfgAAAAACfgAAAAACggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + - type: Broadphase + - type: Physics + bodyStatus: InAir + angularDamping: 0.05 + linearDamping: 0.05 + fixedRotation: False + bodyType: Dynamic + - type: Fixtures + fixtures: {} + - type: OccluderTree + - type: SpreaderGrid + - type: Shuttle + - type: GridPathfinding + - type: Gravity + gravityShakeSound: !type:SoundPathSpecifier + path: /Audio/Effects/alert.ogg + - type: DecalGrid + chunkCollection: + version: 2 + nodes: + - node: + angle: -1.5707963267948966 rad + color: '#FFFFFFFF' + id: Arrows + decals: + 17: -3,1 + 18: -3,-1 + - node: + color: '#FFFFFFFF' + id: Bot + decals: + 8: -1,3 + 13: -2,-5 + 14: -1,-5 + 15: -3,1 + 16: -3,-1 + - node: + color: '#FFFFFFFF' + id: BotRightGreyscale + decals: + 10: 1,3 + - node: + color: '#0096FFFF' + id: BoxGreyscale + decals: + 12: -2,-3 + - node: + color: '#FF0000FF' + id: BoxGreyscale + decals: + 11: -2,-4 + - node: + color: '#FFFFFFFF' + id: BoxGreyscale + decals: + 9: 0,3 + - node: + cleanable: True + color: '#FFFFFFFF' + id: Dirt + decals: + 35: -1,-4 + 45: 2,0 + - node: + cleanable: True + color: '#FFFFFFFF' + id: DirtHeavy + decals: + 36: -1,0 + 41: -1,-3 + - node: + cleanable: True + color: '#FFFFFFFF' + id: DirtHeavyMonotile + decals: + 37: -3,-1 + 38: -3,1 + 42: -1,-5 + 43: -1,-1 + 44: 0,0 + 46: 2,-2 + - node: + cleanable: True + color: '#FFFFFFFF' + id: DirtLight + decals: + 39: 1,-3 + - node: + cleanable: True + color: '#FFFFFFFF' + id: DirtMedium + decals: + 40: 0,1 + - node: + color: '#334E6DFF' + id: HalfTileOverlayGreyscale + decals: + 21: 0,4 + - node: + angle: 1.5707963267948966 rad + color: '#FFFFFFFF' + id: StandClear + decals: + 26: -2,-1 + 27: -2,1 + - node: + color: '#334E6DFF' + id: ThreeQuarterTileOverlayGreyscale + decals: + 19: -1,4 + - node: + color: '#334E6DFF' + id: ThreeQuarterTileOverlayGreyscale90 + decals: + 20: 1,4 + - node: + color: '#FFFF00FF' + id: WarnLineGreyscaleE + decals: + 24: -2,1 + 25: -2,-1 + 33: -4,-1 + 34: -4,1 + - node: + color: '#334E6DC8' + id: WarnLineGreyscaleN + decals: + 28: 0,1 + - node: + color: '#FFFF00FF' + id: WarnLineGreyscaleW + decals: + 22: -2,-1 + 23: -2,1 + 29: -1,1 + 30: -1,-1 + - node: + color: '#FFFFFFFF' + id: WarnLineS + decals: + 31: -4,-1 + 32: -4,1 + - node: + color: '#FFFFFFFF' + id: WoodTrimThinCornerNe + decals: + 3: 3,1 + - node: + color: '#FFFFFFFF' + id: WoodTrimThinCornerNw + decals: + 1: 1,1 + - node: + color: '#FFFFFFFF' + id: WoodTrimThinCornerSe + decals: + 2: 3,-1 + - node: + color: '#FFFFFFFF' + id: WoodTrimThinCornerSw + decals: + 4: 1,-1 + - node: + color: '#FFFFFFFF' + id: WoodTrimThinLineE + decals: + 6: 3,0 + - node: + color: '#FFFFFFFF' + id: WoodTrimThinLineN + decals: + 7: 2,1 + - node: + color: '#FFFFFFFF' + id: WoodTrimThinLineS + decals: + 5: 2,-1 + - node: + color: '#FFFFFFFF' + id: WoodTrimThinLineW + decals: + 0: 1,0 + - type: GridAtmosphere + version: 2 + data: + tiles: + 0,0: + 0: 12799 + 1: 32768 + 0,-1: + 0: 63094 + -1,0: + 0: 33018 + 1: 8192 + 0,1: + 0: 3 + 1: 64 + -1,1: + 0: 8 + 1: 64 + -1,-1: + 0: 61644 + 1: 16 + -1,-2: + 1: 512 + 0: 49152 + 0,-2: + 0: 24576 + 1: 2048 + 1,-1: + 1: 16 + uniqueMixes: + - volume: 2500 + temperature: 293.15 + moles: + - 21.824879 + - 82.10312 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - volume: 2500 + immutable: True + moles: + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + chunkSize: 4 + - type: GasTileOverlay + - type: RadiationGridResistance + - type: BecomesStation + id: Chauffeur +- proto: AirlockCommandGlass + entities: + - uid: 150 + components: + - type: Transform + pos: 0.5,2.5 + parent: 2 +- proto: AirlockEngineering + entities: + - uid: 114 + components: + - type: Transform + pos: 0.5,-2.5 + parent: 2 +- proto: AirlockExternalGlass + entities: + - uid: 151 + components: + - type: Transform + pos: -1.5,1.5 + parent: 2 + - uid: 152 + components: + - type: Transform + pos: -1.5,-0.5 + parent: 2 +- proto: AirlockGlassShuttle + entities: + - uid: 51 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -3.5,-0.5 + parent: 2 + - uid: 154 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -3.5,1.5 + parent: 2 +- proto: APCBasic + entities: + - uid: 113 + components: + - type: Transform + pos: 0.5,-1.5 + parent: 2 +- proto: AtmosDeviceFanDirectional + entities: + - uid: 1 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -3.5,-0.5 + parent: 2 + - uid: 53 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -3.5,1.5 + parent: 2 +- proto: AtmosFixBlockerMarker + entities: + - uid: 166 + components: + - type: Transform + pos: -3.5,-2.5 + parent: 2 + - uid: 167 + components: + - type: Transform + pos: -2.5,-5.5 + parent: 2 + - uid: 168 + components: + - type: Transform + pos: 3.5,-5.5 + parent: 2 + - uid: 169 + components: + - type: Transform + pos: 4.5,-2.5 + parent: 2 + - uid: 170 + components: + - type: Transform + pos: 3.5,3.5 + parent: 2 + - uid: 171 + components: + - type: Transform + pos: -2.5,3.5 + parent: 2 + - uid: 172 + components: + - type: Transform + pos: -1.5,5.5 + parent: 2 + - uid: 173 + components: + - type: Transform + pos: 2.5,5.5 + parent: 2 +- proto: BenchSofaCorpCorner + entities: + - uid: 55 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 3.5,-0.5 + parent: 2 + - type: Physics + canCollide: False + - type: Fixtures + fixtures: {} +- proto: BenchSofaCorpLeft + entities: + - uid: 58 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,-0.5 + parent: 2 +- proto: BenchSofaCorpMiddle + entities: + - uid: 56 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 3.5,0.5 + parent: 2 +- proto: BenchSofaCorpRight + entities: + - uid: 54 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 3.5,1.5 + parent: 2 +- proto: CableApcExtension + entities: + - uid: 132 + components: + - type: Transform + pos: 0.5,-1.5 + parent: 2 + - uid: 133 + components: + - type: Transform + pos: 0.5,-0.5 + parent: 2 + - uid: 134 + components: + - type: Transform + pos: 0.5,0.5 + parent: 2 + - uid: 135 + components: + - type: Transform + pos: 0.5,1.5 + parent: 2 + - uid: 136 + components: + - type: Transform + pos: 0.5,2.5 + parent: 2 + - uid: 137 + components: + - type: Transform + pos: 0.5,3.5 + parent: 2 + - uid: 138 + components: + - type: Transform + pos: -0.5,-0.5 + parent: 2 + - uid: 139 + components: + - type: Transform + pos: -1.5,-0.5 + parent: 2 + - uid: 140 + components: + - type: Transform + pos: -2.5,-0.5 + parent: 2 + - uid: 141 + components: + - type: Transform + pos: 1.5,-0.5 + parent: 2 + - uid: 142 + components: + - type: Transform + pos: 2.5,-0.5 + parent: 2 + - uid: 144 + components: + - type: Transform + pos: 2.5,-1.5 + parent: 2 + - uid: 145 + components: + - type: Transform + pos: 2.5,-2.5 + parent: 2 + - uid: 146 + components: + - type: Transform + pos: 2.5,-3.5 + parent: 2 + - uid: 174 + components: + - type: Transform + pos: 0.5,-2.5 + parent: 2 + - uid: 194 + components: + - type: Transform + pos: -0.5,-2.5 + parent: 2 + - uid: 196 + components: + - type: Transform + pos: -0.5,-3.5 + parent: 2 +- proto: CableHV + entities: + - uid: 126 + components: + - type: Transform + pos: -0.5,-4.5 + parent: 2 + - uid: 127 + components: + - type: Transform + pos: -0.5,-3.5 + parent: 2 + - uid: 128 + components: + - type: Transform + pos: -0.5,-2.5 + parent: 2 + - uid: 129 + components: + - type: Transform + pos: -0.5,-1.5 + parent: 2 +- proto: CableMV + entities: + - uid: 130 + components: + - type: Transform + pos: -0.5,-1.5 + parent: 2 + - uid: 131 + components: + - type: Transform + pos: 0.5,-1.5 + parent: 2 +- proto: ChairFolding + entities: + - uid: 187 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,-3.5 + parent: 2 +- proto: ChairPilotSeat + entities: + - uid: 161 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,3.5 + parent: 2 +- proto: ComputerTabletopShuttle + entities: + - uid: 157 + components: + - type: Transform + pos: 0.5,4.5 + parent: 2 +- proto: ComputerTabletopStationRecords + entities: + - uid: 158 + components: + - type: Transform + pos: 1.5,4.5 + parent: 2 +- proto: ComputerTelevision + entities: + - uid: 52 + components: + - type: Transform + pos: 2.5,1.5 + parent: 2 +- proto: ComputerWallmountWithdrawBankATM + entities: + - uid: 153 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -2.5,-1.5 + parent: 2 + - type: ContainerContainer + containers: + board: !type:Container + showEnts: False + occludes: True + ents: [] + bank-ATM-cashSlot: !type:ContainerSlot + showEnts: False + occludes: True + ent: null + - type: Physics + canCollide: False + - type: ItemSlots +- proto: CrateFreezer + entities: + - uid: 61 + components: + - type: Transform + pos: 2.5,-2.5 + parent: 2 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14923 + moles: + - 1.7459903 + - 6.568249 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 +- proto: DefibrillatorCabinetFilled + entities: + - uid: 185 + components: + - type: Transform + pos: 2.5,2.5 + parent: 2 +- proto: DrinkChampagneBottleFull + entities: + - uid: 193 + components: + - type: Transform + pos: 1.535899,-4.187701 + parent: 2 +- proto: DrinkGlassCoupeShaped + entities: + - uid: 59 + components: + - type: Transform + pos: 1.9004824,-4.062614 + parent: 2 + - uid: 62 + components: + - type: Transform + pos: 2.1296492,-4.302364 + parent: 2 +- proto: EmergencyLight + entities: + - uid: 190 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,-0.5 + parent: 2 + - uid: 191 + components: + - type: Transform + pos: -0.5,-2.5 + parent: 2 + - uid: 192 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,3.5 + parent: 2 +- proto: ExtinguisherCabinetFilled + entities: + - uid: 125 + components: + - type: Transform + pos: 0.5,-3.5 + parent: 2 +- proto: FaxMachineShip + entities: + - uid: 159 + components: + - type: Transform + pos: -0.5,4.5 + parent: 2 +- proto: FirelockGlass + entities: + - uid: 97 + components: + - type: Transform + pos: 0.5,2.5 + parent: 2 + - uid: 189 + components: + - type: Transform + pos: 0.5,-2.5 + parent: 2 +- proto: GasMixerOn + entities: + - uid: 43 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,-2.5 + parent: 2 + - type: GasMixer + inletTwoConcentration: 0.79 + inletOneConcentration: 0.21 + - type: AtmosPipeColor + color: '#0055CCFF' +- proto: GasPassiveVent + entities: + - uid: 81 + components: + - type: Transform + pos: -2.5,3.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' +- proto: GasPipeBend + entities: + - uid: 44 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,-3.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 84 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -2.5,-0.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 88 + components: + - type: Transform + pos: 0.5,3.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 103 + components: + - type: Transform + pos: 1.5,-0.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 108 + components: + - type: Transform + pos: 2.5,1.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 124 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,-3.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 148 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,-2.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' +- proto: GasPipeStraight + entities: + - uid: 82 + components: + - type: Transform + pos: -2.5,2.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 83 + components: + - type: Transform + pos: -2.5,1.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 85 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,-0.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 87 + components: + - type: Transform + pos: 0.5,2.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 90 + components: + - type: Transform + pos: 0.5,1.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 93 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,-0.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 95 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,-1.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 96 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,-2.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 98 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,-3.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 100 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 0.5,-2.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 101 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,-2.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 106 + components: + - type: Transform + pos: 1.5,2.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 109 + components: + - type: Transform + pos: 2.5,0.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 110 + components: + - type: Transform + pos: 2.5,-0.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 111 + components: + - type: Transform + pos: 2.5,-1.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' +- proto: GasPipeTJunction + entities: + - uid: 91 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,0.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 92 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,-0.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 107 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,1.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' +- proto: GasPort + entities: + - uid: 46 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,-3.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 47 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,-2.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' +- proto: GasVentPump + entities: + - uid: 104 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,0.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 105 + components: + - type: Transform + pos: 1.5,3.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' +- proto: GasVentScrubber + entities: + - uid: 86 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,0.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 89 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,3.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 99 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,-3.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' +- proto: GasVolumePumpOn + entities: + - uid: 94 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -2.5,0.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' +- proto: GravityGeneratorMini + entities: + - uid: 183 + components: + - type: Transform + pos: -1.5,-4.5 + parent: 2 +- proto: Grille + entities: + - uid: 6 + components: + - type: Transform + pos: -2.5,-2.5 + parent: 2 + - uid: 11 + components: + - type: Transform + pos: -0.5,-5.5 + parent: 2 + - uid: 13 + components: + - type: Transform + pos: 1.5,-5.5 + parent: 2 + - uid: 26 + components: + - type: Transform + pos: -1.5,4.5 + parent: 2 + - uid: 27 + components: + - type: Transform + pos: -0.5,5.5 + parent: 2 + - uid: 28 + components: + - type: Transform + pos: 0.5,5.5 + parent: 2 + - uid: 29 + components: + - type: Transform + pos: 1.5,5.5 + parent: 2 + - uid: 30 + components: + - type: Transform + pos: 2.5,4.5 + parent: 2 + - uid: 31 + components: + - type: Transform + pos: 4.5,1.5 + parent: 2 + - uid: 32 + components: + - type: Transform + pos: 4.5,0.5 + parent: 2 + - uid: 33 + components: + - type: Transform + pos: 4.5,-0.5 + parent: 2 + - uid: 35 + components: + - type: Transform + pos: 3.5,-3.5 + parent: 2 + - uid: 36 + components: + - type: Transform + pos: 3.5,-2.5 + parent: 2 + - uid: 48 + components: + - type: Transform + pos: -0.5,2.5 + parent: 2 + - uid: 49 + components: + - type: Transform + pos: 1.5,2.5 + parent: 2 + - uid: 50 + components: + - type: Transform + pos: -3.5,0.5 + parent: 2 + - uid: 60 + components: + - type: Transform + pos: -1.5,0.5 + parent: 2 +- proto: GrilleDiagonal + entities: + - uid: 178 + components: + - type: Transform + pos: -1.5,5.5 + parent: 2 + - uid: 180 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,5.5 + parent: 2 +- proto: JukeboxWallmountShip + entities: + - uid: 102 + components: + - type: Transform + pos: 3.5,2.5 + parent: 2 +- proto: LockerPilotFilled + entities: + - uid: 119 + components: + - type: Transform + pos: 1.5,3.5 + parent: 2 +- proto: LockerWallMaterialsFuelPlasmaFilled + entities: + - uid: 184 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,-4.5 + parent: 2 +- proto: NitrogenCanister + entities: + - uid: 80 + components: + - type: Transform + anchored: True + pos: -1.5,-3.5 + parent: 2 + - type: Physics + bodyType: Static +- proto: OxygenCanister + entities: + - uid: 79 + components: + - type: Transform + anchored: True + pos: -1.5,-2.5 + parent: 2 + - type: Physics + bodyType: Static +- proto: Paper + entities: + - uid: 160 + components: + - type: Transform + pos: -0.30220816,4.429711 + parent: 2 + - uid: 181 + components: + - type: Transform + pos: -0.45423022,4.366728 + parent: 2 +- proto: PortableGeneratorPacmanShuttle + entities: + - uid: 182 + components: + - type: Transform + pos: -0.5,-4.5 + parent: 2 + - type: FuelGenerator + on: False + - type: Physics + bodyType: Static +- proto: PottedPlantRandom + entities: + - uid: 195 + components: + - type: Transform + pos: 1.5,1.5 + parent: 2 +- proto: Poweredlight + entities: + - uid: 143 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,-0.5 + parent: 2 +- proto: PoweredlightGreen + entities: + - uid: 162 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,3.5 + parent: 2 +- proto: PoweredlightRed + entities: + - uid: 163 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -2.5,3.5 + parent: 2 +- proto: PoweredSmallLight + entities: + - uid: 155 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -2.5,-0.5 + parent: 2 + - uid: 156 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,-3.5 + parent: 2 + - uid: 175 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,-3.5 + parent: 2 + - uid: 176 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,3.5 + parent: 2 +- proto: ShuttleWindow + entities: + - uid: 57 + components: + - type: Transform + pos: -1.5,4.5 + parent: 2 + - uid: 63 + components: + - type: Transform + pos: -0.5,5.5 + parent: 2 + - uid: 64 + components: + - type: Transform + pos: 0.5,5.5 + parent: 2 + - uid: 65 + components: + - type: Transform + pos: 1.5,5.5 + parent: 2 + - uid: 66 + components: + - type: Transform + pos: 2.5,4.5 + parent: 2 + - uid: 67 + components: + - type: Transform + pos: 1.5,2.5 + parent: 2 + - uid: 68 + components: + - type: Transform + pos: -0.5,2.5 + parent: 2 + - uid: 69 + components: + - type: Transform + pos: -1.5,0.5 + parent: 2 + - uid: 70 + components: + - type: Transform + pos: -3.5,0.5 + parent: 2 + - uid: 71 + components: + - type: Transform + pos: 4.5,1.5 + parent: 2 + - uid: 72 + components: + - type: Transform + pos: 4.5,0.5 + parent: 2 + - uid: 73 + components: + - type: Transform + pos: 4.5,-0.5 + parent: 2 + - uid: 74 + components: + - type: Transform + pos: 3.5,-2.5 + parent: 2 + - uid: 75 + components: + - type: Transform + pos: 3.5,-3.5 + parent: 2 + - uid: 76 + components: + - type: Transform + pos: 1.5,-5.5 + parent: 2 + - uid: 77 + components: + - type: Transform + pos: -0.5,-5.5 + parent: 2 + - uid: 78 + components: + - type: Transform + pos: -2.5,-2.5 + parent: 2 +- proto: ShuttleWindowDiagonal + entities: + - uid: 37 + components: + - type: Transform + pos: -1.5,5.5 + parent: 2 + - uid: 38 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,5.5 + parent: 2 +- proto: SmallGyroscope + entities: + - uid: 149 + components: + - type: Transform + pos: -0.5,3.5 + parent: 2 +- proto: SpawnPointLatejoin + entities: + - uid: 165 + components: + - type: Transform + pos: 0.5,1.5 + parent: 2 +- proto: SubstationWallBasic + entities: + - uid: 112 + components: + - type: Transform + pos: -0.5,-1.5 + parent: 2 +- proto: SuitStorageWallmountPilot + entities: + - uid: 123 + components: + - type: Transform + pos: -2.5,2.5 + parent: 2 +- proto: TableFancyWhite + entities: + - uid: 177 + components: + - type: Transform + pos: 2.5,-4.5 + parent: 2 + - uid: 179 + components: + - type: Transform + pos: 1.5,-4.5 + parent: 2 +- proto: TableReinforced + entities: + - uid: 120 + components: + - type: Transform + pos: 1.5,4.5 + parent: 2 + - uid: 121 + components: + - type: Transform + pos: 0.5,4.5 + parent: 2 + - uid: 122 + components: + - type: Transform + pos: -0.5,4.5 + parent: 2 +- proto: TableWood + entities: + - uid: 186 + components: + - type: Transform + pos: 2.5,0.5 + parent: 2 +- proto: Thruster + entities: + - uid: 115 + components: + - type: Transform + pos: 3.5,3.5 + parent: 2 + - uid: 116 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,-2.5 + parent: 2 + - uid: 117 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -3.5,-2.5 + parent: 2 + - uid: 118 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,3.5 + parent: 2 +- proto: WallShuttle + entities: + - uid: 3 + components: + - type: Transform + pos: -3.5,-1.5 + parent: 2 + - uid: 4 + components: + - type: Transform + pos: -2.5,-1.5 + parent: 2 + - uid: 5 + components: + - type: Transform + pos: -1.5,-1.5 + parent: 2 + - uid: 7 + components: + - type: Transform + pos: -2.5,-3.5 + parent: 2 + - uid: 8 + components: + - type: Transform + pos: -2.5,-4.5 + parent: 2 + - uid: 9 + components: + - type: Transform + pos: 2.5,-5.5 + parent: 2 + - uid: 12 + components: + - type: Transform + pos: 0.5,-5.5 + parent: 2 + - uid: 14 + components: + - type: Transform + pos: -1.5,-5.5 + parent: 2 + - uid: 16 + components: + - type: Transform + pos: 3.5,-1.5 + parent: 2 + - uid: 17 + components: + - type: Transform + pos: 4.5,-1.5 + parent: 2 + - uid: 18 + components: + - type: Transform + pos: 4.5,2.5 + parent: 2 + - uid: 19 + components: + - type: Transform + pos: 3.5,2.5 + parent: 2 + - uid: 20 + components: + - type: Transform + pos: 2.5,2.5 + parent: 2 + - uid: 21 + components: + - type: Transform + pos: -3.5,2.5 + parent: 2 + - uid: 22 + components: + - type: Transform + pos: -2.5,2.5 + parent: 2 + - uid: 23 + components: + - type: Transform + pos: -1.5,2.5 + parent: 2 + - uid: 24 + components: + - type: Transform + pos: -1.5,3.5 + parent: 2 + - uid: 25 + components: + - type: Transform + pos: 2.5,3.5 + parent: 2 + - uid: 34 + components: + - type: Transform + pos: 3.5,-4.5 + parent: 2 + - uid: 39 + components: + - type: Transform + pos: -0.5,-1.5 + parent: 2 + - uid: 40 + components: + - type: Transform + pos: 0.5,-1.5 + parent: 2 + - uid: 41 + components: + - type: Transform + pos: 0.5,-3.5 + parent: 2 + - uid: 42 + components: + - type: Transform + pos: 0.5,-4.5 + parent: 2 +- proto: WallShuttleDiagonal + entities: + - uid: 10 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,-5.5 + parent: 2 + - uid: 15 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,-5.5 + parent: 2 +- proto: WarpPointShip + entities: + - uid: 164 + components: + - type: Transform + pos: 0.5,0.5 + parent: 2 +- proto: WaterCooler + entities: + - uid: 147 + components: + - type: Transform + pos: 2.5,-1.5 + parent: 2 +- proto: Wrench + entities: + - uid: 45 + components: + - type: Transform + pos: -1.5,-3.5 + parent: 2 +... diff --git a/Resources/Maps/_NF/Shuttles/Sr/mailpod.yml b/Resources/Maps/_NF/Shuttles/Sr/mailpod.yml index 995836b1a5c..56d87723d88 100644 --- a/Resources/Maps/_NF/Shuttles/Sr/mailpod.yml +++ b/Resources/Maps/_NF/Shuttles/Sr/mailpod.yml @@ -14,6 +14,8 @@ entities: components: - type: MetaData name: MailPod + - type: BecomesStation + id: MailPod - type: Transform pos: -0.48958334,-0.5208333 parent: invalid diff --git a/Resources/Maps/_NF/Shuttles/Sr/parcel.yml b/Resources/Maps/_NF/Shuttles/Sr/parcel.yml index efcb2e00f8c..77b085556cd 100644 --- a/Resources/Maps/_NF/Shuttles/Sr/parcel.yml +++ b/Resources/Maps/_NF/Shuttles/Sr/parcel.yml @@ -14,6 +14,8 @@ entities: components: - type: MetaData name: Parcel + - type: BecomesStation + id: Parcel - type: Transform pos: -0.48958334,-0.5208333 parent: invalid diff --git a/Resources/Maps/_NF/Shuttles/Syndicate/infiltrator.yml b/Resources/Maps/_NF/Shuttles/Syndicate/infiltrator.yml index e7e579b07a3..320482a0152 100644 --- a/Resources/Maps/_NF/Shuttles/Syndicate/infiltrator.yml +++ b/Resources/Maps/_NF/Shuttles/Syndicate/infiltrator.yml @@ -24,6 +24,8 @@ entities: components: - type: MetaData name: Infiltrator + - type: BecomesStation + id: Infiltrator - type: Transform pos: 0.64252126,4.1776605 parent: invalid diff --git a/Resources/Maps/_NF/Shuttles/akupara.yml b/Resources/Maps/_NF/Shuttles/akupara.yml index eb13a3899b3..7f044b236f7 100644 --- a/Resources/Maps/_NF/Shuttles/akupara.yml +++ b/Resources/Maps/_NF/Shuttles/akupara.yml @@ -24,6 +24,8 @@ entities: components: - type: MetaData name: Akupara + - type: BecomesStation + id: Akupara - type: Transform pos: -1.6066288,-0.53125 parent: invalid diff --git a/Resources/Maps/_NF/Shuttles/bocadillo.yml b/Resources/Maps/_NF/Shuttles/bocadillo.yml index e4cc68faae5..654bd71dc50 100644 --- a/Resources/Maps/_NF/Shuttles/bocadillo.yml +++ b/Resources/Maps/_NF/Shuttles/bocadillo.yml @@ -17,6 +17,8 @@ entities: components: - type: MetaData name: Bocadillo + - type: BecomesStation + id: Bocadillo - type: Transform pos: -0.4375,-1.703125 parent: invalid diff --git a/Resources/Maps/_NF/Shuttles/bodkin.yml b/Resources/Maps/_NF/Shuttles/bodkin.yml index 4660f70ebc9..4f0e9f72557 100644 --- a/Resources/Maps/_NF/Shuttles/bodkin.yml +++ b/Resources/Maps/_NF/Shuttles/bodkin.yml @@ -645,6 +645,8 @@ entities: chunkSize: 4 - type: GasTileOverlay - type: RadiationGridResistance + - type: BecomesStation + id: Bodkin - proto: AirAlarm entities: - uid: 83 diff --git a/Resources/Maps/_NF/Shuttles/bookworm.yml b/Resources/Maps/_NF/Shuttles/bookworm.yml index b3c638e8749..ebf39f77c36 100644 --- a/Resources/Maps/_NF/Shuttles/bookworm.yml +++ b/Resources/Maps/_NF/Shuttles/bookworm.yml @@ -22,6 +22,8 @@ entities: components: - type: MetaData name: Bookworm + - type: BecomesStation + id: Bookworm - type: Transform pos: -0.53125,-0.55733174 parent: invalid diff --git a/Resources/Maps/_NF/Shuttles/caduceus.yml b/Resources/Maps/_NF/Shuttles/caduceus.yml index 5eb1c654da1..1e58d71a5f1 100644 --- a/Resources/Maps/_NF/Shuttles/caduceus.yml +++ b/Resources/Maps/_NF/Shuttles/caduceus.yml @@ -897,7 +897,7 @@ entities: - type: GasTileOverlay - type: RadiationGridResistance - type: BecomesStation - id: caduceus + id: Caduceus - proto: AirAlarm entities: - uid: 1169 diff --git a/Resources/Maps/_NF/Shuttles/camper.yml b/Resources/Maps/_NF/Shuttles/camper.yml index d55c32460df..3bb338fbae7 100644 --- a/Resources/Maps/_NF/Shuttles/camper.yml +++ b/Resources/Maps/_NF/Shuttles/camper.yml @@ -18,6 +18,8 @@ entities: components: - type: MetaData name: Camper + - type: BecomesStation + id: Camper - type: Transform parent: invalid - type: MapGrid diff --git a/Resources/Maps/_NF/Shuttles/chisel.yml b/Resources/Maps/_NF/Shuttles/chisel.yml index d78761919e6..e59efd0523f 100644 --- a/Resources/Maps/_NF/Shuttles/chisel.yml +++ b/Resources/Maps/_NF/Shuttles/chisel.yml @@ -18,6 +18,8 @@ entities: components: - type: MetaData name: Chisel + - type: BecomesStation + id: Chisel - type: Transform pos: -0.5,-0.5000076 parent: invalid diff --git a/Resources/Maps/_NF/Shuttles/harbormaster.yml b/Resources/Maps/_NF/Shuttles/harbormaster.yml index 4301252f160..e730cad5f22 100644 --- a/Resources/Maps/_NF/Shuttles/harbormaster.yml +++ b/Resources/Maps/_NF/Shuttles/harbormaster.yml @@ -373,7 +373,7 @@ entities: - type: GasTileOverlay - type: RadiationGridResistance - type: BecomesStation - id: harbormaster + id: Harbormaster - proto: AirAlarm entities: - uid: 250 diff --git a/Resources/Maps/_NF/Shuttles/honker.yml b/Resources/Maps/_NF/Shuttles/honker.yml index b7bbee69277..49639fb3491 100644 --- a/Resources/Maps/_NF/Shuttles/honker.yml +++ b/Resources/Maps/_NF/Shuttles/honker.yml @@ -15,6 +15,8 @@ entities: components: - type: MetaData name: Honker + - type: BecomesStation + id: Honker - type: Transform pos: -0.6250305,0.875 parent: invalid diff --git a/Resources/Maps/_NF/Shuttles/investigator.yml b/Resources/Maps/_NF/Shuttles/investigator.yml index 70719ced48e..6c1a60f694c 100644 --- a/Resources/Maps/_NF/Shuttles/investigator.yml +++ b/Resources/Maps/_NF/Shuttles/investigator.yml @@ -24,6 +24,8 @@ entities: components: - type: MetaData name: Investigator + - type: BecomesStation + id: Investigator - type: Transform pos: -2.6107569,3.2554395 parent: invalid diff --git a/Resources/Maps/_NF/Shuttles/kestrel.yml b/Resources/Maps/_NF/Shuttles/kestrel.yml index 475a1d772bd..112b56774b3 100644 --- a/Resources/Maps/_NF/Shuttles/kestrel.yml +++ b/Resources/Maps/_NF/Shuttles/kestrel.yml @@ -24,6 +24,8 @@ entities: components: - type: MetaData name: Kestrel + - type: BecomesStation + id: Kestrel - type: Transform pos: -1.078125,-0.46875 parent: invalid diff --git a/Resources/Maps/_NF/Shuttles/lantern.yml b/Resources/Maps/_NF/Shuttles/lantern.yml index 060f7c3a673..91a146d57be 100644 --- a/Resources/Maps/_NF/Shuttles/lantern.yml +++ b/Resources/Maps/_NF/Shuttles/lantern.yml @@ -423,7 +423,7 @@ entities: - type: GasTileOverlay - type: RadiationGridResistance - type: BecomesStation - id: lantern + id: Lantern - proto: AirAlarm entities: - uid: 295 diff --git a/Resources/Maps/_NF/Shuttles/legman.yml b/Resources/Maps/_NF/Shuttles/legman.yml index f3bd740fdab..2a3e0e84f05 100644 --- a/Resources/Maps/_NF/Shuttles/legman.yml +++ b/Resources/Maps/_NF/Shuttles/legman.yml @@ -254,7 +254,7 @@ entities: - type: GasTileOverlay - type: RadiationGridResistance - type: BecomesStation - id: legman + id: Legman - proto: AirlockGlassShuttle entities: - uid: 4 diff --git a/Resources/Maps/_NF/Shuttles/liquidator.yml b/Resources/Maps/_NF/Shuttles/liquidator.yml index 5ca77aaaabd..b2a84834063 100644 --- a/Resources/Maps/_NF/Shuttles/liquidator.yml +++ b/Resources/Maps/_NF/Shuttles/liquidator.yml @@ -424,7 +424,7 @@ entities: - type: GasTileOverlay - type: RadiationGridResistance - type: BecomesStation - id: liquidator + id: Liquidator - proto: AirAlarm entities: - uid: 396 diff --git a/Resources/Maps/_NF/Shuttles/loader.yml b/Resources/Maps/_NF/Shuttles/loader.yml index 28e7a41027e..8c9be500304 100644 --- a/Resources/Maps/_NF/Shuttles/loader.yml +++ b/Resources/Maps/_NF/Shuttles/loader.yml @@ -15,6 +15,8 @@ entities: components: - type: MetaData name: Loader + - type: BecomesStation + id: Loader - type: Transform pos: -0.48958334,-0.53125 parent: invalid diff --git a/Resources/Maps/_NF/Shuttles/mccargo.yml b/Resources/Maps/_NF/Shuttles/mccargo.yml index cf75bb484a2..ceb61f267d4 100644 --- a/Resources/Maps/_NF/Shuttles/mccargo.yml +++ b/Resources/Maps/_NF/Shuttles/mccargo.yml @@ -17,6 +17,8 @@ entities: components: - type: MetaData name: McCargo + - type: BecomesStation + id: McCargo - type: Transform pos: -0.5,-0.6875 parent: invalid diff --git a/Resources/Maps/_NF/Shuttles/mcdelivery.yml b/Resources/Maps/_NF/Shuttles/mcdelivery.yml index 649f42e3e44..7d791e5fcf2 100644 --- a/Resources/Maps/_NF/Shuttles/mcdelivery.yml +++ b/Resources/Maps/_NF/Shuttles/mcdelivery.yml @@ -14,6 +14,8 @@ entities: components: - type: MetaData name: McDelivery + - type: BecomesStation + id: McDelivery - type: Transform pos: -0.48958334,-0.5208333 parent: invalid diff --git a/Resources/Maps/_NF/Shuttles/phoenix.yml b/Resources/Maps/_NF/Shuttles/phoenix.yml index 1606152ec7d..8065ef2d018 100644 --- a/Resources/Maps/_NF/Shuttles/phoenix.yml +++ b/Resources/Maps/_NF/Shuttles/phoenix.yml @@ -1025,7 +1025,7 @@ entities: - type: GasTileOverlay - type: RadiationGridResistance - type: BecomesStation - id: phoenix + id: Phoenix - proto: AirAlarm entities: - uid: 879 diff --git a/Resources/Maps/_NF/Shuttles/piecrust.yml b/Resources/Maps/_NF/Shuttles/piecrust.yml index 991c1366cb1..30b55192195 100644 --- a/Resources/Maps/_NF/Shuttles/piecrust.yml +++ b/Resources/Maps/_NF/Shuttles/piecrust.yml @@ -380,7 +380,7 @@ entities: - type: GasTileOverlay - type: RadiationGridResistance - type: BecomesStation - id: PTS + id: Piecrust - type: SpreaderGrid - type: NavMap - proto: AirAlarm diff --git a/Resources/Maps/_NF/Shuttles/pioneer.yml b/Resources/Maps/_NF/Shuttles/pioneer.yml index 441cb99ffb3..4d0cf33bcd0 100644 --- a/Resources/Maps/_NF/Shuttles/pioneer.yml +++ b/Resources/Maps/_NF/Shuttles/pioneer.yml @@ -222,7 +222,7 @@ entities: - type: GasTileOverlay - type: RadiationGridResistance - type: BecomesStation - id: pioneer + id: Pioneer - proto: AirAlarm entities: - uid: 49 diff --git a/Resources/Maps/_NF/Shuttles/pts.yml b/Resources/Maps/_NF/Shuttles/pts.yml index de3c00bc5d7..9b07da07086 100644 --- a/Resources/Maps/_NF/Shuttles/pts.yml +++ b/Resources/Maps/_NF/Shuttles/pts.yml @@ -284,6 +284,8 @@ entities: chunkSize: 4 - type: GasTileOverlay - type: RadiationGridResistance + - type: BecomesStation + id: PTS - proto: AirlockCommandGlass entities: - uid: 150 diff --git a/Resources/Maps/_NF/Shuttles/searchlight.yml b/Resources/Maps/_NF/Shuttles/searchlight.yml index ce23b93d70e..2a979fbf9bb 100644 --- a/Resources/Maps/_NF/Shuttles/searchlight.yml +++ b/Resources/Maps/_NF/Shuttles/searchlight.yml @@ -450,7 +450,7 @@ entities: - type: GasTileOverlay - type: RadiationGridResistance - type: BecomesStation - id: searchlight + id: Searchlight - proto: AirAlarm entities: - uid: 34 diff --git a/Resources/Maps/_NF/Shuttles/spectre.yml b/Resources/Maps/_NF/Shuttles/spectre.yml index d914f9e33f1..bb485f8a521 100644 --- a/Resources/Maps/_NF/Shuttles/spectre.yml +++ b/Resources/Maps/_NF/Shuttles/spectre.yml @@ -7222,8 +7222,6 @@ entities: rot: 1.5707963267948966 rad pos: -8.5,4.5 parent: 3 - - type: Thruster - enabled: False - uid: 217 components: - type: Transform @@ -8921,7 +8919,7 @@ entities: - type: Transform pos: 5.5,12.5 parent: 3 -- proto: WarpPointShip +- proto: WarpPoint entities: - uid: 1203 components: diff --git a/Resources/Maps/_NF/Shuttles/stasis.yml b/Resources/Maps/_NF/Shuttles/stasis.yml index 4f2f0a55aa7..bcfb97388ce 100644 --- a/Resources/Maps/_NF/Shuttles/stasis.yml +++ b/Resources/Maps/_NF/Shuttles/stasis.yml @@ -867,7 +867,7 @@ entities: - type: GasTileOverlay - type: RadiationGridResistance - type: BecomesStation - id: stasis + id: Stasis - type: NavMap - proto: AirAlarm entities: diff --git a/Resources/Maps/_NF/Shuttles/tyne.yml b/Resources/Maps/_NF/Shuttles/tyne.yml index 0ab90f220ba..ceee0ecaba2 100644 --- a/Resources/Maps/_NF/Shuttles/tyne.yml +++ b/Resources/Maps/_NF/Shuttles/tyne.yml @@ -19,6 +19,8 @@ entities: components: - type: MetaData name: grid + - type: BecomesStation + id: Tyne - type: Transform pos: -0.5,-0.5 parent: invalid diff --git a/Resources/Maps/_NF/Test/dev_map.yml b/Resources/Maps/_NF/Test/dev_map.yml index 17d9cb3c7fa..c8dab44962e 100644 --- a/Resources/Maps/_NF/Test/dev_map.yml +++ b/Resources/Maps/_NF/Test/dev_map.yml @@ -112,7 +112,7 @@ entities: -4,3: 1: 8738 -4,4: - 1: 230 + 1: 238 -3,0: 0: 65524 -3,1: @@ -120,8 +120,7 @@ entities: -3,2: 1: 35071 -3,-1: - 2: 17 - 0: 56780 + 0: 56797 -2,0: 0: 65534 -2,1: @@ -156,9 +155,14 @@ entities: 1: 4352 -4,-2: 0: 65535 + -5,-2: + 0: 34952 + 1: 8704 + -5,-1: + 0: 34952 + 1: 8738 -3,-2: - 0: 52477 - 3: 4352 + 0: 56829 -2,-2: 0: 3838 -2,-4: @@ -185,7 +189,7 @@ entities: 1: 17 0: 3276 -1,4: - 1: 240 + 1: 255 0,5: 0: 52428 0,6: @@ -236,14 +240,15 @@ entities: 1: 8738 2,1: 1: 2 + 0: 60928 2,-1: 1: 8738 + 3,1: + 0: 56780 3,2: 0: 36828 3,0: 0: 36590 - 3,1: - 0: 52428 3,-1: 0: 36044 4,0: @@ -271,9 +276,11 @@ entities: 2,-5: 1: 57344 3,-4: - 1: 13107 + 1: 13105 + 0: 2 3,-5: - 1: 12288 + 1: 4096 + 0: 8192 3,-2: 0: 52224 4,-2: @@ -303,13 +310,9 @@ entities: 8,-1: 0: 819 -5,0: - 1: 17476 - -5,-1: - 1: 17476 + 1: 17506 -5,1: 1: 17476 - -5,-2: - 1: 16384 5,1: 0: 48051 5,2: @@ -323,9 +326,9 @@ entities: 6,3: 0: 626 -3,4: - 1: 240 + 1: 255 -2,4: - 1: 240 + 1: 255 uniqueMixes: - volume: 2500 temperature: 293.15 @@ -357,36 +360,6 @@ entities: - 0 - 0 - 0 - - volume: 2500 - temperature: 293.15 - moles: - - 22.831823 - - 85.89114 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - volume: 2500 - temperature: 293.14996 - moles: - - 20.078888 - - 75.53487 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 chunkSize: 4 - type: GasTileOverlay - type: BecomesStation @@ -989,6 +962,13 @@ entities: - type: Transform pos: -2.5,-16.5 parent: 179 +- proto: BlueprintLithograph + entities: + - uid: 1088 + components: + - type: Transform + pos: 13.5,17.5 + parent: 179 - proto: BluespaceMatterBinStockPart entities: - uid: 1254 @@ -4024,10 +4004,10 @@ entities: parent: 179 - proto: CrateScienceLabBundle entities: - - uid: 1428 + - uid: 1504 components: - type: Transform - pos: 13.5,17.5 + pos: 13.5,19.5 parent: 179 - proto: CrewMonitoringServer entities: @@ -4745,6 +4725,14 @@ entities: - type: Transform pos: -0.982072,-3.4785347 parent: 179 +- proto: HoloGraffitiProjector + entities: + - uid: 1495 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.00722605,4.669485 + parent: 179 - proto: HolosignWetFloor entities: - uid: 848 @@ -5377,6 +5365,13 @@ entities: - type: Transform pos: -16.5,-5.5 parent: 179 +- proto: MercenaryTechFabHacked + entities: + - uid: 1508 + components: + - type: Transform + pos: -14.5,-5.5 + parent: 179 - proto: MicroManipulatorStockPart entities: - uid: 712 @@ -5443,6 +5438,13 @@ entities: - type: Transform pos: -6.3051395,8.791253 parent: 179 +- proto: NFEnergyPickaxe + entities: + - uid: 1497 + components: + - type: Transform + pos: -3.6757717,-2.0560873 + parent: 179 - proto: NfsdTechFab entities: - uid: 498 @@ -5478,6 +5480,21 @@ entities: - type: Transform pos: -3.5,10.5 parent: 179 +- proto: NFWeaponHoloflareGun + entities: + - uid: 1496 + components: + - type: Transform + pos: -3.8007717,-2.545206 + parent: 179 + - type: Item + heldPrefix: cyan + - type: EnergyGun + currentFireMode: + state: cyan + name: cyan + fireCost: 240 + proto: HoloFlareCyan - proto: NitrogenCanister entities: - uid: 459 @@ -6060,6 +6077,11 @@ entities: rot: 3.141592653589793 rad pos: 0.5,17.5 parent: 179 + - uid: 1231 + components: + - type: Transform + pos: 21.5,14.5 + parent: 179 - uid: 1232 components: - type: Transform @@ -6072,11 +6094,11 @@ entities: parent: 179 - proto: RailingCorner entities: - - uid: 1231 + - uid: 1428 components: - type: Transform rot: -1.5707963267948966 rad - pos: 21.5,14.5 + pos: 20.5,14.5 parent: 179 - proto: RailingCornerSmall entities: @@ -6205,6 +6227,40 @@ entities: - type: Transform pos: -13.5,-7.5 parent: 179 +- proto: ScrapOre + entities: + - uid: 1499 + components: + - type: Transform + pos: 3.3558059,17.606743 + parent: 179 + - uid: 1500 + components: + - type: Transform + pos: 3.5589309,17.528618 + parent: 179 + - uid: 1501 + components: + - type: Transform + pos: 3.3401809,17.294243 + parent: 179 + - uid: 1502 + components: + - type: Transform + pos: 3.6995559,17.731743 + parent: 179 + - uid: 1503 + components: + - type: Transform + pos: 3.8089309,17.247368 + parent: 179 +- proto: ScrapProcessor + entities: + - uid: 1498 + components: + - type: Transform + pos: 3.5,18.5 + parent: 179 - proto: Screen entities: - uid: 1192 @@ -6279,6 +6335,18 @@ entities: - type: Transform pos: -11.5,-5.5 parent: 179 +- proto: SheetPaper + entities: + - uid: 1506 + components: + - type: Transform + pos: 13.352237,16.538458 + parent: 179 + - uid: 1507 + components: + - type: Transform + pos: 13.695987,16.538458 + parent: 179 - proto: SheetPGlass entities: - uid: 416 @@ -6597,6 +6665,13 @@ entities: rot: -1.5707963267948966 rad pos: -10.425851,2.3130608 parent: 179 +- proto: SpawnMobCatBloodCult + entities: + - uid: 1493 + components: + - type: Transform + pos: 20.5,14.5 + parent: 179 - proto: SpawnMobCatCappy entities: - uid: 1230 @@ -7313,6 +7388,11 @@ entities: rot: -1.5707963267948966 rad pos: -0.5,8.5 parent: 179 + - uid: 1505 + components: + - type: Transform + pos: 13.5,16.5 + parent: 179 - proto: TableGlass entities: - uid: 964 @@ -9408,6 +9488,13 @@ entities: - type: Transform pos: -3.433327,-1.5 parent: 179 +- proto: WeaponLaserTurboNF + entities: + - uid: 1494 + components: + - type: Transform + pos: -3.471971,0.6138556 + parent: 179 - proto: WeaponLauncherMultipleRocket entities: - uid: 671 diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_food.yml b/Resources/Prototypes/Catalog/Cargo/cargo_food.yml index e1c67ee941c..280d386c87a 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_food.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_food.yml @@ -75,12 +75,13 @@ category: cargoproduct-category-name-food group: market -# - type: cargoProduct - # id: FoodSoftdrinksLarge - # icon: - # sprite: Objects/Consumable/Drinks/colabottle.rsi - # state: icon - # product: CrateFoodSoftdrinksLarge - # cost: 2400 - # category: cargoproduct-category-name-food - # group: market +- type: cargoProduct + id: FoodSoftdrinksLarge + abstract: true # Frontier + icon: + sprite: Objects/Consumable/Drinks/colabottle.rsi + state: icon + product: CrateFoodSoftdrinksLarge + cost: 2400 + category: cargoproduct-category-name-food + group: market diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_medical.yml b/Resources/Prototypes/Catalog/Cargo/cargo_medical.yml index 9475f346ba4..bcdb0e417dc 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_medical.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_medical.yml @@ -130,6 +130,7 @@ - type: cargoProduct id: ChemistryP + abstract: true # Frontier icon: sprite: Structures/Storage/Crates/chemcrate_secure.rsi state: icon @@ -140,6 +141,7 @@ - type: cargoProduct id: ChemistryS + abstract: true # Frontier icon: sprite: Structures/Storage/Crates/chemcrate_secure.rsi state: icon @@ -150,6 +152,7 @@ - type: cargoProduct id: CrateChemistryD + abstract: true # Frontier icon: sprite: Structures/Storage/Crates/chemcrate_secure.rsi state: icon diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml b/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml index 00a314f91a8..3ade4cebfed 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml @@ -39,6 +39,8 @@ prob: 0.3 - id: SprayPainter prob: 0.7 + - id: MaintenanceJack # Frontier + prob: 0.1 # Frontier - type: entity id: LockerElectricalSuppliesFilled diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml index b5eb2c20dc6..7a1d8763ce2 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml @@ -10,18 +10,16 @@ # FoodCondimentPacketSalt: 4 # Frontier - Replaced with big salt ReagentContainerSalt: 5 # Frontier ReagentContainerPepper: 5 # Frontier - DrinkKegPlasticKetchup: 1 # Frontier - Refills - DrinkKegPlasticMustard: 1 # Frontier - Refills FoodCondimentBottleEnzyme: 5 # Frontier 2<5 FoodCondimentBottleHotsauce: 2 FoodCondimentBottleKetchup: 2 FoodCondimentBottleBBQ: 2 FoodCondimentBottleVinegar: 5 # Frontier 2<5 # ReagentContainerOliveoil: 2 # Frontier - Replaced with OilJarOlive - OilJarOlive: 3 - OilJarCorn: 3 - OilJarGhee: 3 ReagentContainerMayo: 2 + OilJarOlive: 1 # Frontier + OilJarCorn: 1 # Frontier + OilJarGhee: 1 # Frontier #VariantCubeBox: 3 # Frontier MonkeyCubeBox: 2 # Frontier KoboldCubeBox: 2 # Frontier diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/gavel.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/gavel.yml new file mode 100644 index 00000000000..52f5286e34a --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/gavel.yml @@ -0,0 +1,21 @@ +- type: entity + parent: BaseItem + id: Gavel + name: gavel + description: A hardwood mallet made to keep order in the court. + components: + - type: Sprite + sprite: DeltaV/Objects/Specific/Justice/gavel.rsi + layers: + - state: icon + - type: MeleeWeapon + wideAnimationRotation: -90 + damage: + types: + Blunt: 2 + - type: Item + size: Small + sprite: DeltaV/Objects/Specific/Justice/gavel.rsi + - type: Tag + tags: + - Gavel diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/gavelblock.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/gavelblock.yml new file mode 100644 index 00000000000..e96d5acf348 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/gavelblock.yml @@ -0,0 +1,20 @@ +- type: entity + parent: BaseItem + id: GavelBlock + name: gavel block + description: A hardwood block that, when hit with a gavel, emits an aura of authority. + components: + - type: Sprite + sprite: DeltaV/Objects/Specific/Justice/gavelblock.rsi + layers: + - state: icon + - type: Item + size: Small + - type: Clickable + - type: EmitSoundOnInteractUsing + sound: + # path: /Audio/DeltaV/Items/gavel.ogg # Frontier + collection: NFGavel # Frontier + whitelist: + tags: + - Gavel diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/trialtimer.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/trialtimer.yml new file mode 100644 index 00000000000..aaa912ab246 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/trialtimer.yml @@ -0,0 +1,22 @@ +- type: entity + id: TrialTimer + parent: SignalTimer + name: trial timer + description: A fancy timer with a screen, designed to keep trials within their time limit. + components: + - type: SignalTimer + canEditLabel: true + - type: TextScreenVisuals + color: "#fffaf0" # Frontier: b03060 at least 1 required # Standard time, no description, no need to show. - type: salvageTimeMod diff --git a/Resources/Prototypes/_NF/Procedural/scrap_vgroid.yml b/Resources/Prototypes/_NF/Procedural/scrap_vgroid.yml index 11b88fd598d..36cc995ff06 100644 --- a/Resources/Prototypes/_NF/Procedural/scrap_vgroid.yml +++ b/Resources/Prototypes/_NF/Procedural/scrap_vgroid.yml @@ -142,7 +142,14 @@ tileMask: - Plating entity: SpawnMobRogueScapT1 - count: 25 + count: 15 + minGroupSize: 1 + maxGroupSize: 2 + - !type:OreDunGen + tileMask: + - Plating + entity: SpawnMobRogueDronesT1 + count: 10 minGroupSize: 1 maxGroupSize: 1 @@ -184,7 +191,7 @@ maxCount: 3 layers: - !type:ExteriorDunGen - proto: SalvageOutpost + proto: NFSalvageOutpost - !type:EntityTableDunGen minCount: 25 maxCount: 40 @@ -245,6 +252,12 @@ groups: - id: SpawnMobRogueSiliconsT2 amount: 1 + - !type:MobsDunGen + minCount: 1 + maxCount: 1 + groups: + - id: SpawnMobRogueSiliconBossRandom + amount: 1 #- type: dungeonConfig # id: NFVGRoidInteriorDungeonsScrap diff --git a/Resources/Prototypes/_NF/Procedural/snow_vgroid.yml b/Resources/Prototypes/_NF/Procedural/snow_vgroid.yml index ed9ee35cbf4..7b7f8553404 100644 --- a/Resources/Prototypes/_NF/Procedural/snow_vgroid.yml +++ b/Resources/Prototypes/_NF/Procedural/snow_vgroid.yml @@ -161,6 +161,13 @@ count: 5 minGroupSize: 1 maxGroupSize: 1 + - !type:OreDunGen + tileMask: + - FloorSnow + entity: SpawnMobArgocyteLeviathingExpeditions + count: 1 + minGroupSize: 0 + maxGroupSize: 1 # Configs - type: dungeonConfig @@ -219,7 +226,7 @@ maxCount: 3 layers: - !type:ExteriorDunGen - proto: SnowyLabs + proto: NFSnowyLabs - !type:EntityTableDunGen minCount: 25 maxCount: 40 @@ -256,6 +263,12 @@ groups: - id: SpawnMobXenoT2 amount: 1 + - !type:MobsDunGen + minCount: 1 + maxCount: 1 + groups: + - id: SpawnMobXenoQueenDungeon + amount: 1 #- type: dungeonConfig # id: NFVGRoidInteriorDungeonsSnow diff --git a/Resources/Prototypes/_NF/Reagents/Consumables/Drink/drinks.yml b/Resources/Prototypes/_NF/Reagents/Consumables/Drink/drinks.yml index 04c8aaa9ee8..64b434cce50 100644 --- a/Resources/Prototypes/_NF/Reagents/Consumables/Drink/drinks.yml +++ b/Resources/Prototypes/_NF/Reagents/Consumables/Drink/drinks.yml @@ -198,3 +198,42 @@ metamorphicSprite: sprite: _NF/Objects/Consumable/Drinks/honeyicedtea.rsi state: icon + +- type: reagent + id: WassailMulledAle + name: reagent-name-wassail + parent: BaseAlcohol + desc: reagent-desc-wassail + physicalDesc: reagent-physical-desc-spicy + flavor: wassail + color: "#AD2D00" + metabolisms: + Drink: + effects: + - !type:PopupMessage # a nice warm soothing drink + type: Local + visualType: Medium + messages: + - "drinks-effect-nf-wassail" + probability: 0.1 + metamorphicSprite: + sprite: _NF/Objects/Consumable/Drinks/wassail.rsi + state: icon_empty + metamorphicMaxFillLevels: 4 + metamorphicFillBaseName: fill- + metamorphicChangeColor: false + +- type: reagent + id: Eggnog + name: reagent-name-eggnog + parent: BaseAlcohol + desc: reagent-desc-eggnog + physicalDesc: reagent-physical-desc-thick + flavor: creamy + color: "#ffebc4" + metamorphicSprite: + sprite: _NF/Objects/Consumable/Drinks/eggnog.rsi + state: icon_empty + metamorphicMaxFillLevels: 8 + metamorphicFillBaseName: fill + metamorphicChangeColor: false diff --git a/Resources/Prototypes/_NF/Reagents/Materials/fuelgrade.yml b/Resources/Prototypes/_NF/Reagents/Materials/fuelgrade.yml new file mode 100644 index 00000000000..6570d18a1fa --- /dev/null +++ b/Resources/Prototypes/_NF/Reagents/Materials/fuelgrade.yml @@ -0,0 +1,20 @@ +- type: material + id: FuelGradePlasma + stackEntity: FuelPlasma1 + name: fuel-grade plasma + icon: { sprite: _NF/Objects/Specific/Fuel/fuelgrade_material.rsi, state: plasma } + price: 0.1 # half of regular plasma + +- type: material + id: FuelGradeUranium + stackEntity: FuelUranium1 + name: fuel-grade uranium + icon: { sprite: _NF/Objects/Specific/Fuel/fuelgrade_material.rsi, state: uranium } + price: 0.1 # half of regular uranium + +- type: material + id: FuelGradeBananium + stackEntity: FuelBananium1 + name: fuel-grade bananium + icon: { sprite: _NF/Objects/Specific/Fuel/fuelgrade_material.rsi, state: bananium } + price: 0.1 # half of regular bananium diff --git a/Resources/Prototypes/_NF/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/_NF/Recipes/Cooking/meal_recipes.yml index 87ec06e3dd9..7be8a8bf2ab 100644 --- a/Resources/Prototypes/_NF/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/_NF/Recipes/Cooking/meal_recipes.yml @@ -281,7 +281,6 @@ FoodDonutPlain: 1 recipeType: - Assembler - - Assembler - type: microwaveMealRecipe id: RecipeDonutBluePumpkin diff --git a/Resources/Prototypes/_NF/Recipes/Crafting/Graphs/barrel.yml b/Resources/Prototypes/_NF/Recipes/Crafting/Graphs/barrel.yml new file mode 100644 index 00000000000..ac91b2e2370 --- /dev/null +++ b/Resources/Prototypes/_NF/Recipes/Crafting/Graphs/barrel.yml @@ -0,0 +1,26 @@ +- type: constructionGraph + id: WoodenBarrel + start: start + graph: + - node: start + edges: + - to: woodenbarrel + steps: + - material: WoodPlank + amount: 5 + doAfter: 5 + + - node: woodenbarrel + entity: WoodenBarrel + edges: + - to: start + steps: + - tool: Prying + doAfter: 2 + completed: + - !type:SpawnPrototype + prototype: MaterialWoodPlank1 + amount: 5 + - !type:EmptyAllContainers + - !type:DeleteEntity + diff --git a/Resources/Prototypes/_NF/Recipes/Crafting/barrel.yml b/Resources/Prototypes/_NF/Recipes/Crafting/barrel.yml new file mode 100644 index 00000000000..a6649928cba --- /dev/null +++ b/Resources/Prototypes/_NF/Recipes/Crafting/barrel.yml @@ -0,0 +1,12 @@ +- type: construction + name: wooden barrel + id: WoodenBarrel + graph: WoodenBarrel + startNode: start + targetNode: woodenbarrel + category: construction-category-storage + description: A musty old wooden barrel. + icon: + sprite: _NF/Objects/Storage/Barrels/wood.rsi + state: icon + objectType: Structure \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/bloodcult.yml b/Resources/Prototypes/_NF/Recipes/Lathes/bloodcult.yml index b7926fdac93..f27f62faee4 100644 --- a/Resources/Prototypes/_NF/Recipes/Lathes/bloodcult.yml +++ b/Resources/Prototypes/_NF/Recipes/Lathes/bloodcult.yml @@ -2,7 +2,7 @@ - type: latheRecipe id: RitualDagger parent: BaseWeaponRecipe - result: RitualDaggerPrinted + result: RitualDagger materials: Bones: 100 Steel: 500 @@ -10,7 +10,7 @@ - type: latheRecipe id: EldritchBlade parent: BaseWeaponRecipeLong - result: EldritchBladePrinted + result: EldritchBlade materials: Bones: 200 Steel: 700 @@ -19,7 +19,7 @@ - type: latheRecipe id: UnholyHalberd parent: BaseWeaponRecipeLong - result: UnholyHalberdPrinted + result: UnholyHalberd materials: Bones: 1000 Steel: 1000 @@ -28,7 +28,7 @@ - type: latheRecipe id: WizardStaffMeleeBlood parent: BaseWeaponRecipeLong - result: WizardStaffMeleeBloodPrinted + result: WizardStaffMeleeBlood materials: Bones: 500 Plasteel: 500 @@ -46,7 +46,7 @@ - type: latheRecipe id: ClothingHeadHelmetCultJanitor parent: NFBaseArmorRecipe - result: ClothingHeadHelmetCultJanitorPrinted + result: ClothingHeadHelmetCultJanitor materials: Bones: 200 Cloth: 100 @@ -57,7 +57,7 @@ - type: latheRecipe id: ClothingMaskCultJanitor parent: NFBaseArmorRecipe - result: ClothingMaskCultJanitorPrinted + result: ClothingMaskCultJanitor materials: Bones: 200 Cloth: 100 @@ -68,7 +68,7 @@ - type: latheRecipe id: ClothingOuterCoatCultJanitor parent: NFBaseArmorRecipe - result: ClothingOuterCoatCultJanitorPrinted + result: ClothingOuterCoatCultJanitor materials: Bones: 1000 Cloth: 600 @@ -79,7 +79,7 @@ - type: latheRecipe id: ClothingHeadHelmetCult parent: NFBaseArmorRecipe - result: ClothingHeadHelmetCultPrinted + result: ClothingHeadHelmetCult materials: Bones: 200 Cloth: 100 @@ -90,7 +90,7 @@ - type: latheRecipe id: ClothingOuterArmorCult parent: NFBaseArmorRecipe - result: ClothingOuterArmorCultPrinted + result: ClothingOuterArmorCult materials: Bones: 1000 Cloth: 550 @@ -101,7 +101,7 @@ - type: latheRecipe id: ClothingShoesCult parent: NFBaseArmorRecipe - result: ClothingShoesCultPrinted + result: ClothingShoesCult materials: Bones: 200 Cloth: 100 @@ -112,7 +112,7 @@ - type: latheRecipe id: ClothingOuterCoatBloodCultRobes parent: NFBaseArmorRecipe - result: ClothingOuterCoatBloodCultRobesPrinted + result: ClothingOuterCoatBloodCultRobes materials: Bones: 200 Cloth: 600 @@ -122,21 +122,21 @@ - type: latheRecipe id: ClothingHeadHelmetBone parent: NFBaseArmorRecipe - result: ClothingHeadHelmetBonePrinted + result: ClothingHeadHelmetBone materials: Bones: 400 - type: latheRecipe id: ClothingOuterArmorBone parent: NFBaseArmorRecipe - result: ClothingOuterArmorBonePrinted + result: ClothingOuterArmorBone materials: Bones: 600 - type: latheRecipe id: ClothingBackpackMessengerBloodCult parent: NFBaseArmorRecipe - result: ClothingBackpackMessengerBloodCultPrinted + result: ClothingBackpackMessengerBloodCult materials: Cloth: 400 diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/blueprints.yml b/Resources/Prototypes/_NF/Recipes/Lathes/blueprints.yml index 25de71ffaba..9cc898a47cc 100644 --- a/Resources/Prototypes/_NF/Recipes/Lathes/blueprints.yml +++ b/Resources/Prototypes/_NF/Recipes/Lathes/blueprints.yml @@ -93,6 +93,11 @@ id: NFBlueprintSyringeBluespace result: NFBlueprintSyringeBluespace +- type: latheRecipe + parent: NFBaseBlueprintLatheRecipe + id: NFBlueprintJugBluespace + result: NFBlueprintJugBluespace + - type: latheRecipe parent: NFBaseBlueprintLatheRecipe id: NFBlueprintVialBluespace diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/chemistry.yml b/Resources/Prototypes/_NF/Recipes/Lathes/chemistry.yml index 5b1f918ae0b..7476b47670f 100644 --- a/Resources/Prototypes/_NF/Recipes/Lathes/chemistry.yml +++ b/Resources/Prototypes/_NF/Recipes/Lathes/chemistry.yml @@ -5,6 +5,11 @@ materials: Glass: 50 +- type: latheRecipe + id: JugBluespace + result: JugBluespace + parent: BluespaceBeaker # same size, 1:1 recipe + - type: latheRecipe id: VialBluespace result: VialBluespace @@ -20,6 +25,6 @@ id: BlankMediPen result: BlankMediPen completetime: 2 - materials: + materials: Plastic: 25 Steel: 25 diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/prizecounter.yml b/Resources/Prototypes/_NF/Recipes/Lathes/prizecounter.yml index 272df6f9c2f..78a1b496afd 100644 --- a/Resources/Prototypes/_NF/Recipes/Lathes/prizecounter.yml +++ b/Resources/Prototypes/_NF/Recipes/Lathes/prizecounter.yml @@ -86,6 +86,16 @@ result: PlushieMoff parent: BasePrize15Recipe +- type: latheRecipe + id: PlushieMailVulpRecipe + result: PlushieMailVulp + parent: BasePrize15Recipe + +- type: latheRecipe + id: PlushieYarrMothRecipe + result: PlushieYarrMoth + parent: BasePrize15Recipe + - type: latheRecipe id: PlushieMoffsicianRecipe result: PlushieMoffsician diff --git a/Resources/Prototypes/_NF/Recipes/Reactions/chemicals.yml b/Resources/Prototypes/_NF/Recipes/Reactions/chemicals.yml index e973152cab9..7ea78e696d3 100644 --- a/Resources/Prototypes/_NF/Recipes/Reactions/chemicals.yml +++ b/Resources/Prototypes/_NF/Recipes/Reactions/chemicals.yml @@ -5,11 +5,11 @@ amount: 1 Sodium: amount: 1 + SulfuricAcid: + amount: 1 Carbon: amount: 1 Oxygen: amount: 1 - SulfuricAcid: - amount: 1 products: SalicylicAcid: 3 diff --git a/Resources/Prototypes/_NF/Recipes/Reactions/drinks.yml b/Resources/Prototypes/_NF/Recipes/Reactions/drinks.yml index 20d317b5ed1..f0607ddb8d0 100644 --- a/Resources/Prototypes/_NF/Recipes/Reactions/drinks.yml +++ b/Resources/Prototypes/_NF/Recipes/Reactions/drinks.yml @@ -100,3 +100,32 @@ amount: 1 products: HoneyIcedTea: 2 + +- type: reaction + id: WassailMulledAle + minTemp: 350 + reactants: + Ale: + amount: 1 + Sugar: + amount: 1 + JuiceApple: + amount: 1 + products: + WassailMulledAle : 3 + +- type: reaction + id: Eggnog + requiredMixerCategories: + - Shake # close enough to meringue? + reactants: + Sugar: + amount: 1 + Cream: + amount: 1 + Egg: + amount: 1 + Rum: + amount: 1 + products: + Eggnog: 4 diff --git a/Resources/Prototypes/_NF/Recipes/Reactions/medicine.yml b/Resources/Prototypes/_NF/Recipes/Reactions/medicine.yml index 27aad1e1cda..6c8495651a7 100644 --- a/Resources/Prototypes/_NF/Recipes/Reactions/medicine.yml +++ b/Resources/Prototypes/_NF/Recipes/Reactions/medicine.yml @@ -36,3 +36,16 @@ amount: 1 products: Opporozidone: 3 + +- type: reaction + id: NFAloxadone + impact: Medium + reactants: + Cryoxadone: + amount: 1 + Dermaline: + amount: 2 + Siderlac: + amount: 2 + products: + Aloxadone: 4 diff --git a/Resources/Prototypes/_NF/Roles/Ghostroles/whitelisted.yml b/Resources/Prototypes/_NF/Roles/Ghostroles/whitelisted.yml index 4cd480e23af..07a855d1cfc 100644 --- a/Resources/Prototypes/_NF/Roles/Ghostroles/whitelisted.yml +++ b/Resources/Prototypes/_NF/Roles/Ghostroles/whitelisted.yml @@ -48,6 +48,14 @@ entityPrototype: MobCatMistake whitelisted: true +- type: ghostRole + id: CatBloodCult + name: ghost-role-information-cult-cat-name + description: ghost-role-information-cult-cat-description + rules: ghost-role-information-emotional-support-rules + entityPrototype: MobCatBloodCult + whitelisted: true + - type: ghostRole id: MonkeyPunpun name: ghost-role-information-punpun-name diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Fun/misc_startinggear.yml b/Resources/Prototypes/_NF/Roles/Jobs/Fun/misc_startinggear.yml index df51b02df3e..ad70a4a987f 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/Fun/misc_startinggear.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/Fun/misc_startinggear.yml @@ -40,4 +40,4 @@ head: ClothingHeadHatStrawHat ears: ClothingHeadsetService jumpsuit: ClothingUniformJumpsuitHawaiRed - id: YipYipIDCard \ No newline at end of file + id: YipYipIDCard diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Nfsd/nfdetective.yml b/Resources/Prototypes/_NF/Roles/Jobs/Nfsd/nfdetective.yml index 2ab12a7e83d..d0e85aecd72 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/Nfsd/nfdetective.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/Nfsd/nfdetective.yml @@ -34,12 +34,12 @@ id: NFDetectiveGear equipment: pocket1: WeaponRevolverInspector - pocket2: SpeedLoaderMagnum + pocket2: FlashlightNfsdLite storage: back: - Flash - - MagazinePistol - - MagazinePistolRubber + - SpeedLoaderMagnum + - SpeedLoaderMagnumRubber - ForensicPad - ForensicScanner - FrontierUplinkCoin10 diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Pirates/pirate.yml b/Resources/Prototypes/_NF/Roles/Jobs/Pirates/pirate.yml index 97d7e984b74..0ba9f4c9792 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/Pirates/pirate.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/Pirates/pirate.yml @@ -26,6 +26,9 @@ - type: MailDisabled - type: SpecialSectorStationRecord recordGeneration: FalseRecord + - type: NpcFactionMember + factions: + - PirateNF - !type:AddImplantSpecial implants: [ FreelanceTrackingImplant ] - !type:GiveItemOnHolidaySpecial # Even pirates get a piece of cake. diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Pirates/pirate_captain.yml b/Resources/Prototypes/_NF/Roles/Jobs/Pirates/pirate_captain.yml index 4cb7019947c..da729008102 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/Pirates/pirate_captain.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/Pirates/pirate_captain.yml @@ -27,6 +27,9 @@ - type: MailDisabled - type: SpecialSectorStationRecord recordGeneration: FalseRecord + - type: NpcFactionMember + factions: + - PirateNF - !type:AddImplantSpecial implants: [ FreelanceTrackingImplant ] - !type:GiveItemOnHolidaySpecial # Even pirates get a piece of cake. diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Pirates/pirate_first_mate.yml b/Resources/Prototypes/_NF/Roles/Jobs/Pirates/pirate_first_mate.yml index 95c7ca8c305..1ef6318ef2d 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/Pirates/pirate_first_mate.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/Pirates/pirate_first_mate.yml @@ -27,6 +27,9 @@ - type: MailDisabled - type: SpecialSectorStationRecord recordGeneration: FalseRecord + - type: NpcFactionMember + factions: + - PirateNF - !type:AddImplantSpecial implants: [ FreelanceTrackingImplant ] - !type:GiveItemOnHolidaySpecial # Even pirates get a piece of cake. diff --git a/Resources/Prototypes/_NF/Roles/Jobs/departments.yml b/Resources/Prototypes/_NF/Roles/Jobs/departments.yml index 3441be3a23f..9057f9c8c93 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/departments.yml @@ -1,6 +1,6 @@ - type: department id: Frontier - name: department-NF + name: department-Frontier description: department-NF-description color: "#334E6D" weight: 1 # accounted for in jobs @@ -14,7 +14,7 @@ - type: department id: Antag - name: department-NFAntag + name: department-Antag description: department-NFAntag-description color: "#DE3A3A" weight: -1 # accounted for in jobs diff --git a/Resources/Prototypes/_NF/SectorServices/services.yml b/Resources/Prototypes/_NF/SectorServices/services.yml index eb1bac494e8..0a3345974fb 100644 --- a/Resources/Prototypes/_NF/SectorServices/services.yml +++ b/Resources/Prototypes/_NF/SectorServices/services.yml @@ -32,3 +32,9 @@ id: SectorRecords components: - type: StationRecords + +- type: sectorService + id: Alerts + components: + - type: AlertLevel + alertLevelPrototype: stationAlerts diff --git a/Resources/Prototypes/_NF/Shipyard/Sr/chauffeur.yml b/Resources/Prototypes/_NF/Shipyard/Sr/chauffeur.yml index 7176ce3b4bc..7572478fdbc 100644 --- a/Resources/Prototypes/_NF/Shipyard/Sr/chauffeur.yml +++ b/Resources/Prototypes/_NF/Shipyard/Sr/chauffeur.yml @@ -27,14 +27,13 @@ - type: gameMap id: Chauffeur mapName: 'NC Chauffeur' - mapPath: /Maps/_NF/Shuttles/pts.yml + mapPath: /Maps/_NF/Shuttles/Sr/chauffeur.yml minPlayers: 0 stations: Chauffeur: stationProto: StandardFrontierVessel components: - - type: StationNameSetup - mapNameTemplate: 'Chauffeur {1}' - nameGenerator: - !type:NanotrasenNameGenerator - prefixCreator: '14' + - type: StationNameSetup + mapNameTemplate: 'Chauffeur {1}' + nameGenerator: !type:NanotrasenNameGenerator + prefixCreator: '14' diff --git a/Resources/Prototypes/_NF/Shipyard/bodkin.yml b/Resources/Prototypes/_NF/Shipyard/bodkin.yml index e9ee2217ff0..0e676f2aaf9 100644 --- a/Resources/Prototypes/_NF/Shipyard/bodkin.yml +++ b/Resources/Prototypes/_NF/Shipyard/bodkin.yml @@ -28,13 +28,12 @@ Bodkin: stationProto: StandardFrontierVessel components: - - type: StationNameSetup - mapNameTemplate: 'Bodkin {1}' - nameGenerator: - !type:NanotrasenNameGenerator - prefixCreator: '14' - - type: StationJobs - availableJobs: - Contractor: [ 0, 0 ] - Pilot: [ 0, 0 ] - Mercenary: [ 0, 0 ] \ No newline at end of file + - type: StationNameSetup + mapNameTemplate: 'Bodkin {1}' + nameGenerator: !type:NanotrasenNameGenerator + prefixCreator: '14' + - type: StationJobs + availableJobs: + Contractor: [ 0, 0 ] + Pilot: [ 0, 0 ] + Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/construct.yml b/Resources/Prototypes/_NF/Shipyard/construct.yml index c2973bd6756..22e920941ec 100644 --- a/Resources/Prototypes/_NF/Shipyard/construct.yml +++ b/Resources/Prototypes/_NF/Shipyard/construct.yml @@ -21,13 +21,12 @@ Construct: stationProto: StandardFrontierVessel components: - - type: StationNameSetup - mapNameTemplate: 'Construct {1}' - nameGenerator: - !type:NanotrasenNameGenerator - prefixCreator: '14' - - type: StationJobs - availableJobs: - Contractor: [ 0, 0 ] - Pilot: [ 0, 0 ] - Mercenary: [ 0, 0 ] + - type: StationNameSetup + mapNameTemplate: 'Construct {1}' + nameGenerator: !type:NanotrasenNameGenerator + prefixCreator: '14' + - type: StationJobs + availableJobs: + Contractor: [ 0, 0 ] + Pilot: [ 0, 0 ] + Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/kilderkin.yml b/Resources/Prototypes/_NF/Shipyard/kilderkin.yml index b253bcf7cbf..2fe08b24214 100644 --- a/Resources/Prototypes/_NF/Shipyard/kilderkin.yml +++ b/Resources/Prototypes/_NF/Shipyard/kilderkin.yml @@ -31,13 +31,12 @@ Kilderkin: stationProto: StandardFrontierVessel components: - - type: StationNameSetup - mapNameTemplate: 'Kilderkin {1}' - nameGenerator: - !type:NanotrasenNameGenerator - prefixCreator: '14' - - type: StationJobs - availableJobs: - Contractor: [ 0, 0 ] - Pilot: [ 0, 0 ] - Mercenary: [ 0, 0 ] + - type: StationNameSetup + mapNameTemplate: 'Kilderkin {1}' + nameGenerator: !type:NanotrasenNameGenerator + prefixCreator: '14' + - type: StationJobs + availableJobs: + Contractor: [ 0, 0 ] + Pilot: [ 0, 0 ] + Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/phoenix.yml b/Resources/Prototypes/_NF/Shipyard/phoenix.yml index 437acf88ba6..2b1510a5c4f 100644 --- a/Resources/Prototypes/_NF/Shipyard/phoenix.yml +++ b/Resources/Prototypes/_NF/Shipyard/phoenix.yml @@ -32,13 +32,12 @@ Phoenix: stationProto: StandardFrontierVessel components: - - type: StationNameSetup - mapNameTemplate: 'Phoenix {1}' - nameGenerator: - !type:NanotrasenNameGenerator - prefixCreator: '14' - - type: StationJobs - availableJobs: - Contractor: [ 0, 0 ] - Pilot: [ 0, 0 ] - Mercenary: [ 0, 0 ] + - type: StationNameSetup + mapNameTemplate: 'Phoenix {1}' + nameGenerator: !type:NanotrasenNameGenerator + prefixCreator: '14' + - type: StationJobs + availableJobs: + Contractor: [ 0, 0 ] + Pilot: [ 0, 0 ] + Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/pioneer.yml b/Resources/Prototypes/_NF/Shipyard/pioneer.yml index 11c521c185a..0d7f63b29c7 100644 --- a/Resources/Prototypes/_NF/Shipyard/pioneer.yml +++ b/Resources/Prototypes/_NF/Shipyard/pioneer.yml @@ -31,13 +31,12 @@ Pioneer: stationProto: StandardFrontierVessel components: - - type: StationNameSetup - mapNameTemplate: 'Pioneer {1}' - nameGenerator: - !type:NanotrasenNameGenerator - prefixCreator: '14' - - type: StationJobs - availableJobs: - Contractor: [ 0, 0 ] - Pilot: [ 0, 0 ] - Mercenary: [ 0, 0 ] + - type: StationNameSetup + mapNameTemplate: 'Pioneer {1}' + nameGenerator: !type:NanotrasenNameGenerator + prefixCreator: '14' + - type: StationJobs + availableJobs: + Contractor: [ 0, 0 ] + Pilot: [ 0, 0 ] + Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/pts.yml b/Resources/Prototypes/_NF/Shipyard/pts.yml index 157d27c7629..991163da054 100644 --- a/Resources/Prototypes/_NF/Shipyard/pts.yml +++ b/Resources/Prototypes/_NF/Shipyard/pts.yml @@ -31,13 +31,12 @@ PTS: stationProto: StandardFrontierVessel components: - - type: StationNameSetup - mapNameTemplate: 'PTS {1}' - nameGenerator: - !type:NanotrasenNameGenerator - prefixCreator: '14' - - type: StationJobs - availableJobs: - Contractor: [ 0, 0 ] - Pilot: [ 0, 0 ] - Mercenary: [ 0, 0 ] + - type: StationNameSetup + mapNameTemplate: 'PTS {1}' + nameGenerator: !type:NanotrasenNameGenerator + prefixCreator: '14' + - type: StationJobs + availableJobs: + Contractor: [ 0, 0 ] + Pilot: [ 0, 0 ] + Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/SoundCollections/gavel.yml b/Resources/Prototypes/_NF/SoundCollections/gavel.yml new file mode 100644 index 00000000000..05a9f398bb1 --- /dev/null +++ b/Resources/Prototypes/_NF/SoundCollections/gavel.yml @@ -0,0 +1,7 @@ +- type: soundCollection + id: NFGavel + files: + - /Audio/_NF/Items/Gavel/gavel1.ogg + - /Audio/_NF/Items/Gavel/gavel2.ogg + - /Audio/_NF/Items/Gavel/gavel3.ogg + - /Audio/_NF/Items/Gavel/gavel4.ogg diff --git a/Resources/Prototypes/_NF/Stacks/Materials/fuelgrade.yml b/Resources/Prototypes/_NF/Stacks/Materials/fuelgrade.yml new file mode 100644 index 00000000000..ff892c4383a --- /dev/null +++ b/Resources/Prototypes/_NF/Stacks/Materials/fuelgrade.yml @@ -0,0 +1,20 @@ +- type: stack + id: FuelPlasma + name: fuel-grade plasma + icon: { sprite: _NF/Objects/Specific/Fuel/fuelgrade_material.rsi, state: plasma } + spawn: FuelPlasma1 + maxCount: 30 + +- type: stack + id: FuelUranium + name: fuel-grade uranium + icon: { sprite: _NF/Objects/Specific/Fuel/fuelgrade_material.rsi, state: uranium } + spawn: FuelUranium1 + maxCount: 30 + +- type: stack + id: FuelBananium + name: fuel-grade bananium + icon: { sprite: _NF/Objects/Specific/Fuel/fuelgrade_material.rsi, state: bananium } + spawn: FuelBananium1 + maxCount: 30 diff --git a/Resources/Prototypes/_NF/ai_factions.yml b/Resources/Prototypes/_NF/ai_factions.yml index 5c8dea137bf..730cd03888d 100644 --- a/Resources/Prototypes/_NF/ai_factions.yml +++ b/Resources/Prototypes/_NF/ai_factions.yml @@ -36,6 +36,8 @@ - type: npcFaction id: Cat + hostile: + - Mouse - type: npcFaction id: Chicken @@ -165,7 +167,7 @@ - MercenariesExpeditionNF - SiliconsExpeditionNF - AberrantFleshExpeditionNF - - ContrabandClothing + # - ContrabandClothing - ContrabandDetection - type: npcFaction @@ -411,30 +413,6 @@ - type: npcFaction id: ContrabandDetection hostile: - ## SS14 factions - #- NanoTrasen - - Syndicate - - SimpleHostile - #- SimpleNeutral - #- Passive - #- PetsNT - - Zombie - - Revolutionary - - Xeno - ## Frontier Factions - #- Monkey - #- Goblin - - SyndicateNF - - WizFedFaction - - BloodCultNF - - PirateNF - - ExplorersExpeditionNF - - ArtifactConstruct - - StreetGangNF - - DinosaursNF - - MercenariesExpeditionNF - - SiliconsExpeditionNF - - AberrantFleshExpeditionNF - ContrabandClothing - type: npcFaction diff --git a/Resources/Prototypes/_NF/game_presets.yml b/Resources/Prototypes/_NF/game_presets.yml index b87244e0a7f..6c39e92fdb9 100644 --- a/Resources/Prototypes/_NF/game_presets.yml +++ b/Resources/Prototypes/_NF/game_presets.yml @@ -1,12 +1,30 @@ - type: gamePreset - id: Adventure + id: NFAdventure alias: + - nfadventure - adventure - name: adventure-title - description: adventure-description - showInVote: false + name: nf-adventure-title + description: nf-adventure-description + showInVote: true rules: - - Adventure + - NFAdventure + - BasicStationEventScheduler + - BluespaceEventScheduler + - BluespaceDungeonEventScheduler + - BluespaceSalvageEventScheduler + - SmugglingEventScheduler + - FrontierRoundstartVariation + +- type: gamePreset + id: NFPirate + alias: + - nfpirate + - pirate + name: nf-pirate-title + description: nf-pirate-description + showInVote: true + rules: + - NFAdventure - BasicStationEventScheduler - BluespaceEventScheduler - BluespaceDungeonEventScheduler diff --git a/Resources/Prototypes/_NF/tags.yml b/Resources/Prototypes/_NF/tags.yml index 81c8d23bf8d..751cd8a092c 100644 --- a/Resources/Prototypes/_NF/tags.yml +++ b/Resources/Prototypes/_NF/tags.yml @@ -1,6 +1,36 @@ +# Dungeon + +- type: Tag + id: NFCaveFactory + +- type: Tag + id: NFSalvageExperiment + +- type: Tag + id: NFHaunted + +- type: Tag + id: NFLavaBrig + - type: Tag - id: CaveFactory + id: NFLavaMercenary +- type: Tag + id: NFMineshaft + +- type: Tag + id: NFSalvageOutpost + +- type: Tag + id: NFSnowyLabs + +- type: Tag + id: NFVirologyLab + +- type: Tag + id: NFWreck + +# Misc - type: Tag id: DockTransit @@ -64,12 +94,6 @@ - type: Tag id: LightReplacer -- type: Tag - id: VirologyLab - -- type: Tag - id: SalvageOutpost - - type: Tag id: HoverbikeKeys @@ -110,4 +134,4 @@ id: NFVGRoidInterior - type: Tag - id: NFFoamRPG + id: NFFoamRPG \ No newline at end of file diff --git a/Resources/Prototypes/ai_factions.yml b/Resources/Prototypes/ai_factions.yml index 780494df5e8..864e1acf47b 100644 --- a/Resources/Prototypes/ai_factions.yml +++ b/Resources/Prototypes/ai_factions.yml @@ -52,20 +52,9 @@ id: PetsNT hostile: - Mouse - - SimpleHostile - - Zombie - - Xeno - - WizFedFaction # Frontier - - BloodCultNF # Frontier - - PirateNF # Frontier - - ExplorersExpeditionNF # Frontier - - ArtifactConstruct # Frontier - - StreetGangNF # Frontier - - DinosaursNF # Frontier - - MercenariesExpeditionNF # Frontier - - SiliconsExpeditionNF # Frontier - - AberrantFleshExpeditionNF # Frontier - - ContrabandClothing # Frontier + # - SimpleHostile # Frontier + # - Zombie # Frontier + # - Xeno # Frontier - type: npcFaction id: SimpleHostile diff --git a/Resources/Prototypes/game_presets.yml b/Resources/Prototypes/game_presets.yml index 945b4a8c83b..ad66624f7f5 100644 --- a/Resources/Prototypes/game_presets.yml +++ b/Resources/Prototypes/game_presets.yml @@ -91,7 +91,7 @@ showInVote: false #4boring4vote description: greenshift-description rules: - - SpaceTrafficControlFriendlyEventScheduler + - SpaceTrafficControlFriendlyEventScheduler - BasicRoundstartVariation - type: gamePreset @@ -100,7 +100,7 @@ - secret - sekrit name: secret-title - showInVote: true + showInVote: false # Frontier: true < false description: secret-description rules: - Secret @@ -126,7 +126,7 @@ showInVote: false #Admin Use description: secret-description rules: - - SpaceTrafficControlFriendlyEventScheduler + - SpaceTrafficControlFriendlyEventScheduler - BasicRoundstartVariation - type: gamePreset @@ -164,7 +164,7 @@ name: death-match-title description: death-match-description maxPlayers: 15 - showInVote: true + showInVote: false # Frontier: true < false supportedMaps: DeathMatchMapPool rules: - DeathMatch31 @@ -233,4 +233,4 @@ - BasicStationEventScheduler - KesslerSyndromeScheduler - SpaceTrafficControlEventScheduler - - BasicRoundstartVariation \ No newline at end of file + - BasicRoundstartVariation diff --git a/Resources/ServerInfo/_NF/Guidebook/Shipyard/Charon.xml b/Resources/ServerInfo/_NF/Guidebook/Shipyard/Charon.xml index 91f1067542b..3158a7ef555 100644 --- a/Resources/ServerInfo/_NF/Guidebook/Shipyard/Charon.xml +++ b/Resources/ServerInfo/_NF/Guidebook/Shipyard/Charon.xml @@ -6,6 +6,9 @@ + + + [color=#a4885c]Ship Size:[/color] Medium [color=#a4885c]Recommended Crew:[/color] 2-4 diff --git a/Resources/Textures/DeltaV/Objects/Specific/Justice/gavel.rsi/icon.png b/Resources/Textures/DeltaV/Objects/Specific/Justice/gavel.rsi/icon.png new file mode 100644 index 00000000000..3cf56d45371 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Specific/Justice/gavel.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Objects/Specific/Justice/gavel.rsi/inhand-left.png b/Resources/Textures/DeltaV/Objects/Specific/Justice/gavel.rsi/inhand-left.png new file mode 100644 index 00000000000..a41d27bcc71 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Specific/Justice/gavel.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Objects/Specific/Justice/gavel.rsi/inhand-right.png b/Resources/Textures/DeltaV/Objects/Specific/Justice/gavel.rsi/inhand-right.png new file mode 100644 index 00000000000..cbabf3b291a Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Specific/Justice/gavel.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Objects/Specific/Justice/gavel.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Specific/Justice/gavel.rsi/meta.json new file mode 100644 index 00000000000..39ff0ed9d9b --- /dev/null +++ b/Resources/Textures/DeltaV/Objects/Specific/Justice/gavel.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprites sourced from https://github.com/tgstation/tgstation/pull/8495. In-hand sprites edited by Timemaster99 (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Objects/Specific/Justice/gavelblock.rsi/icon.png b/Resources/Textures/DeltaV/Objects/Specific/Justice/gavelblock.rsi/icon.png new file mode 100644 index 00000000000..c1254bb8086 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Specific/Justice/gavelblock.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Objects/Specific/Justice/gavelblock.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Specific/Justice/gavelblock.rsi/meta.json new file mode 100644 index 00000000000..5abad9b4225 --- /dev/null +++ b/Resources/Textures/DeltaV/Objects/Specific/Justice/gavelblock.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprites sourced from https://github.com/tgstation/tgstation/pull/8495", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + } + ] +} diff --git a/Resources/Textures/DeltaV/Objects/Specific/Justice/trialtimer.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Specific/Justice/trialtimer.rsi/meta.json new file mode 100644 index 00000000000..8081065c329 --- /dev/null +++ b/Resources/Textures/DeltaV/Objects/Specific/Justice/trialtimer.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Original screen timer sprite by brainfood1183 (Github) for Space Station 14, modified by Leonardo_dabepis (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "trialtimer" + } + ] +} diff --git a/Resources/Textures/DeltaV/Objects/Specific/Justice/trialtimer.rsi/trialtimer.png b/Resources/Textures/DeltaV/Objects/Specific/Justice/trialtimer.rsi/trialtimer.png new file mode 100644 index 00000000000..34c8f1b90a9 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Specific/Justice/trialtimer.rsi/trialtimer.png differ diff --git a/Resources/Textures/_NF/Clothing/Head/Misc/pwig.rsi/equipped-HELMET.png b/Resources/Textures/_NF/Clothing/Head/Misc/pwig.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..6cb9af02e93 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Head/Misc/pwig.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/_NF/Clothing/Head/Misc/pwig.rsi/icon.png b/Resources/Textures/_NF/Clothing/Head/Misc/pwig.rsi/icon.png new file mode 100644 index 00000000000..50a51759d9f Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Head/Misc/pwig.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Clothing/Head/Misc/pwig.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Head/Misc/pwig.rsi/inhand-left.png new file mode 100644 index 00000000000..c716e112758 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Head/Misc/pwig.rsi/inhand-left.png differ diff --git a/Resources/Textures/_NF/Clothing/Head/Misc/pwig.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Head/Misc/pwig.rsi/inhand-right.png new file mode 100644 index 00000000000..46b73daf9f7 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Head/Misc/pwig.rsi/inhand-right.png differ diff --git a/Resources/Textures/_NF/Clothing/Head/Misc/pwig.rsi/meta.json b/Resources/Textures/_NF/Clothing/Head/Misc/pwig.rsi/meta.json new file mode 100644 index 00000000000..b4a19d6b0de --- /dev/null +++ b/Resources/Textures/_NF/Clothing/Head/Misc/pwig.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, equipped-HELMET edited by whatstone", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_NF/Effects/bloodcultprojectiles.rsi/hand.png b/Resources/Textures/_NF/Effects/bloodcultprojectiles.rsi/hand.png new file mode 100644 index 00000000000..66d776da6ce Binary files /dev/null and b/Resources/Textures/_NF/Effects/bloodcultprojectiles.rsi/hand.png differ diff --git a/Resources/Textures/_NF/Effects/bloodcultprojectiles.rsi/meta.json b/Resources/Textures/_NF/Effects/bloodcultprojectiles.rsi/meta.json new file mode 100644 index 00000000000..817c0194222 --- /dev/null +++ b/Resources/Textures/_NF/Effects/bloodcultprojectiles.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation https://github.com/tgstation/tgstation/blob/master/icons/mob/actions/actions_cult.dmi ", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "hand" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/charon.png b/Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/charon.png new file mode 100644 index 00000000000..a4bd1f8c64c Binary files /dev/null and b/Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/charon.png differ diff --git a/Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/meta.json b/Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/meta.json index 5fd0e9c7d2e..14145fba669 100644 --- a/Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/meta.json +++ b/Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/meta.json @@ -1,7 +1,10 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "ambition, bocadillo, brigand, bulker, ceres, chisel, comet, construct, garden, gasbender, harbormaster, investigator, kestrel, kilderkin, lantern, legman, liquidator, loader, pathfinder, pioneer, prospector, searchlight and vagabond by erhardsteinhauer (discord/github), used font from https://github.com/tgstation/tgstation/blob/master/icons/obj/signs.dmi. spirit by iNoahGuy/actualcatmoment (discord/github). apothecary, stasis by dustylens (discord/github). barge, eagle, hauler, phoenix, placebo, skipper, sparrow by Mygnol (discord/github)", + "copyright": "ambition, bocadillo, brigand, bulker, ceres, chisel, comet, construct, garden, gasbender, harbormaster, investigator, kestrel, kilderkin, lantern, legman, liquidator, loader, pathfinder, pioneer, prospector, searchlight and vagabond by erhardsteinhauer (discord/github), used font from https://github.com/tgstation/tgstation/blob/master/icons/obj/signs.dmi.", + "copyright": "spirit by iNoahGuy/actualcatmoment (discord/github).", + "copyright": "apothecary, charon, stasis by dustylens (discord/github).", + "copyright": "barge, eagle, hauler, phoenix, placebo, skipper, sparrow by Mygnol (discord/github)", "size": { "x": 128, "y": 96 @@ -31,6 +34,9 @@ { "name": "ceres" }, + { + "name": "charon" + }, { "name": "chisel" }, diff --git a/Resources/Textures/_NF/Mobs/Pets/cat.rsi/cultcat.png b/Resources/Textures/_NF/Mobs/Pets/cat.rsi/cultcat.png new file mode 100644 index 00000000000..20518db471d Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Pets/cat.rsi/cultcat.png differ diff --git a/Resources/Textures/_NF/Mobs/Pets/cat.rsi/cultcat_dead.png b/Resources/Textures/_NF/Mobs/Pets/cat.rsi/cultcat_dead.png new file mode 100644 index 00000000000..3203daf86a1 Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Pets/cat.rsi/cultcat_dead.png differ diff --git a/Resources/Textures/_NF/Mobs/Pets/cat.rsi/cultcat_rest.png b/Resources/Textures/_NF/Mobs/Pets/cat.rsi/cultcat_rest.png new file mode 100644 index 00000000000..099de165c5f Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Pets/cat.rsi/cultcat_rest.png differ diff --git a/Resources/Textures/_NF/Mobs/Pets/cat.rsi/cultcat_rest_unshaded.png b/Resources/Textures/_NF/Mobs/Pets/cat.rsi/cultcat_rest_unshaded.png new file mode 100644 index 00000000000..7269ce17b21 Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Pets/cat.rsi/cultcat_rest_unshaded.png differ diff --git a/Resources/Textures/_NF/Mobs/Pets/cat.rsi/cultcat_sit.png b/Resources/Textures/_NF/Mobs/Pets/cat.rsi/cultcat_sit.png new file mode 100644 index 00000000000..308c253f1f5 Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Pets/cat.rsi/cultcat_sit.png differ diff --git a/Resources/Textures/_NF/Mobs/Pets/cat.rsi/cultcat_sit_unshaded.png b/Resources/Textures/_NF/Mobs/Pets/cat.rsi/cultcat_sit_unshaded.png new file mode 100644 index 00000000000..9a2e23061d3 Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Pets/cat.rsi/cultcat_sit_unshaded.png differ diff --git a/Resources/Textures/_NF/Mobs/Pets/cat.rsi/cultcat_unshaded.png b/Resources/Textures/_NF/Mobs/Pets/cat.rsi/cultcat_unshaded.png new file mode 100644 index 00000000000..e16977956fb Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Pets/cat.rsi/cultcat_unshaded.png differ diff --git a/Resources/Textures/_NF/Mobs/Pets/cat.rsi/mask_null.png b/Resources/Textures/_NF/Mobs/Pets/cat.rsi/mask_null.png new file mode 100644 index 00000000000..2975c479be7 Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Pets/cat.rsi/mask_null.png differ diff --git a/Resources/Textures/_NF/Mobs/Pets/cat.rsi/meta.json b/Resources/Textures/_NF/Mobs/Pets/cat.rsi/meta.json index e8f1d8ea4ab..3193bc67c3b 100644 --- a/Resources/Textures/_NF/Mobs/Pets/cat.rsi/meta.json +++ b/Resources/Textures/_NF/Mobs/Pets/cat.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "Modified from https://github.com/tgstation/tgstation/commit/53d1f1477d22a11a99c6c6924977cd431075761b, piratecat and mistakecat edited by Dvir001, nfsdcat and cavecat edited by ghostprince", + "copyright": "Modified from https://github.com/tgstation/tgstation/commit/53d1f1477d22a11a99c6c6924977cd431075761b, piratecat and mistakecat edited by Dvir001, nfsdcat and cavecat edited by ghostprince | Cult cat taken from tgstation at https://github.com/tgstation/tgstation/blob/master/icons/mob/simple/pets.dmi and modified by erhardsteinhauer (discord/github)", "states": [ { "name": "piratecat", @@ -93,6 +93,48 @@ { "name": "cattag", "directions": 4 + }, + { + "name": "cultcat", + "directions": 4 + }, + { + "name": "cultcat_unshaded", + "directions": 4 + }, + { + "name": "cultcat_dead" + }, + { + "name": "cultcat_rest", + "delays": [ + [ + 0.1, + 0.2, + 0.1, + 0.2 + ] + ] + }, + { + "name": "cultcat_rest_unshaded", + "delays": [ + [ + 0.1, + 0.2, + 0.1, + 0.2 + ] + ] + }, + { + "name": "cultcat_sit" + }, + { + "name": "cultcat_sit_unshaded" + }, + { + "name": "mask_null" } ] } diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/eggnog.rsi/fill1.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/eggnog.rsi/fill1.png new file mode 100644 index 00000000000..ee3a7c08e7b Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Drinks/eggnog.rsi/fill1.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/eggnog.rsi/fill2.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/eggnog.rsi/fill2.png new file mode 100644 index 00000000000..7aaebf3894c Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Drinks/eggnog.rsi/fill2.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/eggnog.rsi/fill3.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/eggnog.rsi/fill3.png new file mode 100644 index 00000000000..2c4ad57579b Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Drinks/eggnog.rsi/fill3.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/eggnog.rsi/fill4.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/eggnog.rsi/fill4.png new file mode 100644 index 00000000000..d7d1c5b6ddd Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Drinks/eggnog.rsi/fill4.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/eggnog.rsi/fill5.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/eggnog.rsi/fill5.png new file mode 100644 index 00000000000..593f71b2ff0 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Drinks/eggnog.rsi/fill5.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/eggnog.rsi/fill6.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/eggnog.rsi/fill6.png new file mode 100644 index 00000000000..df9444923c0 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Drinks/eggnog.rsi/fill6.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/eggnog.rsi/fill7.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/eggnog.rsi/fill7.png new file mode 100644 index 00000000000..0d66df4bc0b Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Drinks/eggnog.rsi/fill7.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/eggnog.rsi/fill8.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/eggnog.rsi/fill8.png new file mode 100644 index 00000000000..ac649ea8711 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Drinks/eggnog.rsi/fill8.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/eggnog.rsi/icon.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/eggnog.rsi/icon.png new file mode 100644 index 00000000000..c171704eff2 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Drinks/eggnog.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/eggnog.rsi/icon_empty.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/eggnog.rsi/icon_empty.png new file mode 100644 index 00000000000..ff6c74cf952 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Drinks/eggnog.rsi/icon_empty.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/eggnog.rsi/meta.json b/Resources/Textures/_NF/Objects/Consumable/Drinks/eggnog.rsi/meta.json new file mode 100644 index 00000000000..828ef1ea4ce --- /dev/null +++ b/Resources/Textures/_NF/Objects/Consumable/Drinks/eggnog.rsi/meta.json @@ -0,0 +1,43 @@ +{ + "version": 1, + "size": + { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-4.0", + "copyright": "Made by whatston3", + "states": + [ + { + "name": "icon" + }, + { + "name": "icon_empty" + }, + { + "name": "fill1" + }, + { + "name": "fill2" + }, + { + "name": "fill3" + }, + { + "name": "fill4" + }, + { + "name": "fill5" + }, + { + "name": "fill6" + }, + { + "name": "fill7" + }, + { + "name": "fill8" + } + ] +} diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/wassail.rsi/fill-1.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/wassail.rsi/fill-1.png new file mode 100644 index 00000000000..75e2d658963 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Drinks/wassail.rsi/fill-1.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/wassail.rsi/fill-2.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/wassail.rsi/fill-2.png new file mode 100644 index 00000000000..b0c10ebe94d Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Drinks/wassail.rsi/fill-2.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/wassail.rsi/fill-3.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/wassail.rsi/fill-3.png new file mode 100644 index 00000000000..bb52e312eac Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Drinks/wassail.rsi/fill-3.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/wassail.rsi/fill-4.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/wassail.rsi/fill-4.png new file mode 100644 index 00000000000..0e069c9d7db Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Drinks/wassail.rsi/fill-4.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/wassail.rsi/icon.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/wassail.rsi/icon.png new file mode 100644 index 00000000000..015a05d8baa Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Drinks/wassail.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/wassail.rsi/icon_empty.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/wassail.rsi/icon_empty.png new file mode 100644 index 00000000000..f82e92693f0 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Drinks/wassail.rsi/icon_empty.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/wassail.rsi/meta.json b/Resources/Textures/_NF/Objects/Consumable/Drinks/wassail.rsi/meta.json new file mode 100644 index 00000000000..d9fcc9963d6 --- /dev/null +++ b/Resources/Textures/_NF/Objects/Consumable/Drinks/wassail.rsi/meta.json @@ -0,0 +1,29 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Made by dustylens (GitHub)", + "states": [ + { + "name": "icon" + }, + { + "name": "icon_empty" + }, + { + "name": "fill-1" + }, + { + "name": "fill-2" + }, + { + "name": "fill-3" + }, + { + "name": "fill-4" + } + ] +} diff --git a/Resources/Textures/_NF/Objects/Devices/encryption_keys.rsi/common_label.png b/Resources/Textures/_NF/Objects/Devices/encryption_keys.rsi/common_label.png new file mode 100644 index 00000000000..b925335aaa2 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Devices/encryption_keys.rsi/common_label.png differ diff --git a/Resources/Textures/_NF/Objects/Devices/encryption_keys.rsi/crypt_gray.png b/Resources/Textures/_NF/Objects/Devices/encryption_keys.rsi/crypt_gray.png index 47d410736e7..8f905fb9a88 100644 Binary files a/Resources/Textures/_NF/Objects/Devices/encryption_keys.rsi/crypt_gray.png and b/Resources/Textures/_NF/Objects/Devices/encryption_keys.rsi/crypt_gray.png differ diff --git a/Resources/Textures/_NF/Objects/Devices/encryption_keys.rsi/meta.json b/Resources/Textures/_NF/Objects/Devices/encryption_keys.rsi/meta.json index 221c50f895d..68fbb30c86f 100644 --- a/Resources/Textures/_NF/Objects/Devices/encryption_keys.rsi/meta.json +++ b/Resources/Textures/_NF/Objects/Devices/encryption_keys.rsi/meta.json @@ -2,11 +2,13 @@ "version": 1, "license": "CC-BY-SA-3.0", "copyright": "Created by data_redacted@394589156048633866 and GhostPrince for New Frontier 14.", + "copyright": "crypt states modified by Flareguy for Space Station 14, common/stc_label by whatston3", "size": { "x": 32, "y": 32 }, "states": [ + {"name": "common_label"}, {"name": "crypt_gray"}, {"name": "stc_label"}, {"name": "nfsd_label"} diff --git a/Resources/Textures/_NF/Objects/Devices/encryption_keys.rsi/stc_label.png b/Resources/Textures/_NF/Objects/Devices/encryption_keys.rsi/stc_label.png index 0c228563e59..e49715cef19 100644 Binary files a/Resources/Textures/_NF/Objects/Devices/encryption_keys.rsi/stc_label.png and b/Resources/Textures/_NF/Objects/Devices/encryption_keys.rsi/stc_label.png differ diff --git a/Resources/Textures/_NF/Objects/Fun/toys.rsi/meta.json b/Resources/Textures/_NF/Objects/Fun/toys.rsi/meta.json index 1fb57ff4e1c..81ca0475904 100644 --- a/Resources/Textures/_NF/Objects/Fun/toys.rsi/meta.json +++ b/Resources/Textures/_NF/Objects/Fun/toys.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "plushie_jester, plushie_trystan, plushie_vulp: gentlejester-148196053781315584 / plushie_slips: mintymoo-449394523089403905 / gnome/ipc/grey/loveable/abductor/abductor_agent/deer - Taken from Paradise (toy.dmi) at https://github.com/ParadiseSS13/Paradise/tree/dab6fc55044e4a86d2107629cf148229001c7cd2, construction, botany, engineer and cmo lizard plushies by Created by Ghost Prince for use on Frontier Server.", + "copyright": "plushie_jester, plushie_trystan, plushie_vulp: gentlejester-148196053781315584 / plushie_slips: mintymoo-449394523089403905 / gnome/ipc/grey/loveable/abductor/abductor_agent/deer - Taken from Paradise (toy.dmi) at https://github.com/ParadiseSS13/Paradise/tree/dab6fc55044e4a86d2107629cf148229001c7cd2, construction, botany, engineer and cmo lizard plushies by Created by Ghost Prince for use on Frontier Server. Yarrmoth and Mailvulp by lvl1eevee (Discord)", "size": { "x": 32, "y": 32 @@ -46,6 +46,12 @@ { "name": "plushie_construction" }, + { + "name": "plushie_yarrmoth" + }, + { + "name": "plushie_mailvulp" + }, { "name": "gnome" } diff --git a/Resources/Textures/_NF/Objects/Fun/toys.rsi/plushie_mailvulp.png b/Resources/Textures/_NF/Objects/Fun/toys.rsi/plushie_mailvulp.png new file mode 100644 index 00000000000..08f3657ba2d Binary files /dev/null and b/Resources/Textures/_NF/Objects/Fun/toys.rsi/plushie_mailvulp.png differ diff --git a/Resources/Textures/_NF/Objects/Fun/toys.rsi/plushie_yarrmoth.png b/Resources/Textures/_NF/Objects/Fun/toys.rsi/plushie_yarrmoth.png new file mode 100644 index 00000000000..e799e7b2413 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Fun/toys.rsi/plushie_yarrmoth.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/jug_bluespace.rsi/inhand-left-fill-1.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/jug_bluespace.rsi/inhand-left-fill-1.png new file mode 100644 index 00000000000..257de3f3b5f Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Chemistry/jug_bluespace.rsi/inhand-left-fill-1.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/jug_bluespace.rsi/inhand-left-fill-2.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/jug_bluespace.rsi/inhand-left-fill-2.png new file mode 100644 index 00000000000..ce3eb4fad60 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Chemistry/jug_bluespace.rsi/inhand-left-fill-2.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/jug_bluespace.rsi/inhand-left-fill-3.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/jug_bluespace.rsi/inhand-left-fill-3.png new file mode 100644 index 00000000000..c37040f1df2 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Chemistry/jug_bluespace.rsi/inhand-left-fill-3.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/jug_bluespace.rsi/inhand-left-fill-4.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/jug_bluespace.rsi/inhand-left-fill-4.png new file mode 100644 index 00000000000..b4f4d2489c7 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Chemistry/jug_bluespace.rsi/inhand-left-fill-4.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/jug_bluespace.rsi/inhand-left-fill-5.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/jug_bluespace.rsi/inhand-left-fill-5.png new file mode 100644 index 00000000000..b4f4d2489c7 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Chemistry/jug_bluespace.rsi/inhand-left-fill-5.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/jug_bluespace.rsi/inhand-left-unlit.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/jug_bluespace.rsi/inhand-left-unlit.png new file mode 100644 index 00000000000..3a8ad0fe4ca Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Chemistry/jug_bluespace.rsi/inhand-left-unlit.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/jug_bluespace.rsi/inhand-left.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/jug_bluespace.rsi/inhand-left.png new file mode 100644 index 00000000000..77233b8e94e Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Chemistry/jug_bluespace.rsi/inhand-left.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/jug_bluespace.rsi/inhand-right-fill-1.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/jug_bluespace.rsi/inhand-right-fill-1.png new file mode 100644 index 00000000000..7c40b68d520 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Chemistry/jug_bluespace.rsi/inhand-right-fill-1.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/jug_bluespace.rsi/inhand-right-fill-2.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/jug_bluespace.rsi/inhand-right-fill-2.png new file mode 100644 index 00000000000..e144ea1eb7a Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Chemistry/jug_bluespace.rsi/inhand-right-fill-2.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/jug_bluespace.rsi/inhand-right-fill-3.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/jug_bluespace.rsi/inhand-right-fill-3.png new file mode 100644 index 00000000000..7ad303bf5c0 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Chemistry/jug_bluespace.rsi/inhand-right-fill-3.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/jug_bluespace.rsi/inhand-right-fill-4.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/jug_bluespace.rsi/inhand-right-fill-4.png new file mode 100644 index 00000000000..e22dddc05f8 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Chemistry/jug_bluespace.rsi/inhand-right-fill-4.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/jug_bluespace.rsi/inhand-right-fill-5.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/jug_bluespace.rsi/inhand-right-fill-5.png new file mode 100644 index 00000000000..e22dddc05f8 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Chemistry/jug_bluespace.rsi/inhand-right-fill-5.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/jug_bluespace.rsi/inhand-right-unlit.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/jug_bluespace.rsi/inhand-right-unlit.png new file mode 100644 index 00000000000..edb98f515f9 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Chemistry/jug_bluespace.rsi/inhand-right-unlit.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/jug_bluespace.rsi/inhand-right.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/jug_bluespace.rsi/inhand-right.png new file mode 100644 index 00000000000..d3ed5fcfa84 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Chemistry/jug_bluespace.rsi/inhand-right.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/jug_bluespace.rsi/jug-unlit.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/jug_bluespace.rsi/jug-unlit.png new file mode 100644 index 00000000000..e78f8ae27a6 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Chemistry/jug_bluespace.rsi/jug-unlit.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/jug_bluespace.rsi/jug.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/jug_bluespace.rsi/jug.png new file mode 100644 index 00000000000..9b0dfea14e3 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Chemistry/jug_bluespace.rsi/jug.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/jug_bluespace.rsi/jug1.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/jug_bluespace.rsi/jug1.png new file mode 100644 index 00000000000..96a20ad0ae2 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Chemistry/jug_bluespace.rsi/jug1.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/jug_bluespace.rsi/jug2.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/jug_bluespace.rsi/jug2.png new file mode 100644 index 00000000000..b6a3816bd50 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Chemistry/jug_bluespace.rsi/jug2.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/jug_bluespace.rsi/jug3.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/jug_bluespace.rsi/jug3.png new file mode 100644 index 00000000000..64394532748 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Chemistry/jug_bluespace.rsi/jug3.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/jug_bluespace.rsi/jug4.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/jug_bluespace.rsi/jug4.png new file mode 100644 index 00000000000..5fe9eb0a8a9 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Chemistry/jug_bluespace.rsi/jug4.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/jug_bluespace.rsi/jug5.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/jug_bluespace.rsi/jug5.png new file mode 100644 index 00000000000..4a3b79543eb Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Chemistry/jug_bluespace.rsi/jug5.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/jug_bluespace.rsi/jug6.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/jug_bluespace.rsi/jug6.png new file mode 100644 index 00000000000..3d41a00a6bc Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Chemistry/jug_bluespace.rsi/jug6.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/jug_bluespace.rsi/meta.json b/Resources/Textures/_NF/Objects/Specific/Chemistry/jug_bluespace.rsi/meta.json new file mode 100644 index 00000000000..3ff057a4308 --- /dev/null +++ b/Resources/Textures/_NF/Objects/Specific/Chemistry/jug_bluespace.rsi/meta.json @@ -0,0 +1,133 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Edited by whatston3", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "jug" + }, + { + "name": "jug-unlit", + "delays": [ + [ + 0.1, + 0.1 + ] + ] + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-left-unlit", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ] + ] + }, + { + "name": "inhand-left-fill-1", + "directions": 4 + }, + { + "name": "inhand-left-fill-2", + "directions": 4 + }, + { + "name": "inhand-left-fill-3", + "directions": 4 + }, + { + "name": "inhand-left-fill-4", + "directions": 4 + }, + { + "name": "inhand-left-fill-5", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-right-unlit", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ] + ] + }, + { + "name": "inhand-right-fill-1", + "directions": 4 + }, + { + "name": "inhand-right-fill-2", + "directions": 4 + }, + { + "name": "inhand-right-fill-3", + "directions": 4 + }, + { + "name": "inhand-right-fill-4", + "directions": 4 + }, + { + "name": "inhand-right-fill-5", + "directions": 4 + }, + { + "name": "jug1" + }, + { + "name": "jug2" + }, + { + "name": "jug3" + }, + { + "name": "jug4" + }, + { + "name": "jug5" + }, + { + "name": "jug6" + } + ] +} diff --git a/Resources/Textures/_NF/Objects/Specific/Fuel/fuelgrade_material.rsi/bananium.png b/Resources/Textures/_NF/Objects/Specific/Fuel/fuelgrade_material.rsi/bananium.png index 96360749fd5..cfbcb4c29c0 100644 Binary files a/Resources/Textures/_NF/Objects/Specific/Fuel/fuelgrade_material.rsi/bananium.png and b/Resources/Textures/_NF/Objects/Specific/Fuel/fuelgrade_material.rsi/bananium.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Fuel/fuelgrade_material.rsi/empty.png b/Resources/Textures/_NF/Objects/Specific/Fuel/fuelgrade_material.rsi/empty.png new file mode 100644 index 00000000000..2d5ac61ad68 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Fuel/fuelgrade_material.rsi/empty.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Fuel/fuelgrade_material.rsi/meta.json b/Resources/Textures/_NF/Objects/Specific/Fuel/fuelgrade_material.rsi/meta.json index 21b63619775..672dc370302 100644 --- a/Resources/Textures/_NF/Objects/Specific/Fuel/fuelgrade_material.rsi/meta.json +++ b/Resources/Textures/_NF/Objects/Specific/Fuel/fuelgrade_material.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 1, - "copyright": "Made by Whatstone based sprites from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", + "copyright": "Made by GhostPrince", "license": "CC-BY-SA-3.0", "size": { "x": 32, @@ -10,6 +10,9 @@ { "name": "bananium" }, + { + "name": "empty" + }, { "name": "plasma" }, diff --git a/Resources/Textures/_NF/Objects/Specific/Fuel/fuelgrade_material.rsi/plasma.png b/Resources/Textures/_NF/Objects/Specific/Fuel/fuelgrade_material.rsi/plasma.png index 6a040497614..07784f8a7f7 100644 Binary files a/Resources/Textures/_NF/Objects/Specific/Fuel/fuelgrade_material.rsi/plasma.png and b/Resources/Textures/_NF/Objects/Specific/Fuel/fuelgrade_material.rsi/plasma.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Fuel/fuelgrade_material.rsi/uranium.png b/Resources/Textures/_NF/Objects/Specific/Fuel/fuelgrade_material.rsi/uranium.png index 82e3f5c5679..1eae8262d9d 100644 Binary files a/Resources/Textures/_NF/Objects/Specific/Fuel/fuelgrade_material.rsi/uranium.png and b/Resources/Textures/_NF/Objects/Specific/Fuel/fuelgrade_material.rsi/uranium.png differ diff --git a/Resources/Textures/_NF/Objects/Storage/Barrels/black.rsi/icon.png b/Resources/Textures/_NF/Objects/Storage/Barrels/black.rsi/icon.png new file mode 100644 index 00000000000..ee1382a4809 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Storage/Barrels/black.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Objects/Storage/Barrels/black.rsi/icon_open.png b/Resources/Textures/_NF/Objects/Storage/Barrels/black.rsi/icon_open.png new file mode 100644 index 00000000000..9cc195f27d0 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Storage/Barrels/black.rsi/icon_open.png differ diff --git a/Resources/Textures/_NF/Objects/Storage/Barrels/black.rsi/meta.json b/Resources/Textures/_NF/Objects/Storage/Barrels/black.rsi/meta.json new file mode 100644 index 00000000000..a6e9f155347 --- /dev/null +++ b/Resources/Textures/_NF/Objects/Storage/Barrels/black.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation PR https://github.com/tgstation/tgstation/pull/38977, modified by rosieposieeee & whatston3", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon_open" + }, + { + "name": "paper" + }, + { + "name": "metal_explosive_label" + } + ] +} diff --git a/Resources/Textures/_NF/Objects/Storage/Barrels/black.rsi/metal_explosive_label.png b/Resources/Textures/_NF/Objects/Storage/Barrels/black.rsi/metal_explosive_label.png new file mode 100644 index 00000000000..b1b977b07e8 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Storage/Barrels/black.rsi/metal_explosive_label.png differ diff --git a/Resources/Textures/_NF/Objects/Storage/Barrels/black.rsi/paper.png b/Resources/Textures/_NF/Objects/Storage/Barrels/black.rsi/paper.png new file mode 100644 index 00000000000..08d7f696fec Binary files /dev/null and b/Resources/Textures/_NF/Objects/Storage/Barrels/black.rsi/paper.png differ diff --git a/Resources/Textures/_NF/Objects/Storage/Barrels/blue.rsi/icon.png b/Resources/Textures/_NF/Objects/Storage/Barrels/blue.rsi/icon.png new file mode 100644 index 00000000000..1bf90ce9918 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Storage/Barrels/blue.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Objects/Storage/Barrels/blue.rsi/icon_open.png b/Resources/Textures/_NF/Objects/Storage/Barrels/blue.rsi/icon_open.png new file mode 100644 index 00000000000..9cc195f27d0 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Storage/Barrels/blue.rsi/icon_open.png differ diff --git a/Resources/Textures/_NF/Objects/Storage/Barrels/blue.rsi/meta.json b/Resources/Textures/_NF/Objects/Storage/Barrels/blue.rsi/meta.json new file mode 100644 index 00000000000..a6e9f155347 --- /dev/null +++ b/Resources/Textures/_NF/Objects/Storage/Barrels/blue.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation PR https://github.com/tgstation/tgstation/pull/38977, modified by rosieposieeee & whatston3", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon_open" + }, + { + "name": "paper" + }, + { + "name": "metal_explosive_label" + } + ] +} diff --git a/Resources/Textures/_NF/Objects/Storage/Barrels/blue.rsi/metal_explosive_label.png b/Resources/Textures/_NF/Objects/Storage/Barrels/blue.rsi/metal_explosive_label.png new file mode 100644 index 00000000000..b1b977b07e8 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Storage/Barrels/blue.rsi/metal_explosive_label.png differ diff --git a/Resources/Textures/_NF/Objects/Storage/Barrels/blue.rsi/paper.png b/Resources/Textures/_NF/Objects/Storage/Barrels/blue.rsi/paper.png new file mode 100644 index 00000000000..08d7f696fec Binary files /dev/null and b/Resources/Textures/_NF/Objects/Storage/Barrels/blue.rsi/paper.png differ diff --git a/Resources/Textures/_NF/Objects/Storage/Barrels/green.rsi/icon.png b/Resources/Textures/_NF/Objects/Storage/Barrels/green.rsi/icon.png new file mode 100644 index 00000000000..101ec3f6d1b Binary files /dev/null and b/Resources/Textures/_NF/Objects/Storage/Barrels/green.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Objects/Storage/Barrels/green.rsi/icon_open.png b/Resources/Textures/_NF/Objects/Storage/Barrels/green.rsi/icon_open.png new file mode 100644 index 00000000000..9cc195f27d0 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Storage/Barrels/green.rsi/icon_open.png differ diff --git a/Resources/Textures/_NF/Objects/Storage/Barrels/green.rsi/meta.json b/Resources/Textures/_NF/Objects/Storage/Barrels/green.rsi/meta.json new file mode 100644 index 00000000000..a6e9f155347 --- /dev/null +++ b/Resources/Textures/_NF/Objects/Storage/Barrels/green.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation PR https://github.com/tgstation/tgstation/pull/38977, modified by rosieposieeee & whatston3", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon_open" + }, + { + "name": "paper" + }, + { + "name": "metal_explosive_label" + } + ] +} diff --git a/Resources/Textures/_NF/Objects/Storage/Barrels/green.rsi/metal_explosive_label.png b/Resources/Textures/_NF/Objects/Storage/Barrels/green.rsi/metal_explosive_label.png new file mode 100644 index 00000000000..b1b977b07e8 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Storage/Barrels/green.rsi/metal_explosive_label.png differ diff --git a/Resources/Textures/_NF/Objects/Storage/Barrels/green.rsi/paper.png b/Resources/Textures/_NF/Objects/Storage/Barrels/green.rsi/paper.png new file mode 100644 index 00000000000..08d7f696fec Binary files /dev/null and b/Resources/Textures/_NF/Objects/Storage/Barrels/green.rsi/paper.png differ diff --git a/Resources/Textures/_NF/Objects/Storage/Barrels/grey.rsi/icon.png b/Resources/Textures/_NF/Objects/Storage/Barrels/grey.rsi/icon.png new file mode 100644 index 00000000000..a417ce2e29c Binary files /dev/null and b/Resources/Textures/_NF/Objects/Storage/Barrels/grey.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Objects/Storage/Barrels/grey.rsi/icon_open.png b/Resources/Textures/_NF/Objects/Storage/Barrels/grey.rsi/icon_open.png new file mode 100644 index 00000000000..9cc195f27d0 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Storage/Barrels/grey.rsi/icon_open.png differ diff --git a/Resources/Textures/_NF/Objects/Storage/Barrels/grey.rsi/meta.json b/Resources/Textures/_NF/Objects/Storage/Barrels/grey.rsi/meta.json new file mode 100644 index 00000000000..a6e9f155347 --- /dev/null +++ b/Resources/Textures/_NF/Objects/Storage/Barrels/grey.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation PR https://github.com/tgstation/tgstation/pull/38977, modified by rosieposieeee & whatston3", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon_open" + }, + { + "name": "paper" + }, + { + "name": "metal_explosive_label" + } + ] +} diff --git a/Resources/Textures/_NF/Objects/Storage/Barrels/grey.rsi/metal_explosive_label.png b/Resources/Textures/_NF/Objects/Storage/Barrels/grey.rsi/metal_explosive_label.png new file mode 100644 index 00000000000..b1b977b07e8 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Storage/Barrels/grey.rsi/metal_explosive_label.png differ diff --git a/Resources/Textures/_NF/Objects/Storage/Barrels/grey.rsi/paper.png b/Resources/Textures/_NF/Objects/Storage/Barrels/grey.rsi/paper.png new file mode 100644 index 00000000000..08d7f696fec Binary files /dev/null and b/Resources/Textures/_NF/Objects/Storage/Barrels/grey.rsi/paper.png differ diff --git a/Resources/Textures/_NF/Objects/Storage/Barrels/red.rsi/icon.png b/Resources/Textures/_NF/Objects/Storage/Barrels/red.rsi/icon.png new file mode 100644 index 00000000000..6c37208bcfa Binary files /dev/null and b/Resources/Textures/_NF/Objects/Storage/Barrels/red.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Objects/Storage/Barrels/red.rsi/icon_open.png b/Resources/Textures/_NF/Objects/Storage/Barrels/red.rsi/icon_open.png new file mode 100644 index 00000000000..9cc195f27d0 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Storage/Barrels/red.rsi/icon_open.png differ diff --git a/Resources/Textures/_NF/Objects/Storage/Barrels/red.rsi/meta.json b/Resources/Textures/_NF/Objects/Storage/Barrels/red.rsi/meta.json new file mode 100644 index 00000000000..a6e9f155347 --- /dev/null +++ b/Resources/Textures/_NF/Objects/Storage/Barrels/red.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation PR https://github.com/tgstation/tgstation/pull/38977, modified by rosieposieeee & whatston3", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon_open" + }, + { + "name": "paper" + }, + { + "name": "metal_explosive_label" + } + ] +} diff --git a/Resources/Textures/_NF/Objects/Storage/Barrels/red.rsi/metal_explosive_label.png b/Resources/Textures/_NF/Objects/Storage/Barrels/red.rsi/metal_explosive_label.png new file mode 100644 index 00000000000..b1b977b07e8 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Storage/Barrels/red.rsi/metal_explosive_label.png differ diff --git a/Resources/Textures/_NF/Objects/Storage/Barrels/red.rsi/paper.png b/Resources/Textures/_NF/Objects/Storage/Barrels/red.rsi/paper.png new file mode 100644 index 00000000000..08d7f696fec Binary files /dev/null and b/Resources/Textures/_NF/Objects/Storage/Barrels/red.rsi/paper.png differ diff --git a/Resources/Textures/_NF/Objects/Storage/Barrels/white.rsi/icon.png b/Resources/Textures/_NF/Objects/Storage/Barrels/white.rsi/icon.png new file mode 100644 index 00000000000..c935fef87d4 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Storage/Barrels/white.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Objects/Storage/Barrels/white.rsi/icon_open.png b/Resources/Textures/_NF/Objects/Storage/Barrels/white.rsi/icon_open.png new file mode 100644 index 00000000000..9cc195f27d0 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Storage/Barrels/white.rsi/icon_open.png differ diff --git a/Resources/Textures/_NF/Objects/Storage/Barrels/white.rsi/meta.json b/Resources/Textures/_NF/Objects/Storage/Barrels/white.rsi/meta.json new file mode 100644 index 00000000000..a6e9f155347 --- /dev/null +++ b/Resources/Textures/_NF/Objects/Storage/Barrels/white.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation PR https://github.com/tgstation/tgstation/pull/38977, modified by rosieposieeee & whatston3", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon_open" + }, + { + "name": "paper" + }, + { + "name": "metal_explosive_label" + } + ] +} diff --git a/Resources/Textures/_NF/Objects/Storage/Barrels/white.rsi/metal_explosive_label.png b/Resources/Textures/_NF/Objects/Storage/Barrels/white.rsi/metal_explosive_label.png new file mode 100644 index 00000000000..b1b977b07e8 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Storage/Barrels/white.rsi/metal_explosive_label.png differ diff --git a/Resources/Textures/_NF/Objects/Storage/Barrels/white.rsi/paper.png b/Resources/Textures/_NF/Objects/Storage/Barrels/white.rsi/paper.png new file mode 100644 index 00000000000..08d7f696fec Binary files /dev/null and b/Resources/Textures/_NF/Objects/Storage/Barrels/white.rsi/paper.png differ diff --git a/Resources/Textures/_NF/Objects/Storage/Barrels/wood.rsi/closed.png b/Resources/Textures/_NF/Objects/Storage/Barrels/wood.rsi/closed.png new file mode 100644 index 00000000000..b111827b8e5 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Storage/Barrels/wood.rsi/closed.png differ diff --git a/Resources/Textures/_NF/Objects/Storage/Barrels/wood.rsi/icon.png b/Resources/Textures/_NF/Objects/Storage/Barrels/wood.rsi/icon.png new file mode 100644 index 00000000000..bfc92c166d4 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Storage/Barrels/wood.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Objects/Storage/Barrels/wood.rsi/meta.json b/Resources/Textures/_NF/Objects/Storage/Barrels/wood.rsi/meta.json new file mode 100644 index 00000000000..8e941fd7d61 --- /dev/null +++ b/Resources/Textures/_NF/Objects/Storage/Barrels/wood.rsi/meta.json @@ -0,0 +1,20 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation PR https://github.com/tgstation/tgstation/pull/38977, modified by rosieposieeee", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "closed" + }, + { + "name": "open" + }, + { + "name": "icon" + } + ] +} diff --git a/Resources/Textures/_NF/Objects/Storage/Barrels/wood.rsi/open.png b/Resources/Textures/_NF/Objects/Storage/Barrels/wood.rsi/open.png new file mode 100644 index 00000000000..bfc92c166d4 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Storage/Barrels/wood.rsi/open.png differ diff --git a/Resources/Textures/_NF/Objects/Storage/Barrels/yellow.rsi/icon.png b/Resources/Textures/_NF/Objects/Storage/Barrels/yellow.rsi/icon.png new file mode 100644 index 00000000000..a22bef0ff3f Binary files /dev/null and b/Resources/Textures/_NF/Objects/Storage/Barrels/yellow.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Objects/Storage/Barrels/yellow.rsi/icon_open.png b/Resources/Textures/_NF/Objects/Storage/Barrels/yellow.rsi/icon_open.png new file mode 100644 index 00000000000..9cc195f27d0 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Storage/Barrels/yellow.rsi/icon_open.png differ diff --git a/Resources/Textures/_NF/Objects/Storage/Barrels/yellow.rsi/meta.json b/Resources/Textures/_NF/Objects/Storage/Barrels/yellow.rsi/meta.json new file mode 100644 index 00000000000..a6e9f155347 --- /dev/null +++ b/Resources/Textures/_NF/Objects/Storage/Barrels/yellow.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation PR https://github.com/tgstation/tgstation/pull/38977, modified by rosieposieeee & whatston3", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon_open" + }, + { + "name": "paper" + }, + { + "name": "metal_explosive_label" + } + ] +} diff --git a/Resources/Textures/_NF/Objects/Storage/Barrels/yellow.rsi/metal_explosive_label.png b/Resources/Textures/_NF/Objects/Storage/Barrels/yellow.rsi/metal_explosive_label.png new file mode 100644 index 00000000000..b1b977b07e8 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Storage/Barrels/yellow.rsi/metal_explosive_label.png differ diff --git a/Resources/Textures/_NF/Objects/Storage/Barrels/yellow.rsi/paper.png b/Resources/Textures/_NF/Objects/Storage/Barrels/yellow.rsi/paper.png new file mode 100644 index 00000000000..08d7f696fec Binary files /dev/null and b/Resources/Textures/_NF/Objects/Storage/Barrels/yellow.rsi/paper.png differ diff --git a/Resources/Textures/_NF/Structures/Specific/BloodCult/forge.rsi/building.png b/Resources/Textures/_NF/Structures/Specific/BloodCult/forge.rsi/building.png deleted file mode 100644 index ca53a9ce208..00000000000 Binary files a/Resources/Textures/_NF/Structures/Specific/BloodCult/forge.rsi/building.png and /dev/null differ diff --git a/Resources/Textures/_NF/Structures/Specific/BloodCult/forge.rsi/meta.json b/Resources/Textures/_NF/Structures/Specific/BloodCult/forge.rsi/meta.json index d104b23ffb9..482b0f35a70 100644 --- a/Resources/Textures/_NF/Structures/Specific/BloodCult/forge.rsi/meta.json +++ b/Resources/Textures/_NF/Structures/Specific/BloodCult/forge.rsi/meta.json @@ -19,7 +19,7 @@ "delays": [ [ 0.2, 0.2, 0.2 ] ] }, { - "name": "building", + "name": "unlit-building", "delays": [ [ 0.2, 0.2, 0.2 ] ] }, { diff --git a/Resources/Textures/_NF/Structures/Specific/BloodCult/forge.rsi/unlit-building.png b/Resources/Textures/_NF/Structures/Specific/BloodCult/forge.rsi/unlit-building.png new file mode 100644 index 00000000000..29de7ec26d2 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Specific/BloodCult/forge.rsi/unlit-building.png differ diff --git a/Resources/_NF/migration.yml b/Resources/_NF/migration.yml index 73037ad97c2..51d4980573f 100644 --- a/Resources/_NF/migration.yml +++ b/Resources/_NF/migration.yml @@ -166,4 +166,10 @@ NFPosterContrabandFsbStasisDD: NFPosterContrabandFsbStasis NFPosterContrabandFsbApothecaryDD: NFPosterContrabandFsbApothecary NFPosterContrabandFsbLogoDD: NFPosterContrabandFsbLogo NFPosterContrabandFsbSpiritDD: NFPosterContrabandFsbSpirit -NFPosterContrabandEmsCoordsDD: NFPosterContrabandEmsCoords \ No newline at end of file +NFPosterContrabandEmsCoordsDD: NFPosterContrabandEmsCoords + +# 2024-12-09 Wreck +RandomItem: null + +# 2024-12-22 Barrels +CrateSpaceCleaner: ChemicalBarrelSpaceCleaner \ No newline at end of file