diff --git a/Content.IntegrationTests/Tests/Nyanotrasen/DeepFryerTest.cs b/Content.IntegrationTests/Tests/Nyanotrasen/DeepFryerTest.cs deleted file mode 100644 index 0685c7d8877..00000000000 --- a/Content.IntegrationTests/Tests/Nyanotrasen/DeepFryerTest.cs +++ /dev/null @@ -1,59 +0,0 @@ -#nullable enable annotations -using Content.Server.Kitchen.Components; -using Content.Server.Nyanotrasen.Kitchen.Components; -using Content.Server.Nyanotrasen.Kitchen.EntitySystems; -using Robust.Shared.GameObjects; -using Robust.Shared.Reflection; - -namespace Content.IntegrationTests.Tests.DeepFryer -{ - [TestFixture] - [TestOf(typeof(DeepFriedComponent))] - [TestOf(typeof(DeepFryerSystem))] - [TestOf(typeof(DeepFryerComponent))] - public sealed class DeepFryerTest - { - - [TestPrototypes] - private const string Prototypes = @" -- type: entity - name: DeepFryerDummy - id: DeepFryerDummy - components: - - type: DeepFryer - entryDelay: 0 - draggedEntryDelay: 0 - flushTime: 0 - - type: Anchorable - - type: ApcPowerReceiver - - type: Physics - bodyType: Static - - type: Fixtures - fixtures: - fix1: - shape: - !type:PhysShapeCircle - radius: 0.35 -"; - - [Test] - public async Task Test() - { - await using var pair = await PoolManager.GetServerClient(); - var server = pair.Server; - - var testMap = await pair.CreateTestMap(); - - EntityUid unitUid = default; - - var entityManager = server.ResolveDependency(); - var xformSystem = entityManager.System(); - var deepFryerSystem = entityManager.System(); - await server.WaitAssertion(() => - { - Assert.That(deepFryerSystem, Is.Not.Null); - }); - await pair.CleanReturnAsync(); - } - } -} diff --git a/Content.IntegrationTests/Tests/Round/JobTest.cs b/Content.IntegrationTests/Tests/Round/JobTest.cs index 865f68db815..befb96c7dcf 100644 --- a/Content.IntegrationTests/Tests/Round/JobTest.cs +++ b/Content.IntegrationTests/Tests/Round/JobTest.cs @@ -19,7 +19,7 @@ namespace Content.IntegrationTests.Tests.Round; public sealed class JobTest { private static readonly ProtoId Passenger = "Contractor"; // Frontier: use job prototypes that exist - private static readonly ProtoId Engineer = "Pilot"; // Frontier + private static readonly ProtoId Engineer = "Prisoner"; // Frontier private static readonly ProtoId Captain = "StationRepresentative"; // Frontier private static string _map = "JobTestMap"; diff --git a/Content.Server/Materials/MaterialStorageSystem.cs b/Content.Server/Materials/MaterialStorageSystem.cs index 9f43a220493..e8f9ab52e63 100644 --- a/Content.Server/Materials/MaterialStorageSystem.cs +++ b/Content.Server/Materials/MaterialStorageSystem.cs @@ -3,6 +3,7 @@ using Content.Shared.Materials; using Content.Shared.Popups; using Content.Shared.Stacks; +using Content.Server.Storage.Components; // Frontier using Content.Server.Power.Components; using Content.Server.Stack; using Content.Shared.ActionBlocker; @@ -81,6 +82,14 @@ private void OnEjectMessage(EjectMaterialMessage msg, EntitySessionEventArgs arg if (volume <= 0 || !TryChangeMaterialAmount(uid, msg.Material, -volume)) return; + // Frontier + // If we made it this far, turn off the magnet before spawning materials + if (TryComp(uid, out var magnet)) + { + magnet.MagnetEnabled = false; + } + // end Frontier + var mats = SpawnMultipleFromMaterial(volume, material, Transform(uid).Coordinates, out _); foreach (var mat in mats.Where(mat => !TerminatingOrDeleted(mat))) { diff --git a/Content.Server/Medical/HealingSystem.cs b/Content.Server/Medical/HealingSystem.cs index cf5869d1cbb..b74cb42d5de 100644 --- a/Content.Server/Medical/HealingSystem.cs +++ b/Content.Server/Medical/HealingSystem.cs @@ -115,13 +115,13 @@ entity.Comp.DamageContainerID is not null && _audio.PlayPvs(healing.HealingEndSound, entity.Owner, AudioHelpers.WithVariation(0.125f, _random).WithVolume(1f)); // Logic to determine the whether or not to repeat the healing action - args.Repeat = (HasDamage(entity.Comp, healing) && !dontRepeat); + args.Repeat = (HasDamage(entity.Owner, entity.Comp, healing) && !dontRepeat); // Frontier: add entity.Owner if (!args.Repeat && !dontRepeat) _popupSystem.PopupEntity(Loc.GetString("medical-item-finished-using", ("item", args.Used)), entity.Owner, args.User); args.Handled = true; } - private bool HasDamage(DamageableComponent component, HealingComponent healing) + private bool HasDamage(EntityUid target, DamageableComponent component, HealingComponent healing) { var damageableDict = component.Damage.DamageDict; var healingDict = healing.Damage.DamageDict; @@ -133,6 +133,25 @@ private bool HasDamage(DamageableComponent component, HealingComponent healing) } } + // Frontier: check if this healing item can restore the target's blood or staunch their bleeding + var hasBloodstream = TryComp(target, out var bloodstream); + + if (healing.ModifyBloodLevel > 0 + && hasBloodstream + && _solutionContainerSystem.ResolveSolution(target, bloodstream!.BloodSolutionName, ref bloodstream.BloodSolution, out var bloodSolution) + && bloodSolution.Volume < bloodSolution.MaxVolume) + { + return true; + } + + if (healing.BloodlossModifier < 0 + && hasBloodstream + && bloodstream!.BleedAmount > 0) + { + return true; + } + // End Frontier + return false; } @@ -172,14 +191,16 @@ targetDamage.DamageContainerID is not null && if (TryComp(uid, out var stack) && stack.Count < 1) return false; - var anythingToDo = - HasDamage(targetDamage, component) || - component.ModifyBloodLevel > 0 // Special case if healing item can restore lost blood... - && TryComp(target, out var bloodstream) - && _solutionContainerSystem.ResolveSolution(target, bloodstream.BloodSolutionName, ref bloodstream.BloodSolution, out var bloodSolution) - && bloodSolution.Volume < bloodSolution.MaxVolume; // ...and there is lost blood to restore. + // Frontier: extra conditions moved into HasDamage + // var anythingToDo = + // HasDamage(targetDamage, component) || + // component.ModifyBloodLevel > 0 // Special case if healing item can restore lost blood... + // && TryComp(target, out var bloodstream) + // && _solutionContainerSystem.ResolveSolution(target, bloodstream.BloodSolutionName, ref bloodstream.BloodSolution, out var bloodSolution) + // && bloodSolution.Volume < bloodSolution.MaxVolume; // ...and there is lost blood to restore. + // End Frontier - if (!anythingToDo) + if (!HasDamage(target, targetDamage, component)) // Frontier: anythingToDo(); + + if (!entMan.TryGetComponent(entity, out StrapComponent? strap)) return false; + + if (strap.BuckledEntities.Count > 0) + { + args.PushMarkup(Loc.GetString("construction-examine-condition-nf-strap-empty", ("entityName", entMan.GetComponent(entity).EntityName)) + "\n"); + return true; + } + + return false; + } + + public IEnumerable GenerateGuideEntry() + { + yield return new ConstructionGuideEntry() + { + Localization = "construction-step-condition-nf-strap-empty" + }; + } +} \ No newline at end of file diff --git a/Content.Server/_NF/StationEvents/EventSystems/LinkedLifecycleGridSystem.cs b/Content.Server/_NF/StationEvents/EventSystems/LinkedLifecycleGridSystem.cs index d663831a4f1..15ae44863fc 100644 --- a/Content.Server/_NF/StationEvents/EventSystems/LinkedLifecycleGridSystem.cs +++ b/Content.Server/_NF/StationEvents/EventSystems/LinkedLifecycleGridSystem.cs @@ -1,13 +1,14 @@ using System.Numerics; using Content.Server.StationEvents.Components; -using Content.Shared.Buckle.Components; using Content.Shared.Humanoid; using Content.Shared.Mech.Components; using Content.Shared.Mind; using Content.Shared.Mind.Components; using Content.Shared.Mobs.Components; +using Content.Shared.Silicons.Borgs.Components; using Content.Shared.Vehicle.Components; using Robust.Shared.Map; +using Robust.Shared.Player; namespace Content.Server.StationEvents.Events; @@ -106,6 +107,20 @@ private void OnMasterRemoved(EntityUid uid, LinkedLifecycleGridParentComponent c reparentEntities.Add(((targetUid, targetXform), targetXform.MapUid!.Value, _transform.GetWorldPosition(targetXform))); } + // Get silicon + var borgQuery = AllEntityQuery(); + while (borgQuery.MoveNext(out var borgUid, out _, out _, out var xform)) + { + handledEntities.Add(borgUid); + + if (xform.GridUid == null || xform.MapUid == null || xform.GridUid != grid) + continue; + + var (targetUid, targetXform) = GetParentToReparent(borgUid, xform); + + reparentEntities.Add(((targetUid, targetXform), targetXform.MapUid!.Value, _transform.GetWorldPosition(targetXform))); + } + // Get occupied MindContainers var mindQuery = AllEntityQuery(); while (mindQuery.MoveNext(out var mobUid, out var mindContainer, out var xform)) @@ -130,9 +145,9 @@ private void OnMasterRemoved(EntityUid uid, LinkedLifecycleGridParentComponent c } // Deletes a grid, reparenting every humanoid and player character that's on it. - public void UnparentPlayersFromGrid(EntityUid grid, bool deleteGrid) + public void UnparentPlayersFromGrid(EntityUid grid, bool deleteGrid, bool ignoreLifeStage = false) { - if (MetaData(grid).EntityLifeStage >= EntityLifeStage.Terminating) + if (!ignoreLifeStage && MetaData(grid).EntityLifeStage >= EntityLifeStage.Terminating) return; var reparentEntities = GetEntitiesToReparent(grid); diff --git a/Resources/Audio/_NF/Jukebox/attributions.yml b/Resources/Audio/_NF/Jukebox/attributions.yml index ef3aa977ff3..02c82f01e09 100644 --- a/Resources/Audio/_NF/Jukebox/attributions.yml +++ b/Resources/Audio/_NF/Jukebox/attributions.yml @@ -1,3 +1,13 @@ +- files: ["victory.ogg"] + license: "CC-BY-NC-SA-3.0" + copyright: "Victory by Koruu Chan. Rights reserved by Checkraze. Converted from WAV to OGG." + source: "https://github.com/Cheackraze" + +- files: ["shibamata.ogg"] + license: "CC-BY-3.0" + copyright: "Shibamata midi remake. Likely original: https://www.nicovideo.jp/watch/sm32841166" + source: "https://github.com/Elijahrane/arcadia-station/blob/c2ea3f44d4de4c0a337aeddb12f167a89c5ed3ef/Resources/Audio/Lobby/shibamata.ogg" + - files: ["lateraligator.ogg"] license: "CC-BY-3.0" copyright: "Later Alligator By Silverman Sound Studios. Converted to mono OGG." diff --git a/Resources/Audio/_NF/Jukebox/shibamata.ogg b/Resources/Audio/_NF/Jukebox/shibamata.ogg new file mode 100644 index 00000000000..6633037f310 Binary files /dev/null and b/Resources/Audio/_NF/Jukebox/shibamata.ogg differ diff --git a/Resources/Audio/_NF/Jukebox/victory.ogg b/Resources/Audio/_NF/Jukebox/victory.ogg new file mode 100644 index 00000000000..312e7441668 Binary files /dev/null and b/Resources/Audio/_NF/Jukebox/victory.ogg differ diff --git a/Resources/Audio/_NF/Lobby/attributions.yml b/Resources/Audio/_NF/Lobby/attributions.yml deleted file mode 100644 index 65365a341b8..00000000000 --- a/Resources/Audio/_NF/Lobby/attributions.yml +++ /dev/null @@ -1,9 +0,0 @@ -- files: ["victory.ogg"] - license: "CC-BY-NC-SA-3.0" - copyright: "Victory by Koruu Chan. Rights reserved by Checkraze. Converted from WAV to OGG." - source: "https://github.com/Cheackraze" - -- files: ["shibamata.ogg"] - license: "CC-BY-3.0" - copyright: "Shibamata midi remake. Likely original: https://www.nicovideo.jp/watch/sm32841166" - source: "https://github.com/Elijahrane/arcadia-station/blob/c2ea3f44d4de4c0a337aeddb12f167a89c5ed3ef/Resources/Audio/Lobby/shibamata.ogg" \ No newline at end of file diff --git a/Resources/Audio/_NF/Lobby/shibamata.ogg b/Resources/Audio/_NF/Lobby/shibamata.ogg deleted file mode 100644 index e116449a5bd..00000000000 Binary files a/Resources/Audio/_NF/Lobby/shibamata.ogg and /dev/null differ diff --git a/Resources/Audio/_NF/Lobby/victory.ogg b/Resources/Audio/_NF/Lobby/victory.ogg deleted file mode 100644 index 482cbc83f82..00000000000 Binary files a/Resources/Audio/_NF/Lobby/victory.ogg and /dev/null differ diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index 3f2423429e8..be1f28fcdec 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -6242,3 +6242,143 @@ Entries: message: Colored craftable lightbulbs and prefilled light strobes.! id: 5631 time: '2025-01-04T23:23:37.0000000+00:00' +- author: dustylens + changes: + - type: Add + message: mappable ice box for bars and restaurants! + id: 5632 + time: '2025-01-05T01:40:13.0000000+00:00' +- author: dustylens + changes: + - type: Add + message: Black light to service lathe. + id: 5633 + time: '2025-01-05T17:56:21.0000000+00:00' +- author: dustylens + changes: + - type: Add + message: Handheld crew health monitor added to medical techfab. + id: 5634 + time: '2025-01-05T17:57:46.0000000+00:00' +- author: dvir001 + changes: + - type: Tweak + message: >- + You can now directly dump ore bags into ore processors by clicking on + them. + id: 5635 + time: '2025-01-06T21:21:18.0000000+00:00' +- author: Tych0theSynth + changes: + - type: Add + message: 'Updated the SBB Tyne. ' + id: 5636 + time: '2025-01-07T15:34:09.0000000+00:00' +- author: GreaseMonk + changes: + - type: Fix + message: Fix player bodies despawning on debris + - type: Tweak + message: No longer possible to fly debris, wrecks, and salvage + id: 5637 + time: '2025-01-07T16:01:29.0000000+00:00' +- author: Alkheemist + changes: + - type: Tweak + message: Lathes now automatically disable their magnets when ejecting materials. + id: 5638 + time: '2025-01-08T10:14:46.0000000+00:00' +- author: blackknight954 + changes: [] + id: 5639 + time: '2025-01-08T10:17:27.0000000+00:00' +- author: dustylens + changes: + - type: Add + message: Dresses added to contractor loadout. + id: 5640 + time: '2025-01-09T19:55:37.0000000+00:00' +- author: Alkheemist + changes: + - type: Fix + message: Accentless now works on goblins. + id: 5641 + time: '2025-01-10T11:01:45.0000000+00:00' +- author: dvir001 + changes: + - type: Tweak + message: Moved Victory and Shibamata from the lobby music to the jukebox. + id: 5642 + time: '2025-01-10T17:58:03.0000000+00:00' +- author: blackknight954 + changes: + - type: Add + message: Added shotgun slugs and rubber magazines to the NFSD and Mercfabs + id: 5643 + time: '2025-01-10T21:16:43.0000000+00:00' +- author: dustylens + changes: + - type: Add + message: New ramen dishes from Umami! (Sometimes the SR) + id: 5644 + time: '2025-01-10T21:48:51.0000000+00:00' +- author: MagnusCrowe + changes: + - type: Add + message: Added monkey and kobold cubes to loadout under tools. + id: 5645 + time: '2025-01-10T21:50:07.0000000+00:00' +- author: Alkheemist + changes: + - type: Fix + message: >- + Trade mall has had a new solar array fitted, power should be more + consistent now. + id: 5646 + time: '2025-01-11T08:22:27.0000000+00:00' +- author: dvir001 + changes: + - type: Fix + message: >- + Player controlled borgs no longer get deleted on event grids when they + end. + id: 5647 + time: '2025-01-11T15:50:26.0000000+00:00' +- author: dvir001 + changes: + - type: Fix + message: Paladin NFSD Shuttle locker isn't locked to detective only anymore. + id: 5648 + time: '2025-01-11T16:10:51.0000000+00:00' +- author: whatston3 + changes: + - type: Add + message: >- + Blood restoring/hemostatic items can be used even if the user isn't + damaged. + id: 5649 + time: '2025-01-12T12:28:48.0000000+00:00' +- author: Jakumba + changes: + - type: Tweak + message: Updates NFSD PTech with additional items + id: 5650 + time: '2025-01-12T12:44:54.0000000+00:00' +- author: dustylens + changes: + - type: Tweak + message: Condiment dispenser can now be shuttered. + id: 5651 + time: '2025-01-12T13:00:48.0000000+00:00' +- author: Lyndomen + changes: + - type: Tweak + message: Speedboots consume more energy, are faster, and are powered by bluespace + id: 5652 + time: '2025-01-12T13:01:52.0000000+00:00' +- author: dvir001 + changes: + - type: Fix + message: Xenos can now be butchered on meat spikes. + id: 5653 + time: '2025-01-12T13:08:35.0000000+00:00' diff --git a/Resources/Locale/en-US/_NF/construction/conditions/strap-buckled.ftl b/Resources/Locale/en-US/_NF/construction/conditions/strap-buckled.ftl new file mode 100644 index 00000000000..6edbcc47363 --- /dev/null +++ b/Resources/Locale/en-US/_NF/construction/conditions/strap-buckled.ftl @@ -0,0 +1,3 @@ +# NFBuckled +construction-examine-condition-nf-strap-empty = Unbuckle everything from the {$entityName}. +construction-step-condition-nf-strap-empty = Nothing must be buckled. diff --git a/Resources/Locale/en-US/_NF/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/_NF/flavors/flavor-profiles.ftl index bd350a7b5bb..6d23ac9e55e 100644 --- a/Resources/Locale/en-US/_NF/flavors/flavor-profiles.ftl +++ b/Resources/Locale/en-US/_NF/flavors/flavor-profiles.ftl @@ -10,3 +10,6 @@ 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 +flavor-complex-fine-noodles = like fine noodles +flavor-complex-rich-broth = rich broth +flavor-complex-tangy = tangy diff --git a/Resources/Maps/_NF/POI/trademall.yml b/Resources/Maps/_NF/POI/trademall.yml index 21a8a2cbdec..34d2b9ab705 100644 --- a/Resources/Maps/_NF/POI/trademall.yml +++ b/Resources/Maps/_NF/POI/trademall.yml @@ -141,35 +141,35 @@ entities: version: 6 2,1: ind: 2,1 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 3,1: ind: 3,1 - tiles: BQAAAAACAgAAAAADAgAAAAADAgAAAAAABQAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAAAgAAAAABAgAAAAAAAgAAAAACBQAAAAAAgwAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAABAAAAAAABAAAAAAABAAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: BQAAAAACAgAAAAADAgAAAAADAgAAAAAABQAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAABQAAAAAAAgAAAAABAgAAAAAAAgAAAAACBQAAAAAAgwAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAAAgAAAAAAAgAAAAAAAgAAAAAABQAAAAAAgwAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAABAAAAAAABAAAAAAABAAAAAAABQAAAAAAgwAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 3,0: ind: 3,0 - tiles: BAAAAAAAAgAAAAAAAgAAAAADAgAAAAABBAAAAAAAAgAAAAACAgAAAAADAgAAAAACAgAAAAAABAAAAAAAAgAAAAAAAgAAAAACAgAAAAABAgAAAAAAAgAAAAABAgAAAAAABAAAAAAAAgAAAAACAgAAAAACAgAAAAAABAAAAAAAAgAAAAADAgAAAAABAgAAAAADAgAAAAAABAAAAAAAAgAAAAABAgAAAAAAAgAAAAAAAgAAAAABAgAAAAABAgAAAAAAgwAAAAAAAgAAAAAAAgAAAAAAAgAAAAACgwAAAAAABQAAAAAABQAAAAACBQAAAAACBQAAAAABgwAAAAAAAgAAAAADAgAAAAABgwAAAAAAgwAAAAAAgwAAAAAABQAAAAABgwAAAAAAAgAAAAACAgAAAAACAgAAAAAABQAAAAACgwAAAAAABQAAAAACBQAAAAABBQAAAAADgwAAAAAAAgAAAAAAAgAAAAACgwAAAAAAgwAAAAAAgwAAAAAABQAAAAACgwAAAAAAAgAAAAABAgAAAAAAAgAAAAACBQAAAAADBQAAAAABHQAAAAAAHQAAAAAAHQAAAAAAgwAAAAAAAgAAAAABAgAAAAADgwAAAAAAgwAAAAAAgwAAAAAABQAAAAACgwAAAAAAAgAAAAABAgAAAAACAgAAAAACBQAAAAAABQAAAAADHQAAAAAGHQAAAAAAHQAAAAAAgwAAAAAAAgAAAAACAgAAAAAABQAAAAABBQAAAAAABQAAAAAABQAAAAADgwAAAAAAAgAAAAABAgAAAAACAgAAAAAABQAAAAADBQAAAAACHQAAAAAAHQAAAAAAHQAAAAAFgwAAAAAAgwAAAAAABAAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAABAAAAAAABAAAAAAABAAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAEAAAAAADEAAAAAAAgwAAAAAAAgAAAAAAAgAAAAADAgAAAAAAAgAAAAABAgAAAAABAgAAAAABAgAAAAAAAgAAAAADgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAEAAAAAABgwAAAAAAgwAAAAAAAgAAAAADAgAAAAABAgAAAAACAgAAAAAAAgAAAAADAgAAAAAAAgAAAAADAgAAAAAABAAAAAAAEAAAAAACgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAgwAAAAAAAgAAAAADAgAAAAABAgAAAAABgwAAAAAABQAAAAABgwAAAAAABQAAAAADgwAAAAAAEAAAAAADgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAgAAAAACAgAAAAACAgAAAAAABQAAAAABBQAAAAAABQAAAAACBQAAAAAAgwAAAAAAEAAAAAABEAAAAAACgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAgAAAAADAgAAAAAAAgAAAAADBQAAAAADBQAAAAACgwAAAAAABQAAAAABgwAAAAAAEAAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAABQAAAAABAgAAAAAAAgAAAAACAgAAAAADBQAAAAADBQAAAAADBQAAAAABBQAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAABQAAAAAAAgAAAAAAAgAAAAAAAgAAAAABBQAAAAABBQAAAAAABQAAAAABgwAAAAAAgwAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAAAAAAAABQAAAAABBAAAAAAABAAAAAAABAAAAAAABQAAAAADgwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAA + tiles: BAAAAAAAAgAAAAAAAgAAAAADAgAAAAABBAAAAAAAAgAAAAACAgAAAAADAgAAAAACAgAAAAAABAAAAAAAAgAAAAAAAgAAAAACAgAAAAABAgAAAAAAAgAAAAABAgAAAAAABAAAAAAAAgAAAAACAgAAAAACAgAAAAAABAAAAAAAAgAAAAADAgAAAAABAgAAAAADAgAAAAAABAAAAAAAAgAAAAABAgAAAAAAAgAAAAAAAgAAAAABAgAAAAABAgAAAAAAgwAAAAAAAgAAAAAAAgAAAAAAAgAAAAACgwAAAAAABQAAAAAABQAAAAACBQAAAAACBQAAAAABgwAAAAAAAgAAAAADAgAAAAABgwAAAAAAgwAAAAAAgwAAAAAABQAAAAABgwAAAAAAAgAAAAACAgAAAAACAgAAAAAABQAAAAACgwAAAAAABQAAAAACBQAAAAABBQAAAAADgwAAAAAAAgAAAAAAAgAAAAACgwAAAAAAgwAAAAAAgwAAAAAABQAAAAACgwAAAAAAAgAAAAABAgAAAAAAAgAAAAACBQAAAAADBQAAAAABHQAAAAAAHQAAAAAAHQAAAAAAgwAAAAAAAgAAAAABAgAAAAADgwAAAAAAgwAAAAAAgwAAAAAABQAAAAACgwAAAAAAAgAAAAABAgAAAAACAgAAAAACBQAAAAAABQAAAAADHQAAAAAGHQAAAAAAHQAAAAAAgwAAAAAAAgAAAAACAgAAAAAABQAAAAABBQAAAAAABQAAAAAABQAAAAADgwAAAAAAAgAAAAABAgAAAAACAgAAAAAABQAAAAADBQAAAAACHQAAAAAAHQAAAAAAHQAAAAAFgwAAAAAAgwAAAAAABAAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAABAAAAAAABAAAAAAABAAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAEAAAAAADEAAAAAAAgwAAAAAAAgAAAAAAAgAAAAADAgAAAAAAAgAAAAABAgAAAAABAgAAAAABAgAAAAAAAgAAAAADgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAEAAAAAABgwAAAAAAgwAAAAAAAgAAAAADAgAAAAABAgAAAAACAgAAAAAAAgAAAAADAgAAAAAAAgAAAAADAgAAAAAABAAAAAAAEAAAAAACgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAgwAAAAAAAgAAAAADAgAAAAABAgAAAAABgwAAAAAABQAAAAABgwAAAAAABQAAAAADgwAAAAAAEAAAAAADgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAgAAAAACAgAAAAACAgAAAAAABQAAAAABBQAAAAAABQAAAAACBQAAAAAAgwAAAAAAEAAAAAABEAAAAAACgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAgwAAAAAAAgAAAAADAgAAAAAAAgAAAAADBQAAAAADBQAAAAACgwAAAAAABQAAAAABgwAAAAAAEAAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAABQAAAAABAgAAAAAAAgAAAAACAgAAAAADBQAAAAADBQAAAAADBQAAAAABBQAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAABQAAAAAAAgAAAAAAAgAAAAAAAgAAAAABBQAAAAABBQAAAAAABQAAAAABgwAAAAAAgwAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAABQAAAAABBAAAAAAABAAAAAAABAAAAAAABQAAAAADgwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAA version: 6 4,0: ind: 4,0 - tiles: AgAAAAADBAAAAAAAAgAAAAADAgAAAAADBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAADBAAAAAAAAgAAAAAAAgAAAAADBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAABQAAAAADBQAAAAADBQAAAAADgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAACgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAAgwAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: AgAAAAADBAAAAAAAAgAAAAADAgAAAAAAAgAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAADBAAAAAAAAgAAAAAAAgAAAAADAgAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAABQAAAAADBQAAAAADBQAAAAADBQAAAAAABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAACgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAAgwAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 4,-1: ind: 4,-1 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAABgwAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAADgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAADBQAAAAAABQAAAAACBQAAAAACgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAABBAAAAAAAAgAAAAAAAgAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAABgwAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAADgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAADBQAAAAAABQAAAAACBQAAAAACBQAAAAAABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAABBAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 3,-1: ind: 3,-1 - tiles: BQAAAAAAAgAAAAAAAgAAAAABAgAAAAADBQAAAAACgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAADBAAAAAAABAAAAAAABAAAAAAABQAAAAACgwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAABQAAAAAAAgAAAAADAgAAAAABAgAAAAABBQAAAAADBQAAAAADBQAAAAACgwAAAAAAgwAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAAAAAAAABQAAAAADAgAAAAACAgAAAAADAgAAAAACBQAAAAABBQAAAAACBQAAAAABBQAAAAACgwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAABQAAAAADAgAAAAADAgAAAAABAgAAAAABgwAAAAAAgwAAAAAAgwAAAAAABQAAAAAAgwAAAAAAEAAAAAABgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAABQAAAAAAAgAAAAABAgAAAAADAgAAAAABgwAAAAAAgwAAAAAAgwAAAAAABQAAAAABgwAAAAAAEAAAAAABEAAAAAACgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAgAAAAAAAgAAAAABAgAAAAABgwAAAAAAgwAAAAAAgwAAAAAABQAAAAABgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAgAAAAABAgAAAAACAgAAAAAAAgAAAAAAAgAAAAABAgAAAAACAgAAAAACAgAAAAACBAAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAgAAAAADAgAAAAABAgAAAAAAAgAAAAADAgAAAAABAgAAAAABAgAAAAAAAgAAAAABgwAAAAAAEAAAAAABEAAAAAACgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAABAAAAAAABAAAAAAABAAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAEAAAAAADgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAgAAAAADAgAAAAAAAgAAAAAABQAAAAACBQAAAAADHQAAAAABHQAAAAAAHQAAAAAAgwAAAAAAgwAAAAAABAAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAgAAAAACAgAAAAACAgAAAAABBQAAAAACBQAAAAAAHQAAAAAAHQAAAAALHQAAAAAGgwAAAAAAAgAAAAADAgAAAAACBQAAAAADBQAAAAABBQAAAAABBQAAAAAAgwAAAAAAAgAAAAAAAgAAAAAAAgAAAAABBQAAAAACBQAAAAACHQAAAAAAHQAAAAAAHQAAAAAAgwAAAAAAAgAAAAABAgAAAAADgwAAAAAABQAAAAAAAgAAAAABBQAAAAADgwAAAAAAAgAAAAABAgAAAAABAgAAAAABBQAAAAACgwAAAAAABQAAAAAABQAAAAABBQAAAAACgwAAAAAAAgAAAAADAgAAAAABBQAAAAADBQAAAAAABQAAAAAABQAAAAACgwAAAAAAAgAAAAAAAgAAAAADAgAAAAADgwAAAAAABQAAAAACBQAAAAADBQAAAAACBQAAAAAAgwAAAAAAAgAAAAAAAgAAAAACgwAAAAAABQAAAAABBQAAAAAABQAAAAABBAAAAAAAAgAAAAABAgAAAAADAgAAAAAABAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAABAAAAAAAAgAAAAAAAgAAAAABAgAAAAABAgAAAAACAgAAAAADAgAAAAAB + tiles: BQAAAAAAAgAAAAAAAgAAAAABAgAAAAADBQAAAAACgwAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAABQAAAAADBAAAAAAABAAAAAAABAAAAAAABQAAAAACgwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAABQAAAAAAAgAAAAADAgAAAAABAgAAAAABBQAAAAADBQAAAAADBQAAAAACgwAAAAAAgwAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAABQAAAAADAgAAAAACAgAAAAADAgAAAAACBQAAAAABBQAAAAACBQAAAAABBQAAAAACgwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAABQAAAAADAgAAAAADAgAAAAABAgAAAAABgwAAAAAAgwAAAAAAgwAAAAAABQAAAAAAgwAAAAAAEAAAAAABgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAABQAAAAAAAgAAAAABAgAAAAADAgAAAAABgwAAAAAAgwAAAAAAgwAAAAAABQAAAAABgwAAAAAAEAAAAAABEAAAAAACgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAgwAAAAAAAgAAAAAAAgAAAAABAgAAAAABgwAAAAAAgwAAAAAAgwAAAAAABQAAAAABgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAgAAAAABAgAAAAACAgAAAAAAAgAAAAAAAgAAAAABAgAAAAACAgAAAAACAgAAAAACBAAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAgAAAAADAgAAAAABAgAAAAAAAgAAAAADAgAAAAABAgAAAAABAgAAAAAAAgAAAAABgwAAAAAAEAAAAAABEAAAAAACgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAABAAAAAAABAAAAAAABAAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAEAAAAAADgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAgAAAAADAgAAAAAAAgAAAAAABQAAAAACBQAAAAADHQAAAAABHQAAAAAAHQAAAAAAgwAAAAAAgwAAAAAABAAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAgAAAAACAgAAAAACAgAAAAABBQAAAAACBQAAAAAAHQAAAAAAHQAAAAALHQAAAAAGgwAAAAAAAgAAAAADAgAAAAACBQAAAAADBQAAAAABBQAAAAABBQAAAAAAgwAAAAAAAgAAAAAAAgAAAAAAAgAAAAABBQAAAAACBQAAAAACHQAAAAAAHQAAAAAAHQAAAAAAgwAAAAAAAgAAAAABAgAAAAADgwAAAAAABQAAAAAAAgAAAAABBQAAAAADgwAAAAAAAgAAAAABAgAAAAABAgAAAAABBQAAAAACgwAAAAAABQAAAAAABQAAAAABBQAAAAACgwAAAAAAAgAAAAADAgAAAAABBQAAAAADBQAAAAAABQAAAAAABQAAAAACgwAAAAAAAgAAAAAAAgAAAAADAgAAAAADgwAAAAAABQAAAAACBQAAAAADBQAAAAACBQAAAAAAgwAAAAAAAgAAAAAAAgAAAAACgwAAAAAABQAAAAABBQAAAAAABQAAAAABBAAAAAAAAgAAAAABAgAAAAADAgAAAAAABAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAABAAAAAAAAgAAAAAAAgAAAAABAgAAAAABAgAAAAACAgAAAAADAgAAAAAB version: 6 3,-2: ind: 3,-2 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAABAAAAAAABAAAAAAABAAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAAAgAAAAAAAgAAAAACAgAAAAAABQAAAAACgwAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAABAAAAAAABAAAAAAABAAAAAAABQAAAAAAgwAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAAAgAAAAAAAgAAAAAAAgAAAAAABQAAAAAAgwAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAAAgAAAAAAAgAAAAACAgAAAAAABQAAAAACgwAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 2,-2: ind: 2,-2 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAgwAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAA version: 6 - type: Broadphase - type: Physics @@ -1604,13 +1604,15 @@ entities: 959: 6,-7 964: 8,-4 - node: - color: '#B33831FF' + color: '#B32828FF' id: BrickTileSteelLineE decals: - 519: 51,17 - 520: 51,16 - 521: 51,-16 - 522: 51,-17 + 4411: 51,18 + 4412: 51,17 + 4413: 51,16 + 4451: 51,-16 + 4452: 51,-17 + 4453: 51,-18 - node: color: '#FFFFFFFF' id: BrickTileSteelLineE @@ -1620,11 +1622,12 @@ entities: 1711: 43,-4 1712: 43,-4 - node: - color: '#B33831FF' + color: '#B32828FF' id: BrickTileSteelLineN decals: - 525: 67,1 - 526: 66,1 + 4414: 66,1 + 4415: 67,1 + 4416: 68,1 - node: color: '#FFFFFFFF' id: BrickTileSteelLineN @@ -1640,11 +1643,12 @@ entities: 970: 5,-3 971: 4,-3 - node: - color: '#B33831FF' + color: '#B32828FF' id: BrickTileSteelLineS decals: - 523: 66,-1 - 524: 67,-1 + 4417: 66,-1 + 4418: 67,-1 + 4419: 68,-1 - node: color: '#FFFFFFFF' id: BrickTileSteelLineS @@ -1657,13 +1661,15 @@ entities: 960: 7,-7 1710: 41,-5 - node: - color: '#B33831FF' + color: '#B32828FF' id: BrickTileSteelLineW decals: - 515: 49,-17 - 516: 49,-16 - 517: 49,16 - 518: 49,17 + 4408: 49,16 + 4409: 49,17 + 4410: 49,18 + 4448: 49,-16 + 4450: 49,-18 + 4463: 49,-17 - node: color: '#FFFFFFFF' id: BrickTileSteelLineW @@ -2864,10 +2870,7 @@ entities: 2796: 64,4 2797: 64,3 2798: 64,0 - 2799: 66,1 2800: 66,0 - 2801: 66,-1 - 2802: 67,-1 2803: 67,2 2804: 63,0 2805: 63,-2 @@ -2966,25 +2969,11 @@ entities: 2898: 49,-9 2899: 49,-11 2900: 50,-13 - 2901: 48,-16 - 2902: 49,-16 - 2903: 51,-16 - 2904: 51,-16 - 2905: 49,-17 - 2906: 50,-17 - 2907: 51,-17 - 2908: 51,-17 2909: 52,-17 2910: 49,-15 - 2911: 50,-16 2912: 53,-16 - 2913: 49,-16 2914: 48,-17 - 2915: 51,-18 2916: 52,-17 - 2917: 49,-17 - 2918: 51,-18 - 2919: 52,-18 2920: 52,-13 2921: 50,-14 2922: 46,-13 @@ -3090,18 +3079,12 @@ entities: 3022: 50,12 3023: 50,15 3024: 50,13 - 3025: 49,16 - 3026: 51,16 3027: 52,16 3028: 52,17 - 3029: 50,17 - 3030: 48,18 3031: 48,17 3032: 48,17 - 3033: 51,16 3034: 52,16 3035: 52,17 - 3036: 49,17 3037: 48,17 3038: 50,13 3039: 50,11 @@ -4154,6 +4137,32 @@ entities: 4086: 14,19 4087: 15,19 4088: 13,19 + - node: + cleanable: True + color: '#FFFFFFFF' + id: Dirt + decals: + 4454: 49,-18 + 4455: 50,-18 + 4456: 51,-17 + 4457: 50,-17 + 4459: 49,-16 + 4460: 50,-16 + 4461: 51,-16 + 4462: 51,-18 + 4465: 68,0 + 4466: 67,1 + 4473: 50,16 + 4474: 51,18 + 4475: 49,18 + 4476: 49,17 + - node: + cleanable: True + color: '#FFFFFFFF' + id: DirtHeavy + decals: + 4477: 50,18 + 4478: 51,16 - node: cleanable: True color: '#49392696' @@ -4190,8 +4199,6 @@ entities: 4296: 62,0 4297: 63,1 4298: 64,0 - 4299: 67,1 - 4300: 66,-1 4301: 62,0 4302: 59,-1 4303: 59,-4 @@ -4209,8 +4216,6 @@ entities: 4315: 51,12 4316: 50,14 4317: 49,14 - 4318: 49,16 - 4319: 51,17 4320: 54,12 4321: 54,13 4322: 53,13 @@ -4289,12 +4294,25 @@ entities: 4395: -5,0 4396: -3,0 4397: -1,-1 + - node: + cleanable: True + color: '#FFFFFFFF' + id: DirtHeavyMonotile + decals: + 4469: 67,-1 + 4470: 66,1 + - node: + cleanable: True + angle: 1.5707963267948966 rad + color: '#FFFFFFFF' + id: DirtHeavyMonotile + decals: + 4472: 68,-1 - node: cleanable: True color: '#49392696' id: DirtLight decals: - 4219: 67,1 4220: 65,1 4221: 62,1 4222: 59,1 @@ -4343,6 +4361,14 @@ entities: 4265: -18,0 4266: -17,0 4267: -21,1 + - node: + cleanable: True + color: '#FFFFFFFF' + id: DirtLight + decals: + 4464: 49,-17 + 4479: 50,17 + 4480: 49,16 - node: cleanable: True color: '#49392696' @@ -4478,6 +4504,15 @@ entities: 4216: 58,-4 4217: 58,-1 4218: 60,1 + - node: + cleanable: True + color: '#FFFFFFFF' + id: DirtMedium + decals: + 4467: 51,-16 + 4468: 50,-18 + 4471: 66,-1 + 4481: 51,17 - node: color: '#A4610696' id: HalfTileOverlayGreyscale @@ -4964,8 +4999,6 @@ entities: 1349: 50,-7 1350: 51,-7 1353: 46,2 - 1356: 49,18 - 1357: 51,18 1359: 49,7 1360: 50,7 1361: 51,7 @@ -4988,7 +5021,11 @@ entities: 2030: -7,17 4400: 50,-15 4405: 50,15 - 4406: 50,18 + 4436: 48,19 + 4437: 49,19 + 4438: 50,19 + 4439: 51,19 + 4440: 52,19 - node: color: '#FFFFFFFF' id: WarnLineS @@ -5073,8 +5110,6 @@ entities: 1390: 52,-1 1399: 65,-1 1400: 65,1 - 1401: 68,1 - 1402: 68,-1 2002: -35,-1 2003: -35,1 2004: -2,-40 @@ -5087,7 +5122,11 @@ entities: 2011: -2,40 2032: -9,19 4402: 65,0 - 4403: 68,0 + 4431: 69,-2 + 4432: 69,-1 + 4433: 69,0 + 4434: 69,1 + 4435: 69,2 - node: color: '#FFFFFFFF' id: WarnLineW @@ -5176,8 +5215,6 @@ entities: 1337: 50,-7 1338: 51,-7 1339: 49,-7 - 1342: 49,-18 - 1343: 51,-18 1344: 43,-11 1345: 59,-6 1346: 59,6 @@ -5196,9 +5233,13 @@ entities: 2027: -1,43 2028: -5,20 2031: -7,17 - 4398: 50,-18 4399: 50,-15 4404: 50,15 + 4426: 48,-19 + 4427: 49,-19 + 4428: 50,-19 + 4429: 51,-19 + 4430: 52,-19 - node: color: '#FFFFFFFF' id: WoodTrimThinInnerNw @@ -5696,11 +5737,22 @@ entities: parent: 1 - proto: AirlockEngineering entities: + - uid: 74 + components: + - type: Transform + pos: 56.5,9.5 + parent: 1 - uid: 2858 components: - type: Transform pos: -10.5,-1.5 parent: 1 + - uid: 6157 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 59.5,6.5 + parent: 1 - proto: AirlockEngineeringGlass entities: - uid: 5412 @@ -6318,29 +6370,6 @@ entities: parent: 1 - type: Docking name: dock-label-trade-six - - uid: 1526 - components: - - type: Transform - pos: 50.5,-17.5 - parent: 1 - - type: Docking - name: dock-label-trade-cargo-bay-three - - uid: 1730 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 50.5,18.5 - parent: 1 - - type: Docking - name: dock-label-trade-cargo-bay-one - - uid: 1750 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 68.5,0.5 - parent: 1 - - type: Docking - name: dock-label-trade-cargo-bay-two - uid: 1754 components: - type: Transform @@ -6536,60 +6565,65 @@ entities: parent: 1 - type: Docking name: dock-label-guard - - uid: 2842 + - uid: 2852 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 68.5,1.5 + rot: 3.141592653589793 rad + pos: 0.5,45.5 parent: 1 - type: Docking - name: dock-label-trade-cargo-bay-two - - uid: 2843 + name: dock-label-trade-seven-b + - uid: 6166 + components: + - type: Transform + pos: 50.5,-18.5 + parent: 1 + - uid: 6167 + components: + - type: Transform + pos: 51.5,-18.5 + parent: 1 + - uid: 6168 + components: + - type: Transform + pos: 49.5,-18.5 + parent: 1 + - uid: 6169 components: - type: Transform rot: 1.5707963267948966 rad - pos: 68.5,-0.5 + pos: 69.5,-0.5 parent: 1 - - type: Docking - name: dock-label-trade-cargo-bay-two - - uid: 2844 + - uid: 6170 components: - type: Transform - pos: 51.5,-17.5 + rot: 1.5707963267948966 rad + pos: 69.5,0.5 parent: 1 - - type: Docking - name: dock-label-trade-cargo-bay-three - - uid: 2845 + - uid: 6171 components: - type: Transform - pos: 49.5,-17.5 + rot: 1.5707963267948966 rad + pos: 69.5,1.5 parent: 1 - - type: Docking - name: dock-label-trade-cargo-bay-three - - uid: 2846 + - uid: 6172 components: - type: Transform rot: 3.141592653589793 rad - pos: 49.5,18.5 + pos: 51.5,19.5 parent: 1 - - type: Docking - name: dock-label-trade-cargo-bay-one - - uid: 2847 + - uid: 6173 components: - type: Transform rot: 3.141592653589793 rad - pos: 51.5,18.5 + pos: 50.5,19.5 parent: 1 - - type: Docking - name: dock-label-trade-cargo-bay-one - - uid: 2852 + - uid: 6174 components: - type: Transform rot: 3.141592653589793 rad - pos: 0.5,45.5 + pos: 49.5,19.5 parent: 1 - - type: Docking - name: dock-label-trade-seven-b - proto: AirlockGlassShuttleNfsdLocked entities: - uid: 2544 @@ -6655,16 +6689,6 @@ entities: - type: Transform pos: 59.5,-5.5 parent: 1 - - uid: 5379 - components: - - type: Transform - pos: 59.5,6.5 - parent: 1 - - uid: 5380 - components: - - type: Transform - pos: 56.5,9.5 - parent: 1 - proto: AirlockMailCarrierLocked entities: - uid: 5406 @@ -6985,11 +7009,84 @@ entities: parent: 1 - proto: AtmosDeviceFanDirectional entities: + - uid: 35 + components: + - type: Transform + pos: 48.5,-18.5 + parent: 1 - uid: 41 components: - type: Transform pos: -3.5,17.5 parent: 1 + - uid: 60 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 49.5,19.5 + parent: 1 + - uid: 63 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 50.5,19.5 + parent: 1 + - uid: 64 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 48.5,19.5 + parent: 1 + - uid: 67 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 69.5,-1.5 + parent: 1 + - uid: 68 + components: + - type: Transform + pos: 49.5,-18.5 + parent: 1 + - uid: 76 + components: + - type: Transform + pos: 51.5,-18.5 + parent: 1 + - uid: 78 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 69.5,1.5 + parent: 1 + - uid: 82 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 69.5,2.5 + parent: 1 + - uid: 87 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 69.5,0.5 + parent: 1 + - uid: 97 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 51.5,19.5 + parent: 1 + - uid: 99 + components: + - type: Transform + pos: 50.5,-18.5 + parent: 1 + - uid: 101 + components: + - type: Transform + pos: 52.5,-18.5 + parent: 1 - uid: 126 components: - type: Transform @@ -7081,11 +7178,6 @@ entities: - type: Transform pos: -33.5,-3.5 parent: 1 - - uid: 1341 - components: - - type: Transform - pos: 50.5,-17.5 - parent: 1 - uid: 1366 components: - type: Transform @@ -7098,18 +7190,6 @@ entities: rot: 1.5707963267948966 rad pos: 4.5,-39.5 parent: 1 - - uid: 1527 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 68.5,0.5 - parent: 1 - - uid: 1692 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 50.5,18.5 - parent: 1 - uid: 2082 components: - type: Transform @@ -7176,74 +7256,6 @@ entities: rot: -1.5707963267948966 rad pos: 42.5,12.5 parent: 1 - - uid: 4941 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 68.5,1.5 - parent: 1 - - uid: 4942 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 68.5,-0.5 - parent: 1 - - uid: 4943 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 68.5,-1.5 - parent: 1 - - uid: 4944 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 68.5,2.5 - parent: 1 - - uid: 4945 - components: - - type: Transform - pos: 52.5,-17.5 - parent: 1 - - uid: 4946 - components: - - type: Transform - pos: 51.5,-17.5 - parent: 1 - - uid: 4947 - components: - - type: Transform - pos: 49.5,-17.5 - parent: 1 - - uid: 4948 - components: - - type: Transform - pos: 48.5,-17.5 - parent: 1 - - uid: 4949 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 48.5,18.5 - parent: 1 - - uid: 4950 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 49.5,18.5 - parent: 1 - - uid: 4951 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 51.5,18.5 - parent: 1 - - uid: 4952 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 52.5,18.5 - parent: 1 - uid: 5338 components: - type: Transform @@ -7310,6 +7322,18 @@ entities: rot: 1.5707963267948966 rad pos: 4.5,40.5 parent: 1 + - uid: 5469 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 52.5,19.5 + parent: 1 + - uid: 5486 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 69.5,-0.5 + parent: 1 - proto: AtmosFixBlockerMarker entities: - uid: 44 @@ -7542,6 +7566,11 @@ entities: - type: Transform pos: -15.5,-22.5 parent: 1 + - uid: 1762 + components: + - type: Transform + pos: 68.5,-6.5 + parent: 1 - uid: 1947 components: - type: Transform @@ -7562,6 +7591,26 @@ entities: - type: Transform pos: -18.5,-19.5 parent: 1 + - uid: 2581 + components: + - type: Transform + pos: 67.5,5.5 + parent: 1 + - uid: 2582 + components: + - type: Transform + pos: 67.5,6.5 + parent: 1 + - uid: 2583 + components: + - type: Transform + pos: 67.5,-5.5 + parent: 1 + - uid: 2584 + components: + - type: Transform + pos: 67.5,-3.5 + parent: 1 - uid: 2762 components: - type: Transform @@ -7572,6 +7621,36 @@ entities: - type: Transform pos: -17.5,-20.5 parent: 1 + - uid: 2842 + components: + - type: Transform + pos: 66.5,-7.5 + parent: 1 + - uid: 2843 + components: + - type: Transform + pos: 66.5,-5.5 + parent: 1 + - uid: 2844 + components: + - type: Transform + pos: 66.5,-8.5 + parent: 1 + - uid: 2845 + components: + - type: Transform + pos: 66.5,-9.5 + parent: 1 + - uid: 2846 + components: + - type: Transform + pos: 65.5,-7.5 + parent: 1 + - uid: 2847 + components: + - type: Transform + pos: 62.5,-11.5 + parent: 1 - uid: 2853 components: - type: Transform @@ -7627,6 +7706,11 @@ entities: - type: Transform pos: -11.5,-23.5 parent: 1 + - uid: 3448 + components: + - type: Transform + pos: 63.5,-10.5 + parent: 1 - uid: 3488 components: - type: Transform @@ -7657,6 +7741,11 @@ entities: - type: Transform pos: -10.5,-18.5 parent: 1 + - uid: 3499 + components: + - type: Transform + pos: 61.5,-12.5 + parent: 1 - uid: 3505 components: - type: Transform @@ -7677,6 +7766,11 @@ entities: - type: Transform pos: -10.5,-19.5 parent: 1 + - uid: 3844 + components: + - type: Transform + pos: 64.5,-10.5 + parent: 1 - uid: 4052 components: - type: Transform @@ -7722,6 +7816,51 @@ entities: - type: Transform pos: -23.5,8.5 parent: 1 + - uid: 4941 + components: + - type: Transform + pos: 60.5,-13.5 + parent: 1 + - uid: 4942 + components: + - type: Transform + pos: 61.5,-14.5 + parent: 1 + - uid: 4943 + components: + - type: Transform + pos: 60.5,-15.5 + parent: 1 + - uid: 4944 + components: + - type: Transform + pos: 59.5,-14.5 + parent: 1 + - uid: 4945 + components: + - type: Transform + pos: 58.5,-14.5 + parent: 1 + - uid: 4946 + components: + - type: Transform + pos: 65.5,8.5 + parent: 1 + - uid: 4947 + components: + - type: Transform + pos: 56.5,-17.5 + parent: 1 + - uid: 4948 + components: + - type: Transform + pos: 54.5,-16.5 + parent: 1 + - uid: 4950 + components: + - type: Transform + pos: 46.5,-17.5 + parent: 1 - uid: 5680 components: - type: Transform @@ -9047,21 +9186,6 @@ entities: - type: Transform pos: 43.5,-16.5 parent: 1 - - uid: 5961 - components: - - type: Transform - pos: 44.5,-16.5 - parent: 1 - - uid: 5962 - components: - - type: Transform - pos: 45.5,-16.5 - parent: 1 - - uid: 5963 - components: - - type: Transform - pos: 46.5,-16.5 - parent: 1 - uid: 5964 components: - type: Transform @@ -9197,340 +9321,570 @@ entities: - type: Transform pos: 43.5,17.5 parent: 1 - - uid: 5991 + - uid: 6004 components: - type: Transform - pos: 60.5,15.5 + pos: 57.5,14.5 parent: 1 - - uid: 5992 + - uid: 6019 components: - type: Transform - pos: 44.5,17.5 + pos: 64.5,7.5 parent: 1 - - uid: 5993 + - uid: 6020 components: - type: Transform - pos: 45.5,17.5 + pos: 65.5,7.5 parent: 1 - - uid: 5994 + - uid: 6022 components: - type: Transform - pos: 46.5,17.5 + pos: 66.5,6.5 parent: 1 - - uid: 5995 + - uid: 6024 components: - type: Transform - pos: 54.5,17.5 + pos: 66.5,9.5 parent: 1 - - uid: 5996 + - uid: 6025 components: - type: Transform - pos: 55.5,17.5 + pos: 66.5,7.5 parent: 1 - - uid: 5997 + - uid: 6026 components: - type: Transform - pos: 56.5,17.5 + pos: 67.5,8.5 parent: 1 - - uid: 5998 + - uid: 6027 components: - type: Transform - pos: 57.5,17.5 + pos: 66.5,8.5 parent: 1 - - uid: 5999 + - uid: 6028 components: - type: Transform - pos: 57.5,16.5 + pos: 68.5,7.5 parent: 1 - - uid: 6000 + - uid: 6029 components: - type: Transform - pos: 58.5,16.5 + pos: 66.5,11.5 parent: 1 - - uid: 6001 + - uid: 6030 components: - type: Transform - pos: 59.5,16.5 + pos: 67.5,7.5 parent: 1 - - uid: 6002 + - uid: 6031 components: - type: Transform - pos: 60.5,16.5 + pos: 64.5,12.5 parent: 1 - - uid: 6003 + - uid: 6033 components: - type: Transform - pos: 57.5,15.5 + pos: 63.5,13.5 parent: 1 - - uid: 6004 + - uid: 6034 components: - type: Transform - pos: 57.5,14.5 + pos: 64.5,13.5 parent: 1 - - uid: 6005 + - uid: 6035 components: - type: Transform - pos: 61.5,15.5 + pos: 63.5,11.5 parent: 1 - - uid: 6006 + - uid: 6036 + components: + - type: Transform + pos: 63.5,14.5 + parent: 1 + - uid: 6037 + components: + - type: Transform + pos: 62.5,15.5 + parent: 1 + - uid: 6038 components: - type: Transform pos: 61.5,14.5 parent: 1 - - uid: 6007 + - uid: 6039 + components: + - type: Transform + pos: 61.5,16.5 + parent: 1 + - uid: 6040 components: - type: Transform pos: 62.5,14.5 parent: 1 - - uid: 6008 + - uid: 6041 components: - type: Transform - pos: 62.5,13.5 + pos: 59.5,17.5 parent: 1 - - uid: 6009 + - uid: 6042 components: - type: Transform - pos: 63.5,13.5 + pos: 59.5,16.5 parent: 1 - - uid: 6010 + - uid: 6043 components: - type: Transform - pos: 63.5,12.5 + pos: 58.5,17.5 parent: 1 - - uid: 6011 + - uid: 6044 components: - type: Transform - pos: 64.5,12.5 + pos: 58.5,16.5 parent: 1 - - uid: 6012 + - uid: 6045 components: - type: Transform - pos: 64.5,11.5 + pos: 58.5,15.5 parent: 1 - - uid: 6013 + - uid: 6046 components: - type: Transform - pos: 65.5,11.5 + pos: 56.5,16.5 parent: 1 - - uid: 6014 + - uid: 6047 components: - type: Transform - pos: 65.5,10.5 + pos: 57.5,18.5 parent: 1 - - uid: 6015 + - uid: 6048 components: - type: Transform - pos: 66.5,-7.5 + pos: 54.5,18.5 parent: 1 - - uid: 6016 + - uid: 6049 components: - type: Transform - pos: 66.5,10.5 + pos: 54.5,17.5 parent: 1 - - uid: 6017 + - uid: 6050 components: - type: Transform - pos: 66.5,9.5 + pos: 44.5,18.5 parent: 1 - - uid: 6018 + - uid: 6051 components: - type: Transform - pos: 66.5,8.5 + pos: 57.5,-13.5 parent: 1 - - uid: 6019 + - uid: 6052 components: - type: Transform - pos: 64.5,7.5 + pos: 43.5,18.5 parent: 1 - - uid: 6020 + - uid: 6053 components: - type: Transform - pos: 65.5,7.5 + pos: 46.5,18.5 parent: 1 - - uid: 6021 + - uid: 6057 components: - type: Transform - pos: 66.5,7.5 + pos: 11.5,19.5 parent: 1 - - uid: 6022 + - uid: 6058 components: - type: Transform - pos: 67.5,7.5 + pos: 11.5,13.5 parent: 1 - - uid: 6023 + - uid: 6091 components: - type: Transform - pos: 67.5,6.5 + pos: 65.5,-9.5 parent: 1 - - uid: 6024 + - uid: 6092 components: - type: Transform - pos: 67.5,5.5 + pos: 64.5,-11.5 parent: 1 - - uid: 6025 + - uid: 6093 components: - type: Transform - pos: 67.5,4.5 + pos: 63.5,-13.5 parent: 1 - - uid: 6026 + - uid: 6094 components: - type: Transform - pos: 67.5,-3.5 + pos: 67.5,-7.5 parent: 1 - - uid: 6027 + - uid: 6095 components: - type: Transform - pos: 67.5,-4.5 + pos: 65.5,-10.5 parent: 1 - - uid: 6028 + - uid: 6096 components: - type: Transform - pos: 67.5,-5.5 + pos: 57.5,-16.5 parent: 1 - - uid: 6029 + - uid: 6097 components: - type: Transform - pos: 67.5,-6.5 + pos: 57.5,-14.5 parent: 1 - - uid: 6030 + - uid: 6098 components: - type: Transform - pos: 64.5,-6.5 + pos: 61.5,-13.5 parent: 1 - - uid: 6031 + - uid: 6099 + components: + - type: Transform + pos: 56.5,-16.5 + parent: 1 + - uid: 6100 + components: + - type: Transform + pos: 55.5,-17.5 + parent: 1 + - uid: 6101 + components: + - type: Transform + pos: 62.5,-13.5 + parent: 1 + - uid: 6107 components: - type: Transform pos: 66.5,-6.5 parent: 1 - - uid: 6032 + - uid: 6115 + components: + - type: Transform + pos: 68.5,4.5 + parent: 1 + - uid: 6124 + components: + - type: Transform + pos: 68.5,-4.5 + parent: 1 + - uid: 6127 + components: + - type: Transform + pos: 68.5,6.5 + parent: 1 + - uid: 6128 + components: + - type: Transform + pos: 62.5,-14.5 + parent: 1 + - uid: 6129 + components: + - type: Transform + pos: 64.5,-9.5 + parent: 1 + - uid: 6130 + components: + - type: Transform + pos: 57.5,-15.5 + parent: 1 + - uid: 6131 + components: + - type: Transform + pos: 58.5,-16.5 + parent: 1 + - uid: 6185 + components: + - type: Transform + pos: 61.5,15.5 + parent: 1 + - uid: 6186 + components: + - type: Transform + pos: 66.5,10.5 + parent: 1 + - uid: 6187 + components: + - type: Transform + pos: 60.5,15.5 + parent: 1 + - uid: 6188 + components: + - type: Transform + pos: 46.5,19.5 + parent: 1 + - uid: 6189 + components: + - type: Transform + pos: 60.5,14.5 + parent: 1 + - uid: 6190 + components: + - type: Transform + pos: 56.5,17.5 + parent: 1 + - uid: 6191 + components: + - type: Transform + pos: 55.5,17.5 + parent: 1 + - uid: 6192 + components: + - type: Transform + pos: 55.5,18.5 + parent: 1 + - uid: 6193 + components: + - type: Transform + pos: 57.5,16.5 + parent: 1 + - uid: 6194 + components: + - type: Transform + pos: 57.5,17.5 + parent: 1 + - uid: 6195 components: - type: Transform pos: 65.5,-6.5 parent: 1 - - uid: 6033 + - uid: 6196 components: - type: Transform - pos: 66.5,-8.5 + pos: 62.5,12.5 parent: 1 - - uid: 6034 + - uid: 6197 components: - type: Transform - pos: 66.5,-9.5 + pos: 45.5,18.5 parent: 1 - - uid: 6035 + - uid: 6198 components: - type: Transform - pos: 65.5,-9.5 + pos: 63.5,12.5 parent: 1 - - uid: 6036 + - uid: 6199 components: - type: Transform - pos: 65.5,-10.5 + pos: 64.5,10.5 parent: 1 - - uid: 6037 + - uid: 6200 components: - type: Transform - pos: 64.5,-10.5 + pos: 64.5,11.5 parent: 1 - - uid: 6038 + - uid: 6201 components: - type: Transform - pos: 64.5,-11.5 + pos: 65.5,12.5 parent: 1 - - uid: 6039 + - uid: 6203 components: - type: Transform - pos: 63.5,-11.5 + pos: 65.5,10.5 parent: 1 - - uid: 6040 + - uid: 6204 components: - type: Transform - pos: 63.5,-12.5 + pos: 65.5,9.5 parent: 1 - - uid: 6041 + - uid: 6205 components: - type: Transform - pos: 62.5,-12.5 + pos: 67.5,9.5 parent: 1 - - uid: 6042 + - uid: 6222 components: - type: Transform - pos: 62.5,-13.5 + pos: 66.5,-10.5 parent: 1 - - uid: 6043 + - uid: 6223 components: - type: Transform - pos: 61.5,-13.5 + pos: 66.5,-10.5 parent: 1 - - uid: 6044 + - uid: 6237 components: - type: Transform - pos: 61.5,-14.5 + pos: 59.5,15.5 parent: 1 - - uid: 6045 + - uid: 6238 components: - type: Transform - pos: 60.5,-14.5 + pos: 64.5,-12.5 parent: 1 - - uid: 6046 + - uid: 6239 components: - type: Transform - pos: 60.5,-15.5 + pos: 65.5,11.5 parent: 1 - - uid: 6047 + - uid: 6240 components: - type: Transform - pos: 57.5,-16.5 + pos: 62.5,13.5 parent: 1 - - uid: 6048 + - uid: 6241 components: - type: Transform - pos: 59.5,-15.5 + pos: 60.5,16.5 parent: 1 - - uid: 6049 + - uid: 6242 components: - type: Transform - pos: 58.5,-15.5 + pos: 61.5,13.5 parent: 1 - - uid: 6050 + - uid: 6243 components: - type: Transform - pos: 57.5,-15.5 + pos: 64.5,-6.5 parent: 1 - - uid: 6051 + - uid: 6244 components: - type: Transform - pos: 57.5,-13.5 + pos: 57.5,15.5 parent: 1 - - uid: 6052 + - uid: 6245 components: - type: Transform - pos: 57.5,-14.5 + pos: 54.5,19.5 parent: 1 - - uid: 6053 + - uid: 6261 components: - type: Transform - pos: 56.5,-16.5 + pos: 44.5,-17.5 parent: 1 - - uid: 6054 + - uid: 6262 + components: + - type: Transform + pos: 43.5,-17.5 + parent: 1 + - uid: 6274 + components: + - type: Transform + pos: 68.5,5.5 + parent: 1 + - uid: 6275 + components: + - type: Transform + pos: 69.5,4.5 + parent: 1 + - uid: 6276 + components: + - type: Transform + pos: 69.5,-3.5 + parent: 1 + - uid: 6277 + components: + - type: Transform + pos: 67.5,4.5 + parent: 1 + - uid: 6278 + components: + - type: Transform + pos: 68.5,-3.5 + parent: 1 + - uid: 6279 + components: + - type: Transform + pos: 67.5,-4.5 + parent: 1 + - uid: 6280 + components: + - type: Transform + pos: 68.5,-5.5 + parent: 1 + - uid: 6281 + components: + - type: Transform + pos: 67.5,-6.5 + parent: 1 + - uid: 6282 + components: + - type: Transform + pos: 67.5,-8.5 + parent: 1 + - uid: 6283 + components: + - type: Transform + pos: 65.5,-8.5 + parent: 1 + - uid: 6284 + components: + - type: Transform + pos: 65.5,-11.5 + parent: 1 + - uid: 6285 + components: + - type: Transform + pos: 63.5,-11.5 + parent: 1 + - uid: 6286 + components: + - type: Transform + pos: 63.5,-12.5 + parent: 1 + - uid: 6287 + components: + - type: Transform + pos: 62.5,-12.5 + parent: 1 + - uid: 6288 + components: + - type: Transform + pos: 61.5,-15.5 + parent: 1 + - uid: 6289 + components: + - type: Transform + pos: 57.5,-17.5 + parent: 1 + - uid: 6290 + components: + - type: Transform + pos: 60.5,-14.5 + parent: 1 + - uid: 6291 + components: + - type: Transform + pos: 59.5,-15.5 + parent: 1 + - uid: 6292 + components: + - type: Transform + pos: 58.5,-15.5 + parent: 1 + - uid: 6293 + components: + - type: Transform + pos: 56.5,-15.5 + parent: 1 + - uid: 6294 components: - type: Transform pos: 55.5,-16.5 parent: 1 - - uid: 6055 + - uid: 6295 components: - type: Transform - pos: 54.5,-16.5 + pos: 54.5,-17.5 parent: 1 - - uid: 6057 + - uid: 6296 components: - type: Transform - pos: 11.5,19.5 + pos: 46.5,-18.5 parent: 1 - - uid: 6058 + - uid: 6297 components: - type: Transform - pos: 11.5,13.5 + pos: 45.5,-17.5 + parent: 1 + - uid: 6303 + components: + - type: Transform + pos: 56.5,18.5 + parent: 1 + - uid: 6307 + components: + - type: Transform + pos: 54.5,-18.5 parent: 1 - proto: AtmosFixFreezerMarker entities: @@ -9885,6 +10239,12 @@ entities: parent: 1 - proto: BenchSteelMiddle entities: + - uid: 115 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,19.5 + parent: 1 - uid: 3061 components: - type: Transform @@ -9909,11 +10269,11 @@ entities: rot: 3.141592653589793 rad pos: 12.5,-17.5 parent: 1 - - uid: 5383 + - uid: 5384 components: - type: Transform rot: -1.5707963267948966 rad - pos: 2.5,19.5 + pos: 2.5,18.5 parent: 1 - proto: BenchSteelRight entities: @@ -9929,11 +10289,11 @@ entities: rot: 3.141592653589793 rad pos: 10.5,-18.5 parent: 1 - - uid: 5384 + - uid: 5395 components: - type: Transform rot: -1.5707963267948966 rad - pos: 2.5,18.5 + pos: 2.5,17.5 parent: 1 - proto: BoozeDispenserEmpty entities: @@ -13112,6 +13472,11 @@ entities: - type: Transform pos: 17.5,-13.5 parent: 1 + - uid: 5465 + components: + - type: Transform + pos: 50.5,-17.5 + parent: 1 - uid: 5498 components: - type: Transform @@ -13157,6 +13522,16 @@ entities: - type: Transform pos: 0.5,-2.5 parent: 1 + - uid: 5650 + components: + - type: Transform + pos: 50.5,18.5 + parent: 1 + - uid: 5651 + components: + - type: Transform + pos: 68.5,0.5 + parent: 1 - uid: 5673 components: - type: Transform @@ -13231,11 +13606,76 @@ entities: - type: Transform pos: -11.5,-3.5 parent: 1 + - uid: 121 + components: + - type: Transform + pos: 50.5,-0.5 + parent: 1 + - uid: 124 + components: + - type: Transform + pos: 50.5,-1.5 + parent: 1 - uid: 151 components: - type: Transform pos: -16.5,-3.5 parent: 1 + - uid: 163 + components: + - type: Transform + pos: 50.5,-2.5 + parent: 1 + - uid: 168 + components: + - type: Transform + pos: 50.5,-3.5 + parent: 1 + - uid: 171 + components: + - type: Transform + pos: 50.5,-4.5 + parent: 1 + - uid: 172 + components: + - type: Transform + pos: 67.5,6.5 + parent: 1 + - uid: 173 + components: + - type: Transform + pos: 50.5,-5.5 + parent: 1 + - uid: 174 + components: + - type: Transform + pos: 50.5,-8.5 + parent: 1 + - uid: 175 + components: + - type: Transform + pos: 50.5,-6.5 + parent: 1 + - uid: 176 + components: + - type: Transform + pos: 50.5,-7.5 + parent: 1 + - uid: 177 + components: + - type: Transform + pos: 51.5,-8.5 + parent: 1 + - uid: 178 + components: + - type: Transform + pos: 52.5,-8.5 + parent: 1 + - uid: 179 + components: + - type: Transform + pos: 53.5,-8.5 + parent: 1 - uid: 221 components: - type: Transform @@ -13251,6 +13691,11 @@ entities: - type: Transform pos: 0.5,21.5 parent: 1 + - uid: 264 + components: + - type: Transform + pos: 53.5,-8.5 + parent: 1 - uid: 265 components: - type: Transform @@ -13336,6 +13781,11 @@ entities: - type: Transform pos: 23.5,-2.5 parent: 1 + - uid: 355 + components: + - type: Transform + pos: 55.5,-8.5 + parent: 1 - uid: 360 components: - type: Transform @@ -13426,16 +13876,61 @@ entities: - type: Transform pos: -11.5,-6.5 parent: 1 + - uid: 1084 + components: + - type: Transform + pos: 54.5,-8.5 + parent: 1 - uid: 1205 components: - type: Transform pos: 0.5,20.5 parent: 1 + - uid: 1272 + components: + - type: Transform + pos: 67.5,4.5 + parent: 1 + - uid: 1292 + components: + - type: Transform + pos: 65.5,8.5 + parent: 1 + - uid: 1306 + components: + - type: Transform + pos: 65.5,10.5 + parent: 1 - uid: 1321 components: - type: Transform pos: -8.5,-7.5 parent: 1 + - uid: 1341 + components: + - type: Transform + pos: 63.5,11.5 + parent: 1 + - uid: 1382 + components: + - type: Transform + pos: 61.5,14.5 + parent: 1 + - uid: 1527 + components: + - type: Transform + pos: 56.5,16.5 + parent: 1 + - uid: 1730 + components: + - type: Transform + pos: 57.5,-12.5 + parent: 1 + - uid: 1759 + components: + - type: Transform + pos: 57.5,-13.5 + parent: 1 - uid: 1939 components: - type: Transform @@ -15091,6 +15586,11 @@ entities: - type: Transform pos: 42.5,0.5 parent: 1 + - uid: 4952 + components: + - type: Transform + pos: 57.5,16.5 + parent: 1 - uid: 5628 components: - type: Transform @@ -15166,105 +15666,175 @@ entities: - type: Transform pos: 50.5,0.5 parent: 1 - - uid: 5648 + - uid: 5649 components: - type: Transform - pos: 51.5,0.5 + pos: 45.5,0.5 parent: 1 - - uid: 5649 + - uid: 5655 components: - type: Transform - pos: 45.5,0.5 + pos: 57.5,0.5 parent: 1 - - uid: 5650 + - uid: 5662 components: - type: Transform - pos: 52.5,0.5 + pos: 57.5,14.5 parent: 1 - - uid: 5651 + - uid: 5663 components: - type: Transform - pos: 53.5,0.5 + pos: 56.5,-8.5 parent: 1 - - uid: 5652 + - uid: 5664 components: - type: Transform - pos: 54.5,0.5 + pos: 57.5,-8.5 parent: 1 - - uid: 5653 + - uid: 5665 components: - type: Transform - pos: 55.5,0.5 + pos: 57.5,-9.5 parent: 1 - - uid: 5654 + - uid: 5667 components: - type: Transform - pos: 56.5,0.5 + pos: 61.5,7.5 parent: 1 - - uid: 5655 + - uid: 5668 components: - type: Transform - pos: 57.5,0.5 + pos: 61.5,8.5 parent: 1 - - uid: 5656 + - uid: 5859 components: - type: Transform - pos: 59.5,0.5 + pos: 57.5,-10.5 parent: 1 - - uid: 5657 + - uid: 5860 components: - type: Transform - pos: 58.5,0.5 + pos: 57.5,-11.5 parent: 1 - - uid: 5658 + - uid: 5861 components: - type: Transform - pos: 59.5,1.5 + pos: 50.5,1.5 parent: 1 - - uid: 5659 + - uid: 5862 components: - type: Transform - pos: 59.5,2.5 + pos: 50.5,2.5 parent: 1 - - uid: 5660 + - uid: 5863 components: - type: Transform - pos: 59.5,3.5 + pos: 50.5,3.5 parent: 1 - - uid: 5661 + - uid: 5864 components: - type: Transform - pos: 59.5,4.5 + pos: 50.5,4.5 parent: 1 - - uid: 5662 + - uid: 5871 components: - type: Transform - pos: 59.5,5.5 + pos: 50.5,4.5 parent: 1 - - uid: 5663 + - uid: 5872 components: - type: Transform - pos: 59.5,6.5 + pos: 50.5,6.5 parent: 1 - - uid: 5664 + - uid: 5873 components: - type: Transform - pos: 59.5,7.5 + pos: 50.5,5.5 parent: 1 - - uid: 5665 + - uid: 5891 components: - type: Transform - pos: 60.5,7.5 + pos: 50.5,6.5 parent: 1 - - uid: 5667 + - uid: 5961 components: - type: Transform - pos: 61.5,7.5 + pos: 57.5,-15.5 parent: 1 - - uid: 5668 + - uid: 5962 components: - type: Transform - pos: 61.5,8.5 + pos: 57.5,-14.5 + parent: 1 + - uid: 5963 + components: + - type: Transform + pos: 59.5,-14.5 + parent: 1 + - uid: 5991 + components: + - type: Transform + pos: 54.5,-16.5 + parent: 1 + - uid: 5992 + components: + - type: Transform + pos: 58.5,-15.5 + parent: 1 + - uid: 5993 + components: + - type: Transform + pos: 62.5,-12.5 + parent: 1 + - uid: 5994 + components: + - type: Transform + pos: 60.5,-14.5 + parent: 1 + - uid: 5995 + components: + - type: Transform + pos: 60.5,-13.5 + parent: 1 + - uid: 5996 + components: + - type: Transform + pos: 63.5,-11.5 + parent: 1 + - uid: 5997 + components: + - type: Transform + pos: 63.5,-10.5 + parent: 1 + - uid: 5999 + components: + - type: Transform + pos: 64.5,-10.5 + parent: 1 + - uid: 6000 + components: + - type: Transform + pos: 62.5,-11.5 + parent: 1 + - uid: 6001 + components: + - type: Transform + pos: 65.5,-7.5 + parent: 1 + - uid: 6002 + components: + - type: Transform + pos: 66.5,-7.5 + parent: 1 + - uid: 6003 + components: + - type: Transform + pos: 67.5,-3.5 + parent: 1 + - uid: 6005 + components: + - type: Transform + pos: 66.5,-5.5 parent: 1 - uid: 6066 components: @@ -15291,6 +15861,291 @@ entities: - type: Transform pos: 21.5,20.5 parent: 1 + - uid: 6074 + components: + - type: Transform + pos: 50.5,6.5 + parent: 1 + - uid: 6075 + components: + - type: Transform + pos: 50.5,7.5 + parent: 1 + - uid: 6076 + components: + - type: Transform + pos: 50.5,9.5 + parent: 1 + - uid: 6077 + components: + - type: Transform + pos: 50.5,9.5 + parent: 1 + - uid: 6078 + components: + - type: Transform + pos: 50.5,8.5 + parent: 1 + - uid: 6079 + components: + - type: Transform + pos: 51.5,9.5 + parent: 1 + - uid: 6080 + components: + - type: Transform + pos: 52.5,9.5 + parent: 1 + - uid: 6081 + components: + - type: Transform + pos: 53.5,9.5 + parent: 1 + - uid: 6082 + components: + - type: Transform + pos: 55.5,9.5 + parent: 1 + - uid: 6083 + components: + - type: Transform + pos: 54.5,9.5 + parent: 1 + - uid: 6084 + components: + - type: Transform + pos: 56.5,9.5 + parent: 1 + - uid: 6085 + components: + - type: Transform + pos: 57.5,9.5 + parent: 1 + - uid: 6086 + components: + - type: Transform + pos: 57.5,10.5 + parent: 1 + - uid: 6087 + components: + - type: Transform + pos: 57.5,11.5 + parent: 1 + - uid: 6088 + components: + - type: Transform + pos: 57.5,12.5 + parent: 1 + - uid: 6089 + components: + - type: Transform + pos: 57.5,13.5 + parent: 1 + - uid: 6090 + components: + - type: Transform + pos: 57.5,15.5 + parent: 1 + - uid: 6109 + components: + - type: Transform + pos: 63.5,12.5 + parent: 1 + - uid: 6110 + components: + - type: Transform + pos: 60.5,15.5 + parent: 1 + - uid: 6111 + components: + - type: Transform + pos: 56.5,17.5 + parent: 1 + - uid: 6135 + components: + - type: Transform + pos: 54.5,17.5 + parent: 1 + - uid: 6141 + components: + - type: Transform + pos: 64.5,11.5 + parent: 1 + - uid: 6142 + components: + - type: Transform + pos: 66.5,6.5 + parent: 1 + - uid: 6143 + components: + - type: Transform + pos: 66.5,7.5 + parent: 1 + - uid: 6147 + components: + - type: Transform + pos: 62.5,13.5 + parent: 1 + - uid: 6151 + components: + - type: Transform + pos: 58.5,11.5 + parent: 1 + - uid: 6152 + components: + - type: Transform + pos: 59.5,11.5 + parent: 1 + - uid: 6153 + components: + - type: Transform + pos: 59.5,10.5 + parent: 1 + - uid: 6154 + components: + - type: Transform + pos: 59.5,9.5 + parent: 1 + - uid: 6155 + components: + - type: Transform + pos: 59.5,8.5 + parent: 1 + - uid: 6158 + components: + - type: Transform + pos: 61.5,7.5 + parent: 1 + - uid: 6159 + components: + - type: Transform + pos: 61.5,8.5 + parent: 1 + - uid: 6160 + components: + - type: Transform + pos: 60.5,8.5 + parent: 1 + - uid: 6181 + components: + - type: Transform + pos: 56.5,-16.5 + parent: 1 + - uid: 6182 + components: + - type: Transform + pos: 55.5,-16.5 + parent: 1 + - uid: 6183 + components: + - type: Transform + pos: 56.5,-15.5 + parent: 1 + - uid: 6184 + components: + - type: Transform + pos: 58.5,-14.5 + parent: 1 + - uid: 6218 + components: + - type: Transform + pos: 64.5,-9.5 + parent: 1 + - uid: 6219 + components: + - type: Transform + pos: 65.5,-9.5 + parent: 1 + - uid: 6220 + components: + - type: Transform + pos: 61.5,-13.5 + parent: 1 + - uid: 6221 + components: + - type: Transform + pos: 59.5,15.5 + parent: 1 + - uid: 6227 + components: + - type: Transform + pos: 61.5,13.5 + parent: 1 + - uid: 6228 + components: + - type: Transform + pos: 61.5,-12.5 + parent: 1 + - uid: 6229 + components: + - type: Transform + pos: 65.5,-8.5 + parent: 1 + - uid: 6230 + components: + - type: Transform + pos: 67.5,-5.5 + parent: 1 + - uid: 6231 + components: + - type: Transform + pos: 66.5,-6.5 + parent: 1 + - uid: 6233 + components: + - type: Transform + pos: 67.5,-4.5 + parent: 1 + - uid: 6246 + components: + - type: Transform + pos: 67.5,5.5 + parent: 1 + - uid: 6247 + components: + - type: Transform + pos: 56.5,-16.5 + parent: 1 + - uid: 6248 + components: + - type: Transform + pos: 65.5,9.5 + parent: 1 + - uid: 6249 + components: + - type: Transform + pos: 64.5,10.5 + parent: 1 + - uid: 6250 + components: + - type: Transform + pos: 62.5,12.5 + parent: 1 + - uid: 6251 + components: + - type: Transform + pos: 60.5,14.5 + parent: 1 + - uid: 6252 + components: + - type: Transform + pos: 58.5,16.5 + parent: 1 + - uid: 6253 + components: + - type: Transform + pos: 58.5,15.5 + parent: 1 + - uid: 6255 + components: + - type: Transform + pos: 55.5,17.5 + parent: 1 + - uid: 6257 + components: + - type: Transform + pos: 66.5,8.5 + parent: 1 - proto: CableMV entities: - uid: 199 @@ -17216,6 +18071,12 @@ entities: rot: 3.141592653589793 rad pos: 17.5,20.5 parent: 1 + - uid: 6150 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 57.5,11.5 + parent: 1 - proto: CandlePurpleInfinite entities: - uid: 400 @@ -18233,6 +19094,13 @@ entities: - type: Transform pos: 27.5,-5.5 parent: 1 +- proto: ComputerPowerMonitoring + entities: + - uid: 73 + components: + - type: Transform + pos: 59.5,10.5 + parent: 1 - proto: ComputerRadar entities: - uid: 296 @@ -18262,6 +19130,14 @@ entities: - type: Transform pos: -19.5,2.5 parent: 1 +- proto: ComputerSolarControl + entities: + - uid: 354 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 60.5,9.5 + parent: 1 - proto: ComputerTabletopAlert entities: - uid: 1420 @@ -18322,39 +19198,39 @@ entities: rot: -1.5707963267948966 rad pos: 29.5,11.5 parent: 1 -- proto: ComputerTabletopMarketConsoleNFHigh +- proto: ComputerTabletopMarketConsoleNFLow entities: - - uid: 621 + - uid: 27 components: - type: Transform pos: 46.5,-7.5 parent: 1 - - uid: 622 + - uid: 621 components: - type: Transform rot: 3.141592653589793 rad pos: 54.5,8.5 parent: 1 - - uid: 632 + - uid: 622 components: - type: Transform rot: 1.5707963267948966 rad pos: 58.5,-3.5 parent: 1 -- proto: ComputerTabletopPalletConsoleNFVeryLowMarket +- proto: ComputerTabletopPalletConsoleNFLowMarket entities: - - uid: 633 + - uid: 632 components: - type: Transform pos: 53.5,-7.5 parent: 1 - - uid: 634 + - uid: 633 components: - type: Transform rot: 1.5707963267948966 rad pos: 58.5,3.5 parent: 1 - - uid: 637 + - uid: 634 components: - type: Transform rot: 3.141592653589793 rad @@ -18419,16 +19295,41 @@ entities: parent: 1 - proto: ConveyorBelt entities: - - uid: 1813 + - uid: 59 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 48.5,18.5 + parent: 1 + - uid: 71 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 48.5,19.5 + parent: 1 + - uid: 72 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 48.5,-18.5 + parent: 1 + - uid: 1207 components: - type: Transform rot: -1.5707963267948966 rad - pos: -3.5,-13.5 + pos: 69.5,-1.5 parent: 1 - - uid: 1843 + - uid: 1235 components: - type: Transform - pos: 52.5,18.5 + rot: -1.5707963267948966 rad + pos: 68.5,-1.5 + parent: 1 + - uid: 1813 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -3.5,-13.5 parent: 1 - uid: 1844 components: @@ -18474,12 +19375,6 @@ entities: rot: 3.141592653589793 rad pos: 48.5,17.5 parent: 1 - - uid: 1852 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 48.5,18.5 - parent: 1 - uid: 1853 components: - type: Transform @@ -18601,6 +19496,27 @@ entities: rot: -1.5707963267948966 rad pos: -2.5,-13.5 parent: 1 + - uid: 5485 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 69.5,2.5 + parent: 1 + - uid: 5652 + components: + - type: Transform + pos: 52.5,-18.5 + parent: 1 + - uid: 6175 + components: + - type: Transform + pos: 52.5,19.5 + parent: 1 + - uid: 6176 + components: + - type: Transform + pos: 52.5,18.5 + parent: 1 - proto: CrateMachine entities: - uid: 4530 @@ -28201,30 +29117,15 @@ entities: - type: Transform pos: 9.5,32.5 parent: 1 - - uid: 27 - components: - - type: Transform - pos: 54.5,-16.5 - parent: 1 - - uid: 32 - components: - - type: Transform - pos: 46.5,-16.5 - parent: 1 - - uid: 35 - components: - - type: Transform - pos: 66.5,-6.5 - parent: 1 - uid: 37 components: - type: Transform - pos: 45.5,-16.5 + pos: 46.5,-18.5 parent: 1 - uid: 54 components: - type: Transform - pos: 44.5,-16.5 + pos: 56.5,-17.5 parent: 1 - uid: 55 components: @@ -28236,115 +29137,15 @@ entities: - type: Transform pos: 43.5,-13.5 parent: 1 - - uid: 59 - components: - - type: Transform - pos: 64.5,-6.5 - parent: 1 - - uid: 60 - components: - - type: Transform - pos: 65.5,-6.5 - parent: 1 - - uid: 63 - components: - - type: Transform - pos: 66.5,-8.5 - parent: 1 - - uid: 64 - components: - - type: Transform - pos: 66.5,-7.5 - parent: 1 - - uid: 67 - components: - - type: Transform - pos: 67.5,-5.5 - parent: 1 - - uid: 68 - components: - - type: Transform - pos: 67.5,-4.5 - parent: 1 - uid: 70 components: - type: Transform pos: 43.5,16.5 parent: 1 - - uid: 71 - components: - - type: Transform - pos: 64.5,-10.5 - parent: 1 - - uid: 72 - components: - - type: Transform - pos: 63.5,-11.5 - parent: 1 - - uid: 73 - components: - - type: Transform - pos: 64.5,-11.5 - parent: 1 - - uid: 74 - components: - - type: Transform - pos: 62.5,-12.5 - parent: 1 - - uid: 76 - components: - - type: Transform - pos: 62.5,-13.5 - parent: 1 - - uid: 78 - components: - - type: Transform - pos: 65.5,-10.5 - parent: 1 - - uid: 81 - components: - - type: Transform - pos: 60.5,-14.5 - parent: 1 - - uid: 82 - components: - - type: Transform - pos: 57.5,-16.5 - parent: 1 - - uid: 87 - components: - - type: Transform - pos: 55.5,-16.5 - parent: 1 - - uid: 93 - components: - - type: Transform - pos: 60.5,-15.5 - parent: 1 - - uid: 97 - components: - - type: Transform - pos: 58.5,-15.5 - parent: 1 - - uid: 98 - components: - - type: Transform - pos: 59.5,-15.5 - parent: 1 - - uid: 99 - components: - - type: Transform - pos: 57.5,-14.5 - parent: 1 - uid: 100 components: - type: Transform - pos: 57.5,-13.5 - parent: 1 - - uid: 101 - components: - - type: Transform - pos: 57.5,-15.5 + pos: 59.5,-15.5 parent: 1 - uid: 102 components: @@ -28356,55 +29157,10 @@ entities: - type: Transform pos: 43.5,14.5 parent: 1 - - uid: 106 - components: - - type: Transform - pos: 67.5,-3.5 - parent: 1 - - uid: 109 - components: - - type: Transform - pos: 58.5,16.5 - parent: 1 - - uid: 110 - components: - - type: Transform - pos: 56.5,17.5 - parent: 1 - - uid: 111 - components: - - type: Transform - pos: 57.5,17.5 - parent: 1 - - uid: 112 - components: - - type: Transform - pos: 59.5,16.5 - parent: 1 - - uid: 114 - components: - - type: Transform - pos: 57.5,16.5 - parent: 1 - - uid: 115 - components: - - type: Transform - pos: 54.5,17.5 - parent: 1 - - uid: 121 - components: - - type: Transform - pos: 61.5,14.5 - parent: 1 - uid: 123 components: - type: Transform - pos: 57.5,15.5 - parent: 1 - - uid: 124 - components: - - type: Transform - pos: 57.5,14.5 + pos: 57.5,-16.5 parent: 1 - uid: 130 components: @@ -28461,70 +29217,15 @@ entities: - type: Transform pos: 43.5,15.5 parent: 1 - - uid: 163 - components: - - type: Transform - pos: 65.5,7.5 - parent: 1 - uid: 166 components: - type: Transform - pos: 64.5,7.5 - parent: 1 - - uid: 168 - components: - - type: Transform - pos: 67.5,5.5 + pos: 58.5,-16.5 parent: 1 - uid: 169 components: - type: Transform - pos: 45.5,17.5 - parent: 1 - - uid: 171 - components: - - type: Transform - pos: 64.5,11.5 - parent: 1 - - uid: 172 - components: - - type: Transform - pos: 46.5,17.5 - parent: 1 - - uid: 173 - components: - - type: Transform - pos: 65.5,10.5 - parent: 1 - - uid: 174 - components: - - type: Transform - pos: 65.5,11.5 - parent: 1 - - uid: 175 - components: - - type: Transform - pos: 66.5,9.5 - parent: 1 - - uid: 176 - components: - - type: Transform - pos: 62.5,14.5 - parent: 1 - - uid: 177 - components: - - type: Transform - pos: 62.5,13.5 - parent: 1 - - uid: 178 - components: - - type: Transform - pos: 63.5,13.5 - parent: 1 - - uid: 179 - components: - - type: Transform - pos: 64.5,12.5 + pos: 44.5,-17.5 parent: 1 - uid: 180 components: @@ -28584,11 +29285,6 @@ entities: - type: Transform pos: 7.5,-25.5 parent: 1 - - uid: 264 - components: - - type: Transform - pos: 67.5,4.5 - parent: 1 - uid: 269 components: - type: Transform @@ -28719,16 +29415,6 @@ entities: - type: Transform pos: 8.5,32.5 parent: 1 - - uid: 354 - components: - - type: Transform - pos: 66.5,8.5 - parent: 1 - - uid: 355 - components: - - type: Transform - pos: 66.5,7.5 - parent: 1 - uid: 366 components: - type: Transform @@ -29781,6 +30467,11 @@ entities: rot: -1.5707963267948966 rad pos: 44.5,-13.5 parent: 1 + - uid: 1367 + components: + - type: Transform + pos: 63.5,-12.5 + parent: 1 - uid: 1370 components: - type: Transform @@ -29835,6 +30526,41 @@ entities: rot: -1.5707963267948966 rad pos: 32.5,-1.5 parent: 1 + - uid: 1526 + components: + - type: Transform + pos: 54.5,18.5 + parent: 1 + - uid: 1535 + components: + - type: Transform + pos: 44.5,18.5 + parent: 1 + - uid: 1692 + components: + - type: Transform + pos: 57.5,17.5 + parent: 1 + - uid: 1751 + components: + - type: Transform + pos: 46.5,18.5 + parent: 1 + - uid: 1760 + components: + - type: Transform + pos: 63.5,13.5 + parent: 1 + - uid: 1761 + components: + - type: Transform + pos: 64.5,13.5 + parent: 1 + - uid: 1764 + components: + - type: Transform + pos: 65.5,11.5 + parent: 1 - uid: 1766 components: - type: Transform @@ -29876,6 +30602,16 @@ entities: - type: Transform pos: -6.5,2.5 parent: 1 + - uid: 1852 + components: + - type: Transform + pos: 67.5,7.5 + parent: 1 + - uid: 1906 + components: + - type: Transform + pos: 68.5,-4.5 + parent: 1 - uid: 1934 components: - type: Transform @@ -29917,6 +30653,11 @@ entities: - type: Transform pos: -1.5,6.5 parent: 1 + - uid: 2144 + components: + - type: Transform + pos: 68.5,-3.5 + parent: 1 - uid: 2159 components: - type: Transform @@ -29945,6 +30686,16 @@ entities: - type: Transform pos: 38.5,8.5 parent: 1 + - uid: 2579 + components: + - type: Transform + pos: 66.5,-9.5 + parent: 1 + - uid: 2580 + components: + - type: Transform + pos: 65.5,-10.5 + parent: 1 - uid: 2886 components: - type: Transform @@ -30135,121 +30886,282 @@ entities: rot: 1.5707963267948966 rad pos: -1.5,44.5 parent: 1 -- proto: GrilleDiagonal - entities: - - uid: 2887 + - uid: 6021 components: - type: Transform - rot: 3.141592653589793 rad - pos: -11.5,9.5 + pos: 67.5,-8.5 parent: 1 - - uid: 2888 + - uid: 6108 components: - type: Transform - pos: -12.5,10.5 + pos: 61.5,-15.5 parent: 1 - - uid: 2889 + - uid: 6112 + components: + - type: Transform + pos: 62.5,-14.5 + parent: 1 + - uid: 6113 + components: + - type: Transform + pos: 55.5,18.5 + parent: 1 + - uid: 6116 + components: + - type: Transform + pos: 68.5,7.5 + parent: 1 + - uid: 6117 + components: + - type: Transform + pos: 66.5,9.5 + parent: 1 + - uid: 6119 + components: + - type: Transform + pos: 67.5,-7.5 + parent: 1 + - uid: 6120 + components: + - type: Transform + pos: 57.5,18.5 + parent: 1 + - uid: 6121 + components: + - type: Transform + pos: 60.5,16.5 + parent: 1 + - uid: 6122 + components: + - type: Transform + pos: 59.5,16.5 + parent: 1 + - uid: 6123 + components: + - type: Transform + pos: 54.5,-17.5 + parent: 1 + - uid: 6125 + components: + - type: Transform + pos: 68.5,4.5 + parent: 1 + - uid: 6126 + components: + - type: Transform + pos: 64.5,-12.5 + parent: 1 + - uid: 6136 + components: + - type: Transform + pos: 59.5,17.5 + parent: 1 + - uid: 6138 + components: + - type: Transform + pos: 60.5,-15.5 + parent: 1 + - uid: 6139 + components: + - type: Transform + pos: 68.5,5.5 + parent: 1 + - uid: 6140 + components: + - type: Transform + pos: 64.5,12.5 + parent: 1 + - uid: 6144 + components: + - type: Transform + pos: 55.5,-17.5 + parent: 1 + - uid: 6145 + components: + - type: Transform + pos: 46.5,-17.5 + parent: 1 + - uid: 6148 + components: + - type: Transform + pos: 43.5,-17.5 + parent: 1 + - uid: 6149 components: - type: Transform rot: 3.141592653589793 rad - pos: -12.5,8.5 + pos: 54.5,19.5 parent: 1 - - uid: 2945 + - uid: 6180 components: - type: Transform - pos: -13.5,9.5 + pos: 45.5,-17.5 parent: 1 -- proto: GrilleSpawner - entities: - - uid: 1053 + - uid: 6215 components: - type: Transform - pos: 6.5,33.5 + pos: 54.5,-18.5 parent: 1 - - uid: 1057 + - uid: 6224 components: - type: Transform - pos: 43.5,-16.5 + pos: 69.5,-3.5 parent: 1 - - uid: 1083 + - uid: 6226 components: - type: Transform - pos: 43.5,-15.5 + pos: 69.5,4.5 parent: 1 - - uid: 1084 + - uid: 6254 components: - type: Transform - pos: 67.5,6.5 + pos: 62.5,-13.5 parent: 1 - - uid: 1207 + - uid: 6256 components: - type: Transform - pos: 66.5,-9.5 + pos: 56.5,18.5 parent: 1 - - uid: 1235 + - uid: 6258 components: - type: Transform - pos: 67.5,-6.5 + pos: 46.5,19.5 parent: 1 - - uid: 1272 + - uid: 6259 components: - type: Transform - pos: 63.5,-12.5 + pos: 45.5,18.5 parent: 1 - - uid: 1292 + - uid: 6260 components: - type: Transform - pos: 65.5,-9.5 + pos: 58.5,17.5 parent: 1 - - uid: 1306 + - uid: 6264 components: - type: Transform - pos: 61.5,-14.5 + pos: 65.5,12.5 parent: 1 - - uid: 1361 + - uid: 6266 components: - type: Transform - pos: 61.5,-13.5 + pos: 67.5,9.5 parent: 1 - - uid: 1367 + - uid: 6267 components: - type: Transform - pos: 56.5,-16.5 + pos: 68.5,-5.5 parent: 1 - - uid: 1376 + - uid: 6268 + components: + - type: Transform + pos: 67.5,8.5 + parent: 1 + - uid: 6269 + components: + - type: Transform + pos: 68.5,-5.5 + parent: 1 + - uid: 6271 + components: + - type: Transform + pos: 66.5,-8.5 + parent: 1 + - uid: 6272 + components: + - type: Transform + pos: 66.5,-10.5 + parent: 1 + - uid: 6273 + components: + - type: Transform + pos: 65.5,-11.5 + parent: 1 +- proto: GrilleDiagonal + entities: + - uid: 2887 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -11.5,9.5 + parent: 1 + - uid: 2888 + components: + - type: Transform + pos: -12.5,10.5 + parent: 1 + - uid: 2889 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -12.5,8.5 + parent: 1 + - uid: 2945 + components: + - type: Transform + pos: -13.5,9.5 + parent: 1 +- proto: GrilleSpawner + entities: + - uid: 32 components: - type: Transform pos: 61.5,15.5 parent: 1 - - uid: 1382 + - uid: 1053 components: - type: Transform - pos: 55.5,17.5 + pos: 6.5,33.5 parent: 1 - - uid: 1385 + - uid: 1057 components: - type: Transform - pos: 60.5,15.5 + pos: 43.5,-16.5 parent: 1 - - uid: 1387 + - uid: 1083 components: - type: Transform - pos: 67.5,7.5 + pos: 43.5,-15.5 parent: 1 - - uid: 1535 + - uid: 1361 components: - type: Transform - pos: 60.5,16.5 + pos: 62.5,14.5 + parent: 1 + - uid: 1376 + components: + - type: Transform + pos: 61.5,16.5 + parent: 1 + - uid: 1385 + components: + - type: Transform + pos: 63.5,14.5 + parent: 1 + - uid: 1387 + components: + - type: Transform + pos: 66.5,11.5 parent: 1 - uid: 1538 components: - type: Transform pos: 10.5,32.5 parent: 1 - - uid: 1906 + - uid: 1750 components: - type: Transform - pos: 66.5,10.5 + pos: 57.5,-17.5 + parent: 1 + - uid: 1763 + components: + - type: Transform + pos: 63.5,-13.5 + parent: 1 + - uid: 1843 + components: + - type: Transform + pos: 61.5,-14.5 parent: 1 - uid: 1945 components: @@ -30286,11 +31198,6 @@ entities: - type: Transform pos: -23.5,-11.5 parent: 1 - - uid: 3499 - components: - - type: Transform - pos: 63.5,12.5 - parent: 1 - uid: 3503 components: - type: Transform @@ -30346,6 +31253,46 @@ entities: - type: Transform pos: 18.5,27.5 parent: 1 + - uid: 6114 + components: + - type: Transform + pos: 59.5,-16.5 + parent: 1 + - uid: 6118 + components: + - type: Transform + pos: 68.5,6.5 + parent: 1 + - uid: 6137 + components: + - type: Transform + pos: 43.5,18.5 + parent: 1 + - uid: 6146 + components: + - type: Transform + pos: 62.5,15.5 + parent: 1 + - uid: 6263 + components: + - type: Transform + pos: 64.5,-11.5 + parent: 1 + - uid: 6265 + components: + - type: Transform + pos: 67.5,-6.5 + parent: 1 + - uid: 6270 + components: + - type: Transform + pos: 68.5,-6.5 + parent: 1 + - uid: 6298 + components: + - type: Transform + pos: 66.5,10.5 + parent: 1 - proto: HandheldHealthAnalyzerUnpowered entities: - uid: 5519 @@ -30355,16 +31302,25 @@ entities: parent: 1 - proto: HandheldStationMapEmpty entities: - - uid: 2144 + - uid: 2371 components: - type: Transform - pos: 10.485309,-6.4716725 + pos: 18.610277,16.784569 parent: 1 - - uid: 2371 + - uid: 5380 components: - type: Transform - pos: 18.610277,16.784569 + pos: 10.529349,-6.4789734 parent: 1 + - type: PowerCellDraw + canUse: True + canDraw: True + - type: ContainerContainer + containers: + cell_slot: !type:ContainerSlot + showEnts: False + occludes: True + ent: 5383 - proto: HighSecFrontierCommandLocked entities: - uid: 5413 @@ -30491,10 +31447,10 @@ entities: parent: 1 - proto: LessLethalVendingMachinePOI entities: - - uid: 5357 + - uid: 5479 components: - type: Transform - pos: 2.5,14.5 + pos: 27.5,1.5 parent: 1 - proto: LightReplacer entities: @@ -30999,10 +31955,10 @@ entities: bodyType: Static - proto: NonLethalVendingMachine entities: - - uid: 5360 + - uid: 6163 components: - type: Transform - pos: 2.5,13.5 + pos: 28.5,1.5 parent: 1 - proto: OxygenCanister entities: @@ -31067,39 +32023,20 @@ entities: parent: 1 - proto: PlasticFlapsAirtightClear entities: - - uid: 1759 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 48.5,-17.5 - parent: 1 - - uid: 1760 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 52.5,-17.5 - parent: 1 - - uid: 1761 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 68.5,-1.5 - parent: 1 - - uid: 1762 + - uid: 93 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 68.5,2.5 + pos: 52.5,19.5 parent: 1 - - uid: 1763 + - uid: 98 components: - type: Transform - pos: 48.5,18.5 + pos: 48.5,-18.5 parent: 1 - - uid: 1764 + - uid: 106 components: - type: Transform - pos: 52.5,18.5 + pos: 69.5,2.5 parent: 1 - uid: 1837 components: @@ -31133,6 +32070,21 @@ entities: - type: Transform pos: 65.5,-1.5 parent: 1 + - uid: 5464 + components: + - type: Transform + pos: 69.5,-1.5 + parent: 1 + - uid: 5466 + components: + - type: Transform + pos: 48.5,19.5 + parent: 1 + - uid: 5488 + components: + - type: Transform + pos: 52.5,-18.5 + parent: 1 - proto: PlushieAtmosian entities: - uid: 5358 @@ -31182,6 +32134,11 @@ entities: parent: 1 - proto: PottedPlantRandom entities: + - uid: 114 + components: + - type: Transform + pos: 2.5,16.5 + parent: 1 - uid: 2965 components: - type: Transform @@ -31207,30 +32164,25 @@ entities: - type: Transform pos: 45.5,-7.5 parent: 1 - - uid: 5362 - components: - - type: Transform - pos: 2.5,17.5 - parent: 1 - uid: 5385 components: - type: Transform pos: 2.5,11.5 parent: 1 - - uid: 5472 + - uid: 5526 components: - type: Transform - pos: -25.5,1.5 + pos: 3.5,26.5 parent: 1 - - uid: 5473 + - uid: 6309 components: - type: Transform - pos: 1.5,35.5 + pos: -25.5,1.5 parent: 1 - - uid: 5526 + - uid: 6311 components: - type: Transform - pos: 3.5,26.5 + pos: 1.5,38.5 parent: 1 - proto: PottedPlantRandomPlastic entities: @@ -31239,6 +32191,14 @@ entities: - type: Transform pos: -15.5,2.5 parent: 1 +- proto: PowerCellMedium + entities: + - uid: 5383 + components: + - type: Transform + parent: 5380 + - type: Physics + canCollide: False - proto: PowerCellRecharger entities: - uid: 3341 @@ -31781,12 +32741,6 @@ entities: rot: 3.141592653589793 rad pos: 16.5,21.5 parent: 1 - - uid: 3448 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 12.5,27.5 - parent: 1 - uid: 4037 components: - type: Transform @@ -31877,6 +32831,12 @@ entities: - type: Transform pos: 12.5,-12.5 parent: 1 + - uid: 5480 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 11.5,27.5 + parent: 1 - uid: 5531 components: - type: Transform @@ -33721,39 +34681,41 @@ entities: - type: Transform pos: -2.5,-8.5 parent: 1 - - uid: 5483 + - uid: 5487 components: - type: Transform - pos: 48.5,18.5 + rot: 3.141592653589793 rad + pos: 69.5,-1.5 parent: 1 - - uid: 5484 + - uid: 5590 components: - type: Transform - pos: 52.5,18.5 + rot: 3.141592653589793 rad + pos: 52.5,-18.5 parent: 1 - - uid: 5485 + - uid: 5648 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 68.5,2.5 + rot: 3.141592653589793 rad + pos: 69.5,2.5 parent: 1 - - uid: 5486 + - uid: 6177 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 68.5,-1.5 + rot: 3.141592653589793 rad + pos: 48.5,-18.5 parent: 1 - - uid: 5487 + - uid: 6178 components: - type: Transform rot: 3.141592653589793 rad - pos: 52.5,-17.5 + pos: 48.5,19.5 parent: 1 - - uid: 5488 + - uid: 6179 components: - type: Transform rot: 3.141592653589793 rad - pos: 48.5,-17.5 + pos: 52.5,19.5 parent: 1 - proto: ShuttersNormalOpen entities: @@ -34051,9 +35013,9 @@ entities: parent: 1 - type: DeviceLinkSource linkedPorts: - 5488: + 6177: - Pressed: Toggle - 5487: + 5590: - Pressed: Toggle - uid: 5490 components: @@ -34063,9 +35025,9 @@ entities: parent: 1 - type: DeviceLinkSource linkedPorts: - 5486: + 5487: - Pressed: Toggle - 5485: + 5648: - Pressed: Toggle - uid: 5491 components: @@ -34074,9 +35036,9 @@ entities: parent: 1 - type: DeviceLinkSource linkedPorts: - 5484: + 6179: - Pressed: Toggle - 5483: + 6178: - Pressed: Toggle - proto: SignAtmos entities: @@ -34095,41 +35057,41 @@ entities: parent: 1 - proto: SignCargoDock entities: - - uid: 2579 + - uid: 109 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 47.5,-17.5 + rot: 3.141592653589793 rad + pos: 47.5,19.5 parent: 1 - - uid: 2580 + - uid: 112 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 53.5,-17.5 + rot: 3.141592653589793 rad + pos: 69.5,3.5 parent: 1 - - uid: 2581 + - uid: 5470 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 68.5,-2.5 + rot: 3.141592653589793 rad + pos: 47.5,-18.5 parent: 1 - - uid: 2582 + - uid: 5471 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 68.5,3.5 + rot: 3.141592653589793 rad + pos: 69.5,-2.5 parent: 1 - - uid: 2583 + - uid: 5484 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 53.5,18.5 + rot: 3.141592653589793 rad + pos: 53.5,-18.5 parent: 1 - - uid: 2584 + - uid: 5653 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 47.5,18.5 + rot: 3.141592653589793 rad + pos: 53.5,19.5 parent: 1 - proto: SignCryo entities: @@ -34246,6 +35208,18 @@ entities: - type: Transform pos: -11.5,-1.5 parent: 1 + - uid: 6161 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 60.5,6.5 + parent: 1 + - uid: 6162 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 56.5,10.5 + parent: 1 - proto: SignDirectionalSupply entities: - uid: 3831 @@ -34441,6 +35415,11 @@ entities: - type: Transform pos: 17.5,21.5 parent: 1 + - uid: 6156 + components: + - type: Transform + pos: 58.5,11.5 + parent: 1 - proto: SolarPanel entities: - uid: 198 @@ -35229,6 +36208,276 @@ entities: - type: Transform pos: -19.5,15.5 parent: 1 + - uid: 4949 + components: + - type: Transform + pos: 65.5,8.5 + parent: 1 + - uid: 4951 + components: + - type: Transform + pos: 58.5,15.5 + parent: 1 + - uid: 5357 + components: + - type: Transform + pos: 55.5,17.5 + parent: 1 + - uid: 5360 + components: + - type: Transform + pos: 56.5,16.5 + parent: 1 + - uid: 5362 + components: + - type: Transform + pos: 61.5,13.5 + parent: 1 + - uid: 5363 + components: + - type: Transform + pos: 62.5,12.5 + parent: 1 + - uid: 5379 + components: + - type: Transform + pos: 63.5,12.5 + parent: 1 + - uid: 5998 + components: + - type: Transform + pos: 61.5,-12.5 + parent: 1 + - uid: 6006 + components: + - type: Transform + pos: 58.5,-15.5 + parent: 1 + - uid: 6007 + components: + - type: Transform + pos: 56.5,-15.5 + parent: 1 + - uid: 6008 + components: + - type: Transform + pos: 59.5,-14.5 + parent: 1 + - uid: 6009 + components: + - type: Transform + pos: 58.5,-14.5 + parent: 1 + - uid: 6010 + components: + - type: Transform + pos: 60.5,-14.5 + parent: 1 + - uid: 6011 + components: + - type: Transform + pos: 62.5,-11.5 + parent: 1 + - uid: 6012 + components: + - type: Transform + pos: 64.5,-10.5 + parent: 1 + - uid: 6013 + components: + - type: Transform + pos: 63.5,-10.5 + parent: 1 + - uid: 6014 + components: + - type: Transform + pos: 65.5,-7.5 + parent: 1 + - uid: 6015 + components: + - type: Transform + pos: 64.5,10.5 + parent: 1 + - uid: 6016 + components: + - type: Transform + pos: 67.5,-5.5 + parent: 1 + - uid: 6017 + components: + - type: Transform + pos: 66.5,-6.5 + parent: 1 + - uid: 6018 + components: + - type: Transform + pos: 67.5,5.5 + parent: 1 + - uid: 6023 + components: + - type: Transform + pos: 67.5,-3.5 + parent: 1 + - uid: 6032 + components: + - type: Transform + pos: 66.5,7.5 + parent: 1 + - uid: 6054 + components: + - type: Transform + pos: 60.5,15.5 + parent: 1 + - uid: 6055 + components: + - type: Transform + pos: 65.5,10.5 + parent: 1 + - uid: 6102 + components: + - type: Transform + pos: 54.5,17.5 + parent: 1 + - uid: 6103 + components: + - type: Transform + pos: 65.5,9.5 + parent: 1 + - uid: 6104 + components: + - type: Transform + pos: 64.5,11.5 + parent: 1 + - uid: 6105 + components: + - type: Transform + pos: 58.5,16.5 + parent: 1 + - uid: 6106 + components: + - type: Transform + pos: 57.5,16.5 + parent: 1 + - uid: 6132 + components: + - type: Transform + pos: 66.5,8.5 + parent: 1 + - uid: 6133 + components: + - type: Transform + pos: 66.5,6.5 + parent: 1 + - uid: 6134 + components: + - type: Transform + pos: 60.5,14.5 + parent: 1 + - uid: 6202 + components: + - type: Transform + pos: 67.5,-4.5 + parent: 1 + - uid: 6206 + components: + - type: Transform + pos: 67.5,4.5 + parent: 1 + - uid: 6207 + components: + - type: Transform + pos: 66.5,-5.5 + parent: 1 + - uid: 6208 + components: + - type: Transform + pos: 63.5,-11.5 + parent: 1 + - uid: 6209 + components: + - type: Transform + pos: 65.5,-8.5 + parent: 1 + - uid: 6210 + components: + - type: Transform + pos: 64.5,-9.5 + parent: 1 + - uid: 6211 + components: + - type: Transform + pos: 61.5,-13.5 + parent: 1 + - uid: 6212 + components: + - type: Transform + pos: 60.5,-13.5 + parent: 1 + - uid: 6213 + components: + - type: Transform + pos: 56.5,-16.5 + parent: 1 + - uid: 6214 + components: + - type: Transform + pos: 55.5,-16.5 + parent: 1 + - uid: 6216 + components: + - type: Transform + pos: 57.5,-15.5 + parent: 1 + - uid: 6217 + components: + - type: Transform + pos: 54.5,-16.5 + parent: 1 + - uid: 6225 + components: + - type: Transform + pos: 56.5,17.5 + parent: 1 + - uid: 6232 + components: + - type: Transform + pos: 62.5,-12.5 + parent: 1 + - uid: 6234 + components: + - type: Transform + pos: 67.5,6.5 + parent: 1 + - uid: 6235 + components: + - type: Transform + pos: 65.5,-9.5 + parent: 1 + - uid: 6236 + components: + - type: Transform + pos: 66.5,-7.5 + parent: 1 + - uid: 6299 + components: + - type: Transform + pos: 59.5,15.5 + parent: 1 + - uid: 6300 + components: + - type: Transform + pos: 62.5,13.5 + parent: 1 + - uid: 6301 + components: + - type: Transform + pos: 61.5,14.5 + parent: 1 + - uid: 6302 + components: + - type: Transform + pos: 63.5,11.5 + parent: 1 - proto: SolarTracker entities: - uid: 4147 @@ -35313,6 +36562,38 @@ entities: - type: Transform pos: 27.5,7.5 parent: 1 +- proto: SpawnShuttleVendomatsClothes + entities: + - uid: 5473 + components: + - type: Transform + pos: -28.5,1.5 + parent: 1 + - uid: 5654 + components: + - type: Transform + pos: -0.5,-36.5 + parent: 1 + - uid: 5656 + components: + - type: Transform + pos: 1.5,37.5 + parent: 1 + - uid: 5657 + components: + - type: Transform + pos: -26.5,1.5 + parent: 1 + - uid: 5658 + components: + - type: Transform + pos: 1.5,34.5 + parent: 1 + - uid: 5659 + components: + - type: Transform + pos: -0.5,-33.5 + parent: 1 - proto: SpiderWeb entities: - uid: 2006 @@ -36448,7 +37729,7 @@ entities: parent: 1 - type: DeviceLinkSource linkedPorts: - 1843: + 6175: - Left: Forward - Right: Reverse - Middle: Off @@ -36468,6 +37749,10 @@ entities: - Left: Forward - Right: Reverse - Middle: Off + 6176: + - Left: Forward + - Right: Reverse + - Middle: Off - uid: 5493 components: - type: Transform @@ -36495,6 +37780,14 @@ entities: - Left: Forward - Right: Reverse - Middle: Off + 1207: + - Left: Forward + - Right: Reverse + - Middle: Off + 1235: + - Left: Forward + - Right: Reverse + - Middle: Off - uid: 5494 components: - type: Transform @@ -36522,6 +37815,10 @@ entities: - Left: Forward - Right: Reverse - Middle: Off + 72: + - Left: Forward + - Right: Reverse + - Middle: Off - uid: 5495 components: - type: Transform @@ -36549,6 +37846,10 @@ entities: - Left: Forward - Right: Reverse - Middle: Off + 5652: + - Left: Forward + - Right: Reverse + - Middle: Off - uid: 5496 components: - type: Transform @@ -36576,6 +37877,10 @@ entities: - Left: Forward - Right: Reverse - Middle: Off + 5485: + - Left: Forward + - Right: Reverse + - Middle: Off - uid: 5497 components: - type: Transform @@ -36583,7 +37888,7 @@ entities: parent: 1 - type: DeviceLinkSource linkedPorts: - 1852: + 71: - Left: Forward - Right: Reverse - Middle: Off @@ -36603,6 +37908,10 @@ entities: - Left: Forward - Right: Reverse - Middle: Off + 59: + - Left: Forward + - Right: Reverse + - Middle: Off - proto: VendingMachineAstroVendPOI entities: - uid: 5462 @@ -36624,13 +37933,6 @@ entities: - type: Transform pos: 11.5,23.5 parent: 1 -- proto: VendingMachineChapel - entities: - - uid: 5469 - components: - - type: Transform - pos: -0.5,-36.5 - parent: 1 - proto: VendingMachineCigs entities: - uid: 5361 @@ -36659,26 +37961,19 @@ entities: - type: Transform pos: 11.5,22.5 parent: 1 -- proto: VendingMachineCuraDrobe - entities: - - uid: 5471 - components: - - type: Transform - pos: -26.5,1.5 - parent: 1 -- proto: VendingMachineDetDrobe +- proto: VendingMachineDinnerware entities: - - uid: 5470 + - uid: 2357 components: - type: Transform - pos: -28.5,1.5 + pos: -5.5,15.5 parent: 1 -- proto: VendingMachineDinnerware +- proto: VendingMachineEngivendPOI entities: - - uid: 2357 + - uid: 5472 components: - type: Transform - pos: -5.5,15.5 + pos: 2.5,13.5 parent: 1 - proto: VendingMachineFlatpackVend entities: @@ -36694,19 +37989,19 @@ entities: - type: Transform pos: 44.5,1.5 parent: 1 -- proto: VendingMachineJaniDrobe +- proto: VendingMachineGames entities: - - uid: 1388 + - uid: 6310 components: - type: Transform - pos: -6.5,-9.5 + pos: 1.5,35.5 parent: 1 -- proto: VendingMachineLawDrobe +- proto: VendingMachineJaniDrobe entities: - - uid: 5466 + - uid: 1388 components: - type: Transform - pos: -0.5,-34.5 + pos: -6.5,-9.5 parent: 1 - proto: VendingMachineMailDrobe entities: @@ -36736,19 +38031,19 @@ entities: - type: Transform pos: -27.5,1.5 parent: 1 -- proto: VendingMachineRepDrobe +- proto: VendingMachineRobotics entities: - - uid: 5464 + - uid: 5365 components: - type: Transform - pos: 1.5,37.5 + pos: 2.5,15.5 parent: 1 -- proto: VendingMachineRobotics +- proto: VendingMachineSalvagePOI entities: - - uid: 5365 + - uid: 5660 components: - type: Transform - pos: 2.5,15.5 + pos: -0.5,-34.5 parent: 1 - proto: VendingMachineSec entities: @@ -36764,13 +38059,6 @@ entities: - type: Transform pos: 2.5,22.5 parent: 1 -- proto: VendingMachineTheater - entities: - - uid: 5465 - components: - - type: Transform - pos: 1.5,38.5 - parent: 1 - proto: VendingMachineVendomatPOI entities: - uid: 5381 @@ -36780,10 +38068,10 @@ entities: parent: 1 - proto: VendingMachineYouToolPOI entities: - - uid: 5363 + - uid: 5661 components: - type: Transform - pos: 2.5,16.5 + pos: 2.5,14.5 parent: 1 - proto: WallmountTelevision entities: @@ -36834,6 +38122,24 @@ entities: rot: 3.141592653589793 rad pos: 26.5,-12.5 parent: 1 + - uid: 81 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 53.5,19.5 + parent: 1 + - uid: 110 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 69.5,3.5 + parent: 1 + - uid: 111 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 47.5,19.5 + parent: 1 - uid: 127 components: - type: Transform @@ -39856,6 +41162,24 @@ entities: rot: 3.141592653589793 rad pos: -5.5,17.5 parent: 1 + - uid: 5483 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 69.5,-2.5 + parent: 1 + - uid: 6164 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 53.5,-18.5 + parent: 1 + - uid: 6165 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 47.5,-18.5 + parent: 1 - proto: WallReinforcedDiagonal entities: - uid: 395 @@ -41550,7 +42874,6 @@ entities: - type: DeviceLinkSource lastSignals: DoorStatus: True - state: Opening - type: Airlock autoClose: False - uid: 49 diff --git a/Resources/Maps/_NF/Shuttles/Expedition/gasbender.yml b/Resources/Maps/_NF/Shuttles/Expedition/gasbender.yml index 3c3a5389532..b3f47d5bad3 100644 --- a/Resources/Maps/_NF/Shuttles/Expedition/gasbender.yml +++ b/Resources/Maps/_NF/Shuttles/Expedition/gasbender.yml @@ -1847,7 +1847,6 @@ entities: parent: 1 - type: Physics canCollide: False - bodyType: Static - type: Fixtures fixtures: {} - uid: 840 @@ -1858,7 +1857,6 @@ entities: parent: 1 - type: Physics canCollide: False - bodyType: Static - type: Fixtures fixtures: {} - proto: BenchSofaCorpLeft @@ -1869,8 +1867,6 @@ entities: rot: 1.5707963267948966 rad pos: -0.5,9.5 parent: 1 - - type: Physics - bodyType: Static - proto: BenchSofaCorpMiddle entities: - uid: 528 @@ -1879,24 +1875,18 @@ entities: rot: 3.141592653589793 rad pos: 1.5,8.5 parent: 1 - - type: Physics - bodyType: Static - uid: 539 components: - type: Transform rot: 3.141592653589793 rad pos: 0.5,8.5 parent: 1 - - type: Physics - bodyType: Static - uid: 540 components: - type: Transform rot: 3.141592653589793 rad pos: 2.5,8.5 parent: 1 - - type: Physics - bodyType: Static - proto: BenchSofaCorpRight entities: - uid: 833 @@ -1905,8 +1895,6 @@ entities: rot: -1.5707963267948966 rad pos: 3.5,9.5 parent: 1 - - type: Physics - bodyType: Static - proto: BenchSofaLeft entities: - uid: 516 @@ -1915,8 +1903,6 @@ entities: rot: 3.141592653589793 rad pos: -1.5,13.5 parent: 1 - - type: Physics - bodyType: Static - proto: BenchSofaRight entities: - uid: 510 @@ -1925,8 +1911,6 @@ entities: rot: 3.141592653589793 rad pos: -0.5,13.5 parent: 1 - - type: Physics - bodyType: Static - proto: BlastDoor entities: - uid: 79 @@ -3541,19 +3525,6 @@ entities: rot: -1.5707963267948966 rad pos: 0.5,-13.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: 7 @@ -3969,16 +3940,6 @@ entities: rot: 1.5707963267948966 rad pos: -6.5,-10.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: GasFilterFlipped entities: - uid: 89 @@ -5234,6 +5195,13 @@ entities: parent: 1 - type: AtmosPipeColor color: '#990000FF' +- proto: GasRecyclerMachineCircuitboard + entities: + - uid: 891 + components: + - type: Transform + pos: -2.4430587,2.3822143 + parent: 1 - proto: GasThermoMachineFreezer entities: - uid: 414 @@ -7823,7 +7791,7 @@ entities: rot: -1.5707963267948966 rad pos: -1.5,1.5 parent: 1 -- proto: WarpPointShip +- proto: WarpPoint entities: - uid: 818 components: diff --git a/Resources/Maps/_NF/Shuttles/Nfsd/paladin.yml b/Resources/Maps/_NF/Shuttles/Nfsd/paladin.yml index 634912c6326..abef7d0985f 100644 --- a/Resources/Maps/_NF/Shuttles/Nfsd/paladin.yml +++ b/Resources/Maps/_NF/Shuttles/Nfsd/paladin.yml @@ -1012,7 +1012,7 @@ entities: - Pressed: Toggle 67: - Pressed: Toggle -- proto: LockerNfsdSilverDetectiveFilled +- proto: LockerNfsdSilver entities: - uid: 116 components: diff --git a/Resources/Maps/_NF/Shuttles/Scrap/tide.yml b/Resources/Maps/_NF/Shuttles/Scrap/tide.yml index 9f46292a949..ff708046030 100644 --- a/Resources/Maps/_NF/Shuttles/Scrap/tide.yml +++ b/Resources/Maps/_NF/Shuttles/Scrap/tide.yml @@ -1249,6 +1249,13 @@ entities: - type: Transform pos: 0.5,7.5 parent: 2 +- proto: SpawnPointLatejoin + entities: + - uid: 137 + components: + - type: Transform + pos: 2.5,0.5 + parent: 2 - proto: Stool entities: - uid: 170 diff --git a/Resources/Maps/_NF/Shuttles/lyrae.yml b/Resources/Maps/_NF/Shuttles/lyrae.yml index 48b4b9fcf78..4de1788a6b1 100644 --- a/Resources/Maps/_NF/Shuttles/lyrae.yml +++ b/Resources/Maps/_NF/Shuttles/lyrae.yml @@ -2419,8 +2419,8 @@ entities: pos: 3.5,-4.5 parent: 2 - type: GasMixer - inletTwoConcentration: 0.78 - inletOneConcentration: 0.22 + inletTwoConcentration: 0.21 + inletOneConcentration: 0.79 - type: AtmosPipeColor color: '#0055CCFF' - proto: GasPassiveVent diff --git a/Resources/Maps/_NF/Shuttles/tyne.yml b/Resources/Maps/_NF/Shuttles/tyne.yml index ceee0ecaba2..78688103579 100644 --- a/Resources/Maps/_NF/Shuttles/tyne.yml +++ b/Resources/Maps/_NF/Shuttles/tyne.yml @@ -36,11 +36,11 @@ entities: version: 6 0,-1: ind: 0,-1 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAARQAAAAAAggAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARQAAAAAARQAAAAAAggAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAARQAAAAAAggAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdAAAAAAAdAAAAAABggAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdAAAAAADdAAAAAAAggAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdAAAAAADdAAAAAACggAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdAAAAAACdAAAAAACggAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARQAAAAAAggAAAAAAggAAAAAARQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARQAAAAAARQAAAAAARQAAAAAARQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARQAAAAAARQAAAAAAggAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARQAAAAAARQAAAAAAggAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARQAAAAAARQAAAAAAggAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdAAAAAAAdAAAAAABggAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAdAAAAAAAggAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAdAAAAAACggAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdAAAAAACdAAAAAACggAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARQAAAAAAggAAAAAAggAAAAAARQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARQAAAAAARQAAAAAARQAAAAAARQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 -1,-1: ind: -1,-1 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAggAAAAAARQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAggAAAAAARQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAggAAAAAARQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAggAAAAAAdAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAggAAAAAAdAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAggAAAAAAdAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAggAAAAAAdAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARQAAAAAAggAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARQAAAAAARQAAAAAARQAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAggAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAggAAAAAARQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAggAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAggAAAAAAdAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAggAAAAAAdAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAggAAAAAAdAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAggAAAAAAdAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARQAAAAAAggAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARQAAAAAARQAAAAAARQAAAAAA version: 6 - type: Broadphase - type: Physics @@ -75,6 +75,11 @@ entities: id: BotGreyscale decals: 62: -1,2 + - node: + color: '#96DAFFFF' + id: BotGreyscale + decals: + 70: -1,-4 - node: cleanable: True color: '#96DAFFFF' @@ -87,6 +92,11 @@ entities: id: BotGreyscale decals: 63: -1,3 + - node: + color: '#FFFFFFFF' + id: Box + decals: + 68: -1,-8 - node: color: '#4B709C7F' id: BrickTileWhiteCornerNe @@ -192,8 +202,6 @@ entities: color: '#FFFFFFFF' id: DirtHeavyMonotile decals: - 38: -1,-8 - 39: 1,-8 40: -1,-7 41: 1,-7 44: 0,-1 @@ -236,9 +244,8 @@ entities: color: '#FFFFFFFF' id: StandClear decals: - 4: -1,-8 - 5: 1,-8 27: 0,-1 + 64: 0,-8 - node: color: '#FFFFFFFF' id: WarnCornerNE @@ -274,8 +281,8 @@ entities: color: '#FFFFFFFF' id: WarnLineN decals: - 2: -1,-8 - 3: 1,-8 + 65: 0,-8 + 69: 1,-8 - node: color: '#FFFFFFFF' id: WarnLineS @@ -310,17 +317,16 @@ entities: 0: 49288 2: 34 0,-3: - 0: 8192 + 0: 12288 2: 32768 - -1,-3: - 0: 32768 - 2: 8192 0,-2: - 0: 13090 + 0: 13107 2: 34952 -1,-2: - 0: 34952 + 0: 34824 2: 8738 + -1,-3: + 2: 8192 uniqueMixes: - volume: 2500 temperature: 293.15 @@ -381,8 +387,6 @@ entities: parent: 2 - type: DeviceList devices: - - 136 - - 138 - 114 - 113 - 135 @@ -411,22 +415,22 @@ entities: - type: Transform pos: 1.5,-6.5 parent: 2 - - uid: 8 + - uid: 213 components: - type: Transform - pos: -0.5,-6.5 + pos: 0.5,-6.5 parent: 2 - proto: AirlockGlassShuttle entities: - - uid: 9 + - uid: 10 components: - type: Transform - pos: -0.5,-8.5 + pos: 1.5,-8.5 parent: 2 - - uid: 10 + - uid: 14 components: - type: Transform - pos: 1.5,-8.5 + pos: 0.5,-8.5 parent: 2 - proto: AirlockMedicalGlass entities: @@ -445,10 +449,10 @@ entities: parent: 2 - proto: AtmosDeviceFanDirectional entities: - - uid: 14 + - uid: 9 components: - type: Transform - pos: -0.5,-8.5 + pos: 0.5,-8.5 parent: 2 - uid: 15 components: @@ -621,17 +625,17 @@ entities: parent: 2 - proto: BoxBodyBag entities: - - uid: 47 + - uid: 165 components: - type: Transform - pos: -0.671875,-2.1547117 + pos: -0.6532581,-2.1312675 parent: 2 - proto: BoxPaper entities: - - uid: 13 + - uid: 111 components: - type: Transform - pos: 1.7410264,4.3407273 + pos: 1.4625001,4.3004127 parent: 2 - proto: CableApcExtension entities: @@ -695,32 +699,12 @@ entities: - type: Transform pos: 0.5,-5.5 parent: 2 - - uid: 61 - components: - - type: Transform - pos: -0.5,-5.5 - parent: 2 - - uid: 62 - components: - - type: Transform - pos: -0.5,-6.5 - parent: 2 - uid: 63 - components: - - type: Transform - pos: 1.5,-5.5 - parent: 2 - - uid: 64 - components: - - type: Transform - pos: 1.5,-6.5 - parent: 2 - - uid: 65 components: - type: Transform pos: 1.5,-7.5 parent: 2 - - uid: 66 + - uid: 64 components: - type: Transform pos: -0.5,-7.5 @@ -730,34 +714,32 @@ entities: - type: Transform pos: 0.5,-1.5 parent: 2 - - uid: 68 + - uid: 119 components: - type: Transform - pos: 0.5,5.5 + pos: 0.5,-7.5 + parent: 2 + - uid: 162 + components: + - type: Transform + pos: 0.5,-6.5 parent: 2 - proto: CableHV entities: - uid: 69 components: - type: Transform - pos: -0.5,0.5 + pos: 0.5,3.5 parent: 2 - uid: 70 components: - type: Transform pos: -0.5,1.5 parent: 2 -- proto: CableMV - entities: - - uid: 71 - components: - - type: Transform - pos: 0.5,2.5 - parent: 2 - uid: 72 components: - type: Transform - pos: -0.5,0.5 + pos: 0.5,4.5 parent: 2 - uid: 73 components: @@ -767,7 +749,24 @@ entities: - uid: 74 components: - type: Transform - pos: -0.5,1.5 + pos: 0.5,2.5 + parent: 2 + - uid: 200 + components: + - type: Transform + pos: 2.5,4.5 + parent: 2 + - uid: 202 + components: + - type: Transform + pos: 1.5,4.5 + parent: 2 +- proto: CableMV + entities: + - uid: 71 + components: + - type: Transform + pos: 2.5,4.5 parent: 2 - uid: 75 components: @@ -779,15 +778,15 @@ entities: - type: Transform pos: 0.5,4.5 parent: 2 - - uid: 77 + - uid: 78 components: - type: Transform - pos: 0.5,3.5 + pos: -1.5,4.5 parent: 2 - - uid: 78 + - uid: 157 components: - type: Transform - pos: -1.5,4.5 + pos: 1.5,4.5 parent: 2 - proto: Catwalk entities: @@ -881,11 +880,10 @@ entities: parent: 2 - proto: ClosetWallO2N2FilledRandom entities: - - uid: 1 + - uid: 68 components: - type: Transform - rot: 3.141592653589793 rad - pos: -0.5,-1.5 + pos: -0.5,-6.5 parent: 2 - proto: ComputerCrewMonitoring entities: @@ -908,16 +906,36 @@ entities: - type: Transform pos: -0.5,5.5 parent: 2 +- proto: ComputerWallmountWithdrawBankATM + entities: + - uid: 61 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,-7.5 + parent: 2 - proto: DefibrillatorCabinetFilled entities: - - uid: 102 + - uid: 47 components: - type: Transform - rot: 3.141592653589793 rad - pos: 0.5,-6.5 + rot: 1.5707963267948966 rad + pos: -1.5,-4.5 parent: 2 - proto: EmergencyLight entities: + - uid: 13 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,1.5 + parent: 2 + - uid: 65 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,-7.5 + parent: 2 - uid: 103 components: - type: Transform @@ -941,36 +959,24 @@ entities: rot: -1.5707963267948966 rad pos: -2.5,0.5 parent: 2 +- proto: EmergencyRollerBed + entities: - uid: 107 components: - type: Transform - rot: 3.141592653589793 rad - pos: -0.5,1.5 - parent: 2 - - uid: 108 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -0.5,-7.5 + pos: -0.5,-3.5 parent: 2 -- proto: EmergencyRollerBed - entities: - uid: 109 components: - type: Transform pos: 1.5,-3.5 parent: 2 - - uid: 110 - components: - - type: Transform - pos: 1.5,-4.5 - parent: 2 - proto: ExtinguisherCabinetFilled entities: - - uid: 95 + - uid: 181 components: - type: Transform - pos: -1.5,-5.5 + pos: 1.5,-1.5 parent: 2 - proto: FaxMachineShip entities: @@ -1036,11 +1042,19 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 119 + - uid: 242 components: - type: Transform rot: -1.5707963267948966 rad - pos: 1.5,-4.5 + pos: 0.5,-7.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 248 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,-3.5 parent: 2 - type: AtmosPipeColor color: '#0055CCFF' @@ -1123,15 +1137,68 @@ entities: parent: 2 - type: AtmosPipeColor color: '#990000FF' - - uid: 130 + - uid: 136 components: - type: Transform - pos: 1.5,-3.5 + rot: 3.141592653589793 rad + pos: 1.5,-4.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 138 + components: + - type: Transform + pos: 0.5,-5.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 155 + components: + - type: Transform + pos: 1.5,-5.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 240 + components: + - type: Transform + pos: 0.5,-6.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 241 + components: + - type: Transform + pos: 1.5,-6.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 246 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,-3.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 247 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,-3.5 parent: 2 - type: AtmosPipeColor color: '#0055CCFF' - proto: GasPipeTJunction entities: + - uid: 130 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 0.5,-4.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' - uid: 131 components: - type: Transform @@ -1148,6 +1215,14 @@ entities: parent: 2 - type: AtmosPipeColor color: '#990000FF' + - uid: 245 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,-3.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' - proto: GasPort entities: - uid: 133 @@ -1178,15 +1253,20 @@ entities: - 3 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 136 + - uid: 244 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 0.5,-4.5 + rot: 3.141592653589793 rad + pos: 1.5,-7.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 250 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,-4.5 parent: 2 - - type: DeviceNetwork - deviceLists: - - 3 - type: AtmosPipeColor color: '#0055CCFF' - proto: GasVentScrubber @@ -1202,15 +1282,20 @@ entities: - 3 - type: AtmosPipeColor color: '#990000FF' - - uid: 138 + - uid: 243 components: - type: Transform - rot: 3.141592653589793 rad - pos: 0.5,-3.5 + rot: 1.5707963267948966 rad + pos: -0.5,-7.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 249 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,-4.5 parent: 2 - - type: DeviceNetwork - deviceLists: - - 3 - type: AtmosPipeColor color: '#990000FF' - proto: GravityGeneratorMini @@ -1300,6 +1385,13 @@ entities: rot: -1.5707963267948966 rad pos: 2.5,6.5 parent: 2 +- proto: Gyroscope + entities: + - uid: 197 + components: + - type: Transform + pos: 1.5,2.5 + parent: 2 - proto: LockerParamedicFilled entities: - uid: 156 @@ -1314,27 +1406,49 @@ entities: - type: Transform pos: 1.5,0.5 parent: 2 +- proto: LockerWallMaterialsBasic10Filled + entities: + - uid: 102 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,-5.5 + parent: 2 - proto: LockerWallMaterialsFuelPlasmaFilled entities: - - uid: 166 + - uid: 77 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 2.5,4.5 + rot: 3.141592653589793 rad + pos: -0.5,0.5 + parent: 2 +- proto: MedicalTechFab + entities: + - uid: 66 + components: + - type: Transform + pos: -0.5,-5.5 parent: 2 - proto: MedkitOxygenFilled entities: - - uid: 157 + - uid: 95 components: - type: Transform - pos: -0.3125,-2.3422117 + pos: -0.3407581,-2.3656425 parent: 2 -- proto: NFSignDock +- proto: NFPosterContrabandEmsCoords entities: - - uid: 169 + - uid: 8 components: - type: Transform - pos: 0.5,-8.5 + pos: -1.5,-3.5 + parent: 2 +- proto: NFSignEms1 + entities: + - uid: 234 + components: + - type: Transform + pos: -0.5,-8.5 parent: 2 - proto: NitrogenCanister entities: @@ -1363,17 +1477,6 @@ entities: - type: Transform pos: -0.5,1.5 parent: 2 - - type: FuelGenerator - on: False - - type: Physics - bodyType: Static -- proto: PosterLegitHelpOthers - entities: - - uid: 162 - components: - - type: Transform - pos: -1.5,-3.5 - parent: 2 - proto: PosterLegitSMEpi entities: - uid: 163 @@ -1383,18 +1486,24 @@ entities: parent: 2 - proto: PowerCellMedium entities: - - uid: 164 + - uid: 231 components: - type: Transform - pos: -0.671875,-2.5140867 + pos: -0.7001331,-2.5687675 parent: 2 - proto: PoweredLEDSmallLight entities: - - uid: 161 + - uid: 108 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,-7.5 + parent: 2 + - uid: 203 components: - type: Transform rot: 3.141592653589793 rad - pos: 1.5,-0.5 + pos: -0.5,-0.5 parent: 2 - proto: PoweredlightGreen entities: @@ -1412,11 +1521,11 @@ entities: rot: 1.5707963267948966 rad pos: -0.5,-3.5 parent: 2 - - uid: 111 + - uid: 110 components: - type: Transform - rot: 3.141592653589793 rad - pos: 1.5,1.5 + rot: -1.5707963267948966 rad + pos: 1.5,4.5 parent: 2 - proto: PoweredlightRed entities: @@ -1426,13 +1535,6 @@ entities: rot: -1.5707963267948966 rad pos: -2.5,-5.5 parent: 2 -- proto: PoweredSmallLight - entities: - - uid: 234 - components: - - type: Transform - pos: 0.5,-7.5 - parent: 2 - proto: Railing entities: - uid: 170 @@ -1496,12 +1598,12 @@ entities: rot: 3.141592653589793 rad pos: 3.5,1.5 parent: 2 -- proto: RandomPosterAny +- proto: RandomPosterLegit entities: - - uid: 165 + - uid: 232 components: - type: Transform - pos: 1.5,-1.5 + pos: -1.5,-7.5 parent: 2 - proto: ShuttleWindow entities: @@ -1595,31 +1697,23 @@ entities: - type: Transform pos: 2.5,0.5 parent: 2 -- proto: SmallGyroscope +- proto: SpawnPointLatejoin entities: - - uid: 155 + - uid: 251 components: - type: Transform - rot: 3.141592653589793 rad - pos: 1.5,2.5 + pos: 0.5,-4.5 parent: 2 -- proto: SpawnPointLatejoin +- proto: StasisBed entities: - - uid: 200 + - uid: 1 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 0.5,-5.5 + pos: 1.5,-4.5 parent: 2 - proto: SteelBench entities: - - uid: 201 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -0.5,-3.5 - parent: 2 - - uid: 202 + - uid: 164 components: - type: Transform rot: 1.5707963267948966 rad @@ -1627,10 +1721,10 @@ entities: parent: 2 - proto: SubstationWallBasic entities: - - uid: 203 + - uid: 204 components: - type: Transform - pos: -0.5,0.5 + pos: 2.5,4.5 parent: 2 - proto: Table entities: @@ -1689,14 +1783,23 @@ entities: parent: 2 - proto: VendingMachineWallMedical entities: - - uid: 213 + - uid: 161 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 2.5,-5.5 + pos: -0.5,-1.5 parent: 2 - proto: WallShuttle entities: + - uid: 62 + components: + - type: Transform + pos: -0.5,-8.5 + parent: 2 + - uid: 169 + components: + - type: Transform + pos: -0.5,-6.5 + parent: 2 - uid: 214 components: - type: Transform @@ -1782,16 +1885,6 @@ entities: - type: Transform pos: 2.5,-1.5 parent: 2 - - uid: 231 - components: - - type: Transform - pos: 0.5,-8.5 - parent: 2 - - uid: 232 - components: - - type: Transform - pos: 0.5,-6.5 - parent: 2 - uid: 233 components: - type: Transform @@ -1817,7 +1910,15 @@ entities: - type: Transform pos: -1.5,-4.5 parent: 2 -- proto: WarpPointShip +- proto: WallWeaponCapacitorRechargerOmnidirectional + entities: + - uid: 166 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 2.5,-5.5 + parent: 2 +- proto: WarpPoint entities: - uid: 239 components: diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml index 7a1d8763ce2..74692516bbe 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml @@ -15,6 +15,7 @@ FoodCondimentBottleKetchup: 2 FoodCondimentBottleBBQ: 2 FoodCondimentBottleVinegar: 5 # Frontier 2<5 + FoodCondimentBottleSoysauce: 5 # Frontier # ReagentContainerOliveoil: 2 # Frontier - Replaced with OilJarOlive ReagentContainerMayo: 2 OilJarOlive: 1 # Frontier diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml b/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml index 5f039d309ee..994ca424e07 100644 --- a/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml +++ b/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml @@ -89,7 +89,7 @@ parent: [ClothingShoesBase, PowerCellSlotSmallItem, BaseToggleClothing] id: ClothingShoesBootsSpeed name: speed boots - description: High-tech boots woven with quantum fibers, able to convert electricity into pure speed! + description: High-tech boots with interwoven bluespace fibers, able to convert electricity into pure speed! # DeltaV illegal ops components: - type: Sprite sprite: Clothing/Shoes/Boots/speedboots.rsi @@ -101,8 +101,8 @@ - type: ToggleClothing action: ActionToggleSpeedBoots - type: ClothingSpeedModifier - walkModifier: 1.15 # Frontier 1.5<1.15 - sprintModifier: 1.15 # Frontier 1.5<1.15 + walkModifier: 1.7 # DeltaV + sprintModifier: 1.7 # DeltaV - type: Appearance - type: GenericVisualizer visuals: @@ -113,7 +113,7 @@ - type: StaticPrice price: 500 - type: PowerCellDraw - drawRate: 4 + drawRate: 30 # DeltaV 4>30, you have to turn off micro reactor at somepoint - type: ToggleCellDraw - type: ItemSlots slots: diff --git a/Resources/Prototypes/Entities/Structures/Machines/flatpacker.yml b/Resources/Prototypes/Entities/Structures/Machines/flatpacker.yml index 8c95b09fb6b..c0e64b263ef 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/flatpacker.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/flatpacker.yml @@ -82,6 +82,8 @@ - machine_parts - machine_board - board_slot + - type: MaterialStorageMagnetPickup # Frontier + range: 0.30 # Frontier # - type: StaticPrice # Frontier # price: 2000 diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 1037e79ae02..208080408b6 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -1045,6 +1045,7 @@ - PowerCellSmall # Frontier - BlankMediPen # Frontier - MedicalAppraisalTool # Frontier + - HandheldCrewMonitor # Frontier dynamicRecipes: - ChemicalPayload - CryostasisBeaker @@ -1409,6 +1410,8 @@ - MaterialBananium1 - MaterialDiamond - BluespaceCrystal #Nyano - Summary: Bluespace Crystals can be created here. + - type: PlaceableSurface # DeltaV: Allow ore bags to dump into it directly + isPlaceable: false # but not place on it if you just click it with a random item - type: entity parent: OreProcessor diff --git a/Resources/Prototypes/Entities/Structures/Shuttles/station_anchor.yml b/Resources/Prototypes/Entities/Structures/Shuttles/station_anchor.yml index f2c8e21dfc4..3df9fd100ac 100644 --- a/Resources/Prototypes/Entities/Structures/Shuttles/station_anchor.yml +++ b/Resources/Prototypes/Entities/Structures/Shuttles/station_anchor.yml @@ -94,7 +94,7 @@ sound: collection: MetalBreak - type: StaticPrice - price: 10000 + price: 300 # Frontier 10000<300 - type: Machine board: StationAnchorCircuitboard - type: ContainerContainer diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml index 64622172a9c..a685f27b714 100644 --- a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml +++ b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml @@ -15,7 +15,6 @@ canBeAntag: false icon: "JobIconPrisoner" supervisors: job-supervisors-prisoner - weight: 10 # Frontier displayWeight: 10 # Frontier special: - !type:AddImplantSpecial diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/seats.yml b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/seats.yml index 18dcaf04031..ff4647e483a 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/seats.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/seats.yml @@ -191,53 +191,62 @@ steps: - tool: Screwing doAfter: 1 - - #Frontier: fancy wooden chairs + # Frontier: fancy wooden chairs - to: chairWoodFancyBlack + conditions: + - !type:NFStrapEmpty steps: - material: FloorCarpetBlack amount: 1 - - to: chairWoodFancyBlue + conditions: + - !type:NFStrapEmpty steps: - material: FloorCarpetBlue amount: 1 - - to: chairWoodFancyCyan + conditions: + - !type:NFStrapEmpty steps: - material: FloorCarpetCyan amount: 1 - - to: chairWoodFancyGreen + conditions: + - !type:NFStrapEmpty steps: - material: FloorCarpetGreen amount: 1 - - to: chairWoodFancyOrange + conditions: + - !type:NFStrapEmpty steps: - material: FloorCarpetOrange amount: 1 - - - to: chairWoodFancyPurple - steps: - - material: FloorCarpetPurple - amount: 1 - - to: chairWoodFancyPink + conditions: + - !type:NFStrapEmpty steps: - material: FloorCarpetPink amount: 1 - + - to: chairWoodFancyPurple + conditions: + - !type:NFStrapEmpty + steps: + - material: FloorCarpetPurple + amount: 1 - to: chairWoodFancyRed + conditions: + - !type:NFStrapEmpty steps: - material: FloorCarpetRed amount: 1 - - to: chairWoodFancyWhite + conditions: + - !type:NFStrapEmpty steps: - material: FloorCarpetWhite amount: 1 - #End Frontier + # End Frontier - node: chairMeat entity: ChairMeat @@ -329,6 +338,8 @@ entity: ChairWoodFancyBlack edges: - to: chairWood + conditions: + - !type:NFStrapEmpty completed: - !type:SpawnPrototype prototype: FloorCarpetItemBlack @@ -341,6 +352,8 @@ entity: ChairWoodFancyBlue edges: - to: chairWood + conditions: + - !type:NFStrapEmpty completed: - !type:SpawnPrototype prototype: FloorCarpetItemBlue @@ -353,6 +366,8 @@ entity: ChairWoodFancyCyan edges: - to: chairWood + conditions: + - !type:NFStrapEmpty completed: - !type:SpawnPrototype prototype: FloorCarpetItemCyan @@ -365,6 +380,8 @@ entity: ChairWoodFancyGreen edges: - to: chairWood + conditions: + - !type:NFStrapEmpty completed: - !type:SpawnPrototype prototype: FloorCarpetItemGreen @@ -377,6 +394,8 @@ entity: ChairWoodFancyOrange edges: - to: chairWood + conditions: + - !type:NFStrapEmpty completed: - !type:SpawnPrototype prototype: FloorCarpetItemOrange @@ -385,25 +404,29 @@ - tool: Prying doAfter: 1 - - node: chairWoodFancyPink - entity: ChairWoodFancyPink + - node: chairWoodFancyPurple + entity: ChairWoodFancyPurple edges: - to: chairWood + conditions: + - !type:NFStrapEmpty completed: - !type:SpawnPrototype - prototype: FloorCarpetItemPink + prototype: FloorCarpetItemPurple amount: 1 steps: - tool: Prying doAfter: 1 - - node: chairWoodFancyPurple - entity: ChairWoodFancyPurple + - node: chairWoodFancyPink + entity: ChairWoodFancyPink edges: - to: chairWood + conditions: + - !type:NFStrapEmpty completed: - !type:SpawnPrototype - prototype: FloorCarpetItemPurple + prototype: FloorCarpetItemPink amount: 1 steps: - tool: Prying @@ -413,6 +436,8 @@ entity: ChairWoodFancyRed edges: - to: chairWood + conditions: + - !type:NFStrapEmpty completed: - !type:SpawnPrototype prototype: FloorCarpetItemRed @@ -425,6 +450,8 @@ entity: ChairWoodFancyWhite edges: - to: chairWood + conditions: + - !type:NFStrapEmpty completed: - !type:SpawnPrototype prototype: FloorCarpetItemWhite @@ -432,3 +459,4 @@ steps: - tool: Prying doAfter: 1 + # End Frontier diff --git a/Resources/Prototypes/Recipes/Lathes/misc.yml b/Resources/Prototypes/Recipes/Lathes/misc.yml index a0e74fc34e2..d74f76bc4c3 100644 --- a/Resources/Prototypes/Recipes/Lathes/misc.yml +++ b/Resources/Prototypes/Recipes/Lathes/misc.yml @@ -141,6 +141,7 @@ Steel: 1500 Plastic: 1000 Silver: 500 + Bluespace: 200 #DeltaV - type: latheRecipe id: ModularReceiver diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml index 1fc9b4b2e91..2b151e88215 100644 --- a/Resources/Prototypes/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/Roles/Jobs/departments.yml @@ -12,7 +12,7 @@ name: department-Civilian description: department-NFCivilian-description # Frontier color: "#9FED58" - weight: 0 # Frontier: -10<0 accounted for in jobs + weight: -10 roles: # - Bartender # Frontier # - Botanist # Frontier @@ -79,7 +79,7 @@ - Sheriff # Frontier - StationTrafficController # Frontier primary: false - weight: 2 # Frontier: 100<2 - accounted for in jobs + weight: 100 - type: department id: Engineering diff --git a/Resources/Prototypes/SoundCollections/lobby.yml b/Resources/Prototypes/SoundCollections/lobby.yml index 56062995a3a..914b2eca285 100644 --- a/Resources/Prototypes/SoundCollections/lobby.yml +++ b/Resources/Prototypes/SoundCollections/lobby.yml @@ -14,5 +14,3 @@ - /Audio/Lobby/pwmur.ogg # - /Audio/Lobby/lasers_rip_apart_the_bulkhead.ogg - /Audio/Lobby/every_light_is_blinking_at_once.ogg - - /Audio/_NF/Lobby/victory.ogg # Frontier - - /Audio/_NF/Lobby/shibamata.ogg # Frontier diff --git a/Resources/Prototypes/Traits/speech.yml b/Resources/Prototypes/Traits/speech.yml index 98d0368ed6e..dca599eb1ff 100644 --- a/Resources/Prototypes/Traits/speech.yml +++ b/Resources/Prototypes/Traits/speech.yml @@ -9,6 +9,7 @@ components: - type: Accentless removes: + - type: GoblinAccent # Frontier - type: LizardAccent - type: MothAccent - type: ReplacementAccent diff --git a/Resources/Prototypes/_NF/Catalog/Cargo/cargo_materials.yml b/Resources/Prototypes/_NF/Catalog/Cargo/cargo_materials.yml index eee8c97f24e..e78102bc6e1 100644 --- a/Resources/Prototypes/_NF/Catalog/Cargo/cargo_materials.yml +++ b/Resources/Prototypes/_NF/Catalog/Cargo/cargo_materials.yml @@ -1,14 +1,3 @@ -- type: cargoProduct - id: Materials - abstract: true - icon: - sprite: Objects/Materials/Sheets/metal.rsi - state: steel_3 - product: CrateMaterials - cost: 8400 # TODO: Lower the cost back when possible - category: cargoproduct-category-name-materials - group: market - - type: cargoProduct id: MaterialUranium abstract: true diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Crates/materials.yml b/Resources/Prototypes/_NF/Catalog/Fills/Crates/materials.yml index 9d16c9afbde..41ad228c95c 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Crates/materials.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Crates/materials.yml @@ -1,17 +1,3 @@ -- type: entity - id: CrateMaterials - parent: CrateGenericSteel - name: materials crate - description: 1 stack of glass, plastic, steel, plasma and plasteel. - components: - - type: StorageFill - contents: - - id: SheetGlass - - id: SheetPlastic - - id: SheetSteel - - id: SheetPlasma - - id: SheetPlasteel - - type: entity id: CrateMaterialMetalRods parent: CrateGenericSteel @@ -33,3 +19,17 @@ contents: - id: MaterialBiomass amount: 3 + +# region Materials +- type: entity + parent: [ CrateGenericSteel, StorageFillMaterialsBasic ] + id: CrateMaterialsBasicFilled + suffix: Filled, Basic Materials (full) + name: materials crate + +- type: entity + parent: [ CrateGenericSteel, StorageFillMaterialsBasic10 ] + id: CrateMaterialsBasic10Filled + suffix: Filled, Basic Materials (10) + name: materials crate +# endregion Materials diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/misc.yml b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/misc.yml new file mode 100644 index 00000000000..c0d8ac39bb6 --- /dev/null +++ b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/misc.yml @@ -0,0 +1,11 @@ +# region Materials +- type: entity + parent: [ LockerMaterials, StorageFillMaterialsBasic ] + id: LockerMaterialsBasicFilled + suffix: Filled, Basic Materials (full) + +- type: entity + parent: [ LockerMaterials, StorageFillMaterialsBasic10 ] + id: LockerMaterialsBasic10Filled + suffix: Filled, Basic Materials (10) +# endregion Materials \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Catalog/Jukebox/Standard.yml b/Resources/Prototypes/_NF/Catalog/Jukebox/Standard.yml index 65c475f5e2b..a7f17842243 100644 --- a/Resources/Prototypes/_NF/Catalog/Jukebox/Standard.yml +++ b/Resources/Prototypes/_NF/Catalog/Jukebox/Standard.yml @@ -1,3 +1,15 @@ +- type: jukebox + id: victory + name: Koruu Chan - Victory + path: + path: /Audio/_NF/Jukebox/victory.ogg + +- type: jukebox + id: shibamata + name: Shibamata + path: + path: /Audio/_NF/Jukebox/shibamata.ogg + - type: jukebox id: lateraligator name: Silverman Sound Studios - Later Alligator @@ -8,4 +20,4 @@ id: frontierarrivals name: Troglodyte71 - Frontier Arrivals path: - path: /Audio/_NF/Jukebox/frontier-arrivals.ogg \ No newline at end of file + path: /Audio/_NF/Jukebox/frontier-arrivals.ogg diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/cart.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/cart.yml index 9acdca52da8..16c563a7236 100644 --- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/cart.yml +++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/cart.yml @@ -23,7 +23,7 @@ DeskBell: 4294967295 #Infinite EncryptionKeySecurity: 4294967295 #Infinite EncryptionKeyService: 4294967295 #Infinite - EncryptionKeyNfsd: 5 + EncryptionKeyNfsd: 5 EncryptionKeyCommand: 5 - type: vendingMachineInventory @@ -38,6 +38,9 @@ ClothingHeadsetNfsdBrownCommon: 4294967295 #infinite ClothingHeadsetNfsdCreamCommon: 4294967295 #infinite ClothingHeadsetNfsdGreenCommon: 4294967295 #infinite + ClearNFPDA: 4294967295 #infinite + ContractorIDCard: 4294967295 #infinite + ClothingHeadsetGrey: 4294967295 #infinite RubberStampPal: 3 RubberStampApproved: 4294967295 #Infinite RubberStampDenied: 4294967295 #Infinite @@ -48,8 +51,11 @@ BoxEnvelope: 4 BoxFolderNfsdForms: 3 BoxFolderNfsdFormsBrown: 3 + BoxFolderGreen: 3 + BoxFolderRed: 3 HandLabeler: 4294967295 #Infinite EncryptionKeyNfsd: 4294967295 #Infinite + EncryptionKeyCommand: 5 ClothingOuterCoatNfsdFormal: 3 ClothingOuterCoatNfsdFormalSheriff: 3 ClothingOuterCoatNfsdLongCoat: 3 diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/cargo.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/cargo.yml index 5708a6d85b9..e423f4c643d 100644 --- a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/cargo.yml +++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/cargo.yml @@ -30,7 +30,6 @@ state: icon - type: RandomSpawner prototypes: - - CrateMaterials - CrateMaterialGlass - CrateMaterialPlastic - CrateMaterialPlasteel diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_engineering.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_engineering.yml index 00897e2159e..000f56191f5 100644 --- a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_engineering.yml +++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_engineering.yml @@ -280,7 +280,6 @@ - CrateMaterialPlasma - CrateMaterialUranium - CrateMaterialTextiles - - CrateMaterials - CrateMaterialBrass - WeldingFuelTankFull # Filled crates diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_general.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_general.yml index 4e2e68ff8e3..d775f5ad52f 100644 --- a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_general.yml +++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_general.yml @@ -327,7 +327,6 @@ - CrateMaterialPlasma - CrateMaterialUranium - CrateMaterialTextiles - - CrateMaterials - CrateMaterialBrass - CrateMaterialMetalRods - CrateMaterialPaper diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_research.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_research.yml index cf4e39b2190..f82e6d22d52 100644 --- a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_research.yml +++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_research.yml @@ -142,7 +142,6 @@ - CrateMaterialPlasma - CrateMaterialUranium - CrateMaterialTextiles - - CrateMaterials - CrateMaterialBrass - CrateMaterialMetalRods - CrateMaterialPaper diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_expeditions_xeno.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_expeditions_xeno.yml index 14cf1e253e3..7b4b8794379 100644 --- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_expeditions_xeno.yml +++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_expeditions_xeno.yml @@ -1,6 +1,6 @@ # BASE - type: entity - parent: [ MobNonHumanHostileBase, NFMobRestrictions ] + parent: [ NFMobRestrictions, MobNonHumanHostileBase ] id: BaseMobXenoExpeditions name: xeno description: They mostly come at night. Mostly. @@ -86,6 +86,14 @@ speechVerb: LargeMob - type: Perishable #Ummmm the acid kills a lot of the bacteria or something molsPerSecondPerUnitMass: 0.0005 + - type: Body # Needed for meat spike + prototype: Animal + - type: TriggerOnBeingGibbed + - type: GibOnTrigger # Needed to remove organs from body definition + deleteItems: true + deleteOrgans: true + gib: false + useArgumentEntity: true - type: Tag tags: - CannotSuicide diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_syndicate.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_syndicate.yml index b942b4e59e0..3186f565dc5 100644 --- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_syndicate.yml +++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_syndicate.yml @@ -485,6 +485,7 @@ parent: - MobHumanoidHostileBase - MobHumanoidHostileAISimpleMelee + - NFMobRestrictions id: MobExperimentationVictim categories: [ HideSpawnMenu ] components: @@ -501,6 +502,10 @@ - type: HTN rootTask: task: SimpleHumanoidHostileCompound + - type: NFSalvageMobRestrictions + despawnIfOffLinkedGrid: false + addComponentsOnDeath: [] + removeComponentsOnDeath: [] # Syndicate Commander, "armed" with AK - type: entity diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/silicon.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/silicon.yml index d7ef2fd5e6c..a5e71d7b380 100644 --- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/silicon.yml +++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/silicon.yml @@ -47,6 +47,7 @@ parent: - MobCleanBot - BaseC3SyndicateContrabandNoValue + - NFMobRestrictions id: MobCleanBotSyndie name: syndicate cleanbot description: The creep of automation now threatening space janitors with a knife. @@ -59,3 +60,7 @@ - type: HTN rootTask: task: CleanbotCompound + - type: NFSalvageMobRestrictions + despawnIfOffLinkedGrid: false + addComponentsOnDeath: [] + removeComponentsOnDeath: [] diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/drinks_special.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/drinks_special.yml new file mode 100644 index 00000000000..aa1b02ed101 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/drinks_special.yml @@ -0,0 +1,17 @@ +- type: entity + parent: [BaseItem, BartenderMixer] + id: DrinkIceBucketEmpty + name: ice bucket + suffix: Empty + description: A special bucket that was specifically designed to hold ice. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 200 + - type: Sprite + sprite: Objects/Consumable/Drinks/icebucket.rsi + state: icon + - type: PhysicalComposition + materialComposition: + Steel: 50 diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/Containers/condiments.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/Containers/condiments.yml index 6b43a731960..879d46639c8 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/Containers/condiments.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/Containers/condiments.yml @@ -86,3 +86,39 @@ - type: SolutionContainerVisuals maxFillLevels: 6 fillBaseName: squeeze-bottle-clear + +- type: entity + parent: [DrinkBottleVisualsAll, DrinkBottleGlassBaseFull] + id: FoodCondimentBottleSoysauce + name: soy sauce bottle + description: Used to season dishes to umami perfection. With extra sodium! + components: + - type: Appearance + - type: GenericVisualizer + visuals: + enum.OpenableVisuals.Opened: + enum.OpenableVisuals.Layer: + True: {state: "icon_open"} + False: {state: "icon_empty"} + - type: Item + size: Small + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: Soysauce + Quantity: 30 + - type: SolutionTransfer + playTransferSound: false + canChangeTransferAmount: true + minTransferAmount: 1 + maxTransferAmount: 5 + - type: Sprite + sprite: _NF/Objects/Consumable/Food/soysauce.rsi + state: icon + - type: Openable + closeable: true + - type: SolutionContainerVisuals + maxFillLevels: 5 + fillBaseName: fill- diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/meals.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/meals.yml index 2a16a535a9c..1a37b7f73da 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/meals.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/meals.yml @@ -361,3 +361,193 @@ - type: Tag tags: - Fruit + +- type: entity + name: basic noodles + parent: FoodBowlBase + id: FoodMealBasicNoodles + description: A simple ramen bowl of noodles and broth. Yum! + components: + - type: FlavorProfile + flavors: + - finenoodles + - richbroth + - type: Sprite + sprite: _NF/Objects/Consumable/Food/bowl.rsi + layers: + - state: bowl + - state: basic-noodles + - type: SolutionContainerManager + solutions: + food: + maxVol: 35 + reagents: + - ReagentId: Nutriment + Quantity: 15 + - ReagentId: Flavorol + Quantity: 10 + +- type: entity + name: miso noodles + parent: FoodBowlBase + id: FoodMealMisoNoodles + description: Miso, or fermented bean paste, broth with scallion and egg. Robust! + components: + - type: FlavorProfile + flavors: + - finenoodles + - richbroth + - tangy + - type: Sprite + sprite: _NF/Objects/Consumable/Food/bowl.rsi + layers: + - state: bowl + - state: miso-noodles + - type: SolutionContainerManager + solutions: + food: + maxVol: 35 + reagents: + - ReagentId: Nutriment + Quantity: 15 + - ReagentId: Vitamin + Quantity: 5 + - ReagentId: Flavorol + Quantity: 10 + - ReagentId: Protein + Quantity: 3 + - type: Tag + tags: + - Meat + +- type: entity + name: shio noodles + parent: FoodBowlBase + id: FoodMealShioNoodles + description: Sea salt broth with corn and seaweed. Light! + components: + - type: FlavorProfile + flavors: + - finenoodles + - richbroth + - type: Sprite + sprite: _NF/Objects/Consumable/Food/bowl.rsi + layers: + - state: bowl + - state: shio-noodles + - type: SolutionContainerManager + solutions: + food: + maxVol: 35 + reagents: + - ReagentId: Nutriment + Quantity: 15 + - ReagentId: Vitamin + Quantity: 5 + - ReagentId: Flavorol + Quantity: 10 + - ReagentId: Protein + Quantity: 3 + - type: Tag + tags: + - Vegetable + +- type: entity + name: shoyu noodles + parent: FoodBowlBase + id: FoodMealShoyuNoodles + description: Soy sauce broth with corn, egg, and pork. Salty! + components: + - type: FlavorProfile + flavors: + - finenoodles + - richbroth + - savory + - type: Sprite + sprite: _NF/Objects/Consumable/Food/bowl.rsi + layers: + - state: bowl + - state: shoyu-noodles + - type: SolutionContainerManager + solutions: + food: + maxVol: 35 + reagents: + - ReagentId: Nutriment + Quantity: 15 + - ReagentId: Vitamin + Quantity: 5 + - ReagentId: Flavorol + Quantity: 10 + - ReagentId: Protein + Quantity: 3 + - type: Tag + tags: + - Vegetable + - Meat + +- type: entity + name: spicy noodles + parent: FoodBowlBase + id: FoodMealSpicyNoodles + description: A not-so-simple ramen bowl of noodles, broth, and tofu. Hot! + components: + - type: FlavorProfile + flavors: + - finenoodles + - tofu + - spicy + - type: Sprite + sprite: _NF/Objects/Consumable/Food/bowl.rsi + layers: + - state: bowl + - state: spicy-noodles + - type: SolutionContainerManager + solutions: + food: + maxVol: 35 + reagents: + - ReagentId: Nutriment + Quantity: 15 + - ReagentId: Vitamin + Quantity: 5 + - ReagentId: Flavorol + Quantity: 10 + - ReagentId: CapsaicinOil + Quantity: 3 + - type: Tag + tags: + - Vegetable + +- type: entity + name: tonkatsu noodles + parent: FoodBowlBase + id: FoodMealTonkatsuNoodles + description: Pork bone broth with garlic and pork. Rich! + components: + - type: FlavorProfile + flavors: + - finenoodles + - savory + - garlic + - type: Sprite + sprite: _NF/Objects/Consumable/Food/bowl.rsi + layers: + - state: bowl + - state: tonkatsu-noodles + - type: SolutionContainerManager + solutions: + food: + maxVol: 35 + reagents: + - ReagentId: Nutriment + Quantity: 15 + - ReagentId: Vitamin + Quantity: 5 + - ReagentId: Flavorol + Quantity: 10 + - ReagentId: Protein + Quantity: 3 + - type: Tag + tags: + - Meat diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index 08c384c9551..6f303ea0bb9 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -141,7 +141,7 @@ description: A modification of a civilian-grade laser pistol that can project holoflares onto surfaces. components: - type: Sprite - sprite: _NF/Objects/Weapons/Guns/Battery/holoflare_pistol.yml + sprite: _NF/Objects/Weapons/Guns/Battery/holoflare_pistol.rsi layers: - state: base map: ["enum.GunVisualLayers.Base"] diff --git a/Resources/Prototypes/_NF/Entities/Structures/Dispensers/condiments.yml b/Resources/Prototypes/_NF/Entities/Structures/Dispensers/condiments.yml index f0b25439ebb..ab07a3d5961 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Dispensers/condiments.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Dispensers/condiments.yml @@ -5,6 +5,20 @@ suffix: Filled description: A condiment dispenser with a single slot for a condiment cup. components: + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeAabb + bounds: "-0.3,-0.16,0.3,0.40" + mask: + - Impassable # Frontier +# - MidImpassable # Frontier - Do not add this, it will block shutters from closing on it. + - LowImpassable # Frontier +# - MachineMask # Frontier +# layer: # Frontier +# - MachineLayer # Frontier + density: 190 - type: Rotatable - type: Sprite sprite: _NF/Structures/smalldispensers.rsi diff --git a/Resources/Prototypes/_NF/Entities/Structures/Furniture/icebox.yml b/Resources/Prototypes/_NF/Entities/Structures/Furniture/icebox.yml new file mode 100644 index 00000000000..7cecd0fd444 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Structures/Furniture/icebox.yml @@ -0,0 +1,39 @@ +- type: entity + name: ice box + description: This delightful machine is slowly filling with ice! + id: IceboxEmpty + parent: SinkEmpty + components: + - type: Sprite + sprite: _NF/Structures/Furniture/icebox.rsi + layers: + - state: icebox + - map: [ "enum.SolutionContainerLayers.Fill" ] + state: icebox_fill-1 + visible: false + - type: Appearance + - type: SolutionContainerVisuals + maxFillLevels: 1 + fillBaseName: icebox_fill- + solutionName: drainBuffer + - type: SolutionRegeneration + solution: tank + generated: + reagents: + - ReagentId: Ice + Quantity: 1 + +- type: entity + name: ice box + id: Icebox + parent: IceboxEmpty + suffix: Ice + components: + - type: SolutionContainerManager + solutions: + drainBuffer: + maxVol: 100 + tank: + reagents: + - ReagentId: Ice + Quantity: 500 diff --git a/Resources/Prototypes/_NF/Entities/Structures/Lighting/ground_lighting.yml b/Resources/Prototypes/_NF/Entities/Structures/Lighting/ground_lighting.yml index cdf5befc804..dd93bfd5d76 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Lighting/ground_lighting.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Lighting/ground_lighting.yml @@ -8,4 +8,4 @@ - state: base map: [ "enum.PoweredLightLayers.Base" ] - type: PoweredLight - hasLampOnSpawn: PoweredlightRed + hasLampOnSpawn: LightTubeCrystalRed diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml index 1bdfeedf63a..5a227ee8ae2 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml @@ -74,6 +74,7 @@ - LedLightTube - SodiumLightTube - ExteriorLightTube + - LightTubeCrystalBlack - LightBulb - LedLightBulb - SodiumLightBulb @@ -117,6 +118,7 @@ - DrinkMug - DrinkMugMetal - DrinkGlass + - DrinkIceBucketEmpty - KitchenKnife - ButchCleaver - ServiceRollingPin @@ -534,6 +536,13 @@ - TargetHuman - TargetSyndicate - WeaponDisablerPractice + - SpeedLoaderRifleHeavyRubber + - SpeedLoaderMagnumRubber + - MagazineRifleRubber + - MagazineShotgunBeanbag + - MagazineShotgunSlug + - MagazinePistolRubber + - MagazineLightRifleRubber # - WeaponFlareGunSecurity - WeaponLaserCarbinePractice - Zipties @@ -717,11 +726,19 @@ - MagazineBoxRifle - CrossbowBolt - CrossbowBoltBroadhead + - BoxBeanbag + - BoxShotgunSlug + - MagazineBoxLightRifleRubber + - MagazineBoxMagnumRubber + - MagazineBoxPistolRubber + - MagazineBoxRifleRubber ## Mags / Speedloaders / Clips - MagazineNovaliteC1Empty - MagazineNovaliteC1 + - MagazineNovaliteC1Rubber - MagazineLightRifleLowCapacityEmpty - MagazineLightRifleLowCapacity + - MagazineLightRifleLowCapacityRubber - MagazineLightRifle - MagazineLightRifleEmpty - MagazineRifle @@ -730,6 +747,13 @@ - MagazinePistolEmpty - SpeedLoaderRifleHeavy - SpeedLoaderRifleHeavyEmpty + - SpeedLoaderRifleHeavyRubber + - SpeedLoaderMagnumRubber + - MagazineRifleRubber + - MagazineShotgunSlug + - MagazinePistolRubber + - MagazineLightRifleRubber + - MagazineShotgunBeanbag dynamicRecipes: # Shared lathe recipes ## Advanced tools diff --git a/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/Lockers/lockers.yml index 80c4fd64ad8..1e94e935ee8 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/Lockers/lockers.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/Lockers/lockers.yml @@ -56,6 +56,41 @@ stateDoorOpen: pilot_open stateDoorClosed: pilot_door +# Materials +- type: entity + id: LockerMaterials + parent: NFLockerBaseSecure + name: materials locker + components: + - type: Appearance + - type: EntityStorageVisuals + stateBaseClosed: secure + stateDoorOpen: secure_open + stateDoorClosed: secure_door + - type: GenericVisualizer + visuals: + enum.StorageVisuals.Open: + decal1: + True: { visible: false } + False: { visible: true } + decal2: + True: { visible: false } + False: { visible: true } + - type: Sprite + layers: + - state: secure + map: ["enum.StorageVisualLayers.Base"] + - state: secure_door + map: ["enum.StorageVisualLayers.Door"] + - state: door-decal-engi-01 + map: [ decal1 ] + color: "#ad8c27" + - state: welded + visible: false + map: ["enum.WeldableLayers.BaseWelded"] + - state: locked + map: ["enum.LockVisualLayers.Lock"] + # Wooden Cabinet - type: entity id: LockerWoodenGeneric diff --git a/Resources/Prototypes/_NF/Entities/World/Debris/base_debris.yml b/Resources/Prototypes/_NF/Entities/World/Debris/base_debris.yml index fe24ffd6c0a..06273f90cfa 100644 --- a/Resources/Prototypes/_NF/Entities/World/Debris/base_debris.yml +++ b/Resources/Prototypes/_NF/Entities/World/Debris/base_debris.yml @@ -6,5 +6,7 @@ - type: LocalityLoader - type: GCAbleObject queue: SpaceDebris + - type: LinkedLifecycleGridParent - type: ProtectedGrid - preventArtifactTriggers: true \ No newline at end of file + preventArtifactTriggers: true + - type: PreventPilot diff --git a/Resources/Prototypes/_NF/Events/nf_bluespace_dungeons_events.yml b/Resources/Prototypes/_NF/Events/nf_bluespace_dungeons_events.yml index fbaf8d45ee7..4abd96077dd 100644 --- a/Resources/Prototypes/_NF/Events/nf_bluespace_dungeons_events.yml +++ b/Resources/Prototypes/_NF/Events/nf_bluespace_dungeons_events.yml @@ -41,6 +41,7 @@ - type: LinkedLifecycleGridParent - type: ProtectedGrid preventArtifactTriggers: true + - type: PreventPilot protos: - NFVGRoidBasalt diff --git a/Resources/Prototypes/_NF/Events/nf_bluespace_grids_events.yml b/Resources/Prototypes/_NF/Events/nf_bluespace_grids_events.yml index 9ff65d1e4bf..6b849df3af1 100644 --- a/Resources/Prototypes/_NF/Events/nf_bluespace_grids_events.yml +++ b/Resources/Prototypes/_NF/Events/nf_bluespace_grids_events.yml @@ -32,6 +32,9 @@ angularDamping: 999999 linearDamping: 999999 - type: LinkedLifecycleGridParent + - type: ProtectedGrid + preventArtifactTriggers: true + - type: PreventPilot paths: - /Maps/_NF/Bluespace/cache.yml rewardAccounts: @@ -71,6 +74,9 @@ angularDamping: 999999 linearDamping: 999999 - type: LinkedLifecycleGridParent + - type: ProtectedGrid + preventArtifactTriggers: true + - type: PreventPilot paths: - /Maps/_NF/Bluespace/vault.yml rewardAccounts: @@ -111,6 +117,9 @@ angularDamping: 999999 linearDamping: 999999 - type: LinkedLifecycleGridParent + - type: ProtectedGrid + preventArtifactTriggers: true + - type: PreventPilot paths: - /Maps/_NF/Bluespace/vaultsmall.yml rewardAccounts: @@ -149,6 +158,9 @@ angularDamping: 999999 linearDamping: 999999 - type: LinkedLifecycleGridParent + - type: ProtectedGrid + preventArtifactTriggers: true + - type: PreventPilot paths: - /Maps/_NF/Bluespace/syndieftlintercept.yml @@ -185,6 +197,9 @@ angularDamping: 999999 linearDamping: 999999 - type: LinkedLifecycleGridParent + - type: ProtectedGrid + preventArtifactTriggers: true + - type: PreventPilot paths: - /Maps/_NF/Bluespace/wizardprobealt.yml @@ -221,6 +236,9 @@ angularDamping: 999999 linearDamping: 999999 - type: LinkedLifecycleGridParent + - type: ProtectedGrid + preventArtifactTriggers: true + - type: PreventPilot paths: - /Maps/_NF/Bluespace/bloodmoon.yml @@ -255,6 +273,9 @@ angularDamping: 999999 linearDamping: 999999 - type: LinkedLifecycleGridParent + - type: ProtectedGrid + preventArtifactTriggers: true + - type: PreventPilot paths: - /Maps/_NF/Bluespace/cave.yml @@ -286,5 +307,8 @@ addComponents: - type: IFF - type: LinkedLifecycleGridParent + - type: ProtectedGrid + preventArtifactTriggers: true + - type: PreventPilot paths: - /Maps/_NF/Bluespace/mcevent.yml diff --git a/Resources/Prototypes/_NF/Events/nf_bluespace_salvage_events.yml b/Resources/Prototypes/_NF/Events/nf_bluespace_salvage_events.yml index bd126439dfc..64609585209 100644 --- a/Resources/Prototypes/_NF/Events/nf_bluespace_salvage_events.yml +++ b/Resources/Prototypes/_NF/Events/nf_bluespace_salvage_events.yml @@ -27,6 +27,9 @@ - type: IFF color: "#AAAAAA" - type: LinkedLifecycleGridParent + - type: ProtectedGrid + preventArtifactTriggers: true + - type: PreventPilot paths: - /Maps/_NF/Shuttles/Scrap/bison.yml # - /Maps/_NF/Shuttles/Scrap/canister.yml # Too small diff --git a/Resources/Prototypes/_NF/Flavors/flavors.yml b/Resources/Prototypes/_NF/Flavors/flavors.yml index 3178c09951e..567e44f6e7a 100644 --- a/Resources/Prototypes/_NF/Flavors/flavors.yml +++ b/Resources/Prototypes/_NF/Flavors/flavors.yml @@ -52,3 +52,18 @@ id: wassail flavorType: Complex description: flavor-complex-wassail + +- type: flavor + id: finenoodles + flavorType: Complex + description: flavor-complex-fine-noodles + +- type: flavor + id: richbroth + flavorType: Complex + description: flavor-complex-rich-broth + +- type: flavor + id: tangy + flavorType: Complex + description: flavor-complex-tangy diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/jumpsuit.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/jumpsuit.yml index 9c0a0d4b5f4..82a4096eadb 100644 --- a/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/jumpsuit.yml +++ b/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/jumpsuit.yml @@ -908,6 +908,166 @@ equipment: jumpsuit: ClothingUniformJumpskirtLawyerGood +- type: loadout + id: ContractorClothingUniformJumpskirtBlackElegantDress + name: black elegant dress + effects: + - !type:GroupLoadoutEffect + proto: ContractorT1 + price: 500 + equipment: + jumpsuit: ClothingUniformJumpskirtBlackElegantDress + +- type: loadout + id: ContractorClothingUniformJumpskirtRedElegantDress + name: red elegant dress + effects: + - !type:GroupLoadoutEffect + proto: ContractorT1 + price: 500 + equipment: + jumpsuit: ClothingUniformJumpskirtRedElegantDress + +- type: loadout + id: ContractorClothingUniformJumpskirtGreenElegantDress + name: green elegant dress + effects: + - !type:GroupLoadoutEffect + proto: ContractorT1 + price: 500 + equipment: + jumpsuit: ClothingUniformJumpskirtGreenElegantDress + +- type: loadout + id: ContractorClothingUniformJumpskirtBlueElegantDress + name: blue elegant dress + effects: + - !type:GroupLoadoutEffect + proto: ContractorT1 + price: 500 + equipment: + jumpsuit: ClothingUniformJumpskirtBlueElegantDress + +- type: loadout + id: ContractorClothingUniformJumpskirtPurpleElegantDress + name: purple elegant dress + effects: + - !type:GroupLoadoutEffect + proto: ContractorT1 + price: 500 + equipment: + jumpsuit: ClothingUniformJumpskirtPurpleElegantDress + +- type: loadout + id: ContractorClothingUniformJumpskirtCyanStripedDress + name: cyan striped dress + effects: + - !type:GroupLoadoutEffect + proto: ContractorT1 + price: 500 + equipment: + jumpsuit: ClothingUniformJumpskirtCyanStripedDress + +- type: loadout + id: ContractorClothingUniformJumpskirtRedStripedDress + name: red striped dress + effects: + - !type:GroupLoadoutEffect + proto: ContractorT1 + price: 500 + equipment: + jumpsuit: ClothingUniformJumpskirtRedStripedDress + +- type: loadout + id: ContractorClothingUniformJumpskirtGreenStripedDress + name: green striped dress + effects: + - !type:GroupLoadoutEffect + proto: ContractorT1 + price: 500 + equipment: + jumpsuit: ClothingUniformJumpskirtGreenStripedDress + +- type: loadout + id: ContractorClothingUniformJumpskirtPinkStripedDress + name: pink striped dress + effects: + - !type:GroupLoadoutEffect + proto: ContractorT1 + price: 500 + equipment: + jumpsuit: ClothingUniformJumpskirtPinkStripedDress + +- type: loadout + id: ContractorClothingUniformJumpskirtOrangeStripedDress + name: orange striped dress + effects: + - !type:GroupLoadoutEffect + proto: ContractorT1 + price: 500 + equipment: + jumpsuit: ClothingUniformJumpskirtOrangeStripedDress + +- type: loadout + id: ContractorClothingUniformJumpskirtPurpleTurtleneckDress + name: purple turtleneck dress + effects: + - !type:GroupLoadoutEffect + proto: ContractorT1 + price: 500 + equipment: + jumpsuit: ClothingUniformJumpskirtPurpleTurtleneckDress + +- type: loadout + id: ContractorClothingUniformJumpskirtRedTurtleneckDress + name: red turtleneck dress + effects: + - !type:GroupLoadoutEffect + proto: ContractorT1 + price: 500 + equipment: + jumpsuit: ClothingUniformJumpskirtRedTurtleneckDress + +- type: loadout + id: ContractorClothingUniformJumpskirtGreenTurtleneckDress + name: green turtleneck dress + effects: + - !type:GroupLoadoutEffect + proto: ContractorT1 + price: 500 + equipment: + jumpsuit: ClothingUniformJumpskirtGreenTurtleneckDress + +- type: loadout + id: ContractorClothingUniformJumpskirtBlueTurtleneckDress + name: blue turtleneck dress + effects: + - !type:GroupLoadoutEffect + proto: ContractorT1 + price: 500 + equipment: + jumpsuit: ClothingUniformJumpskirtBlueTurtleneckDress + +- type: loadout + id: ContractorClothingUniformJumpskirtYellowTurtleneckDress + name: yellow turtleneck dress + effects: + - !type:GroupLoadoutEffect + proto: ContractorT1 + price: 500 + equipment: + jumpsuit: ClothingUniformJumpskirtYellowTurtleneckDress + +- type: loadout + id: ContractorClothingUniformJumpskirtYellowOldDress + name: yellow old dress + effects: + - !type:GroupLoadoutEffect + proto: ContractorT1 + price: 500 + equipment: + jumpsuit: ClothingUniformJumpskirtYellowOldDress + # Punk stuff - type: loadout id: ContractorClothingUniformRandomPunkCroptop diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/tools.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/tools.yml index 2dbe0325de8..b14359e7b83 100644 --- a/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/tools.yml +++ b/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/tools.yml @@ -140,3 +140,27 @@ storage: back: - BibleUserImplanter + +- type: loadout + id: ContractorMonkeyCubeWrapped + name: monkey cube + description: Unwrap this to get a monkey cube. + previewEntity: MonkeyCubeWrapped + effects: + - !type:GroupLoadoutEffect + proto: ContractorT2 + price: 500 + inhand: + - MonkeyCubeWrapped + +- type: loadout + id: ContractorKoboldCubeWrapped + name: kobold cube + description: Unwrap this to get a kobold cube. + previewEntity: KoboldCubeWrapped + effects: + - !type:GroupLoadoutEffect + proto: ContractorT2 + price: 500 + inhand: + - KoboldCubeWrapped \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Loadouts/contractor_loadout_groups.yml b/Resources/Prototypes/_NF/Loadouts/contractor_loadout_groups.yml index 689dec9ac50..fe0fcd4d034 100644 --- a/Resources/Prototypes/_NF/Loadouts/contractor_loadout_groups.yml +++ b/Resources/Prototypes/_NF/Loadouts/contractor_loadout_groups.yml @@ -176,6 +176,23 @@ - ContractorClothingUniformJumpsuitMilitaryColorPurple - ContractorClothingUniformJumpsuitMilitaryColorLightBrown - ContractorClothingUniformJumpsuitMilitaryColorBrown + - ContractorClothingUniformJumpskirtBlackElegantDress + - ContractorClothingUniformJumpskirtRedElegantDress + - ContractorClothingUniformJumpskirtGreenElegantDress + - ContractorClothingUniformJumpskirtBlueElegantDress + - ContractorClothingUniformJumpskirtPurpleElegantDress + - ContractorClothingUniformJumpskirtCyanStripedDress + - ContractorClothingUniformJumpskirtRedStripedDress + - ContractorClothingUniformJumpskirtGreenStripedDress + - ContractorClothingUniformJumpskirtPinkStripedDress + - ContractorClothingUniformJumpskirtOrangeStripedDress + - ContractorClothingUniformJumpskirtPurpleTurtleneckDress + - ContractorClothingUniformJumpskirtRedTurtleneckDress + - ContractorClothingUniformJumpskirtGreenTurtleneckDress + - ContractorClothingUniformJumpskirtBlueTurtleneckDress + - ContractorClothingUniformJumpskirtYellowTurtleneckDress + - ContractorClothingUniformJumpskirtYellowOldDress + fallbacks: - ContractorClothingUniformJumpsuitColorGrey - ContractorClothingUniformJumpskirtColorGrey @@ -706,6 +723,8 @@ - ContractorHandheldCrewMonitor - ContractorHypoMini - ContractorBible + - ContractorMonkeyCubeWrapped + - ContractorKoboldCubeWrapped - type: loadoutGroup id: ContractorFun # Left Hand - 1 only diff --git a/Resources/Prototypes/_NF/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/_NF/Recipes/Cooking/meal_recipes.yml index 7be8a8bf2ab..389a2876679 100644 --- a/Resources/Prototypes/_NF/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/_NF/Recipes/Cooking/meal_recipes.yml @@ -663,3 +663,99 @@ recipeType: - Oven - Microwave + +# ramen + +- type: microwaveMealRecipe + id: RecipeBasicNoodles + name: basic noodles + result: FoodMealBasicNoodles + time: 10 + solids: + FoodBowlBig: 1 + FoodNoodlesBoiled: 1 + reagents: + Soysauce: 5 + Water: 15 + recipeType: + - Oven + +- type: microwaveMealRecipe + id: RecipeMisoNoodles + name: miso noodles + result: FoodMealMisoNoodles + time: 20 + solids: + FoodBowlBig: 1 + FoodNoodlesBoiled: 1 + FoodSoybeans: 1 + FoodEgg: 1 + FoodButterSlice: 1 + reagents: + Water: 20 + recipeType: + - Oven + +- type: microwaveMealRecipe + id: RecipeShioNoodles + name: shio noodles + result: FoodMealShioNoodles + time: 15 + solids: + FoodBowlBig: 1 + FoodNoodlesBoiled: 1 + FoodCorn: 1 + reagents: + Water: 20 + recipeType: + - Oven + +- type: microwaveMealRecipe + id: RecipeShoyuNoodles + name: shoyunoodles + result: FoodMealShoyuNoodles + time: 20 + solids: + FoodBowlBig: 1 + FoodNoodlesBoiled: 1 + FoodEgg: 1 + FoodCorn: 1 + FoodMeatBacon: 1 + reagents: + Soysauce: 10 + Water: 10 + recipeType: + - Oven + +- type: microwaveMealRecipe + id: RecipeSpicyNoodles + name: spicynoodles + result: FoodMealSpicyNoodles + time: 20 + solids: + FoodBowlBig: 1 + FoodNoodlesBoiled: 1 + FoodTofuSlice: 1 + FoodChiliPepper: 1 + reagents: + Soysauce: 5 + Water: 15 + recipeType: + - Oven + +- type: microwaveMealRecipe + id: RecipeTonkatsuNoodles + name: tonkatsu noodles + result: FoodMealTonkatsuNoodles + time: 20 + solids: + FoodBowlBig: 1 + FoodNoodlesBoiled: 1 + FoodSoybeans: 1 + FoodGarlic: 1 + FoodMeatBacon: 1 + reagents: + Soysauce: 5 + Water: 15 + recipeType: + - Oven diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/medical.yml b/Resources/Prototypes/_NF/Recipes/Lathes/medical.yml new file mode 100644 index 00000000000..cd6e76be1e5 --- /dev/null +++ b/Resources/Prototypes/_NF/Recipes/Lathes/medical.yml @@ -0,0 +1,9 @@ +- type: latheRecipe + id: HandheldCrewMonitor + result: HandheldCrewMonitor + category: Tools + completetime: 4 + materials: + Glass: 1200 + Steel: 1000 + Plastic: 1400 diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/security.yml b/Resources/Prototypes/_NF/Recipes/Lathes/security.yml index e3d7fc24d4b..4e14f94d445 100644 --- a/Resources/Prototypes/_NF/Recipes/Lathes/security.yml +++ b/Resources/Prototypes/_NF/Recipes/Lathes/security.yml @@ -30,12 +30,27 @@ materials: Steel: 245 # 20 [Steel per empty mag] + 15 [bullets] * 15 [Steel per bullet] +- type: latheRecipe # novalite rubber mag + id: MagazineNovaliteC1Rubber + parent: BaseAmmoRecipe + result: MagazineNovaliteC1Rubber + materials: + Steel: 82 #33% of 245 in steel + Plastic: 163 #66% of 245 + - type: latheRecipe # gestio mag empty id: MagazineLightRifleLowCapacityEmpty parent: BaseEmptyAmmoRecipe result: MagazineLightRifleLowCapacityEmpty materials: Steel: 20 +- type: latheRecipe # Gestio small rubber mag + id: MagazineLightRifleLowCapacityRubber + parent: BaseAmmoRecipe + result: MagazineLightRifleLowCapacityRubber + materials: + Steel: 82 #33% of cost in steel + Plastic: 163 #66% of 245 - type: latheRecipe # gestio mag id: MagazineLightRifleLowCapacity @@ -58,6 +73,14 @@ materials: Steel: 140 # 25 [Steel per empty mag] + 8 [bullets] * 15 [Steel per bullet] +- type: latheRecipe + id: SpeedLoaderRifleHeavyRubber #Argenti rubber loader + parent: BaseAmmoRecipe + result: SpeedLoaderRifleHeavyRubber + materials: + Steel: 47 #33% of cost in Steel + Plastic: 93 #66% of cost in Plastic + - type: latheRecipe id: SpeedLoaderRifleHeavyPractice parent: BaseAmmoRecipe @@ -82,6 +105,14 @@ Steel: 25 # 25 [Steel per empty mag] Plastic: 120 # 8 [bullets] * 15 [Plastic per bullet] +- type: latheRecipe + id: MagazinePistolRubber + parent: BaseAmmoRecipe + result: MagazinePistolRubber + materials: + Steel: 100 #50% of box cost + Plastic: 200 #50% of box cost + - type: latheRecipe id: MagazineBoxLightRifleRubber parent: BaseAmmoRecipe @@ -90,6 +121,14 @@ Steel: 300 Plastic: 600 +- type: latheRecipe + id: MagazineLightRifleRubber + parent: BaseAmmoRecipe + result: MagazineLightRifleRubber + materials: + Steel: 150 #50% of ammo box + Plastic: 300 #50% of ammo box + - type: latheRecipe id: MagazineBoxMagnumRubber parent: BaseAmmoRecipe @@ -98,6 +137,14 @@ Steel: 80 Plastic: 160 +- type: latheRecipe + id: SpeedLoaderMagnumRubber + parent: BaseAmmoRecipe + result: SpeedLoaderMagnumRubber + materials: + Steel: 40 #50% of ammo box + Plastic: 80 #50% of ammo box + - type: latheRecipe id: MagazineBoxPistolRubber parent: BaseAmmoRecipe @@ -113,6 +160,13 @@ materials: Steel: 250 Plastic: 500 +- type: latheRecipe + id: MagazineRifleRubber + parent: BaseAmmoRecipe + result: MagazineRifleRubber + materials: + Steel: 125 #50% of ammo box + Plastic: 250 #50% of ammo box - type: latheRecipe id: ShellTranquilizer # Removed upstream @@ -133,4 +187,4 @@ - type: latheRecipe id: HoloprojectorNfsd parent: ClothingEyesHudSecurity - result: HoloprojectorNfsdEmpty \ No newline at end of file + result: HoloprojectorNfsdEmpty diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/service.yml b/Resources/Prototypes/_NF/Recipes/Lathes/service.yml index 16738728adf..9c9d221e705 100644 --- a/Resources/Prototypes/_NF/Recipes/Lathes/service.yml +++ b/Resources/Prototypes/_NF/Recipes/Lathes/service.yml @@ -98,3 +98,11 @@ materials: Steel: 50 Glass: 50 + +- type: latheRecipe + id: DrinkIceBucketEmpty + result: DrinkIceBucketEmpty + parent: BaseServiceItemsRecipe + completetime: 2 + materials: + Steel: 100 diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Civilian/contractor.yml b/Resources/Prototypes/_NF/Roles/Jobs/Civilian/contractor.yml index e7c7e1374cc..8b6876c9a08 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/Civilian/contractor.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/Civilian/contractor.yml @@ -6,7 +6,6 @@ startingGear: ContractorGear icon: "JobIconContractor" supervisors: job-supervisors-hire - weight: -1 # Prioritize station & department jobs displayWeight: 40 # Top accessGroups: # Frontier - GeneralAccess # Frontier diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Civilian/mercenary.yml b/Resources/Prototypes/_NF/Roles/Jobs/Civilian/mercenary.yml index 7f433199fd7..47820530de6 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/Civilian/mercenary.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/Civilian/mercenary.yml @@ -10,7 +10,7 @@ canBeAntag: true icon: "JobIconMercenary" supervisors: job-supervisors-hire - weight: -1 # Prioritize station & department jobs + weight: 3 # Prioritize station & department jobs displayWeight: 20 # Second from the bottom setPreference: true access: diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Civilian/pilot.yml b/Resources/Prototypes/_NF/Roles/Jobs/Civilian/pilot.yml index e65a9a10086..5b44c5ff5f6 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/Civilian/pilot.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/Civilian/pilot.yml @@ -9,7 +9,7 @@ startingGear: PilotGear icon: "JobIconPilot" supervisors: job-supervisors-hire - weight: -1 # Prioritize station & department jobs + weight: 2 # Prioritize station & department jobs displayWeight: 30 # Second from the top accessGroups: # Frontier - GeneralAccess diff --git a/Resources/Prototypes/_NF/Roles/Jobs/departments.yml b/Resources/Prototypes/_NF/Roles/Jobs/departments.yml index 9057f9c8c93..d431d2a6c87 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/departments.yml @@ -3,7 +3,7 @@ name: department-Frontier description: department-NF-description color: "#334E6D" - weight: 1 # accounted for in jobs + weight: 50 # accounted for in jobs roles: - StationRepresentative - StationTrafficController @@ -17,7 +17,7 @@ name: department-Antag description: department-NFAntag-description color: "#DE3A3A" - weight: -1 # accounted for in jobs + weight: -20 # accounted for in jobs roles: - PirateCaptain - PirateFirstMate diff --git a/Resources/Prototypes/_NF/Shipyard/tyne.yml b/Resources/Prototypes/_NF/Shipyard/tyne.yml index e4f615d1d0a..395dc574e7d 100644 --- a/Resources/Prototypes/_NF/Shipyard/tyne.yml +++ b/Resources/Prototypes/_NF/Shipyard/tyne.yml @@ -7,13 +7,13 @@ # Discord: Tych0 # Shuttle Notes: -# +# Inspired by the Tyne-Class lifeboat: https://en.wikipedia.org/wiki/Tyne-class_lifeboat - type: vessel id: Tyne parent: BaseVessel name: SBB Tyne description: A small, agile lifeboat with an exterior deck and survivor cabin for search and rescue operations. - price: 20750 #~6% markup as it's a med ship. Appraises at ~19350. + price: 23000 #~5% markup as it's a med ship. Appraises at ~22474. category: Small group: Shipyard shuttlePath: /Maps/_NF/Shuttles/tyne.yml diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/bowl.rsi/basic-noodles.png b/Resources/Textures/_NF/Objects/Consumable/Food/bowl.rsi/basic-noodles.png new file mode 100644 index 00000000000..7c3ca70dd19 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Food/bowl.rsi/basic-noodles.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/bowl.rsi/meta.json b/Resources/Textures/_NF/Objects/Consumable/Food/bowl.rsi/meta.json index 0a3b323861d..2ceb8176a6a 100644 --- a/Resources/Textures/_NF/Objects/Consumable/Food/bowl.rsi/meta.json +++ b/Resources/Textures/_NF/Objects/Consumable/Food/bowl.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa. Fills created by potato1234_x, edited by Dusty Lens", + "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa. Fills created by potato1234_x, pears, avocado, greek by Dusty Lens, -noodles by wallfloweghost (discord)", "size": { "x": 32, "y": 32 @@ -16,6 +16,24 @@ { "name": "avocado" }, + { + "name": "basic-noodles" + }, + { + "name": "miso-noodles" + }, + { + "name": "shio-noodles" + }, + { + "name": "shoyu-noodles" + }, + { + "name": "spicy-noodles" + }, + { + "name": "tonkatsu-noodles" + }, { "name": "poachedpear" }, diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/bowl.rsi/miso-noodles.png b/Resources/Textures/_NF/Objects/Consumable/Food/bowl.rsi/miso-noodles.png new file mode 100644 index 00000000000..f5ee9aa91ae Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Food/bowl.rsi/miso-noodles.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/bowl.rsi/shio-noodles.png b/Resources/Textures/_NF/Objects/Consumable/Food/bowl.rsi/shio-noodles.png new file mode 100644 index 00000000000..fea572582a0 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Food/bowl.rsi/shio-noodles.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/bowl.rsi/shoyu-noodles.png b/Resources/Textures/_NF/Objects/Consumable/Food/bowl.rsi/shoyu-noodles.png new file mode 100644 index 00000000000..eede6fab3d6 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Food/bowl.rsi/shoyu-noodles.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/bowl.rsi/spicy-noodles.png b/Resources/Textures/_NF/Objects/Consumable/Food/bowl.rsi/spicy-noodles.png new file mode 100644 index 00000000000..fd597a3abf7 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Food/bowl.rsi/spicy-noodles.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/bowl.rsi/tonkatsu-noodles.png b/Resources/Textures/_NF/Objects/Consumable/Food/bowl.rsi/tonkatsu-noodles.png new file mode 100644 index 00000000000..a116fb02451 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Food/bowl.rsi/tonkatsu-noodles.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/soysauce.rsi/fill-1.png b/Resources/Textures/_NF/Objects/Consumable/Food/soysauce.rsi/fill-1.png new file mode 100644 index 00000000000..67507351576 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Food/soysauce.rsi/fill-1.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/soysauce.rsi/fill-2.png b/Resources/Textures/_NF/Objects/Consumable/Food/soysauce.rsi/fill-2.png new file mode 100644 index 00000000000..a3d5cdf4940 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Food/soysauce.rsi/fill-2.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/soysauce.rsi/fill-3.png b/Resources/Textures/_NF/Objects/Consumable/Food/soysauce.rsi/fill-3.png new file mode 100644 index 00000000000..ed62bd33dae Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Food/soysauce.rsi/fill-3.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/soysauce.rsi/fill-4.png b/Resources/Textures/_NF/Objects/Consumable/Food/soysauce.rsi/fill-4.png new file mode 100644 index 00000000000..0ec1498262f Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Food/soysauce.rsi/fill-4.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/soysauce.rsi/fill-5.png b/Resources/Textures/_NF/Objects/Consumable/Food/soysauce.rsi/fill-5.png new file mode 100644 index 00000000000..b0ef447bdc5 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Food/soysauce.rsi/fill-5.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/soysauce.rsi/icon.png b/Resources/Textures/_NF/Objects/Consumable/Food/soysauce.rsi/icon.png new file mode 100644 index 00000000000..670629b242f Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Food/soysauce.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/soysauce.rsi/icon_empty.png b/Resources/Textures/_NF/Objects/Consumable/Food/soysauce.rsi/icon_empty.png new file mode 100644 index 00000000000..65c53fa8d50 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Food/soysauce.rsi/icon_empty.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/soysauce.rsi/icon_open.png b/Resources/Textures/_NF/Objects/Consumable/Food/soysauce.rsi/icon_open.png new file mode 100644 index 00000000000..4d1a8b72d66 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Food/soysauce.rsi/icon_open.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/soysauce.rsi/meta.json b/Resources/Textures/_NF/Objects/Consumable/Food/soysauce.rsi/meta.json new file mode 100644 index 00000000000..7dd987eaf04 --- /dev/null +++ b/Resources/Textures/_NF/Objects/Consumable/Food/soysauce.rsi/meta.json @@ -0,0 +1,36 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "soysauce by wallflowerghost (discord), edited by DustyLens", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + + { + "name": "icon" + }, + { + "name": "icon_open" + }, + { + "name": "icon_empty" + }, + { + "name": "fill-1" + }, + { + "name": "fill-2" + }, + { + "name": "fill-3" + }, + { + "name": "fill-4" + }, + { + "name": "fill-5" + } + ] +} diff --git a/Resources/Textures/_NF/Structures/Furniture/icebox.rsi/icebox.png b/Resources/Textures/_NF/Structures/Furniture/icebox.rsi/icebox.png new file mode 100644 index 00000000000..0fdbd269475 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Furniture/icebox.rsi/icebox.png differ diff --git a/Resources/Textures/_NF/Structures/Furniture/icebox.rsi/icebox_fill-1.png b/Resources/Textures/_NF/Structures/Furniture/icebox.rsi/icebox_fill-1.png new file mode 100644 index 00000000000..2cab252864c Binary files /dev/null and b/Resources/Textures/_NF/Structures/Furniture/icebox.rsi/icebox_fill-1.png differ diff --git a/Resources/Textures/_NF/Structures/Furniture/icebox.rsi/meta.json b/Resources/Textures/_NF/Structures/Furniture/icebox.rsi/meta.json new file mode 100644 index 00000000000..f8b62ecf815 --- /dev/null +++ b/Resources/Textures/_NF/Structures/Furniture/icebox.rsi/meta.json @@ -0,0 +1,19 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Icebox based on sink-fill-1 and sink_wide-fill-1 made by Topy for SS14, edited by DustyLens", + "states": [ + { + "name": "icebox", + "directions": 4 + }, + { + "name": "icebox_fill-1", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_NF/Structures/Storage/closet.rsi/door-decal-engi-01.png b/Resources/Textures/_NF/Structures/Storage/closet.rsi/door-decal-engi-01.png new file mode 100644 index 00000000000..9deb0952451 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/closet.rsi/door-decal-engi-01.png differ diff --git a/Resources/Textures/_NF/Structures/Storage/closet.rsi/door-decal-null.png b/Resources/Textures/_NF/Structures/Storage/closet.rsi/door-decal-null.png new file mode 100644 index 00000000000..2975c479be7 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/closet.rsi/door-decal-null.png differ diff --git a/Resources/Textures/_NF/Structures/Storage/closet.rsi/generic_open.png b/Resources/Textures/_NF/Structures/Storage/closet.rsi/generic_open.png new file mode 100644 index 00000000000..01ed5bf73b6 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/closet.rsi/generic_open.png differ diff --git a/Resources/Textures/_NF/Structures/Storage/closet.rsi/meta.json b/Resources/Textures/_NF/Structures/Storage/closet.rsi/meta.json index 916317fe5b4..e72f740dbf3 100644 --- a/Resources/Textures/_NF/Structures/Storage/closet.rsi/meta.json +++ b/Resources/Textures/_NF/Structures/Storage/closet.rsi/meta.json @@ -19,9 +19,21 @@ { "name": "generic" }, + { + "name": "secure_door" + }, + { + "name": "secure_open" + }, + { + "name": "secure" + }, { "name": "generic_door" }, + { + "name": "generic_open" + }, { "name": "locked" }, @@ -135,6 +147,12 @@ }, { "name": "o2n2_door" + }, + { + "name": "door-decal-engi-01" + }, + { + "name": "door-decal-null" } ] } \ No newline at end of file diff --git a/Resources/Textures/_NF/Structures/Storage/closet.rsi/secure.png b/Resources/Textures/_NF/Structures/Storage/closet.rsi/secure.png new file mode 100644 index 00000000000..1c1a305ebe3 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/closet.rsi/secure.png differ diff --git a/Resources/Textures/_NF/Structures/Storage/closet.rsi/secure_door.png b/Resources/Textures/_NF/Structures/Storage/closet.rsi/secure_door.png new file mode 100644 index 00000000000..6e2507406eb Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/closet.rsi/secure_door.png differ diff --git a/Resources/Textures/_NF/Structures/Storage/closet.rsi/secure_open.png b/Resources/Textures/_NF/Structures/Storage/closet.rsi/secure_open.png new file mode 100644 index 00000000000..8437fe8a986 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/closet.rsi/secure_open.png differ diff --git a/Resources/_NF/migration.yml b/Resources/_NF/migration.yml index f17c5ceb6af..2a46e89f42e 100644 --- a/Resources/_NF/migration.yml +++ b/Resources/_NF/migration.yml @@ -182,12 +182,15 @@ ScienceTechFab: UnfinishedMachineFrame ScienceTechFabCircuitboard: ProtolatheMachineCircuitboard ScienceTechFabFlatpack: ProtolatheFlatpack +# 2024-12-27 Materials crate +CrateMaterials: CrateMaterialsBasicFilled + # 2025-01-05 Lights ColoredLightTubeRed: LightTubeCrystalRed ColoredBlueLightTube: LightTubeCrystalBlue ColoredLightTubeCyan: LightTubeCrystalCyan -ColoredLightTubeBlackLight: PoweredlightBlack +ColoredLightTubeBlackLight: LightTubeCrystalBlack PoweredlightColoredRed: PoweredlightRed PoweredlightBlueInterior: PoweredlightBlue PoweredlightColoredFrostyBlue: PoweredlightCyan -PoweredlightColoredBlack: LightTubeCrystalBlack +PoweredlightColoredBlack: PoweredlightBlack