diff --git a/.github/ISSUE_TEMPLATE/01_report_issue.yml b/.github/ISSUE_TEMPLATE/01_report_issue.yml new file mode 100644 index 0000000000..0c70d751fc --- /dev/null +++ b/.github/ISSUE_TEMPLATE/01_report_issue.yml @@ -0,0 +1,41 @@ +name: Report an issue +description: For issues that are not related to any other issue form. +body: + - type: markdown + attributes: + value: | + Thank you for taking the time to fill out an issue. This template is intended for any issues that do not fit other issue templates. + For feedback or help running Space Station 14, please join our [Discord](https://discord.gg/rGvu9hKffJ). + - type: input + attributes: + label: What version did the issue occur in? + description: You can find the version by opening the changelog in-game and looking at the bottom right corner of the changelog window. + placeholder: wizards/aa1337b + validations: + required: false + - type: textarea + attributes: + label: Description + description: | + A clear and concise description of what the issue is. + If the issue is visual in nature, consider posting a screenshot. + validations: + required: true + - type: textarea + attributes: + label: Reproduction + description: List the steps required to reproduce the issue. + placeholder: | + 1. + 2. + 3. + ... + validations: + required: true + - type: textarea + attributes: + label: Additional Context + description: Add any other additional context about the issue here. + validations: + required: false + diff --git a/.github/ISSUE_TEMPLATE/02_mapping_issue.yml b/.github/ISSUE_TEMPLATE/02_mapping_issue.yml new file mode 100644 index 0000000000..36fe96c914 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/02_mapping_issue.yml @@ -0,0 +1,48 @@ +name: Report an mapping issue +description: For issues regarding mapping. +body: + - type: markdown + attributes: + value: | + Thank you for taking the time to fill out an issue. This template is intended for any issues related to mapping. + For feedback or help running Space Station 14, please join our [Discord](https://discord.gg/rGvu9hKffJ). + - type: input + attributes: + label: What version did the issue occur in? + description: You can find the version by opening the changelog in-game and looking at the bottom right corner of the changelog window. + placeholder: wizards/aa1337b + validations: + required: false + - type: input + attributes: + label: On what station, shuttle, or grid did the issue occur on? + description: The name of the station, shuttle, or grid. If you do not know the name, try to describe it. + placeholder: Bagel + validations: + required: true + - type: textarea + attributes: + label: Description + description: | + A clear and concise description of what the issue is. + If the issue is visual in nature, consider posting a screenshot. + validations: + required: true + - type: textarea + attributes: + label: Reproduction + description: List the steps required to reproduce the issue. + placeholder: | + 1. + 2. + 3. + ... + validations: + required: true + - type: textarea + attributes: + label: Additional Context + description: Add any other additional context about the issue here. + validations: + required: false + diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index f00e08f8d2..8a28e1b175 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -1,3 +1,4 @@ +blank_issues_enabled: true contact_links: - name: Предложение url: https://discord.station14.ru diff --git a/Content.Client/Emp/EmpSystem.cs b/Content.Client/Emp/EmpSystem.cs index 5ed1022750..b32e370f1e 100644 --- a/Content.Client/Emp/EmpSystem.cs +++ b/Content.Client/Emp/EmpSystem.cs @@ -7,6 +7,18 @@ public sealed class EmpSystem : SharedEmpSystem { [Dependency] private readonly IRobustRandom _random = default!; + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnStartup); + } + + private void OnStartup(Entity ent, ref ComponentStartup args) + { + // EmpPulseEvent.Affected will spawn the first visual effect directly when the emp is used + ent.Comp.TargetTime = Timing.CurTime + _random.NextFloat(0.8f, 1.2f) * ent.Comp.EffectCooldown; + } public override void Update(float frameTime) { base.Update(frameTime); @@ -16,7 +28,7 @@ public sealed class EmpSystem : SharedEmpSystem { if (Timing.CurTime > comp.TargetTime) { - comp.TargetTime = Timing.CurTime + _random.NextFloat(0.8f, 1.2f) * TimeSpan.FromSeconds(comp.EffectCooldown); + comp.TargetTime = Timing.CurTime + _random.NextFloat(0.8f, 1.2f) * comp.EffectCooldown; Spawn(EmpDisabledEffectPrototype, transform.Coordinates); } } diff --git a/Content.Client/Entry/EntryPoint.cs b/Content.Client/Entry/EntryPoint.cs index 18ce1fd156..223652f3b9 100644 --- a/Content.Client/Entry/EntryPoint.cs +++ b/Content.Client/Entry/EntryPoint.cs @@ -79,18 +79,21 @@ namespace Content.Client.Entry [Dependency] private readonly IEntitySystemManager _entitySystemManager = default!; [Dependency] private readonly ClientsidePlaytimeTrackingManager _clientsidePlaytimeManager = default!; - public override void Init() + public override void PreInit() { - ClientContentIoC.Register(); + ClientContentIoC.Register(Dependencies); foreach (var callback in TestingCallbacks) { var cast = (ClientModuleTestingCallbacks) callback; cast.ClientBeforeIoC?.Invoke(); } + } - IoCManager.BuildGraph(); - IoCManager.InjectDependencies(this); + public override void Init() + { + Dependencies.BuildGraph(); + Dependencies.InjectDependencies(this); _contentLoc.Initialize(); _componentFactory.DoAutoRegistrations(); diff --git a/Content.Client/Fax/UI/FaxBoundUi.cs b/Content.Client/Fax/UI/FaxBoundUi.cs index ca2e834b4f..d9265736c3 100644 --- a/Content.Client/Fax/UI/FaxBoundUi.cs +++ b/Content.Client/Fax/UI/FaxBoundUi.cs @@ -40,7 +40,7 @@ public sealed class FaxBoundUi : BoundUserInterface _dialogIsOpen = true; var filters = new FileDialogFilters(new FileDialogFilters.Group("txt")); - await using var file = await _fileDialogManager.OpenFile(filters); + await using var file = await _fileDialogManager.OpenFile(filters, FileAccess.Read); _dialogIsOpen = false; if (_window == null || _window.Disposed || file == null) diff --git a/Content.Client/Input/ContentContexts.cs b/Content.Client/Input/ContentContexts.cs index 6b279cb12c..47f0cda2f6 100644 --- a/Content.Client/Input/ContentContexts.cs +++ b/Content.Client/Input/ContentContexts.cs @@ -73,6 +73,9 @@ namespace Content.Client.Input human.AddFunction(ContentKeyFunctions.OpenInventoryMenu); human.AddFunction(ContentKeyFunctions.SmartEquipBackpack); human.AddFunction(ContentKeyFunctions.SmartEquipBelt); + human.AddFunction(ContentKeyFunctions.SmartEquipPocket1); + human.AddFunction(ContentKeyFunctions.SmartEquipPocket2); + human.AddFunction(ContentKeyFunctions.SmartEquipSuitStorage); human.AddFunction(ContentKeyFunctions.OpenBackpack); human.AddFunction(ContentKeyFunctions.OpenBelt); human.AddFunction(ContentKeyFunctions.MouseMiddle); diff --git a/Content.Client/Instruments/UI/InstrumentMenu.xaml.cs b/Content.Client/Instruments/UI/InstrumentMenu.xaml.cs index 4a29478a9c..16dec590f9 100644 --- a/Content.Client/Instruments/UI/InstrumentMenu.xaml.cs +++ b/Content.Client/Instruments/UI/InstrumentMenu.xaml.cs @@ -129,7 +129,7 @@ namespace Content.Client.Instruments.UI // or focus the previously-opened window. _isMidiFileDialogueWindowOpen = true; - await using var file = await _dialogs.OpenFile(filters); + await using var file = await _dialogs.OpenFile(filters, FileAccess.Read); _isMidiFileDialogueWindowOpen = false; diff --git a/Content.Client/IoC/ClientContentIoC.cs b/Content.Client/IoC/ClientContentIoC.cs index 9a07eff9af..da4727834d 100644 --- a/Content.Client/IoC/ClientContentIoC.cs +++ b/Content.Client/IoC/ClientContentIoC.cs @@ -24,6 +24,7 @@ using Content.Client.Lobby; using Content.Client.Players.RateLimiting; using Content.Shared.Administration.Managers; using Content.Shared.Chat; +using Content.Shared.IoC; using Content.Shared.Players.PlayTimeTracking; using Content.Shared.Players.RateLimiting; @@ -31,10 +32,9 @@ namespace Content.Client.IoC { internal static class ClientContentIoC { - public static void Register() + public static void Register(IDependencyCollection collection) { - var collection = IoCManager.Instance!; - + SharedContentIoC.Register(collection); collection.Register(); collection.Register(); collection.Register(); diff --git a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs index aa639721d3..2872ff96a1 100644 --- a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs +++ b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs @@ -1602,7 +1602,7 @@ namespace Content.Client.Lobby.UI return; StartExport(); - await using var file = await _dialogManager.OpenFile(new FileDialogFilters(new FileDialogFilters.Group("yml"))); + await using var file = await _dialogManager.OpenFile(new FileDialogFilters(new FileDialogFilters.Group("yml")), FileAccess.Read); if (file == null) { diff --git a/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs b/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs index ee72a91fb7..59c9607b24 100644 --- a/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs +++ b/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs @@ -190,6 +190,9 @@ namespace Content.Client.Options.UI.Tabs AddHeader("ui-options-header-interaction-adv"); AddButton(ContentKeyFunctions.SmartEquipBackpack); AddButton(ContentKeyFunctions.SmartEquipBelt); + AddButton(ContentKeyFunctions.SmartEquipPocket1); + AddButton(ContentKeyFunctions.SmartEquipPocket2); + AddButton(ContentKeyFunctions.SmartEquipSuitStorage); AddButton(ContentKeyFunctions.OpenBackpack); AddButton(ContentKeyFunctions.OpenBelt); AddButton(ContentKeyFunctions.ThrowItemInHand); diff --git a/Content.Client/Power/EntitySystems/BatterySystem.cs b/Content.Client/Power/EntitySystems/BatterySystem.cs new file mode 100644 index 0000000000..1d0b48003b --- /dev/null +++ b/Content.Client/Power/EntitySystems/BatterySystem.cs @@ -0,0 +1,5 @@ +using Content.Shared.Power.EntitySystems; + +namespace Content.Client.Power.EntitySystems; + +public sealed class BatterySystem : SharedBatterySystem; diff --git a/Content.Client/Power/EntitySystems/ChargerSystem.cs b/Content.Client/Power/EntitySystems/ChargerSystem.cs new file mode 100644 index 0000000000..efadde30e0 --- /dev/null +++ b/Content.Client/Power/EntitySystems/ChargerSystem.cs @@ -0,0 +1,5 @@ +using Content.Shared.Power.EntitySystems; + +namespace Content.Client.Power.EntitySystems; + +public sealed class ChargerSystem : SharedChargerSystem; diff --git a/Content.Client/SurveillanceCamera/SurveillanceCameraSystem.cs b/Content.Client/SurveillanceCamera/SurveillanceCameraSystem.cs new file mode 100644 index 0000000000..5dbb9f8442 --- /dev/null +++ b/Content.Client/SurveillanceCamera/SurveillanceCameraSystem.cs @@ -0,0 +1,5 @@ +using Content.Shared.SurveillanceCamera; + +namespace Content.Client.SurveillanceCamera; + +public sealed class SurveillanceCameraSystem : SharedSurveillanceCameraSystem; diff --git a/Content.Client/VendingMachines/VendingMachineSystem.cs b/Content.Client/VendingMachines/VendingMachineSystem.cs index 7491912855..f116dd5107 100644 --- a/Content.Client/VendingMachines/VendingMachineSystem.cs +++ b/Content.Client/VendingMachines/VendingMachineSystem.cs @@ -33,6 +33,7 @@ public sealed class VendingMachineSystem : SharedVendingMachineSystem component.EjectEnd = state.EjectEnd; component.DenyEnd = state.DenyEnd; component.DispenseOnHitEnd = state.DispenseOnHitEnd; + component.Broken = state.Broken; // If all we did was update amounts then we can leave BUI buttons in place. var fullUiUpdate = !component.Inventory.Keys.SequenceEqual(state.Inventory.Keys) || diff --git a/Content.IntegrationTests/Pair/TestPair.cs b/Content.IntegrationTests/Pair/TestPair.cs index 947840d5ce..81f99146f7 100644 --- a/Content.IntegrationTests/Pair/TestPair.cs +++ b/Content.IntegrationTests/Pair/TestPair.cs @@ -27,6 +27,16 @@ public sealed partial class TestPair : RobustIntegrationTest.TestPair protected override async Task Initialize() { + await base.Initialize(); + + // Prevent info log spam in some tests (particularly SpawnAndDeleteAllEntitiesOnDifferentMaps) + Server.System().Log.Level = LogLevel.Warning; + Client.EntMan.EntitySysManager.SystemLoaded += (_, e) => + { + if (e.System is SharedMapSystem map) + map.Log.Level = LogLevel.Warning; + }; + var settings = (PoolSettings)Settings; if (!settings.DummyTicker) { diff --git a/Content.IntegrationTests/Tests/Construction/RCDTest.cs b/Content.IntegrationTests/Tests/Construction/RCDTest.cs new file mode 100644 index 0000000000..814f7e89aa --- /dev/null +++ b/Content.IntegrationTests/Tests/Construction/RCDTest.cs @@ -0,0 +1,243 @@ +using System.Numerics; +using Content.IntegrationTests.Tests.Interaction; +using Content.Shared.Charges.Systems; +using Content.Shared.RCD; +using Content.Shared.RCD.Components; +using Robust.Shared.GameObjects; +using Robust.Shared.Map; +using Robust.Shared.Prototypes; + +namespace Content.IntegrationTests.Tests.Construction; + +public sealed class RCDTest : InteractionTest +{ + private static readonly EntProtoId RCDProtoId = "RCD"; + private static readonly ProtoId RCDSettingWall = "WallSolid"; + private static readonly ProtoId RCDSettingAirlock = "Airlock"; + private static readonly ProtoId RCDSettingPlating = "Plating"; + private static readonly ProtoId RCDSettingFloorSteel = "FloorSteel"; + private static readonly ProtoId RCDSettingDeconstruct = "Deconstruct"; + private static readonly ProtoId RCDSettingDeconstructTile = "DeconstructTile"; + private static readonly ProtoId RCDSettingDeconstructLattice = "DeconstructLattice"; + + /// + /// Tests RCD construction and deconstruction, as well as selecting options from the radial menu. + /// + [Test] + public async Task RCDConstructionDeconstructionTest() + { + // Place some tiles around the player so that we have space to build. + var pNorth = new EntityCoordinates(SPlayer, new Vector2(0, 1)); + var pSouth = new EntityCoordinates(SPlayer, new Vector2(0, -1)); + var pEast = new EntityCoordinates(SPlayer, new Vector2(1, 0)); + var pWest = new EntityCoordinates(SPlayer, new Vector2(-1, 0)); + + // Use EntityCoordinates relative to the grid because the player turns around when interacting. + pNorth = Transform.WithEntityId(pNorth, MapData.Grid); + pSouth = Transform.WithEntityId(pSouth, MapData.Grid); + pEast = Transform.WithEntityId(pEast, MapData.Grid); + pWest = Transform.WithEntityId(pWest, MapData.Grid); + + await SetTile(Plating, SEntMan.GetNetCoordinates(pNorth), MapData.Grid); + await SetTile(Plating, SEntMan.GetNetCoordinates(pSouth), MapData.Grid); + await SetTile(Plating, SEntMan.GetNetCoordinates(pEast), MapData.Grid); + await SetTile(Lattice, SEntMan.GetNetCoordinates(pWest), MapData.Grid); + + Assert.That(ProtoMan.TryIndex(RCDSettingWall, out var settingWall), $"RCDPrototype not found: {RCDSettingWall}."); + Assert.That(settingWall.Prototype, Is.Not.Null, "RCDPrototype has a null spawning prototype."); + Assert.That(ProtoMan.TryIndex(RCDSettingAirlock, out var settingAirlock), $"RCDPrototype not found: {RCDSettingAirlock}."); + Assert.That(settingAirlock.Prototype, Is.Not.Null, $"RCDPrototype has a null spawning prototype."); + Assert.That(ProtoMan.TryIndex(RCDSettingPlating, out var settingPlating), $"RCDPrototype not found: {RCDSettingPlating}."); + Assert.That(settingPlating.Prototype, Is.Not.Null, "RCDPrototype has a null spawning prototype."); + Assert.That(ProtoMan.TryIndex(RCDSettingFloorSteel, out var settingFloorSteel), $"RCDPrototype not found: {RCDSettingFloorSteel}."); + Assert.That(settingFloorSteel.Prototype, Is.Not.Null, "RCDPrototype has a null spawning prototype."); + Assert.That(ProtoMan.TryIndex(RCDSettingDeconstructTile, out var settingDeconstructTile), $"RCDPrototype not found: {RCDSettingDeconstructTile}."); + Assert.That(ProtoMan.TryIndex(RCDSettingDeconstructLattice, out var settingDeconstructLattice), $"RCDPrototype not found: {RCDSettingDeconstructLattice}."); + + var rcd = await PlaceInHands(RCDProtoId); + + // Give the RCD enough charges to do everything. + var sCharges = SEntMan.System(); + await Server.WaitPost(() => + { + sCharges.SetMaxCharges(ToServer(rcd), 10000); + sCharges.SetCharges(ToServer(rcd), 10000); + }); + var initialCharges = sCharges.GetCurrentCharges(ToServer(rcd)); + Assert.That(initialCharges, Is.EqualTo(10000), "RCD did not have the correct amount of charges."); + + // Make sure that picking it up did not open the UI. + Assert.That(IsUiOpen(RcdUiKey.Key), Is.False, "RCD UI was opened when picking it up."); + + // Switch to building walls. + await SetRcdProto(rcd, RCDSettingWall); + + // Build a wall next to the player. + await Interact(null, pNorth); + + // Check that there is exactly one wall. + await RunSeconds(settingWall.Delay + 1); // wait for the construction to finish + await AssertEntityLookup((settingWall.Prototype, 1)); + + // Check that the wall is in the correct tile. + var wallUid = await FindEntity(settingWall.Prototype); + var wallNetUid = FromServer(wallUid); + AssertLocation(wallNetUid, FromServer(pNorth)); + + // Check that the cost of the wall was subtracted from the current charges. + var newCharges = sCharges.GetCurrentCharges(ToServer(rcd)); + Assert.That(initialCharges - settingWall.Cost, Is.EqualTo(newCharges), "RCD has wrong amount of charges after building something."); + initialCharges = newCharges; + + // Try building another wall in the same spot. + await Interact(null, pNorth); + await RunSeconds(settingWall.Delay + 1); // wait for the construction to finish + + // Check that there is still exactly one wall. + await AssertEntityLookup((settingWall.Prototype, 1)); + + // Check that the failed construction did not cost us any charges. + newCharges = sCharges.GetCurrentCharges(ToServer(rcd)); + Assert.That(initialCharges, Is.EqualTo(newCharges), "RCD has wrong amount of charges after failing to build something."); + + // Switch to building airlocks. + await SetRcdProto(rcd, RCDSettingAirlock); + + // Build an airlock next to the player. + await Interact(null, pSouth); + + // Check that there is exactly one airlock. + await RunSeconds(settingAirlock.Delay + 1); // wait for the construction to finish + await AssertEntityLookup( + (settingWall.Prototype, 1), + (settingAirlock.Prototype, 1) + ); + + // Check that the airlock is in the correct tile. + var airlockUid = await FindEntity(settingAirlock.Prototype); + var airlockNetUid = FromServer(airlockUid); + AssertLocation(airlockNetUid, FromServer(pSouth)); + + // Check that the cost of the airlock was subtracted from the current charges. + newCharges = sCharges.GetCurrentCharges(ToServer(rcd)); + Assert.That(initialCharges - settingAirlock.Cost, Is.EqualTo(newCharges), "RCD has wrong amount of charges after building something."); + initialCharges = newCharges; + + // Switch to building plating. + await SetRcdProto(rcd, RCDSettingPlating); + + // Try building plating on existing plating. + await AssertTile(settingPlating.Prototype, FromServer(pEast)); + await Interact(null, pEast); + + // Check that the tile did not change. + await AssertTile(settingPlating.Prototype, FromServer(pEast)); + + // Check that the failed construction did not cost us any charges. + await RunSeconds(settingPlating.Delay + 1); // wait for the construction to finish + newCharges = sCharges.GetCurrentCharges(ToServer(rcd)); + Assert.That(initialCharges, Is.EqualTo(newCharges), "RCD has wrong amount of charges after failing to build something."); + + // Try building plating on top of lattice. + await AssertTile(Lattice, FromServer(pWest)); + await Interact(null, pWest); + await RunSeconds(settingPlating.Delay + 1); // wait for the construction to finish + + // Check that the tile is now plating. + await AssertTile(settingPlating.Prototype, FromServer(pWest)); + + // Check that the cost of the plating was subtracted from the current charges. + newCharges = sCharges.GetCurrentCharges(ToServer(rcd)); + Assert.That(initialCharges - settingPlating.Cost, Is.EqualTo(newCharges), "RCD has wrong amount of charges after building something."); + initialCharges = newCharges; + + // Switch to building steel tiles. + await SetRcdProto(rcd, RCDSettingFloorSteel); + + // Try building a steel tile on top of plating. + await Interact(null, pEast); + + // Check that the tile is now a steel tile. + await RunSeconds(settingFloorSteel.Delay + 1); // wait for the construction to finish + await AssertTile(settingFloorSteel.Prototype, FromServer(pEast)); + + // Check that the cost of the plating was subtracted from the current charges. + newCharges = sCharges.GetCurrentCharges(ToServer(rcd)); + Assert.That(initialCharges - settingFloorSteel.Cost, Is.EqualTo(newCharges), "RCD has wrong amount of charges after building something."); + initialCharges = newCharges; + + // Switch to deconstruction mode. + await SetRcdProto(rcd, RCDSettingDeconstruct); + + // Deconstruct the wall. + Assert.That(SEntMan.TryGetComponent(wallUid, out var wallComp), "Wall entity did not have the RCDDeconstructableComponent."); + await Interact(wallUid, pNorth); + await RunSeconds(wallComp.Delay + 1); // wait for the deconstruction to finish + AssertDeleted(wallNetUid); + + // Check that the cost of the deconstruction was subtracted from the current charges. + newCharges = sCharges.GetCurrentCharges(ToServer(rcd)); + Assert.That(initialCharges - wallComp.Cost, Is.EqualTo(newCharges), "RCD has wrong amount of charges after deconstructing something."); + initialCharges = newCharges; + + // Deconstruct the airlock. + Assert.That(SEntMan.TryGetComponent(airlockUid, out var airlockComp), "Wall entity did not have the RCDDeconstructableComponent."); + await Interact(airlockUid, pSouth); + await RunSeconds(airlockComp.Delay + 1); // wait for the deconstruction to finish + AssertDeleted(airlockNetUid); + + // Check that the cost of the deconstruction was subtracted from the current charges. + newCharges = sCharges.GetCurrentCharges(ToServer(rcd)); + Assert.That(initialCharges - airlockComp.Cost, Is.EqualTo(newCharges), "RCD has wrong amount of charges after deconstructing something."); + initialCharges = newCharges; + + // Deconstruct the steel tile. + await Interact(null, pEast); + await RunSeconds(settingDeconstructTile.Delay + 1); // wait for the deconstruction to finish + await AssertTile(Lattice, FromServer(pEast)); + + // Check that the cost of the deconstruction was subtracted from the current charges. + newCharges = sCharges.GetCurrentCharges(ToServer(rcd)); + Assert.That(initialCharges - settingDeconstructTile.Cost, Is.EqualTo(newCharges), "RCD has wrong amount of charges after deconstructing something."); + initialCharges = newCharges; + + // Deconstruct the plating. + await Interact(null, pWest); + await RunSeconds(settingDeconstructTile.Delay + 1); // wait for the deconstruction to finish + await AssertTile(Lattice, FromServer(pWest)); + + // Check that the cost of the deconstruction was subtracted from the current charges. + newCharges = sCharges.GetCurrentCharges(ToServer(rcd)); + Assert.That(initialCharges - settingDeconstructTile.Cost, Is.EqualTo(newCharges), "RCD has wrong amount of charges after deconstructing something."); + initialCharges = newCharges; + + // Deconstruct the lattice. + await Interact(null, pWest); + await RunSeconds(settingDeconstructLattice.Delay + 1); // wait for the deconstruction to finish + await AssertTile(null, FromServer(pWest)); + + // Check that the cost of the deconstruction was subtracted from the current charges. + newCharges = sCharges.GetCurrentCharges(ToServer(rcd)); + Assert.That(initialCharges - settingDeconstructLattice.Cost, Is.EqualTo(newCharges), "RCD has wrong amount of charges after deconstructing something."); + + // Wait for the visual effect to disappear. + await RunSeconds(3); + + // Check that there are no entities left. + await AssertEntityLookup(); + } + + private async Task SetRcdProto(NetEntity rcd, ProtoId protoId) + { + await UseInHand(); + await RunTicks(3); + Assert.That(IsUiOpen(RcdUiKey.Key), Is.True, "RCD UI was not opened when using the RCD while holding it."); + + // Simulating a click on the right control for nested radial menus is very complicated. + // So we just manually send a networking message from the client to tell the server we selected an option. + // TODO: Write a separate test for clicking through a SimpleRadialMenu. + await SendBui(RcdUiKey.Key, new RCDSystemMessage(protoId), rcd); + await CloseBui(RcdUiKey.Key, rcd); + Assert.That(IsUiOpen(RcdUiKey.Key), Is.False, "RCD UI is still open."); + } +} diff --git a/Content.IntegrationTests/Tests/Embedding/EmbedTest.cs b/Content.IntegrationTests/Tests/Embedding/EmbedTest.cs index f9db064163..3a72a195fd 100644 --- a/Content.IntegrationTests/Tests/Embedding/EmbedTest.cs +++ b/Content.IntegrationTests/Tests/Embedding/EmbedTest.cs @@ -132,7 +132,7 @@ public sealed class EmbedTest : InteractionTest "Target has unexpected EmbeddedObjects count."); // Wait for the cooldown between throws - await RunSeconds(Hands.ThrowCooldown.Seconds); + await RunSeconds(Hands!.ThrowCooldown.Seconds); // Throw the second projectile await ThrowItem(); diff --git a/Content.IntegrationTests/Tests/Interaction/InteractionTest.Helpers.cs b/Content.IntegrationTests/Tests/Interaction/InteractionTest.Helpers.cs index c835a36ed5..fa16730dd5 100644 --- a/Content.IntegrationTests/Tests/Interaction/InteractionTest.Helpers.cs +++ b/Content.IntegrationTests/Tests/Interaction/InteractionTest.Helpers.cs @@ -169,6 +169,12 @@ public abstract partial class InteractionTest /// Whether or not to automatically enable any toggleable items protected async Task PlaceInHands(EntitySpecifier entity, bool enableToggleable = true) { + if (Hands == null) + { + Assert.Fail("No HandsComponent"); + return default; + } + if (Hands.ActiveHandId == null) { Assert.Fail("No active hand"); @@ -210,6 +216,12 @@ public abstract partial class InteractionTest { entity ??= Target; + if (Hands == null) + { + Assert.Fail("No HandsComponent"); + return; + } + if (Hands.ActiveHandId == null) { Assert.Fail("No active hand"); @@ -714,7 +726,7 @@ public abstract partial class InteractionTest tile = MapSystem.GetTileRef(gridUid, grid, serverCoords).Tile; }); - Assert.That(tile.TypeId, Is.EqualTo(targetTile.TypeId)); + Assert.That(tile.TypeId, Is.EqualTo(targetTile.TypeId), $"Expected tile at NetCoordinates {coords}: {TileMan[targetTile.TypeId].Name}. But was: {TileMan[tile.TypeId].Name}"); } protected void AssertGridCount(int value) @@ -730,6 +742,20 @@ public abstract partial class InteractionTest Assert.That(count, Is.EqualTo(value)); } + /// + /// Check that some entity is close to a certain coordinate location. + /// + /// The entity to check the location for. Defaults to + /// The coordinates the entity should be at. + /// The maximum allowed distance from the target coords + protected void AssertLocation(NetEntity? target, NetCoordinates coords, float radius = 0.01f) + { + target ??= Target; + Assert.That(target, Is.Not.Null, "No target specified"); + Assert.That(Position(target!.Value).TryDelta(SEntMan, Transform, ToServer(coords), out var delta), "Could not calculate distance between coordinates."); + Assert.That(delta.Length(), Is.LessThanOrEqualTo(radius), $"{SEntMan.ToPrettyString(SEntMan.GetEntity(target.Value))} was not at the intended location. Distance: {delta}, allowed distance: {radius}"); + } + #endregion #region Entity lookups @@ -860,7 +886,7 @@ public abstract partial class InteractionTest /// List of currently active DoAfters on the player. /// protected IEnumerable ActiveDoAfters - => DoAfters.DoAfters.Values.Where(x => !x.Cancelled && !x.Completed); + => DoAfters?.DoAfters.Values.Where(x => !x.Cancelled && !x.Completed) ?? []; #region Component @@ -974,9 +1000,9 @@ public abstract partial class InteractionTest /// /// Sends a bui message using the given bui key. /// - protected async Task SendBui(Enum key, BoundUserInterfaceMessage msg, EntityUid? _ = null) + protected async Task SendBui(Enum key, BoundUserInterfaceMessage msg, NetEntity? target = null) { - if (!TryGetBui(key, out var bui)) + if (!TryGetBui(key, out var bui, target)) return; await Client.WaitPost(() => bui.SendMessage(msg)); @@ -988,9 +1014,9 @@ public abstract partial class InteractionTest /// /// Sends a bui message using the given bui key. /// - protected async Task CloseBui(Enum key, EntityUid? _ = null) + protected async Task CloseBui(Enum key, NetEntity? target = null) { - if (!TryGetBui(key, out var bui)) + if (!TryGetBui(key, out var bui, target)) return; await Client.WaitPost(() => bui.Close()); @@ -1412,15 +1438,25 @@ public abstract partial class InteractionTest protected EntityUid? ToServer(NetEntity? nent) => SEntMan.GetEntity(nent); protected EntityUid? ToClient(NetEntity? nent) => CEntMan.GetEntity(nent); protected EntityUid ToServer(EntityUid cuid) => SEntMan.GetEntity(CEntMan.GetNetEntity(cuid)); - protected EntityUid ToClient(EntityUid cuid) => CEntMan.GetEntity(SEntMan.GetNetEntity(cuid)); + protected EntityUid ToClient(EntityUid suid) => CEntMan.GetEntity(SEntMan.GetNetEntity(suid)); protected EntityUid? ToServer(EntityUid? cuid) => SEntMan.GetEntity(CEntMan.GetNetEntity(cuid)); - protected EntityUid? ToClient(EntityUid? cuid) => CEntMan.GetEntity(SEntMan.GetNetEntity(cuid)); + protected EntityUid? ToClient(EntityUid? suid) => CEntMan.GetEntity(SEntMan.GetNetEntity(suid)); protected EntityCoordinates ToServer(NetCoordinates coords) => SEntMan.GetCoordinates(coords); protected EntityCoordinates ToClient(NetCoordinates coords) => CEntMan.GetCoordinates(coords); protected EntityCoordinates? ToServer(NetCoordinates? coords) => SEntMan.GetCoordinates(coords); protected EntityCoordinates? ToClient(NetCoordinates? coords) => CEntMan.GetCoordinates(coords); + protected NetEntity FromServer(EntityUid suid) => SEntMan.GetNetEntity(suid); + protected NetEntity FromClient(EntityUid cuid) => CEntMan.GetNetEntity(cuid); + protected NetEntity? FromServer(EntityUid? suid) => SEntMan.GetNetEntity(suid); + protected NetEntity? FromClient(EntityUid? cuid) => CEntMan.GetNetEntity(cuid); + + protected NetCoordinates FromServer(EntityCoordinates scoords) => SEntMan.GetNetCoordinates(scoords); + protected NetCoordinates FromClient(EntityCoordinates ccoords) => CEntMan.GetNetCoordinates(ccoords); + protected NetCoordinates? FromServer(EntityCoordinates? scoords) => SEntMan.GetNetCoordinates(scoords); + protected NetCoordinates? FromClient(EntityCoordinates? ccoords) => CEntMan.GetNetCoordinates(ccoords); + #endregion #region Metadata & Transforms diff --git a/Content.IntegrationTests/Tests/Interaction/InteractionTest.cs b/Content.IntegrationTests/Tests/Interaction/InteractionTest.cs index e523be2bfc..eff0ed3a0c 100644 --- a/Content.IntegrationTests/Tests/Interaction/InteractionTest.cs +++ b/Content.IntegrationTests/Tests/Interaction/InteractionTest.cs @@ -125,8 +125,8 @@ public abstract partial class InteractionTest protected SharedUserInterfaceSystem CUiSys = default!; // player components - protected HandsComponent Hands = default!; - protected DoAfterComponent DoAfters = default!; + protected HandsComponent? Hands; + protected DoAfterComponent? DoAfters; public float TickPeriod => (float)STiming.TickPeriod.TotalSeconds; @@ -222,8 +222,8 @@ public abstract partial class InteractionTest SPlayer = SEntMan.SpawnEntity(PlayerPrototype, SEntMan.GetCoordinates(PlayerCoords)); Player = SEntMan.GetNetEntity(SPlayer); Server.PlayerMan.SetAttachedEntity(ServerSession, SPlayer); - Hands = SEntMan.GetComponent(SPlayer); - DoAfters = SEntMan.GetComponent(SPlayer); + Hands = SEntMan.GetComponentOrNull(SPlayer); + DoAfters = SEntMan.GetComponentOrNull(SPlayer); }); // Check player got attached. diff --git a/Content.IntegrationTests/Tests/Mousetrap/MousetrapTest.cs b/Content.IntegrationTests/Tests/Mousetrap/MousetrapTest.cs new file mode 100644 index 0000000000..422d58cdcf --- /dev/null +++ b/Content.IntegrationTests/Tests/Mousetrap/MousetrapTest.cs @@ -0,0 +1,154 @@ +using Content.IntegrationTests.Tests.Movement; +using Content.Server.NPC.HTN; +using Content.Shared.Damage; +using Content.Shared.FixedPoint; +using Content.Shared.Item.ItemToggle; +using Content.Shared.Item.ItemToggle.Components; +using Content.Shared.Mobs; +using Content.Shared.Mobs.Components; +using Content.Shared.Mousetrap; +using Robust.Shared.Maths; +using Robust.Shared.Prototypes; + +namespace Content.IntegrationTests.Tests.Mousetrap; + +/// +/// Spawns a mouse and a mousetrap. +/// Makes the mouse cross the inactive mousetrap, then activates the trap and +/// makes the mouse try to cross back over it. +/// +/// +/// Yep, every time the tests run, a virtual mouse dies. Sorry. +/// +public sealed class MousetrapMouseMoveOverTest : MovementTest +{ + private static readonly EntProtoId MousetrapProtoId = "Mousetrap"; + private static readonly EntProtoId MouseProtoId = "MobMouse"; + protected override string PlayerPrototype => MouseProtoId.Id; // use a mouse as the player entity + + [Test] + public async Task MouseMoveOverTest() + { + // Make sure the mouse doesn't have any AI active + await Server.WaitPost(() => SEntMan.RemoveComponent(SPlayer)); + + // Spawn a mouse trap + await SpawnTarget(MousetrapProtoId); + Assert.That(Delta(), Is.GreaterThan(0.5), "Mouse and mousetrap not in expected positions."); + + Assert.That(HasComp(), + $"{MousetrapProtoId} does not have a MousetrapComponent. If you're refactoring, please update this test!"); + + Assert.That(TryComp(out var itemToggleComp), + $"{MousetrapProtoId} does not have a ItemToggleComponent. If you're refactoring, please update this test!"); + Assert.That(itemToggleComp.Activated, Is.False, "Mousetrap started active."); + + // The mouse is spawned by the test before the atmosphere is added, so it has some barotrauma damage already + // TODO: fix this since it can have an impact on integration tests + Assert.That(SEntMan.TryGetComponent(SPlayer, out var damageComp), + $"Player does not have a DamageableComponent."); + var startingDamage = damageComp.TotalDamage; + + Assert.That(SEntMan.TryGetComponent(SPlayer, out var mouseMobStateComp), + $"{MouseProtoId} does not have a MobStateComponent."); + Assert.That(mouseMobStateComp.CurrentState, Is.EqualTo(MobState.Alive), "Mouse was not alive when spawned."); + + // Move mouse over the trap + await Move(DirectionFlag.East, 1f); + + Assert.That(Delta(), Is.LessThan(0.5), "Mouse did not move over mousetrap."); + + // Walking over an inactive trap does not trigger it + Assert.That(damageComp.TotalDamage, Is.LessThanOrEqualTo(startingDamage), "Mouse took damage from inactive trap!"); + Assert.That(itemToggleComp.Activated, Is.False, "Mousetrap was activated."); + + // Activate the trap + var itemToggleSystem = Server.System(); + await Server.WaitAssertion(() => + { + Assert.That(itemToggleSystem.TrySetActive(STarget.Value, true), "Could not activate the mouse trap."); + }); + + await Move(DirectionFlag.West, 1f); + Assert.That(Delta(), Is.LessThan(0.1), "Mouse moved past active mousetrap."); + + // Walking over an active trap triggers it + Assert.That(damageComp.TotalDamage, Is.GreaterThan(startingDamage), "Mouse did not take damage from active trap!"); + Assert.That(itemToggleComp.Activated, Is.False, "Mousetrap was not deactivated after triggering."); + Assert.That(mouseMobStateComp.CurrentState, Is.EqualTo(MobState.Dead), "Mouse was not killed by trap."); + } +} + +/// +/// Spawns a mousetrap and makes the player walk over it without shoes. +/// Gives the player some shoes and makes them walk back over the trap. +/// +public sealed class MousetrapHumanMoveOverTest : MovementTest +{ + private static readonly EntProtoId MousetrapProtoId = "Mousetrap"; + private const string ShoesProtoId = "InteractionTestShoes"; + + [TestPrototypes] + private static readonly string TestPrototypes = $@" + - type: entity + parent: ClothingShoesBase + id: {ShoesProtoId} + components: + - type: Sprite + sprite: Clothing/Shoes/Boots/workboots.rsi + "; + + [Test] + public async Task HumanMoveOverTest() + { + await SpawnTarget(MousetrapProtoId); + + Assert.That(Delta(), Is.GreaterThan(0.5), "Player and mousetrap not in expected positions."); + + Assert.That(HasComp(), + $"{MousetrapProtoId} does not have a MousetrapComponent. If you're refactoring, please update this test!"); + + Assert.That(TryComp(out var itemToggleComp), + $"{MousetrapProtoId} does not have a ItemToggleComponent. If you're refactoring, please update this test!"); + + // Activate the trap + var itemToggleSystem = Server.System(); + await Server.WaitAssertion(() => + { + Assert.That(itemToggleSystem.TrySetActive(STarget.Value, true), "Could not activate the mouse trap."); + }); + + Assert.That(SEntMan.TryGetComponent(SPlayer, out var damageComp), + $"Player does not have a DamageableComponent."); + var startingDamage = damageComp.TotalDamage; + + // Move player over the trap + await Move(DirectionFlag.East, 0.5f); + + Assert.That(Delta(), Is.LessThan(0.5), "Player did not move over mousetrap."); + + // Walking over the trap without shoes activates it + Assert.That(damageComp.TotalDamage, Is.GreaterThan(startingDamage), "Player did not take damage."); + Assert.That(itemToggleComp.Activated, Is.False, "Mousetrap was not deactivated after triggering."); + + // Reactivate the trap + await Server.WaitAssertion(() => + { + Assert.That(itemToggleSystem.TrySetActive(STarget.Value, true), "Could not activate the mouse trap."); + }); + var afterStepDamage = damageComp.TotalDamage; + + // Give the player some shoes + await PlaceInHands(ShoesProtoId); + // Thanks to quick-equip, using the shoes will wear them + await UseInHand(); + + // Move back over the trap + await Move(DirectionFlag.West, 1f); + Assert.That(Delta(), Is.GreaterThan(0.5), "Player did not move back over mousetrap."); + + // Walking over the trap with shoes on does not activate it + Assert.That(damageComp.TotalDamage, Is.LessThanOrEqualTo(afterStepDamage), "Player took damage from trap!"); + Assert.That(itemToggleComp.Activated, "Mousetrap was deactivated despite the player being protected by shoes."); + } +} diff --git a/Content.IntegrationTests/Tests/Power/PowerTest.cs b/Content.IntegrationTests/Tests/Power/PowerTest.cs index a448427d05..ab8a421c03 100644 --- a/Content.IntegrationTests/Tests/Power/PowerTest.cs +++ b/Content.IntegrationTests/Tests/Power/PowerTest.cs @@ -1,12 +1,11 @@ #nullable enable -using Content.Server.NodeContainer; using Content.Server.NodeContainer.EntitySystems; -using Content.Server.NodeContainer.Nodes; using Content.Server.Power.Components; using Content.Server.Power.EntitySystems; using Content.Server.Power.Nodes; using Content.Shared.Coordinates; using Content.Shared.NodeContainer; +using Content.Shared.Power.Components; using Robust.Shared.GameObjects; using Robust.Shared.Map; using Robust.Shared.Maths; diff --git a/Content.IntegrationTests/Tests/Power/StationPowerTests.cs b/Content.IntegrationTests/Tests/Power/StationPowerTests.cs index c9f9498750..3a0af28e48 100644 --- a/Content.IntegrationTests/Tests/Power/StationPowerTests.cs +++ b/Content.IntegrationTests/Tests/Power/StationPowerTests.cs @@ -5,6 +5,7 @@ using Content.Server.Maps; using Content.Server.Power.Components; using Content.Server.Power.NodeGroups; using Content.Server.Power.Pow3r; +using Content.Shared.Power.Components; using Content.Shared.NodeContainer; using Robust.Shared.EntitySerialization; diff --git a/Content.Packaging/ServerPackaging.cs b/Content.Packaging/ServerPackaging.cs index 24365d3fbf..cde9646422 100644 --- a/Content.Packaging/ServerPackaging.cs +++ b/Content.Packaging/ServerPackaging.cs @@ -19,9 +19,6 @@ public static class ServerPackaging new PlatformReg("osx-x64", "MacOS", true), new PlatformReg("osx-arm64", "MacOS", true), // Non-default platforms (i.e. for Watchdog Git) - new PlatformReg("win-x86", "Windows", false), - new PlatformReg("linux-x86", "Linux", false), - new PlatformReg("linux-arm", "Linux", false), new PlatformReg("freebsd-x64", "FreeBSD", false), }; diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs b/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs index 79c616322a..d03b799ff2 100644 --- a/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs +++ b/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs @@ -1,4 +1,3 @@ -using System.Threading; using Content.Server.Administration.Components; using Content.Server.Atmos.EntitySystems; using Content.Server.Body.Components; @@ -6,8 +5,8 @@ using Content.Server.Body.Systems; using Content.Server.Electrocution; using Content.Server.Explosion.EntitySystems; using Content.Server.GhostKick; -using Content.Server.Medical; using Content.Server.Nutrition.EntitySystems; +using Content.Server.Physics.Components; using Content.Server.Pointing.Components; using Content.Server.Polymorph.Systems; using Content.Server.Popups; @@ -22,8 +21,8 @@ using Content.Shared.Administration.Components; using Content.Shared.Atmos.Components; using Content.Shared.Body.Components; using Content.Shared.Body.Part; -using Content.Shared.Clumsy; using Content.Shared.Clothing.Components; +using Content.Shared.Clumsy; using Content.Shared.Cluwne; using Content.Shared.Damage; using Content.Shared.Damage.Systems; @@ -32,6 +31,7 @@ using Content.Shared.Electrocution; using Content.Shared.Gravity; using Content.Shared.Interaction.Components; using Content.Shared.Inventory; +using Content.Shared.Medical; using Content.Shared.Mobs; using Content.Shared.Mobs.Components; using Content.Shared.Mobs.Systems; @@ -54,7 +54,10 @@ using Robust.Shared.Physics.Systems; using Robust.Shared.Player; using Robust.Shared.Prototypes; using Robust.Shared.Random; +using Robust.Shared.Spawners; using Robust.Shared.Utility; +using System.Numerics; +using System.Threading; using Timer = Robust.Shared.Timing.Timer; namespace Content.Server.Administration.Systems; @@ -63,7 +66,7 @@ public sealed partial class AdminVerbSystem { private readonly ProtoId LizardSmite = "AdminLizardSmite"; private readonly ProtoId VulpkaninSmite = "AdminVulpSmite"; - + [Dependency] private readonly SharedActionsSystem _actions = default!; [Dependency] private readonly IRobustRandom _random = default!; [Dependency] private readonly BloodstreamSystem _bloodstreamSystem = default!; @@ -143,7 +146,6 @@ public sealed partial class AdminVerbSystem { _sharedGodmodeSystem.EnableGodmode(args.Target); // So they don't suffocate. EnsureComp(args.Target); - RemComp(args.Target); // So they can be dragged around. var xform = Transform(args.Target); _popupSystem.PopupEntity(Loc.GetString("admin-smite-chess-self"), args.Target, args.Target, PopupType.LargeCaution); @@ -1006,5 +1008,63 @@ public sealed partial class AdminVerbSystem Message = string.Join(": ", siliconName, Loc.GetString("admin-smite-silicon-laws-bound-description")) }; args.Verbs.Add(silicon); + + var homingRodName = Loc.GetString("admin-smite-homing-rod-name").ToLowerInvariant(); + Verb homingRod = new() + { + Text = homingRodName, + Category = VerbCategory.Smite, + Icon = new SpriteSpecifier.Rsi(new("Objects/Specific/Security/target.rsi"), "target_s"), + Act = () => + { + var speed = 25f; // It don't miss brother. + var distance = 350f; + HomingLaunchSequence(args.Target, "ImmovableRodKeepTiles", distance, speed); // todo: swap the proto for an EntityTable GetSpawns once rod rule rework + }, + Impact = LogImpact.Extreme, + Message = string.Join(": ", homingRodName, Loc.GetString("admin-smite-homing-rod-description")) + }; + args.Verbs.Add(homingRod); + + var homingRodSlowName = Loc.GetString("admin-smite-homing-rod-slow-name").ToLowerInvariant(); + Verb homingRodSlow = new() + { + Text = homingRodSlowName, + Category = VerbCategory.Smite, + Icon = new SpriteSpecifier.Rsi(new("Objects/Specific/Security/target.rsi"), "target_c"), + Act = () => + { + var speed = 5f; // slightly faster than default sprint speed 4.5 + if (TryComp(args.Target, out var movement)) + speed = movement.CurrentSprintSpeed + 0.001f;// run + var distance = 200f; // its kinda slow so were just gonna cheat a bit. + HomingLaunchSequence(args.Target, "ImmovableRodKeepTiles", distance, speed); + }, + Impact = LogImpact.Extreme, + Message = string.Join(": ", homingRodSlowName, Loc.GetString("admin-smite-homing-rod-slow-description")) + }; + args.Verbs.Add(homingRodSlow); + } + + public void HomingLaunchSequence(EntityUid target, EntProtoId proto, float distance, float speed) + { + // ToDo: Reuse some spawning code from whereever the rod rule ends up. + // I would do it now but theres a massive rod rewrite, and I don't wanna poke it for this. + // find reasonable spawn location (use gamerule and find rod?) but respect map not on grid etc etc + + var offset = new Random(target.Id).NextAngle().RotateVec(new Vector2(distance, 0)); + var spawnCoords = _transformSystem.GetMapCoordinates(target).Offset(offset); + var rod = Spawn(proto, spawnCoords); + // Here we abuse the ChasingWalkComp by making it skip targetting logic and dialling its frequency up + EnsureComp(rod, out var chasingComp); + chasingComp.NextChangeVectorTime = TimeSpan.MaxValue; // we just want it to never change + chasingComp.ChasingEntity = target; + chasingComp.ImpulseInterval = .1f; // skrrt skrrrrrrt skrrrt + chasingComp.RotateWithImpulse = true; + chasingComp.MaxSpeed = speed; + chasingComp.Speed = speed; // tell me lies, tell me sweet little lies. + + if (TryComp(rod, out var despawn)) + despawn.Lifetime = offset.Length() / speed * 3; // exists thrice as long as it takes to get to you. } } diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs b/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs index 44795d1fb2..176d4fd04c 100644 --- a/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs +++ b/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs @@ -24,6 +24,7 @@ using Content.Shared.Doors.Components; using Content.Shared.Hands.Components; using Content.Shared.Inventory; using Content.Shared.PDA; +using Content.Shared.Power.Components; using Content.Shared.Stacks; using Content.Shared.Station.Components; using Content.Shared.Verbs; diff --git a/Content.Server/Anomaly/AnomalySystem.cs b/Content.Server/Anomaly/AnomalySystem.cs index 69f18e5eeb..102391baff 100644 --- a/Content.Server/Anomaly/AnomalySystem.cs +++ b/Content.Server/Anomaly/AnomalySystem.cs @@ -126,6 +126,9 @@ public sealed partial class AnomalySystem : SharedAnomalySystem if (_random.Prob(anomaly.Comp.Continuity)) SetBehavior(anomaly, GetRandomBehavior()); } + + var ev = new AnomalyAffectedByParticleEvent(anomaly, args.OtherEntity); + RaiseLocalEvent(anomaly, ref ev); } /// diff --git a/Content.Server/Anomaly/Effects/ShuffleParticlesAnomalySystem.cs b/Content.Server/Anomaly/Effects/ShuffleParticlesAnomalySystem.cs index 925c826fb5..2139967691 100644 --- a/Content.Server/Anomaly/Effects/ShuffleParticlesAnomalySystem.cs +++ b/Content.Server/Anomaly/Effects/ShuffleParticlesAnomalySystem.cs @@ -1,9 +1,9 @@ using Content.Server.Anomaly.Components; using Content.Shared.Anomaly.Components; -using Robust.Shared.Physics.Events; using Robust.Shared.Random; namespace Content.Server.Anomaly.Effects; + public sealed class ShuffleParticlesAnomalySystem : EntitySystem { [Dependency] private readonly AnomalySystem _anomaly = default!; @@ -12,19 +12,16 @@ public sealed class ShuffleParticlesAnomalySystem : EntitySystem public override void Initialize() { SubscribeLocalEvent(OnPulse); - SubscribeLocalEvent(OnStartCollide); + SubscribeLocalEvent(OnAffectedByParticle); } - private void OnStartCollide(Entity ent, ref StartCollideEvent args) + private void OnAffectedByParticle(Entity ent, ref AnomalyAffectedByParticleEvent args) { - if (!TryComp(ent, out var anomaly)) - return; - - if (!HasComp(args.OtherEntity)) + if (!TryComp(ent, out var anomalyComp)) return; if (ent.Comp.ShuffleOnParticleHit && _random.Prob(ent.Comp.Prob)) - _anomaly.ShuffleParticlesEffect((ent, anomaly)); + _anomaly.ShuffleParticlesEffect((args.Anomaly, anomalyComp)); } private void OnPulse(Entity ent, ref AnomalyPulseEvent args) diff --git a/Content.Server/Antag/AntagSelectionSystem.API.cs b/Content.Server/Antag/AntagSelectionSystem.API.cs index 6703b7b7ca..5debd10b6e 100644 --- a/Content.Server/Antag/AntagSelectionSystem.API.cs +++ b/Content.Server/Antag/AntagSelectionSystem.API.cs @@ -174,7 +174,10 @@ public sealed partial class AntagSelectionSystem if (roles.Count == 0) return false; - var pref = (HumanoidCharacterProfile) _pref.GetPreferences(session.UserId).SelectedCharacter; + if (!_pref.TryGetCachedPreferences(session.UserId, out var pref)) + return false; + + var character = (HumanoidCharacterProfile) pref.SelectedCharacter; var valid = false; @@ -183,8 +186,7 @@ public sealed partial class AntagSelectionSystem { var list = new List>{role}; - - if (pref.AntagPreferences.Contains(role) + if (character.AntagPreferences.Contains(role) && !_ban.IsRoleBanned(session, list) && _playTime.IsAllowed(session, list)) valid = true; diff --git a/Content.Server/Arcade/SpaceVillainGame/SpaceVillainArcadeComponent.cs b/Content.Server/Arcade/SpaceVillainGame/SpaceVillainArcadeComponent.cs index 208708a85a..35e1f5b89b 100644 --- a/Content.Server/Arcade/SpaceVillainGame/SpaceVillainArcadeComponent.cs +++ b/Content.Server/Arcade/SpaceVillainGame/SpaceVillainArcadeComponent.cs @@ -1,4 +1,5 @@ using Content.Shared.Arcade; +using Content.Shared.Dataset; using Robust.Shared.Audio; using Robust.Shared.Prototypes; @@ -23,85 +24,73 @@ public sealed partial class SpaceVillainArcadeComponent : SharedSpaceVillainArca /// /// The sound played when a new session of the SpaceVillain game is begun. /// - [DataField("newGameSound")] + [DataField] public SoundSpecifier NewGameSound = new SoundPathSpecifier("/Audio/Effects/Arcade/newgame.ogg"); /// /// The sound played when the player chooses to attack. /// - [DataField("playerAttackSound")] + [DataField] public SoundSpecifier PlayerAttackSound = new SoundPathSpecifier("/Audio/Effects/Arcade/player_attack.ogg"); /// /// The sound played when the player chooses to heal. /// - [DataField("playerHealSound")] + [DataField] public SoundSpecifier PlayerHealSound = new SoundPathSpecifier("/Audio/Effects/Arcade/player_heal.ogg"); /// /// The sound played when the player chooses to regain mana. /// - [DataField("playerChargeSound")] + [DataField] public SoundSpecifier PlayerChargeSound = new SoundPathSpecifier("/Audio/Effects/Arcade/player_charge.ogg"); /// /// The sound played when the player wins. /// - [DataField("winSound")] + [DataField] public SoundSpecifier WinSound = new SoundPathSpecifier("/Audio/Effects/Arcade/win.ogg"); /// /// The sound played when the player loses. /// - [DataField("gameOverSound")] + [DataField] public SoundSpecifier GameOverSound = new SoundPathSpecifier("/Audio/Effects/Arcade/gameover.ogg"); /// /// The prefixes that can be used to create the game name. /// - [ViewVariables(VVAccess.ReadWrite)] - [DataField("possibleFightVerbs")] - public List PossibleFightVerbs = new() - {"Победи", "Аннигилируй", "Спаси", "Ударь", "Останови", "Уничтожь", "Заробасти", "Добейся", "Отымей", "Заовни"}; + [DataField] + public ProtoId PossibleFightVerbs = "SpaceVillainVerbsFight"; /// /// The first names/titles that can be used to construct the name of the villain. /// - [ViewVariables(VVAccess.ReadWrite)] - [DataField("possibleFirstEnemyNames")] - public List PossibleFirstEnemyNames = new(){ - "Автоматический", "Фермер", "Лорд", "Профессор", "Кубинец", "Злой", "Грозный Король", - "Космический", "Лорд", "Могучий", "Герцог", "Генерал" - }; + [DataField] + public ProtoId PossibleFirstEnemyNames = "SpaceVillainNamesEnemyFirst"; /// /// The last names that can be used to construct the name of the villain. /// - [ViewVariables(VVAccess.ReadWrite)] - [DataField("possibleLastEnemyNames")] - public List PossibleLastEnemyNames = new() - { - "Мелоноид", "Киллертрон", "Волшебник", "Руина", "Джефф", "Эктоплазма", "Крушелон", "Ухангоид", - "Вакоид", "Петеоид", "слайм", "Грифер", "ЕРПшер", "Человек-ящерица", "Единорог" - }; + [DataField] + public ProtoId PossibleLastEnemyNames = "SpaceVillainNamesEnemyLast"; /// /// The prototypes that can be dispensed as a reward for winning the game. /// - [ViewVariables(VVAccess.ReadWrite)] [DataField] public List PossibleRewards = new(); /// /// The minimum number of prizes the arcade machine can have. /// - [DataField("rewardMinAmount")] + [DataField] public int RewardMinAmount; /// /// The maximum number of prizes the arcade machine can have. /// - [DataField("rewardMaxAmount")] + [DataField] public int RewardMaxAmount; /// diff --git a/Content.Server/Arcade/SpaceVillainGame/SpaceVillainArcadeSystem.cs b/Content.Server/Arcade/SpaceVillainGame/SpaceVillainArcadeSystem.cs index bb717c7012..021d6f6f11 100644 --- a/Content.Server/Arcade/SpaceVillainGame/SpaceVillainArcadeSystem.cs +++ b/Content.Server/Arcade/SpaceVillainGame/SpaceVillainArcadeSystem.cs @@ -4,15 +4,18 @@ using Content.Server.Advertise.EntitySystems; using Content.Shared.Advertise.Components; using Content.Shared.Arcade; using Content.Shared.Power; +using Content.Shared.Random.Helpers; using Robust.Server.GameObjects; using Robust.Shared.Audio; using Robust.Shared.Audio.Systems; +using Robust.Shared.Prototypes; using Robust.Shared.Random; namespace Content.Server.Arcade.SpaceVillain; public sealed partial class SpaceVillainArcadeSystem : EntitySystem { + [Dependency] private readonly IPrototypeManager _prototypeManager = default!; [Dependency] private readonly IRobustRandom _random = default!; [Dependency] private readonly SharedAudioSystem _audioSystem = default!; [Dependency] private readonly UserInterfaceSystem _uiSystem = default!; @@ -52,7 +55,7 @@ public sealed partial class SpaceVillainArcadeSystem : EntitySystem /// A fight-verb. public string GenerateFightVerb(SpaceVillainArcadeComponent arcade) { - return _random.Pick(arcade.PossibleFightVerbs); + return _random.Pick(_prototypeManager.Index(arcade.PossibleFightVerbs)); } /// @@ -61,7 +64,10 @@ public sealed partial class SpaceVillainArcadeSystem : EntitySystem /// An enemy-name. public string GenerateEnemyName(SpaceVillainArcadeComponent arcade) { - return $"{_random.Pick(arcade.PossibleFirstEnemyNames)} {_random.Pick(arcade.PossibleLastEnemyNames)}"; + var possibleFirstEnemyNames = _prototypeManager.Index(arcade.PossibleFirstEnemyNames); + var possibleLastEnemyNames = _prototypeManager.Index(arcade.PossibleLastEnemyNames); + + return $"{_random.Pick(possibleFirstEnemyNames)} {_random.Pick(possibleLastEnemyNames)}"; } private void OnComponentInit(EntityUid uid, SpaceVillainArcadeComponent component, ComponentInit args) diff --git a/Content.Server/Atmos/EntitySystems/AirtightSystem.cs b/Content.Server/Atmos/EntitySystems/AirtightSystem.cs index 4a108b38a4..431707c835 100644 --- a/Content.Server/Atmos/EntitySystems/AirtightSystem.cs +++ b/Content.Server/Atmos/EntitySystems/AirtightSystem.cs @@ -123,7 +123,7 @@ namespace Content.Server.Atmos.EntitySystems public void InvalidatePosition(Entity grid, Vector2i pos) { var query = GetEntityQuery(); - _explosionSystem.UpdateAirtightMap(grid, pos, grid, query); + _explosionSystem.UpdateAirtightMap(grid, pos, grid); _atmosphereSystem.InvalidateTile(grid.Owner, pos); } diff --git a/Content.Server/Clothing/Systems/ChameleonClothingSystem.cs b/Content.Server/Clothing/Systems/ChameleonClothingSystem.cs index f734d3eb3e..645b47d180 100644 --- a/Content.Server/Clothing/Systems/ChameleonClothingSystem.cs +++ b/Content.Server/Clothing/Systems/ChameleonClothingSystem.cs @@ -1,14 +1,10 @@ -using System.Linq; -using Content.Server.Emp; using Content.Shared.Clothing.Components; using Content.Shared.Clothing.EntitySystems; using Content.Shared.Emp; using Content.Shared.IdentityManagement; using Content.Shared.IdentityManagement.Components; -using Content.Shared.Inventory; using Content.Shared.Prototypes; using Robust.Shared.Prototypes; -using Robust.Shared.Random; namespace Content.Server.Clothing.Systems; @@ -16,15 +12,12 @@ public sealed class ChameleonClothingSystem : SharedChameleonClothingSystem { [Dependency] private readonly IPrototypeManager _proto = default!; [Dependency] private readonly IdentitySystem _identity = default!; - [Dependency] private readonly IRobustRandom _random = default!; public override void Initialize() { base.Initialize(); SubscribeLocalEvent(OnMapInit); SubscribeLocalEvent(OnSelected); - - SubscribeLocalEvent(OnEmpPulse); } private void OnMapInit(EntityUid uid, ChameleonClothingComponent component, MapInitEvent args) @@ -37,21 +30,6 @@ public sealed class ChameleonClothingSystem : SharedChameleonClothingSystem SetSelectedPrototype(uid, args.SelectedId, component: component); } - private void OnEmpPulse(EntityUid uid, ChameleonClothingComponent component, ref EmpPulseEvent args) - { - if (!component.AffectedByEmp) - return; - - if (component.EmpContinuous) - component.NextEmpChange = _timing.CurTime + TimeSpan.FromSeconds(1f / component.EmpChangeIntensity); - - var pick = GetRandomValidPrototype(component.Slot, component.RequireTag); - SetSelectedPrototype(uid, pick, component: component); - - args.Affected = true; - args.Disabled = true; - } - private void UpdateUi(EntityUid uid, ChameleonClothingComponent? component = null) { if (!Resolve(uid, ref component)) @@ -64,7 +42,7 @@ public sealed class ChameleonClothingSystem : SharedChameleonClothingSystem /// /// Change chameleon items name, description and sprite to mimic other entity prototype. /// - public void SetSelectedPrototype(EntityUid uid, string? protoId, bool forceUpdate = false, + public override void SetSelectedPrototype(EntityUid uid, string? protoId, bool forceUpdate = false, ChameleonClothingComponent? component = null) { if (!Resolve(uid, ref component, false)) @@ -88,14 +66,6 @@ public sealed class ChameleonClothingSystem : SharedChameleonClothingSystem Dirty(uid, component); } - /// - /// Get a random prototype for a given slot. - /// - public string GetRandomValidPrototype(SlotFlags slot, string? tag = null) - { - return _random.Pick(GetValidTargets(slot, tag).ToList()); - } - public override void Update(float frameTime) { base.Update(frameTime); @@ -106,7 +76,7 @@ public sealed class ChameleonClothingSystem : SharedChameleonClothingSystem if (!chameleon.EmpContinuous) continue; - if (_timing.CurTime < chameleon.NextEmpChange) + if (Timing.CurTime < chameleon.NextEmpChange) continue; // randomly pick cloth element from available and apply it diff --git a/Content.Server/Construction/Completions/BuildMech.cs b/Content.Server/Construction/Completions/BuildMech.cs index e11c79d851..c0b5921db9 100644 --- a/Content.Server/Construction/Completions/BuildMech.cs +++ b/Content.Server/Construction/Completions/BuildMech.cs @@ -1,7 +1,7 @@ using Content.Server.Mech.Systems; -using Content.Server.Power.Components; using Content.Shared.Construction; using Content.Shared.Mech.Components; +using Content.Shared.Power.Components; using JetBrains.Annotations; using Robust.Server.Containers; using Robust.Shared.Containers; diff --git a/Content.Server/Destructible/Thresholds/Behaviors/VomitBehavior.cs b/Content.Server/Destructible/Thresholds/Behaviors/VomitBehavior.cs index 067e7d4565..cba8576213 100644 --- a/Content.Server/Destructible/Thresholds/Behaviors/VomitBehavior.cs +++ b/Content.Server/Destructible/Thresholds/Behaviors/VomitBehavior.cs @@ -1,4 +1,4 @@ -using Content.Server.Medical; +using Content.Shared.Medical; namespace Content.Server.Destructible.Thresholds.Behaviors; diff --git a/Content.Server/DeviceNetwork/Systems/NetworkConfiguratorSystem.cs b/Content.Server/DeviceNetwork/Systems/NetworkConfiguratorSystem.cs index e34929bd2e..97b27821fd 100644 --- a/Content.Server/DeviceNetwork/Systems/NetworkConfiguratorSystem.cs +++ b/Content.Server/DeviceNetwork/Systems/NetworkConfiguratorSystem.cs @@ -361,14 +361,11 @@ public sealed class NetworkConfiguratorSystem : SharedNetworkConfiguratorSystem if (hasLinking && HasComp(target) || hasLinking == configurator.LinkModeActive) return; - if (hasLinking) - { - SetMode(configuratorUid, configurator, userUid, true); - return; - } - - if (HasComp(target)) + var hasNetworking = HasComp(target); + if (hasNetworking) SetMode(configuratorUid, configurator, userUid, false); + else if (hasLinking) + SetMode(configuratorUid, configurator, userUid, true); } #endregion diff --git a/Content.Server/Emp/EmpSystem.cs b/Content.Server/Emp/EmpSystem.cs index 67f9cabd42..38ab09e1cf 100644 --- a/Content.Server/Emp/EmpSystem.cs +++ b/Content.Server/Emp/EmpSystem.cs @@ -2,16 +2,11 @@ using Content.Server.Power.EntitySystems; using Content.Server.Radio; using Content.Server.SurveillanceCamera; using Content.Shared.Emp; -using Robust.Shared.Map; namespace Content.Server.Emp; public sealed class EmpSystem : SharedEmpSystem { - [Dependency] private readonly EntityLookupSystem _lookup = default!; - - public const string EmpPulseEffectPrototype = "EffectEmpPulse"; - public override void Initialize() { base.Initialize(); @@ -22,84 +17,6 @@ public sealed class EmpSystem : SharedEmpSystem SubscribeLocalEvent(OnCameraSetActive); } - public override void EmpPulse(MapCoordinates coordinates, float range, float energyConsumption, float duration) - { - foreach (var uid in _lookup.GetEntitiesInRange(coordinates, range)) - { - TryEmpEffects(uid, energyConsumption, duration); - } - Spawn(EmpPulseEffectPrototype, coordinates); - } - - /// - /// Triggers an EMP pulse at the given location, by first raising an , then a raising on all entities in range. - /// - /// The location to trigger the EMP pulse at. - /// The range of the EMP pulse. - /// The amount of energy consumed by the EMP pulse. - /// The duration of the EMP effects. - public void EmpPulse(EntityCoordinates coordinates, float range, float energyConsumption, float duration) - { - foreach (var uid in _lookup.GetEntitiesInRange(coordinates, range)) - { - TryEmpEffects(uid, energyConsumption, duration); - } - Spawn(EmpPulseEffectPrototype, coordinates); - } - - /// - /// Attempts to apply the effects of an EMP pulse onto an entity by first raising an , followed by raising a on it. - /// - /// The entity to apply the EMP effects on. - /// The amount of energy consumed by the EMP. - /// The duration of the EMP effects. - public void TryEmpEffects(EntityUid uid, float energyConsumption, float duration) - { - var attemptEv = new EmpAttemptEvent(); - RaiseLocalEvent(uid, attemptEv); - if (attemptEv.Cancelled) - return; - - DoEmpEffects(uid, energyConsumption, duration); - } - - /// - /// Applies the effects of an EMP pulse onto an entity by raising a on it. - /// - /// The entity to apply the EMP effects on. - /// The amount of energy consumed by the EMP. - /// The duration of the EMP effects. - public void DoEmpEffects(EntityUid uid, float energyConsumption, float duration) - { - var ev = new EmpPulseEvent(energyConsumption, false, false, TimeSpan.FromSeconds(duration)); - RaiseLocalEvent(uid, ref ev); - - if (ev.Affected) - Spawn(EmpDisabledEffectPrototype, Transform(uid).Coordinates); - - if (!ev.Disabled) - return; - - var disabled = EnsureComp(uid); - disabled.DisabledUntil = Timing.CurTime + TimeSpan.FromSeconds(duration); - } - - public override void Update(float frameTime) - { - base.Update(frameTime); - - var query = EntityQueryEnumerator(); - while (query.MoveNext(out var uid, out var comp)) - { - if (comp.DisabledUntil < Timing.CurTime) - { - RemComp(uid); - var ev = new EmpDisabledRemoved(); - RaiseLocalEvent(uid, ref ev); - } - } - } - private void OnRadioSendAttempt(EntityUid uid, EmpDisabledComponent component, ref RadioSendAttemptEvent args) { args.Cancelled = true; @@ -120,14 +37,3 @@ public sealed class EmpSystem : SharedEmpSystem args.Cancelled = true; } } - -/// -/// Raised on an entity before . Cancel this to prevent the emp event being raised. -/// -public sealed partial class EmpAttemptEvent : CancellableEntityEventArgs; - -[ByRefEvent] -public record struct EmpPulseEvent(float EnergyConsumption, bool Affected, bool Disabled, TimeSpan Duration); - -[ByRefEvent] -public record struct EmpDisabledRemoved(); diff --git a/Content.Server/EntityEffects/EntityEffectSystem.cs b/Content.Server/EntityEffects/EntityEffectSystem.cs index 3a86941a34..238ef4849d 100644 --- a/Content.Server/EntityEffects/EntityEffectSystem.cs +++ b/Content.Server/EntityEffects/EntityEffectSystem.cs @@ -11,7 +11,6 @@ using Content.Server.Emp; using Content.Server.Explosion.EntitySystems; using Content.Server.Fluids.EntitySystems; using Content.Server.Ghost.Roles.Components; -using Content.Server.Medical; using Content.Server.Polymorph.Components; using Content.Server.Polymorph.Systems; using Content.Server.Speech.Components; @@ -29,6 +28,7 @@ using Content.Shared.EntityEffects.Effects; using Content.Shared.EntityEffects; using Content.Shared.Flash; using Content.Shared.Maps; +using Content.Shared.Medical; using Content.Shared.Mind.Components; using Content.Shared.Popups; using Content.Shared.Random; diff --git a/Content.Server/Entry/EntryPoint.cs b/Content.Server/Entry/EntryPoint.cs index 6ce48278a5..abc49c767b 100644 --- a/Content.Server/Entry/EntryPoint.cs +++ b/Content.Server/Entry/EntryPoint.cs @@ -17,8 +17,6 @@ using Content.Server.Info; using Content.Server.IoC; using Content.Server.Maps; using Content.Server.NodeContainer.NodeGroups; -using Content.Server.Objectives; -using Content.Server.Players; using Content.Server.Players.JobWhitelist; using Content.Server.Players.PlayTimeTracking; using Content.Server.Players.RateLimiting; @@ -44,102 +42,113 @@ namespace Content.Server.Entry internal const string ConfigPresetsDir = "/ConfigPresets/"; private const string ConfigPresetsDirBuild = $"{ConfigPresetsDir}Build/"; - private EuiManager _euiManager = default!; - private IVoteManager _voteManager = default!; - private ServerUpdateManager _updateManager = default!; - private PlayTimeTrackingManager? _playTimeTracking; - private IEntitySystemManager? _sysMan; - private IServerDbManager? _dbManager; - private IWatchlistWebhookManager _watchlistWebhookManager = default!; - private IConnectionManager? _connectionManager; + [Dependency] private readonly CVarControlManager _cvarCtrl = default!; + [Dependency] private readonly ContentLocalizationManager _loc = default!; + [Dependency] private readonly ContentNetworkResourceManager _netResMan = default!; + [Dependency] private readonly DiscordChatLink _discordChatLink = default!; + [Dependency] private readonly DiscordLink _discordLink = default!; + [Dependency] private readonly EuiManager _euiManager = default!; + [Dependency] private readonly GhostKickManager _ghostKick = default!; + [Dependency] private readonly IAdminManager _admin = default!; + [Dependency] private readonly IAdminLogManager _adminLog = default!; + [Dependency] private readonly IAfkManager _afk = default!; + [Dependency] private readonly IBanManager _ban = default!; + [Dependency] private readonly IChatManager _chatSan = default!; + [Dependency] private readonly IChatSanitizationManager _chat = default!; + [Dependency] private readonly IComponentFactory _factory = default!; + [Dependency] private readonly IConfigurationManager _cfg = default!; + [Dependency] private readonly IConnectionManager _connection = default!; + [Dependency] private readonly IEntitySystemManager _entSys = default!; + [Dependency] private readonly IGameMapManager _gameMap = default!; + [Dependency] private readonly ILogManager _log = default!; + [Dependency] private readonly INodeGroupFactory _nodeFactory = default!; + [Dependency] private readonly IPrototypeManager _proto = default!; + [Dependency] private readonly IResourceManager _res = default!; + [Dependency] private readonly IServerDbManager _dbManager = default!; + [Dependency] private readonly IServerPreferencesManager _preferences = default!; + [Dependency] private readonly IStatusHost _host = default!; + [Dependency] private readonly IVoteManager _voteManager = default!; + [Dependency] private readonly IWatchlistWebhookManager _watchlistWebhookManager = default!; + [Dependency] private readonly JobWhitelistManager _job = default!; + [Dependency] private readonly MultiServerKickManager _multiServerKick = default!; + [Dependency] private readonly PlayTimeTrackingManager _playTimeTracking = default!; + [Dependency] private readonly PlayerRateLimitManager _rateLimit = default!; + [Dependency] private readonly RecipeManager _recipe = default!; + [Dependency] private readonly RulesManager _rules = default!; + [Dependency] private readonly ServerApi _serverApi = default!; + [Dependency] private readonly ServerInfoManager _serverInfo = default!; + [Dependency] private readonly ServerUpdateManager _updateManager = default!; + + public override void PreInit() + { + ServerContentIoC.Register(Dependencies); + foreach (var callback in TestingCallbacks) + { + var cast = (ServerModuleTestingCallbacks)callback; + cast.ServerBeforeIoC?.Invoke(); + } + } /// public override void Init() { base.Init(); + Dependencies.BuildGraph(); + Dependencies.InjectDependencies(this); - var cfg = IoCManager.Resolve(); - var res = IoCManager.Resolve(); - var logManager = IoCManager.Resolve(); + LoadConfigPresets(_cfg, _res, _log.GetSawmill("configpreset")); - LoadConfigPresets(cfg, res, logManager.GetSawmill("configpreset")); + var aczProvider = new ContentMagicAczProvider(Dependencies); + _host.SetMagicAczProvider(aczProvider); - var aczProvider = new ContentMagicAczProvider(IoCManager.Resolve()); - IoCManager.Resolve().SetMagicAczProvider(aczProvider); + _factory.DoAutoRegistrations(); + _factory.IgnoreMissingComponents("Visuals"); + _factory.RegisterIgnore(IgnoredComponents.List); + _factory.GenerateNetIds(); - var factory = IoCManager.Resolve(); - var prototypes = IoCManager.Resolve(); + _proto.RegisterIgnore("parallax"); - factory.DoAutoRegistrations(); - factory.IgnoreMissingComponents("Visuals"); + _loc.Initialize(); - factory.RegisterIgnore(IgnoredComponents.List); + var dest = _cfg.GetCVar(CCVars.DestinationFile); + if (!string.IsNullOrEmpty(dest)) + return; //hacky but it keeps load times for the generator down. - prototypes.RegisterIgnore("parallax"); + _log.GetSawmill("Storage").Level = LogLevel.Info; + _log.GetSawmill("db.ef").Level = LogLevel.Info; - ServerContentIoC.Register(); - - foreach (var callback in TestingCallbacks) - { - var cast = (ServerModuleTestingCallbacks) callback; - cast.ServerBeforeIoC?.Invoke(); - } - - IoCManager.BuildGraph(); - factory.GenerateNetIds(); - var configManager = IoCManager.Resolve(); - var dest = configManager.GetCVar(CCVars.DestinationFile); - IoCManager.Resolve().Initialize(); - if (string.IsNullOrEmpty(dest)) //hacky but it keeps load times for the generator down. - { - _euiManager = IoCManager.Resolve(); - _voteManager = IoCManager.Resolve(); - _updateManager = IoCManager.Resolve(); - _playTimeTracking = IoCManager.Resolve(); - _connectionManager = IoCManager.Resolve(); - _sysMan = IoCManager.Resolve(); - _dbManager = IoCManager.Resolve(); - _watchlistWebhookManager = IoCManager.Resolve(); - - logManager.GetSawmill("Storage").Level = LogLevel.Info; - logManager.GetSawmill("db.ef").Level = LogLevel.Info; - - IoCManager.Resolve().Initialize(); - IoCManager.Resolve().Initialize(); - _dbManager.Init(); - IoCManager.Resolve().Init(); - IoCManager.Resolve().Initialize(); - IoCManager.Resolve().Initialize(); - IoCManager.Resolve().Initialize(); + _adminLog.Initialize(); + _connection.Initialize(); + _dbManager.Init(); + _preferences.Init(); + _nodeFactory.Initialize(); + _netResMan.Initialize(); + _ghostKick.Initialize(); + _serverInfo.Initialize(); + _serverApi.Initialize(); + _voteManager.Initialize(); + _updateManager.Initialize(); + _playTimeTracking.Initialize(); + _watchlistWebhookManager.Initialize(); + _job.Initialize(); + _rateLimit.Initialize(); IoCManager.Resolve().Initialize(); // Corvax-TTS - IoCManager.Resolve().Initialize(); - IoCManager.Resolve().Initialize(); - - _voteManager.Initialize(); - _updateManager.Initialize(); - _playTimeTracking.Initialize(); - _watchlistWebhookManager.Initialize(); - IoCManager.Resolve().Initialize(); - IoCManager.Resolve().Initialize(); - } } public override void PostInit() { base.PostInit(); - IoCManager.Resolve().Initialize(); - IoCManager.Resolve().Initialize(); - var configManager = IoCManager.Resolve(); - var resourceManager = IoCManager.Resolve(); - var dest = configManager.GetCVar(CCVars.DestinationFile); + _chatSan.Initialize(); + _chat.Initialize(); + var dest = _cfg.GetCVar(CCVars.DestinationFile); if (!string.IsNullOrEmpty(dest)) { var resPath = new ResPath(dest).ToRootedPath(); - var file = resourceManager.UserData.OpenWriteText(resPath.WithName("chem_" + dest)); + var file = _res.UserData.OpenWriteText(resPath.WithName("chem_" + dest)); ChemistryJsonGenerator.PublishJson(file); file.Flush(); - file = resourceManager.UserData.OpenWriteText(resPath.WithName("react_" + dest)); + file = _res.UserData.OpenWriteText(resPath.WithName("react_" + dest)); ReactionJsonGenerator.PublishJson(file); file.Flush(); // Corvax-Wiki-Start @@ -153,27 +162,23 @@ namespace Content.Server.Entry HealthChangeReagentsJsonGenerator.PublishJson(file); file.Flush(); // Corvax-Wiki-End - IoCManager.Resolve().Shutdown("Data generation done"); + Dependencies.Resolve().Shutdown("Data generation done"); + return; } - else - { - IoCManager.Resolve().Initialize(); - IoCManager.Resolve().Initialize(); - IoCManager.Resolve().Initialize(); - IoCManager.Resolve().Initialize(); - IoCManager.Resolve().Initialize(); - IoCManager.Resolve().Initialize(); - - _euiManager.Initialize(); - - IoCManager.Resolve().Initialize(); - IoCManager.Resolve().GetEntitySystem().PostInitialize(); - IoCManager.Resolve().Initialize(); - IoCManager.Resolve().PostInit(); - IoCManager.Resolve().Initialize(); - IoCManager.Resolve().Initialize(); - } + _recipe.Initialize(); + _admin.Initialize(); + _afk.Initialize(); + _rules.Initialize(); + _discordLink.Initialize(); + _discordChatLink.Initialize(); + _euiManager.Initialize(); + _gameMap.Initialize(); + _entSys.GetEntitySystem().PostInitialize(); + _ban.Initialize(); + _connection.PostInit(); + _multiServerKick.Initialize(); + _cvarCtrl.Initialize(); } public override void Update(ModUpdateLevel level, FrameEventArgs frameEventArgs) @@ -191,21 +196,27 @@ namespace Content.Server.Entry case ModUpdateLevel.FramePostEngine: _updateManager.Update(); - _playTimeTracking?.Update(); + _playTimeTracking.Update(); _watchlistWebhookManager.Update(); - _connectionManager?.Update(); + _connection.Update(); break; } } protected override void Dispose(bool disposing) { - _playTimeTracking?.Shutdown(); - _dbManager?.Shutdown(); - IoCManager.Resolve().Shutdown(); + var dest = _cfg.GetCVar(CCVars.DestinationFile); + if (!string.IsNullOrEmpty(dest)) + { + _playTimeTracking.Shutdown(); + _dbManager.Shutdown(); + } - IoCManager.Resolve().Shutdown(); - IoCManager.Resolve().Shutdown(); + _serverApi.Shutdown(); + + // TODO Should this be awaited? + _discordLink.Shutdown(); + _discordChatLink.Shutdown(); } private static void LoadConfigPresets(IConfigurationManager cfg, IResourceManager res, ISawmill sawmill) diff --git a/Content.Server/ExCable/ExCableNodeGroup.cs b/Content.Server/ExCable/ExCableNodeGroup.cs new file mode 100644 index 0000000000..b505fbad94 --- /dev/null +++ b/Content.Server/ExCable/ExCableNodeGroup.cs @@ -0,0 +1,14 @@ +using Content.Server.NodeContainer.NodeGroups; +using Content.Shared.NodeContainer.NodeGroups; +using Content.Server.Power.Components; +using Content.Server.Power.EntitySystems; + +namespace Content.Server.ExCable; + +/// +/// Dummy Node group class for handling the explosive cables. +/// +[NodeGroup(NodeGroupID.ExCable)] +public sealed class ExCableNodeGroup : BaseNodeGroup +{ +} diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSystem.Airtight.cs b/Content.Server/Explosion/EntitySystems/ExplosionSystem.Airtight.cs index af004e112e..3d55a7e823 100644 --- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.Airtight.cs +++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.Airtight.cs @@ -11,8 +11,6 @@ namespace Content.Server.Explosion.EntitySystems; public sealed partial class ExplosionSystem { - [Dependency] private readonly DestructibleSystem _destructibleSystem = default!; - private readonly Dictionary _explosionTypes = new(); private void InitAirtightMap() @@ -26,6 +24,8 @@ public sealed partial class ExplosionSystem int index = 0; foreach (var prototype in _prototypeManager.EnumeratePrototypes()) { + // TODO EXPLOSION + // just make this a field on the prototype _explosionTypes.Add(prototype.ID, index); index++; } @@ -42,10 +42,10 @@ public sealed partial class ExplosionSystem // indices to this tile-data struct. private Dictionary> _airtightMap = new(); - public void UpdateAirtightMap(EntityUid gridId, Vector2i tile, MapGridComponent? grid = null, EntityQuery? query = null) + public void UpdateAirtightMap(EntityUid gridId, Vector2i tile, MapGridComponent? grid = null) { if (Resolve(gridId, ref grid, false)) - UpdateAirtightMap(gridId, grid, tile, query); + UpdateAirtightMap(gridId, grid, tile); } /// @@ -58,7 +58,7 @@ public sealed partial class ExplosionSystem /// something like a normal and a reinforced windoor on the same tile. But given that this is a pretty rare /// occurrence, I am fine with this. /// - public void UpdateAirtightMap(EntityUid gridId, MapGridComponent grid, Vector2i tile, EntityQuery? query = null) + public void UpdateAirtightMap(EntityUid gridId, MapGridComponent grid, Vector2i tile) { var tolerance = new float[_explosionTypes.Count]; var blockedDirections = AtmosDirection.Invalid; @@ -66,18 +66,15 @@ public sealed partial class ExplosionSystem if (!_airtightMap.ContainsKey(gridId)) _airtightMap[gridId] = new(); - query ??= GetEntityQuery(); - var damageQuery = GetEntityQuery(); - var destructibleQuery = GetEntityQuery(); - var anchoredEnumerator = _mapSystem.GetAnchoredEntitiesEnumerator(gridId, grid, tile); + var anchoredEnumerator = _map.GetAnchoredEntitiesEnumerator(gridId, grid, tile); while (anchoredEnumerator.MoveNext(out var uid)) { - if (!query.Value.TryGetComponent(uid, out var airtight) || !airtight.AirBlocked) + if (!_airtightQuery.TryGetComponent(uid, out var airtight) || !airtight.AirBlocked) continue; blockedDirections |= airtight.AirBlockedDirection; - var entityTolerances = GetExplosionTolerance(uid.Value, damageQuery, destructibleQuery); + var entityTolerances = GetExplosionTolerance(uid.Value); for (var i = 0; i < tolerance.Length; i++) { tolerance[i] = Math.Max(tolerance[i], entityTolerances[i]); @@ -105,28 +102,25 @@ public sealed partial class ExplosionSystem if (!TryComp(transform.GridUid, out var grid)) return; - UpdateAirtightMap(transform.GridUid.Value, grid, _mapSystem.CoordinatesToTile(transform.GridUid.Value, grid, transform.Coordinates)); + UpdateAirtightMap(transform.GridUid.Value, grid, _map.CoordinatesToTile(transform.GridUid.Value, grid, transform.Coordinates)); } /// /// Return a dictionary that specifies how intense a given explosion type needs to be in order to destroy an entity. /// - public float[] GetExplosionTolerance( - EntityUid uid, - EntityQuery damageQuery, - EntityQuery destructibleQuery) + public float[] GetExplosionTolerance(EntityUid uid) { // How much total damage is needed to destroy this entity? This also includes "break" behaviors. This ASSUMES // that this will result in a non-airtight entity.Entities that ONLY break via construction graph node changes // are currently effectively "invincible" as far as this is concerned. This really should be done more rigorously. var totalDamageTarget = FixedPoint2.MaxValue; - if (destructibleQuery.TryGetComponent(uid, out var destructible)) + if (_destructibleQuery.TryGetComponent(uid, out var destructible)) { totalDamageTarget = _destructibleSystem.DestroyedAt(uid, destructible); } var explosionTolerance = new float[_explosionTypes.Count]; - if (totalDamageTarget == FixedPoint2.MaxValue || !damageQuery.TryGetComponent(uid, out var damageable)) + if (totalDamageTarget == FixedPoint2.MaxValue || !_damageableQuery.TryGetComponent(uid, out var damageable)) { for (var i = 0; i < explosionTolerance.Length; i++) { @@ -139,9 +133,12 @@ public sealed partial class ExplosionSystem // does not support entities dynamically changing explosive resistances (e.g. via clothing). But these probably // shouldn't be airtight structures anyways.... + var mod = _damageableSystem.UniversalAllDamageModifier * _damageableSystem.UniversalExplosionDamageModifier; foreach (var (id, index) in _explosionTypes) { - if (!_prototypeManager.TryIndex(id, out var explosionType)) + // TODO EXPLOSION SYSTEM + // cache explosion type damage. + if (!_prototypeManager.Resolve(id, out ExplosionPrototype? explosionType)) continue; // evaluate the damage that this damage type would do to this entity @@ -151,10 +148,15 @@ public sealed partial class ExplosionSystem if (!damageable.Damage.DamageDict.ContainsKey(type)) continue; + // TODO EXPLOSION SYSTEM + // add a variant of the event that gets raised once, instead of once per prototype. + // Or better yet, just calculate this manually w/o the event. + // The event mainly exists for indirect resistances via things like inventory & clothing + // But this shouldn't matter for airtight entities. var ev = new GetExplosionResistanceEvent(explosionType.ID); RaiseLocalEvent(uid, ref ev); - damagePerIntensity += value * Math.Max(0, ev.DamageCoefficient); + damagePerIntensity += value * mod * Math.Max(0, ev.DamageCoefficient); } explosionTolerance[index] = damagePerIntensity > 0 @@ -179,4 +181,16 @@ public sealed partial class ExplosionSystem public float[] ExplosionTolerance; public AtmosDirection BlockedDirections = AtmosDirection.Invalid; } + + public override void ReloadMap() + { + foreach (var(grid, dict) in _airtightMap) + { + var comp = Comp(grid); + foreach (var index in dict.Keys) + { + UpdateAirtightMap(grid, comp, index); + } + } + } } diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSystem.GridMap.cs b/Content.Server/Explosion/EntitySystems/ExplosionSystem.GridMap.cs index 8515e1af42..5c032d5c82 100644 --- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.GridMap.cs +++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.GridMap.cs @@ -258,7 +258,7 @@ public sealed partial class ExplosionSystem { var neighbourIndex = change.GridIndices + NeighbourVectors[i]; - if (_mapSystem.TryGetTileRef(ev.Entity, grid, neighbourIndex, out var neighbourTile) && !neighbourTile.Tile.IsEmpty) + if (_map.TryGetTileRef(ev.Entity, grid, neighbourIndex, out var neighbourTile) && !neighbourTile.Tile.IsEmpty) { var oppositeDirection = (NeighborFlag)(1 << ((i + 4) % 8)); edges[neighbourIndex] = edges.GetValueOrDefault(neighbourIndex) | oppositeDirection; @@ -307,7 +307,7 @@ public sealed partial class ExplosionSystem spaceDirections = NeighborFlag.Invalid; for (var i = 0; i < NeighbourVectors.Length; i++) { - if (!_mapSystem.TryGetTileRef(grid, grid.Comp, index + NeighbourVectors[i], out var neighborTile) || neighborTile.Tile.IsEmpty) + if (!_map.TryGetTileRef(grid, grid.Comp, index + NeighbourVectors[i], out var neighborTile) || neighborTile.Tile.IsEmpty) spaceDirections |= (NeighborFlag) (1 << i); } diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs b/Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs index b61f78e909..263fdabf98 100644 --- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs +++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs @@ -27,8 +27,6 @@ namespace Content.Server.Explosion.EntitySystems; public sealed partial class ExplosionSystem { - [Dependency] private readonly FlammableSystem _flammableSystem = default!; - /// /// Used to limit explosion processing time. See . /// @@ -446,7 +444,7 @@ public sealed partial class ExplosionSystem GetEntitiesToDamage(uid, originalDamage, id); foreach (var (entity, damage) in _toDamage) { - if (damage.GetTotal() > 0 && TryComp(entity, out var actorComponent)) + if (_actorQuery.HasComp(entity)) { // Log damage to player entities only, cause this will create a massive amount of log spam otherwise. if (cause != null) @@ -461,7 +459,7 @@ public sealed partial class ExplosionSystem } // TODO EXPLOSIONS turn explosions into entities, and pass the the entity in as the damage origin. - _damageableSystem.TryChangeDamage(entity, damage * _damageableSystem.UniversalExplosionDamageModifier, ignoreResistances: true); + _damageableSystem.TryChangeDamage(entity, damage, ignoreResistances: true, ignoreGlobalModifiers: true); } } @@ -668,6 +666,7 @@ sealed class Explosion private readonly IEntityManager _entMan; private readonly ExplosionSystem _system; private readonly SharedMapSystem _mapSystem; + private readonly DamageableSystem _damageable; public readonly EntityUid VisualEnt; @@ -688,10 +687,10 @@ sealed class Explosion int maxTileBreak, bool canCreateVacuum, IEntityManager entMan, - IMapManager mapMan, EntityUid visualEnt, EntityUid? cause, - SharedMapSystem mapSystem) + SharedMapSystem mapSystem, + DamageableSystem damageable) { VisualEnt = visualEnt; Cause = cause; @@ -706,6 +705,7 @@ sealed class Explosion _maxTileBreak = maxTileBreak; _canCreateVacuum = canCreateVacuum; _entMan = entMan; + _damageable = damageable; _xformQuery = entMan.GetEntityQuery(); _physicsQuery = entMan.GetEntityQuery(); @@ -760,8 +760,10 @@ sealed class Explosion _expectedDamage = ExplosionType.DamagePerIntensity * _currentIntensity; } #endif - - _currentDamage = ExplosionType.DamagePerIntensity * _currentIntensity; + var modifier = _currentIntensity + * _damageable.UniversalExplosionDamageModifier + * _damageable.UniversalAllDamageModifier; + _currentDamage = ExplosionType.DamagePerIntensity * modifier; // only throw if either the explosion is small, or if this is the outer ring of a large explosion. var doThrow = Area < _system.ThrowLimit || CurrentIteration > _tileSetIntensity.Count - 6; diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSystem.TileFill.cs b/Content.Server/Explosion/EntitySystems/ExplosionSystem.TileFill.cs index cee694886b..ac539da213 100644 --- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.TileFill.cs +++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.TileFill.cs @@ -52,7 +52,7 @@ public sealed partial class ExplosionSystem // get the epicenter tile indices if (_mapManager.TryFindGridAt(epicenter, out var gridUid, out var candidateGrid) && - _mapSystem.TryGetTileRef(gridUid, candidateGrid, _mapSystem.WorldToTile(gridUid, candidateGrid, epicenter.Position), out var tileRef) && + _map.TryGetTileRef(gridUid, candidateGrid, _map.WorldToTile(gridUid, candidateGrid, epicenter.Position), out var tileRef) && !tileRef.Tile.IsEmpty) { epicentreGrid = gridUid; @@ -62,7 +62,7 @@ public sealed partial class ExplosionSystem { // reference grid defines coordinate system that the explosion in space will use var gridComp = Comp(referenceGrid.Value); - initialTile = _mapSystem.WorldToTile(referenceGrid.Value, gridComp, epicenter.Position); + initialTile = _map.WorldToTile(referenceGrid.Value, gridComp, epicenter.Position); } else { diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs b/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs index b459f5c70f..67dbe97b29 100644 --- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs +++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs @@ -2,6 +2,8 @@ using System.Linq; using System.Numerics; using Content.Server.Administration.Logs; using Content.Server.Atmos.Components; +using Content.Server.Atmos.EntitySystems; +using Content.Server.Destructible; using Content.Server.NodeContainer.EntitySystems; using Content.Server.NPC.Pathfinding; using Content.Shared.Atmos.Components; @@ -16,7 +18,6 @@ using Content.Shared.GameTicking; using Content.Shared.Inventory; using Content.Shared.Projectiles; using Content.Shared.Throwing; -using Robust.Server.GameObjects; using Robust.Server.GameStates; using Robust.Server.Player; using Robust.Shared.Audio.Systems; @@ -38,23 +39,28 @@ public sealed partial class ExplosionSystem : SharedExplosionSystem [Dependency] private readonly IPrototypeManager _prototypeManager = default!; [Dependency] private readonly IConfigurationManager _cfg = default!; [Dependency] private readonly IPlayerManager _playerManager = default!; + [Dependency] private readonly IAdminLogManager _adminLogger = default!; - [Dependency] private readonly MapSystem _mapSystem = default!; [Dependency] private readonly SharedAppearanceSystem _appearance = default!; [Dependency] private readonly DamageableSystem _damageableSystem = default!; [Dependency] private readonly NodeGroupSystem _nodeGroupSystem = default!; [Dependency] private readonly PathfindingSystem _pathfindingSystem = default!; [Dependency] private readonly SharedCameraRecoilSystem _recoilSystem = default!; - [Dependency] private readonly IAdminLogManager _adminLogger = default!; [Dependency] private readonly ThrowingSystem _throwingSystem = default!; [Dependency] private readonly PvsOverrideSystem _pvsSys = default!; [Dependency] private readonly SharedAudioSystem _audio = default!; [Dependency] private readonly SharedTransformSystem _transformSystem = default!; [Dependency] private readonly SharedMapSystem _map = default!; + [Dependency] private readonly FlammableSystem _flammableSystem = default!; + [Dependency] private readonly DestructibleSystem _destructibleSystem = default!; private EntityQuery _flammableQuery; private EntityQuery _physicsQuery; private EntityQuery _projectileQuery; + private EntityQuery _actorQuery; + private EntityQuery _destructibleQuery; + private EntityQuery _damageableQuery; + private EntityQuery _airtightQuery; /// /// "Tile-size" for space when there are no nearby grids to use as a reference. @@ -93,6 +99,10 @@ public sealed partial class ExplosionSystem : SharedExplosionSystem _flammableQuery = GetEntityQuery(); _physicsQuery = GetEntityQuery(); _projectileQuery = GetEntityQuery(); + _actorQuery = GetEntityQuery(); + _destructibleQuery = GetEntityQuery(); + _damageableQuery = GetEntityQuery(); + _airtightQuery = GetEntityQuery(); } private void OnReset(RoundRestartCleanupEvent ev) @@ -317,7 +327,7 @@ public sealed partial class ExplosionSystem : SharedExplosionSystem private Explosion? SpawnExplosion(QueuedExplosion queued) { var pos = queued.Epicenter; - if (!_mapSystem.MapExists(pos.MapId)) + if (!_map.MapExists(pos.MapId)) return null; var results = GetExplosionTiles(pos, queued.Proto.ID, queued.TotalIntensity, queued.Slope, queued.MaxTileIntensity); @@ -333,7 +343,7 @@ public sealed partial class ExplosionSystem : SharedExplosionSystem CameraShake(iterationIntensity.Count * 4f, pos, queued.TotalIntensity); //For whatever bloody reason, sound system requires ENTITY coordinates. - var mapEntityCoords = _transformSystem.ToCoordinates(_mapSystem.GetMap(pos.MapId), pos); + var mapEntityCoords = _transformSystem.ToCoordinates(_map.GetMap(pos.MapId), pos); // play sound. // for the normal audio, we want everyone in pvs range @@ -376,10 +386,10 @@ public sealed partial class ExplosionSystem : SharedExplosionSystem queued.MaxTileBreak, queued.CanCreateVacuum, EntityManager, - _mapManager, visualEnt, queued.Cause, - _map); + _map, + _damageableSystem); } private void CameraShake(float range, MapCoordinates epicenter, float totalIntensity) diff --git a/Content.Server/Holosign/HolosignSystem.cs b/Content.Server/Holosign/HolosignSystem.cs index 58ed77ecf8..beb5e909c0 100644 --- a/Content.Server/Holosign/HolosignSystem.cs +++ b/Content.Server/Holosign/HolosignSystem.cs @@ -1,8 +1,8 @@ using Content.Shared.Examine; using Content.Shared.Coordinates.Helpers; -using Content.Server.Power.Components; using Content.Server.PowerCell; using Content.Shared.Interaction; +using Content.Shared.Power.Components; using Content.Shared.Storage; namespace Content.Server.Holosign; @@ -12,7 +12,6 @@ public sealed class HolosignSystem : EntitySystem [Dependency] private readonly PowerCellSystem _powerCell = default!; [Dependency] private readonly SharedTransformSystem _transform = default!; - public override void Initialize() { base.Initialize(); diff --git a/Content.Server/Interaction/InteractionSystem.cs b/Content.Server/Interaction/InteractionSystem.cs index 9ac82b2185..c5488f458c 100644 --- a/Content.Server/Interaction/InteractionSystem.cs +++ b/Content.Server/Interaction/InteractionSystem.cs @@ -1,12 +1,6 @@ using Content.Shared.Interaction; -using Content.Shared.Storage; -using JetBrains.Annotations; -using Robust.Server.GameObjects; -using Robust.Shared.Containers; -using Robust.Shared.Player; namespace Content.Server.Interaction { - // TODO Remove Shared prefix public sealed class InteractionSystem : SharedInteractionSystem; } diff --git a/Content.Server/IoC/ServerContentIoC.cs b/Content.Server/IoC/ServerContentIoC.cs index 8148dd9262..71c8b3d0fd 100644 --- a/Content.Server/IoC/ServerContentIoC.cs +++ b/Content.Server/IoC/ServerContentIoC.cs @@ -27,60 +27,60 @@ using Content.Server.Worldgen.Tools; using Content.Shared.Administration.Logs; using Content.Shared.Administration.Managers; using Content.Shared.Chat; +using Content.Shared.IoC; using Content.Shared.Kitchen; using Content.Shared.Players.PlayTimeTracking; using Content.Shared.Players.RateLimiting; -namespace Content.Server.IoC -{ - internal static class ServerContentIoC - { - public static void Register() - { - IoCManager.Register(); - IoCManager.Register(); - IoCManager.Register(); - IoCManager.Register(); - IoCManager.Register(); - IoCManager.Register(); - IoCManager.Register(); - IoCManager.Register(); - IoCManager.Register(); - IoCManager.Register(); - IoCManager.Register(); - IoCManager.Register(); - IoCManager.Register(); - IoCManager.Register(); - IoCManager.Register(); - IoCManager.Register(); - IoCManager.Register(); - IoCManager.Register(); - IoCManager.Register(); - IoCManager.Register(); - IoCManager.Register(); - IoCManager.Register(); - IoCManager.Register(); - IoCManager.Register(); - IoCManager.Register(); - IoCManager.Register(); // Corvax-TTS - IoCManager.Register(); - IoCManager.Register(); - IoCManager.Register(); - IoCManager.Register(); - IoCManager.Register(); - IoCManager.Register(); - IoCManager.Register(); - IoCManager.Register(); - IoCManager.Register(); - IoCManager.Register(); - IoCManager.Register(); - IoCManager.Register(); - IoCManager.Register(); - IoCManager.Register(); - IoCManager.Register(); +namespace Content.Server.IoC; - IoCManager.Register(); - IoCManager.Register(); - } +internal static class ServerContentIoC +{ + public static void Register(IDependencyCollection deps) + { + SharedContentIoC.Register(deps); + deps.Register(); + deps.Register(); + deps.Register(); + deps.Register(); + deps.Register(); + deps.Register(); + deps.Register(); + deps.Register(); + deps.Register(); + deps.Register(); + deps.Register(); + deps.Register(); + deps.Register(); + deps.Register(); + deps.Register(); + deps.Register(); + deps.Register(); + deps.Register(); + deps.Register(); + deps.Register(); + deps.Register(); + deps.Register(); + deps.Register(); + deps.Register(); + deps.Register(); + deps.Register(); + deps.Register(); + deps.Register(); + deps.Register(); + deps.Register(); + deps.Register(); + deps.Register(); + deps.Register(); + deps.Register(); + deps.Register(); + deps.Register(); + deps.Register(); + deps.Register(); + deps.Register(); + deps.Register(); + deps.Register(); + deps.Register(); + IoCManager.Register(); // Corvax-TTS } } diff --git a/Content.Server/Light/EntitySystems/EmergencyLightSystem.cs b/Content.Server/Light/EntitySystems/EmergencyLightSystem.cs index 1b7b614665..0aea245c79 100644 --- a/Content.Server/Light/EntitySystems/EmergencyLightSystem.cs +++ b/Content.Server/Light/EntitySystems/EmergencyLightSystem.cs @@ -8,6 +8,7 @@ using Content.Shared.Examine; using Content.Shared.Light; using Content.Shared.Light.Components; using Content.Shared.Power; +using Content.Shared.Power.Components; using Content.Shared.Station.Components; using Robust.Server.GameObjects; using Color = Robust.Shared.Maths.Color; diff --git a/Content.Server/Light/EntitySystems/PoweredLightSystem.cs b/Content.Server/Light/EntitySystems/PoweredLightSystem.cs index 948c44cd75..d1c231e490 100644 --- a/Content.Server/Light/EntitySystems/PoweredLightSystem.cs +++ b/Content.Server/Light/EntitySystems/PoweredLightSystem.cs @@ -1,4 +1,3 @@ -using Content.Server.Emp; using Content.Server.Ghost; using Content.Shared.Light.Components; using Content.Shared.Light.EntitySystems; @@ -16,8 +15,6 @@ public sealed class PoweredLightSystem : SharedPoweredLightSystem SubscribeLocalEvent(OnMapInit); SubscribeLocalEvent(OnGhostBoo); - - SubscribeLocalEvent(OnEmpPulse); } private void OnGhostBoo(EntityUid uid, PoweredLightComponent light, GhostBooEvent args) @@ -55,10 +52,4 @@ public sealed class PoweredLightSystem : SharedPoweredLightSystem // need this to update visualizers UpdateLight(uid, light); } - - private void OnEmpPulse(EntityUid uid, PoweredLightComponent component, ref EmpPulseEvent args) - { - if (TryDestroyBulb(uid, component)) - args.Affected = true; - } } diff --git a/Content.Server/Mech/Systems/MechSystem.cs b/Content.Server/Mech/Systems/MechSystem.cs index 7b0c2f6472..917f4f5035 100644 --- a/Content.Server/Mech/Systems/MechSystem.cs +++ b/Content.Server/Mech/Systems/MechSystem.cs @@ -2,7 +2,6 @@ using System.Linq; using Content.Server.Atmos.EntitySystems; using Content.Server.Body.Systems; using Content.Server.Mech.Components; -using Content.Server.Power.Components; using Content.Server.Power.EntitySystems; using Content.Shared.ActionBlocker; using Content.Shared.Damage; @@ -14,6 +13,7 @@ using Content.Shared.Mech.Components; using Content.Shared.Mech.EntitySystems; using Content.Shared.Movement.Events; using Content.Shared.Popups; +using Content.Shared.Power.Components; using Content.Shared.Tools; using Content.Shared.Tools.Components; using Content.Shared.Tools.Systems; diff --git a/Content.Server/Medical/SuitSensors/SuitSensorSystem.cs b/Content.Server/Medical/SuitSensors/SuitSensorSystem.cs index 7af093b178..72c3f5ecd9 100644 --- a/Content.Server/Medical/SuitSensors/SuitSensorSystem.cs +++ b/Content.Server/Medical/SuitSensors/SuitSensorSystem.cs @@ -1,8 +1,6 @@ using Content.Server.DeviceNetwork.Systems; -using Content.Server.Emp; using Content.Server.Medical.CrewMonitoring; using Content.Shared.DeviceNetwork.Components; -using Content.Shared.Medical.SuitSensor; using Content.Shared.Medical.SuitSensors; using Robust.Shared.Timing; @@ -14,14 +12,6 @@ public sealed class SuitSensorSystem : SharedSuitSensorSystem [Dependency] private readonly DeviceNetworkSystem _deviceNetworkSystem = default!; [Dependency] private readonly SingletonDeviceNetServerSystem _singletonServerSystem = default!; - public override void Initialize() - { - base.Initialize(); - - SubscribeLocalEvent(OnEmpPulse); - SubscribeLocalEvent(OnEmpFinished); - } - public override void Update(float frameTime) { base.Update(frameTime); @@ -70,22 +60,4 @@ public sealed class SuitSensorSystem : SharedSuitSensorSystem _deviceNetworkSystem.QueuePacket(uid, sensor.ConnectedServer, payload, device: device); } } - - private void OnEmpPulse(Entity ent, ref EmpPulseEvent args) - { - args.Affected = true; - args.Disabled = true; - - ent.Comp.PreviousMode = ent.Comp.Mode; - SetSensor(ent.AsNullable(), SuitSensorMode.SensorOff, null); - - ent.Comp.PreviousControlsLocked = ent.Comp.ControlsLocked; - ent.Comp.ControlsLocked = true; - } - - private void OnEmpFinished(Entity ent, ref EmpDisabledRemoved args) - { - SetSensor(ent.AsNullable(), ent.Comp.PreviousMode, null); - ent.Comp.ControlsLocked = ent.Comp.PreviousControlsLocked; - } } diff --git a/Content.Server/Medical/VomitSystem.cs b/Content.Server/Medical/VomitSystem.cs deleted file mode 100644 index 235cc17331..0000000000 --- a/Content.Server/Medical/VomitSystem.cs +++ /dev/null @@ -1,112 +0,0 @@ -using Content.Server.Body.Systems; -using Content.Server.Fluids.EntitySystems; -using Content.Server.Forensics; -using Content.Server.Popups; -using Content.Shared.Body.Components; -using Content.Shared.Body.Systems; -using Content.Shared.Chemistry.Components; -using Content.Shared.Chemistry.EntitySystems; -using Content.Shared.Chemistry.Reagent; -using Content.Shared.IdentityManagement; -using Content.Shared.Mobs.Systems; -using Content.Shared.Movement.Systems; -using Content.Shared.Nutrition.Components; -using Content.Shared.Nutrition.EntitySystems; -using Robust.Server.Audio; -using Robust.Shared.Audio; -using Robust.Shared.Prototypes; - -namespace Content.Server.Medical -{ - public sealed class VomitSystem : EntitySystem - { - [Dependency] private readonly IPrototypeManager _proto = default!; - [Dependency] private readonly AudioSystem _audio = default!; - [Dependency] private readonly BloodstreamSystem _bloodstream = default!; - [Dependency] private readonly BodySystem _body = default!; - [Dependency] private readonly ForensicsSystem _forensics = default!; - [Dependency] private readonly HungerSystem _hunger = default!; - [Dependency] private readonly MobStateSystem _mobstate = default!; - [Dependency] private readonly MovementModStatusSystem _movementMod = default!; - [Dependency] private readonly PopupSystem _popup = default!; - [Dependency] private readonly PuddleSystem _puddle = default!; - [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!; - [Dependency] private readonly ThirstSystem _thirst = default!; - - private static readonly ProtoId VomitCollection = "Vomit"; - - private readonly SoundSpecifier _vomitSound = new SoundCollectionSpecifier(VomitCollection, - AudioParams.Default.WithVariation(0.2f).WithVolume(-4f)); - - /// - /// Make an entity vomit, if they have a stomach. - /// - public void Vomit(EntityUid uid, float thirstAdded = -40f, float hungerAdded = -40f, bool force = false) - { - // Main requirement: You have a stomach - var stomachList = _body.GetBodyOrganEntityComps(uid); - if (stomachList.Count == 0) - return; - - // Vomit only if entity is alive - // Ignore condition if force was set to true - if (!force && _mobstate.IsDead(uid)) - return; - - // Vomiting makes you hungrier and thirstier - if (TryComp(uid, out var hunger)) - _hunger.ModifyHunger(uid, hungerAdded, hunger); - - if (TryComp(uid, out var thirst)) - _thirst.ModifyThirst(uid, thirst, thirstAdded); - - // It fully empties the stomach, this amount from the chem stream is relatively small - var solutionSize = (MathF.Abs(thirstAdded) + MathF.Abs(hungerAdded)) / 6; - // Apply a bit of slowdown - _movementMod.TryUpdateMovementSpeedModDuration(uid, MovementModStatusSystem.VomitingSlowdown, TimeSpan.FromSeconds(solutionSize), 0.5f); - - // TODO: Need decals - var solution = new Solution(); - - // Empty the stomach out into it - foreach (var stomach in stomachList) - { - if (_solutionContainer.ResolveSolution(stomach.Owner, StomachSystem.DefaultSolutionName, ref stomach.Comp1.Solution, out var sol)) - { - solution.AddSolution(sol, _proto); - sol.RemoveAllSolution(); - _solutionContainer.UpdateChemicals(stomach.Comp1.Solution.Value); - } - } - // Adds a tiny amount of the chem stream from earlier along with vomit - if (TryComp(uid, out var bloodStream)) - { - const float chemMultiplier = 0.1f; - - var vomitAmount = solutionSize; - - // Takes 10% of the chemicals removed from the chem stream - if (_solutionContainer.ResolveSolution(uid, bloodStream.ChemicalSolutionName, ref bloodStream.ChemicalSolution)) - { - var vomitChemstreamAmount = _solutionContainer.SplitSolution(bloodStream.ChemicalSolution.Value, vomitAmount); - vomitChemstreamAmount.ScaleSolution(chemMultiplier); - solution.AddSolution(vomitChemstreamAmount, _proto); - - vomitAmount -= (float)vomitChemstreamAmount.Volume; - } - - // Makes a vomit solution the size of 90% of the chemicals removed from the chemstream - solution.AddReagent(new ReagentId("Vomit", _bloodstream.GetEntityBloodData(uid)), vomitAmount); // TODO: Dehardcode vomit prototype - } - - if (_puddle.TrySpillAt(uid, solution, out var puddle, false)) - { - _forensics.TransferDna(puddle, uid, false); - } - - // Force sound to play as spill doesn't work if solution is empty. - _audio.PlayPvs(_vomitSound, uid); - _popup.PopupEntity(Loc.GetString("disease-vomit", ("person", Identity.Entity(uid, EntityManager))), uid); - } - } -} diff --git a/Content.Server/Ninja/Systems/BatteryDrainerSystem.cs b/Content.Server/Ninja/Systems/BatteryDrainerSystem.cs index 71e38ed3f6..e563386608 100644 --- a/Content.Server/Ninja/Systems/BatteryDrainerSystem.cs +++ b/Content.Server/Ninja/Systems/BatteryDrainerSystem.cs @@ -6,7 +6,7 @@ using Content.Shared.Interaction; using Content.Shared.Ninja.Components; using Content.Shared.Ninja.Systems; using Content.Shared.Popups; -using Robust.Shared.Audio; +using Content.Shared.Power.Components; using Robust.Shared.Audio.Systems; namespace Content.Server.Ninja.Systems; diff --git a/Content.Server/Ninja/Systems/NinjaSuitSystem.cs b/Content.Server/Ninja/Systems/NinjaSuitSystem.cs index 62d3d0e3ca..399d94e8f7 100644 --- a/Content.Server/Ninja/Systems/NinjaSuitSystem.cs +++ b/Content.Server/Ninja/Systems/NinjaSuitSystem.cs @@ -1,11 +1,11 @@ -using Content.Server.Emp; using Content.Server.Ninja.Events; using Content.Server.Power.Components; using Content.Server.PowerCell; +using Content.Shared.Emp; using Content.Shared.Hands.EntitySystems; using Content.Shared.Ninja.Components; using Content.Shared.Ninja.Systems; -using Content.Shared.Popups; +using Content.Shared.Power.Components; using Content.Shared.PowerCell.Components; using Robust.Shared.Containers; @@ -16,7 +16,7 @@ namespace Content.Server.Ninja.Systems; /// public sealed class NinjaSuitSystem : SharedNinjaSuitSystem { - [Dependency] private readonly EmpSystem _emp = default!; + [Dependency] private readonly SharedEmpSystem _emp = default!; [Dependency] private readonly SharedHandsSystem _hands = default!; [Dependency] private readonly SpaceNinjaSystem _ninja = default!; [Dependency] private readonly PowerCellSystem _powerCell = default!; @@ -30,7 +30,6 @@ public sealed class NinjaSuitSystem : SharedNinjaSuitSystem base.Initialize(); SubscribeLocalEvent(OnSuitInsertAttempt); - SubscribeLocalEvent(OnEmpAttempt); SubscribeLocalEvent(OnRecallKatana); SubscribeLocalEvent(OnEmp); } @@ -44,7 +43,7 @@ public sealed class NinjaSuitSystem : SharedNinjaSuitSystem // raise event to let ninja components get starting battery _ninja.GetNinjaBattery(user.Owner, out var uid, out var _); - if (uid is not {} battery_uid) + if (uid is not { } battery_uid) return; var ev = new NinjaBatteryChangedEvent(battery_uid, ent.Owner); @@ -96,17 +95,10 @@ public sealed class NinjaSuitSystem : SharedNinjaSuitSystem // if a cell is able to automatically recharge, boost the score drastically depending on the recharge rate, // this is to ensure a ninja can still upgrade to a micro reactor cell even if they already have a medium or high. if (TryComp(uid, out var selfcomp) && selfcomp.AutoRecharge) - return battcomp.MaxCharge + (selfcomp.AutoRechargeRate*AutoRechargeValue); + return battcomp.MaxCharge + selfcomp.AutoRechargeRate * AutoRechargeValue; return battcomp.MaxCharge; } - private void OnEmpAttempt(EntityUid uid, NinjaSuitComponent comp, EmpAttemptEvent args) - { - // ninja suit (battery) is immune to emp - // powercell relays the event to suit - args.Cancel(); - } - protected override void UserUnequippedSuit(Entity ent, Entity user) { base.UserUnequippedSuit(ent, user); @@ -144,6 +136,7 @@ public sealed class NinjaSuitSystem : SharedNinjaSuitSystem Popup.PopupEntity(Loc.GetString(message), user, user); } + // TODO: Move this to shared when power cells are predicted. private void OnEmp(Entity ent, ref NinjaEmpEvent args) { var (uid, comp) = ent; @@ -159,7 +152,6 @@ public sealed class NinjaSuitSystem : SharedNinjaSuitSystem if (CheckDisabled(ent, user)) return; - var coords = _transform.GetMapCoordinates(user); - _emp.EmpPulse(coords, comp.EmpRange, comp.EmpConsumption, comp.EmpDuration); + _emp.EmpPulse(Transform(user).Coordinates, comp.EmpRange, comp.EmpConsumption, comp.EmpDuration, user); } } diff --git a/Content.Server/Ninja/Systems/SpaceNinjaSystem.cs b/Content.Server/Ninja/Systems/SpaceNinjaSystem.cs index 1ece045774..ff88926723 100644 --- a/Content.Server/Ninja/Systems/SpaceNinjaSystem.cs +++ b/Content.Server/Ninja/Systems/SpaceNinjaSystem.cs @@ -1,26 +1,20 @@ using Content.Server.Communications; -using Content.Server.Chat.Managers; using Content.Server.CriminalRecords.Systems; -using Content.Server.GameTicking.Rules.Components; using Content.Server.Objectives.Components; using Content.Server.Objectives.Systems; -using Content.Server.Power.Components; using Content.Server.Power.EntitySystems; using Content.Server.PowerCell; using Content.Server.Research.Systems; -using Content.Server.Roles; using Content.Shared.Alert; using Content.Shared.Doors.Components; using Content.Shared.IdentityManagement; using Content.Shared.Mind; using Content.Shared.Ninja.Components; using Content.Shared.Ninja.Systems; +using Content.Shared.Power.Components; using Content.Shared.Popups; using Content.Shared.Rounding; -using Robust.Shared.Audio; -using Robust.Shared.Player; using System.Diagnostics.CodeAnalysis; -using Robust.Shared.Audio.Systems; namespace Content.Server.Ninja.Systems; diff --git a/Content.Server/NodeContainer/EntitySystems/NodeGroupSystem.cs b/Content.Server/NodeContainer/EntitySystems/NodeGroupSystem.cs index 7b55e20f8a..ee72f89abb 100644 --- a/Content.Server/NodeContainer/EntitySystems/NodeGroupSystem.cs +++ b/Content.Server/NodeContainer/EntitySystems/NodeGroupSystem.cs @@ -447,6 +447,7 @@ namespace Content.Server.NodeContainer.EntitySystems NodeGroupID.Pipe => Color.Blue, NodeGroupID.WireNet => Color.DarkMagenta, NodeGroupID.Teg => Color.Red, + NodeGroupID.ExCable => Color.Pink, _ => Color.White }; } diff --git a/Content.Server/Physics/Components/ChasingWalkComponent.cs b/Content.Server/Physics/Components/ChasingWalkComponent.cs index 819fd80939..3c66132bd3 100644 --- a/Content.Server/Physics/Components/ChasingWalkComponent.cs +++ b/Content.Server/Physics/Components/ChasingWalkComponent.cs @@ -1,4 +1,5 @@ +using Content.Server.Administration.Systems; using Content.Server.Physics.Controllers; using Robust.Shared.Prototypes; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom; @@ -8,7 +9,7 @@ namespace Content.Server.Physics.Components; /// /// A component which makes its entity chasing entity with selected component. /// -[RegisterComponent, Access(typeof(ChasingWalkSystem)), AutoGenerateComponentPause] +[RegisterComponent, Access(typeof(ChasingWalkSystem), typeof(AdminVerbSystem)), AutoGenerateComponentPause] public sealed partial class ChasingWalkComponent : Component { /// @@ -78,4 +79,16 @@ public sealed partial class ChasingWalkComponent : Component /// [DataField, ViewVariables(VVAccess.ReadWrite)] public EntityUid? ChasingEntity; + + /// + /// whether the entity should point in the direction its moving + /// + [DataField] + public bool RotateWithImpulse; + + /// + /// Sprite rotation offset. + /// + [DataField] + public Angle RotationAngleOffset = Angle.Zero; } diff --git a/Content.Server/Physics/Controllers/ChasingWalkSystem.cs b/Content.Server/Physics/Controllers/ChasingWalkSystem.cs index fa55ce024e..ffeb53bea9 100644 --- a/Content.Server/Physics/Controllers/ChasingWalkSystem.cs +++ b/Content.Server/Physics/Controllers/ChasingWalkSystem.cs @@ -101,5 +101,11 @@ public sealed class ChasingWalkSystem : VirtualController _physics.SetLinearVelocity(uid, speed); _physics.SetBodyStatus(uid, physics, BodyStatus.InAir); //If this is not done, from the explosion up close, the tesla will "Fall" to the ground, and almost stop moving. + + if (component.RotateWithImpulse) + { + var ang = speed.ToAngle() + Angle.FromDegrees(90); // we want "Up" to be forward, bullet convention. + _transform.SetWorldRotation(uid, ang + component.RotationAngleOffset); + } } } diff --git a/Content.Server/Power/Components/BatteryChargerComponent.cs b/Content.Server/Power/Components/BatteryChargerComponent.cs index 99284e44ac..7f3dd39524 100644 --- a/Content.Server/Power/Components/BatteryChargerComponent.cs +++ b/Content.Server/Power/Components/BatteryChargerComponent.cs @@ -1,4 +1,5 @@ using Content.Server.Power.NodeGroups; +using Content.Shared.Power.Components; namespace Content.Server.Power.Components { diff --git a/Content.Server/Power/Components/BatteryComponent.cs b/Content.Server/Power/Components/BatteryComponent.cs deleted file mode 100644 index 96571bcca3..0000000000 --- a/Content.Server/Power/Components/BatteryComponent.cs +++ /dev/null @@ -1,67 +0,0 @@ -using Content.Server.Power.EntitySystems; -using Content.Shared.Guidebook; - -namespace Content.Server.Power.Components -{ - /// - /// Battery node on the pow3r network. Needs other components to connect to actual networks. - /// - [RegisterComponent] - [Virtual] - [Access(typeof(BatterySystem))] - public partial class BatteryComponent : Component - { - public string SolutionName = "battery"; - - /// - /// Maximum charge of the battery in joules (ie. watt seconds) - /// - [DataField] - [GuidebookData] - public float MaxCharge; - - /// - /// Current charge of the battery in joules (ie. watt seconds) - /// - [DataField("startingCharge")] - public float CurrentCharge; - - /// - /// The price per one joule. Default is 1 credit for 10kJ. - /// - [DataField] - public float PricePerJoule = 0.0001f; - } - - /// - /// Raised when a battery's charge or capacity changes (capacity affects relative charge percentage). - /// - [ByRefEvent] - public readonly record struct ChargeChangedEvent(float Charge, float MaxCharge); - - /// - /// Raised when it is necessary to get information about battery charges. - /// - [ByRefEvent] - public sealed class GetChargeEvent : EntityEventArgs - { - public float CurrentCharge; - public float MaxCharge; - } - - /// - /// Raised when it is necessary to change the current battery charge to a some value. - /// - [ByRefEvent] - public sealed class ChangeChargeEvent : EntityEventArgs - { - public float OriginalValue; - public float ResidualValue; - - public ChangeChargeEvent(float value) - { - OriginalValue = value; - ResidualValue = value; - } - } -} diff --git a/Content.Server/Power/Components/CablePlacerComponent.cs b/Content.Server/Power/Components/CablePlacerComponent.cs index d52cfa118a..4674692c4a 100644 --- a/Content.Server/Power/Components/CablePlacerComponent.cs +++ b/Content.Server/Power/Components/CablePlacerComponent.cs @@ -1,16 +1,35 @@ using Robust.Shared.Prototypes; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; using Content.Shared.Power; +using Content.Shared.Whitelist; namespace Content.Server.Power.Components { [RegisterComponent] public sealed partial class CablePlacerComponent : Component { + /// + /// The structure prototype for the cable coil to place. + /// [DataField("cablePrototypeID", customTypeSerializer:typeof(PrototypeIdSerializer))] public string? CablePrototypeId = "CableHV"; + /// + /// What kind of wire prevents placing this wire over it as CableType. + /// [DataField("blockingWireType")] public CableType BlockingCableType = CableType.HighVoltage; + + /// + /// Blacklist for things the cable cannot be placed over. For things that arent cables with CableTypes. + /// + [DataField] + public EntityWhitelist Blacklist = new(); + + /// + /// Whether the placed cable should go over tiles or not. + /// + [DataField] + public bool OverTile; } } diff --git a/Content.Server/Power/Components/ChargerComponent.cs b/Content.Server/Power/Components/ChargerComponent.cs deleted file mode 100644 index 4a3c83ae03..0000000000 --- a/Content.Server/Power/Components/ChargerComponent.cs +++ /dev/null @@ -1,37 +0,0 @@ -using Content.Shared.Power; -using Content.Shared.Whitelist; - -namespace Content.Server.Power.Components -{ - [RegisterComponent] - public sealed partial class ChargerComponent : Component - { - [ViewVariables] - public CellChargerStatus Status; - - /// - /// The charge rate of the charger, in watts - /// - [DataField("chargeRate")] - public float ChargeRate = 20.0f; - - /// - /// The container ID that is holds the entities being charged. - /// - [DataField("slotId", required: true)] - public string SlotId = string.Empty; - - /// - /// A whitelist for what entities can be charged by this Charger. - /// - [DataField("whitelist")] - public EntityWhitelist? Whitelist; - - /// - /// Indicates whether the charger is portable and thus subject to EMP effects - /// and bypasses checks for transform, anchored, and ApcPowerReceiverComponent. - /// - [DataField] - public bool Portable = false; - } -} diff --git a/Content.Server/Power/EntitySystems/ApcSystem.cs b/Content.Server/Power/EntitySystems/ApcSystem.cs index 29c1431179..ed7ec0e225 100644 --- a/Content.Server/Power/EntitySystems/ApcSystem.cs +++ b/Content.Server/Power/EntitySystems/ApcSystem.cs @@ -1,11 +1,12 @@ -using Content.Server.Emp; using Content.Server.Popups; using Content.Server.Power.Components; using Content.Server.Power.Pow3r; using Content.Shared.Access.Systems; using Content.Shared.APC; using Content.Shared.Emag.Systems; +using Content.Shared.Emp; using Content.Shared.Popups; +using Content.Shared.Power; using Content.Shared.Rounding; using Robust.Server.GameObjects; using Robust.Shared.Audio; @@ -203,6 +204,9 @@ public sealed class ApcSystem : EntitySystem return ApcExternalPowerState.Good; } + // TODO: This subscription should be in shared. + // But I am not moving ApcComponent to shared, this PR already got soaped enough and that component uses several layers of OOP. + // At least the EMP visuals won't mispredict, since all APCs also have the BatteryComponent, which also has a EMP effect and is in shared. private void OnEmpPulse(EntityUid uid, ApcComponent component, ref EmpPulseEvent args) { if (component.MainBreakerEnabled) diff --git a/Content.Server/Power/EntitySystems/BatteryInterfaceSystem.cs b/Content.Server/Power/EntitySystems/BatteryInterfaceSystem.cs index 33e3f8ff2c..83ff28646d 100644 --- a/Content.Server/Power/EntitySystems/BatteryInterfaceSystem.cs +++ b/Content.Server/Power/EntitySystems/BatteryInterfaceSystem.cs @@ -2,6 +2,7 @@ using Content.Server.Power.Components; using Content.Shared.Database; using Content.Shared.Power; +using Content.Shared.Power.Components; using Robust.Server.GameObjects; namespace Content.Server.Power.EntitySystems; diff --git a/Content.Server/Power/EntitySystems/BatterySystem.cs b/Content.Server/Power/EntitySystems/BatterySystem.cs index f4e48f4a3d..28b14f6925 100644 --- a/Content.Server/Power/EntitySystems/BatterySystem.cs +++ b/Content.Server/Power/EntitySystems/BatterySystem.cs @@ -1,7 +1,9 @@ -using Content.Server.Emp; using Content.Server.Power.Components; using Content.Shared.Cargo; using Content.Shared.Examine; +using Content.Shared.Power; +using Content.Shared.Power.Components; +using Content.Shared.Power.EntitySystems; using Content.Shared.Rejuvenate; using JetBrains.Annotations; using Robust.Shared.Utility; @@ -10,7 +12,7 @@ using Robust.Shared.Timing; namespace Content.Server.Power.EntitySystems { [UsedImplicitly] - public sealed class BatterySystem : EntitySystem + public sealed class BatterySystem : SharedBatterySystem { [Dependency] private readonly IGameTiming _timing = default!; @@ -22,7 +24,6 @@ namespace Content.Server.Power.EntitySystems SubscribeLocalEvent(OnNetBatteryRejuvenate); SubscribeLocalEvent(OnBatteryRejuvenate); SubscribeLocalEvent(CalculateBatteryPrice); - SubscribeLocalEvent(OnEmpPulse); SubscribeLocalEvent(OnChangeCharge); SubscribeLocalEvent(OnGetCharge); @@ -50,7 +51,7 @@ namespace Content.Server.Power.EntitySystems if (effectiveMax == 0) effectiveMax = 1; var chargeFraction = batteryComponent.CurrentCharge / effectiveMax; - var chargePercentRounded = (int) (chargeFraction * 100); + var chargePercentRounded = (int)(chargeFraction * 100); args.PushMarkup( Loc.GetString( "examinable-battery-component-examine-detail", @@ -108,15 +109,6 @@ namespace Content.Server.Power.EntitySystems { args.Price += component.CurrentCharge * component.PricePerJoule; } - - private void OnEmpPulse(EntityUid uid, BatteryComponent component, ref EmpPulseEvent args) - { - args.Affected = true; - UseCharge(uid, args.EnergyConsumption, component); - // Apply a cooldown to the entity's self recharge if needed to avoid it immediately self recharging after an EMP. - TrySetChargeCooldown(uid); - } - private void OnChangeCharge(Entity entity, ref ChangeChargeEvent args) { if (args.ResidualValue == 0) @@ -131,7 +123,7 @@ namespace Content.Server.Power.EntitySystems args.MaxCharge += entity.Comp.MaxCharge; } - public float UseCharge(EntityUid uid, float value, BatteryComponent? battery = null) + public override float UseCharge(EntityUid uid, float value, BatteryComponent? battery = null) { if (value <= 0 || !Resolve(uid, ref battery) || battery.CurrentCharge == 0) return 0; @@ -139,7 +131,7 @@ namespace Content.Server.Power.EntitySystems return ChangeCharge(uid, -value, battery); } - public void SetMaxCharge(EntityUid uid, float value, BatteryComponent? battery = null) + public override void SetMaxCharge(EntityUid uid, float value, BatteryComponent? battery = null) { if (!Resolve(uid, ref battery)) return; @@ -174,7 +166,7 @@ namespace Content.Server.Power.EntitySystems /// /// Changes the current battery charge by some value /// - public float ChangeCharge(EntityUid uid, float value, BatteryComponent? battery = null) + public override float ChangeCharge(EntityUid uid, float value, BatteryComponent? battery = null) { if (!Resolve(uid, ref battery)) return 0; @@ -190,10 +182,7 @@ namespace Content.Server.Power.EntitySystems return delta; } - /// - /// Checks if the entity has a self recharge and puts it on cooldown if applicable. - /// - public void TrySetChargeCooldown(EntityUid uid, float value = -1) + public override void TrySetChargeCooldown(EntityUid uid, float value = -1) { if (!TryComp(uid, out var batteryself)) return; @@ -228,7 +217,7 @@ namespace Content.Server.Power.EntitySystems /// /// If sufficient charge is available on the battery, use it. Otherwise, don't. /// - public bool TryUseCharge(EntityUid uid, float value, BatteryComponent? battery = null) + public override bool TryUseCharge(EntityUid uid, float value, BatteryComponent? battery = null) { if (!Resolve(uid, ref battery, false) || value > battery.CurrentCharge) return false; diff --git a/Content.Server/Power/EntitySystems/CableSystem.Placer.cs b/Content.Server/Power/EntitySystems/CableSystem.Placer.cs index 55d517cf7d..79ea6b5285 100644 --- a/Content.Server/Power/EntitySystems/CableSystem.Placer.cs +++ b/Content.Server/Power/EntitySystems/CableSystem.Placer.cs @@ -4,6 +4,7 @@ using Content.Shared.Database; using Content.Shared.Interaction; using Content.Shared.Maps; using Content.Shared.Stacks; +using Content.Shared.Whitelist; using Robust.Shared.Map.Components; namespace Content.Server.Power.EntitySystems; @@ -13,6 +14,7 @@ public sealed partial class CableSystem [Dependency] private readonly IAdminLogManager _adminLogger = default!; [Dependency] private readonly SharedTransformSystem _transform = default!; [Dependency] private readonly SharedMapSystem _map = default!; + [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!; private void InitializeCablePlacer() { @@ -35,12 +37,14 @@ public sealed partial class CableSystem var snapPos = _map.TileIndicesFor((gridUid, grid), args.ClickLocation); var tileDef = (ContentTileDefinition)_tileManager[_map.GetTileRef(gridUid, grid, snapPos).Tile.TypeId]; - if (!tileDef.IsSubFloor || !tileDef.Sturdy) + if ((!component.OverTile && !tileDef.IsSubFloor) || !tileDef.Sturdy) return; - foreach (var anchored in _map.GetAnchoredEntities((gridUid, grid), snapPos)) { + if (_whitelistSystem.IsBlacklistPass(component.Blacklist, anchored)) + return; + if (TryComp(anchored, out var wire) && wire.CableType == component.BlockingCableType) return; } diff --git a/Content.Server/Power/EntitySystems/ChargerSystem.cs b/Content.Server/Power/EntitySystems/ChargerSystem.cs index c128c846fb..e8dc9e9962 100644 --- a/Content.Server/Power/EntitySystems/ChargerSystem.cs +++ b/Content.Server/Power/EntitySystems/ChargerSystem.cs @@ -1,8 +1,9 @@ using Content.Server.Power.Components; -using Content.Server.Emp; -using Content.Server.PowerCell; using Content.Shared.Examine; +using Content.Server.PowerCell; using Content.Shared.Power; +using Content.Shared.Power.Components; +using Content.Shared.Power.EntitySystems; using Content.Shared.PowerCell.Components; using Content.Shared.Emp; using JetBrains.Annotations; @@ -15,7 +16,7 @@ using Content.Shared.Whitelist; namespace Content.Server.Power.EntitySystems; [UsedImplicitly] -internal sealed class ChargerSystem : EntitySystem +public sealed class ChargerSystem : SharedChargerSystem { [Dependency] private readonly ContainerSystem _container = default!; [Dependency] private readonly PowerCellSystem _powerCell = default!; @@ -25,6 +26,8 @@ internal sealed class ChargerSystem : EntitySystem public override void Initialize() { + base.Initialize(); + SubscribeLocalEvent(OnStartup); SubscribeLocalEvent(OnPowerChanged); SubscribeLocalEvent(OnInserted); @@ -32,8 +35,6 @@ internal sealed class ChargerSystem : EntitySystem SubscribeLocalEvent(OnInsertAttempt); SubscribeLocalEvent(OnEntityStorageInsertAttempt); SubscribeLocalEvent(OnChargerExamine); - - SubscribeLocalEvent(OnEmpPulse); } private void OnStartup(EntityUid uid, ChargerComponent component, ComponentStartup args) @@ -46,7 +47,7 @@ internal sealed class ChargerSystem : EntitySystem using (args.PushGroup(nameof(ChargerComponent))) { // rate at which the charger charges - args.PushMarkup(Loc.GetString("charger-examine", ("color", "yellow"), ("chargeRate", (int) component.ChargeRate))); + args.PushMarkup(Loc.GetString("charger-examine", ("color", "yellow"), ("chargeRate", (int)component.ChargeRate))); // try to get contents of the charger if (!_container.TryGetContainer(uid, component.SlotId, out var container)) @@ -70,7 +71,7 @@ internal sealed class ChargerSystem : EntitySystem continue; var chargePercentage = (battery.CurrentCharge / battery.MaxCharge) * 100; - args.PushMarkup(Loc.GetString("charger-content", ("chargePercentage", (int) chargePercentage))); + args.PushMarkup(Loc.GetString("charger-content", ("chargePercentage", (int)chargePercentage))); } } } @@ -194,12 +195,6 @@ internal sealed class ChargerSystem : EntitySystem } } - private void OnEmpPulse(EntityUid uid, ChargerComponent component, ref EmpPulseEvent args) - { - args.Affected = true; - args.Disabled = true; - } - private CellChargerStatus GetStatus(EntityUid uid, ChargerComponent component) { if (!component.Portable) diff --git a/Content.Server/Power/EntitySystems/PowerMonitoringConsoleSystem.cs b/Content.Server/Power/EntitySystems/PowerMonitoringConsoleSystem.cs index be79d64fc9..25757360b3 100644 --- a/Content.Server/Power/EntitySystems/PowerMonitoringConsoleSystem.cs +++ b/Content.Server/Power/EntitySystems/PowerMonitoringConsoleSystem.cs @@ -1,6 +1,4 @@ -using Content.Server.NodeContainer; using Content.Server.NodeContainer.EntitySystems; -using Content.Server.NodeContainer.Nodes; using Content.Server.Power.Components; using Content.Server.Power.Nodes; using Content.Server.Power.NodeGroups; @@ -9,6 +7,7 @@ using Content.Shared.GameTicking.Components; using Content.Shared.Pinpointer; using Content.Shared.Station.Components; using Content.Shared.Power; +using Content.Shared.Power.Components; using JetBrains.Annotations; using Robust.Server.GameObjects; using Robust.Shared.Map.Components; diff --git a/Content.Server/Power/EntitySystems/RiggableSystem.cs b/Content.Server/Power/EntitySystems/RiggableSystem.cs index 26eaca80fe..0f8b32865b 100644 --- a/Content.Server/Power/EntitySystems/RiggableSystem.cs +++ b/Content.Server/Power/EntitySystems/RiggableSystem.cs @@ -4,6 +4,7 @@ using Content.Server.Kitchen.Components; using Content.Server.Power.Components; using Content.Shared.Chemistry.EntitySystems; using Content.Shared.Database; +using Content.Shared.Power.Components; using Content.Shared.Rejuvenate; namespace Content.Server.Power.EntitySystems; diff --git a/Content.Server/Power/SMES/SmesSystem.cs b/Content.Server/Power/SMES/SmesSystem.cs index ebd56ee3e1..15c40b3c92 100644 --- a/Content.Server/Power/SMES/SmesSystem.cs +++ b/Content.Server/Power/SMES/SmesSystem.cs @@ -1,6 +1,7 @@ using Content.Server.Power.Components; using Content.Server.Power.EntitySystems; using Content.Shared.Power; +using Content.Shared.Power.Components; using Content.Shared.Rounding; using Content.Shared.SMES; using JetBrains.Annotations; diff --git a/Content.Server/Power/SetBatteryPercentCommand.cs b/Content.Server/Power/SetBatteryPercentCommand.cs index 7ceee20172..03d6d30f8a 100644 --- a/Content.Server/Power/SetBatteryPercentCommand.cs +++ b/Content.Server/Power/SetBatteryPercentCommand.cs @@ -1,7 +1,7 @@ using Content.Server.Administration; -using Content.Server.Power.Components; using Content.Server.Power.EntitySystems; using Content.Shared.Administration; +using Content.Shared.Power.Components; using Robust.Shared.Console; namespace Content.Server.Power diff --git a/Content.Server/PowerCell/PowerCellSystem.Draw.cs b/Content.Server/PowerCell/PowerCellSystem.Draw.cs index 9156d30b1f..40e54ba13a 100644 --- a/Content.Server/PowerCell/PowerCellSystem.Draw.cs +++ b/Content.Server/PowerCell/PowerCellSystem.Draw.cs @@ -1,4 +1,4 @@ -using Content.Server.Power.Components; +using Content.Shared.Power; using Content.Shared.PowerCell; using Content.Shared.PowerCell.Components; diff --git a/Content.Server/PowerCell/PowerCellSystem.cs b/Content.Server/PowerCell/PowerCellSystem.cs index 01767d6c41..6c00cdd300 100644 --- a/Content.Server/PowerCell/PowerCellSystem.cs +++ b/Content.Server/PowerCell/PowerCellSystem.cs @@ -1,17 +1,17 @@ -using Content.Server.Emp; +using System.Diagnostics.CodeAnalysis; +using Content.Server.Kitchen.Components; using Content.Server.Power.Components; +using Content.Server.Power.EntitySystems; +using Content.Shared.Containers.ItemSlots; using Content.Shared.Examine; +using Content.Shared.Popups; +using Content.Shared.Power; +using Content.Shared.Power.Components; using Content.Shared.PowerCell; using Content.Shared.PowerCell.Components; using Content.Shared.Rounding; +using Content.Shared.UserInterface; using Robust.Shared.Containers; -using System.Diagnostics.CodeAnalysis; -using Content.Server.Kitchen.Components; -using Content.Server.Power.EntitySystems; -using Content.Server.UserInterface; -using Content.Shared.Containers.ItemSlots; -using Content.Shared.Popups; -using ActivatableUISystem = Content.Shared.UserInterface.ActivatableUISystem; namespace Content.Server.PowerCell; @@ -34,7 +34,6 @@ public sealed partial class PowerCellSystem : SharedPowerCellSystem SubscribeLocalEvent(OnChargeChanged); SubscribeLocalEvent(OnCellExamined); - SubscribeLocalEvent(OnCellEmpAttempt); SubscribeLocalEvent(OnDrawChargeChanged); SubscribeLocalEvent(OnDrawCellChanged); @@ -221,14 +220,6 @@ public sealed partial class PowerCellSystem : SharedPowerCellSystem OnBatteryExamined(uid, battery, args); } - private void OnCellEmpAttempt(EntityUid uid, PowerCellComponent component, EmpAttemptEvent args) - { - var parent = Transform(uid).ParentUid; - // relay the attempt event to the slot so it can cancel it - if (HasComp(parent)) - RaiseLocalEvent(parent, args); - } - private void OnCellSlotExamined(EntityUid uid, PowerCellSlotComponent component, ExaminedEvent args) { TryGetBatteryFromSlot(uid, out var battery); diff --git a/Content.Server/PowerSink/PowerSinkSystem.cs b/Content.Server/PowerSink/PowerSinkSystem.cs index ef08240c5c..2bf9046cc3 100644 --- a/Content.Server/PowerSink/PowerSinkSystem.cs +++ b/Content.Server/PowerSink/PowerSinkSystem.cs @@ -1,13 +1,13 @@ -using Content.Server.Explosion.EntitySystems; +using Content.Server.Chat.Systems; +using Content.Server.Explosion.EntitySystems; using Content.Server.Power.Components; -using Content.Shared.Examine; -using Robust.Shared.Utility; -using Content.Server.Chat.Systems; -using Content.Server.Station.Systems; -using Robust.Shared.Timing; -using Robust.Shared.Audio; -using Robust.Shared.Audio.Systems; using Content.Server.Power.EntitySystems; +using Content.Server.Station.Systems; +using Content.Shared.Examine; +using Content.Shared.Power.Components; +using Robust.Shared.Audio.Systems; +using Robust.Shared.Timing; +using Robust.Shared.Utility; namespace Content.Server.PowerSink { diff --git a/Content.Server/Radio/EntitySystems/HeadsetSystem.cs b/Content.Server/Radio/EntitySystems/HeadsetSystem.cs index 91abc9efd5..4d29e2f413 100644 --- a/Content.Server/Radio/EntitySystems/HeadsetSystem.cs +++ b/Content.Server/Radio/EntitySystems/HeadsetSystem.cs @@ -1,5 +1,4 @@ using Content.Server.Chat.Systems; -using Content.Server.Emp; using Content.Shared.Inventory.Events; using Content.Shared.Radio; using Content.Shared.Radio.Components; @@ -21,8 +20,6 @@ public sealed class HeadsetSystem : SharedHeadsetSystem SubscribeLocalEvent(OnKeysChanged); SubscribeLocalEvent(OnSpeak); - - SubscribeLocalEvent(OnEmpPulse); } private void OnKeysChanged(EntityUid uid, HeadsetComponent component, EncryptionChannelsChangedEvent args) @@ -69,7 +66,6 @@ public sealed class HeadsetSystem : SharedHeadsetSystem protected override void OnGotUnequipped(EntityUid uid, HeadsetComponent component, GotUnequippedEvent args) { base.OnGotUnequipped(uid, component, args); - component.IsEquipped = false; RemComp(uid); RemComp(args.Equipee); } @@ -82,6 +78,9 @@ public sealed class HeadsetSystem : SharedHeadsetSystem if (component.Enabled == value) return; + component.Enabled = value; + Dirty(uid, component); + if (!value) { RemCompDeferred(uid); @@ -113,13 +112,4 @@ public sealed class HeadsetSystem : SharedHeadsetSystem if (TryComp(parent, out ActorComponent? actor)) _netMan.ServerSendMessage(args.ChatMsg, actor.PlayerSession.Channel); } - - private void OnEmpPulse(EntityUid uid, HeadsetComponent component, ref EmpPulseEvent args) - { - if (component.Enabled) - { - args.Affected = true; - args.Disabled = true; - } - } } diff --git a/Content.Server/SensorMonitoring/BatterySensorComponent.cs b/Content.Server/SensorMonitoring/BatterySensorComponent.cs index 2f0c97e6ec..a5a48ddc91 100644 --- a/Content.Server/SensorMonitoring/BatterySensorComponent.cs +++ b/Content.Server/SensorMonitoring/BatterySensorComponent.cs @@ -1,4 +1,5 @@ using Content.Server.Power.Components; +using Content.Shared.Power.Components; namespace Content.Server.SensorMonitoring; diff --git a/Content.Server/SensorMonitoring/BatterySensorSystem.cs b/Content.Server/SensorMonitoring/BatterySensorSystem.cs index 5047cd1d29..bd94868c5f 100644 --- a/Content.Server/SensorMonitoring/BatterySensorSystem.cs +++ b/Content.Server/SensorMonitoring/BatterySensorSystem.cs @@ -1,8 +1,8 @@ -using Content.Server.DeviceNetwork; -using Content.Server.DeviceNetwork.Systems; +using Content.Server.DeviceNetwork.Systems; using Content.Server.Power.Components; using Content.Shared.DeviceNetwork; using Content.Shared.DeviceNetwork.Events; +using Content.Shared.Power.Components; namespace Content.Server.SensorMonitoring; diff --git a/Content.Server/Silicons/StationAi/StationAiSystem.cs b/Content.Server/Silicons/StationAi/StationAiSystem.cs index 73c5670c1e..4ee2a07d72 100644 --- a/Content.Server/Silicons/StationAi/StationAiSystem.cs +++ b/Content.Server/Silicons/StationAi/StationAiSystem.cs @@ -19,6 +19,7 @@ using Content.Shared.DoAfter; using Content.Shared.Mobs; using Content.Shared.Mobs.Systems; using Content.Shared.Popups; +using Content.Shared.Power; using Content.Shared.Power.Components; using Content.Shared.Rejuvenate; using Content.Shared.Roles; diff --git a/Content.Server/Storage/EntitySystems/StorageSystem.cs b/Content.Server/Storage/EntitySystems/StorageSystem.cs index 4b5dd7290c..cdbac12d80 100644 --- a/Content.Server/Storage/EntitySystems/StorageSystem.cs +++ b/Content.Server/Storage/EntitySystems/StorageSystem.cs @@ -1,19 +1,11 @@ -using Content.Server.Administration.Managers; -using Content.Shared.Administration; using Content.Shared.Explosion; -using Content.Shared.Ghost; using Content.Shared.Hands; -using Content.Shared.Lock; using Content.Shared.Storage; using Content.Shared.Storage.Components; using Content.Shared.Storage.EntitySystems; -using Content.Shared.Verbs; -using Robust.Server.GameObjects; using Robust.Shared.Map; using Robust.Shared.Player; using Robust.Shared.Prototypes; -using Robust.Shared.Utility; - namespace Content.Server.Storage.EntitySystems; public sealed partial class StorageSystem : SharedStorageSystem @@ -24,7 +16,6 @@ public sealed partial class StorageSystem : SharedStorageSystem { base.Initialize(); SubscribeLocalEvent(OnExploded); - SubscribeLocalEvent(OnStorageFillMapInit); } diff --git a/Content.Server/Stunnable/Systems/StunOnCollideSystem.cs b/Content.Server/Stunnable/Systems/StunOnCollideSystem.cs index c1757b1c2d..09e42966c7 100644 --- a/Content.Server/Stunnable/Systems/StunOnCollideSystem.cs +++ b/Content.Server/Stunnable/Systems/StunOnCollideSystem.cs @@ -27,6 +27,7 @@ internal sealed class StunOnCollideSystem : EntitySystem if (ent.Comp.Refresh) { _stunSystem.TryUpdateStunDuration(target, ent.Comp.StunAmount); + _movementMod.TryUpdateMovementSpeedModDuration( target, MovementModStatusSystem.TaserSlowdown, diff --git a/Content.Server/Stunnable/Systems/StunbatonSystem.cs b/Content.Server/Stunnable/Systems/StunbatonSystem.cs index f043c452ca..7f8aa37036 100644 --- a/Content.Server/Stunnable/Systems/StunbatonSystem.cs +++ b/Content.Server/Stunnable/Systems/StunbatonSystem.cs @@ -7,6 +7,8 @@ using Content.Shared.Examine; using Content.Shared.Item.ItemToggle; using Content.Shared.Item.ItemToggle.Components; using Content.Shared.Popups; +using Content.Shared.Power; +using Content.Shared.Power.Components; using Content.Shared.Stunnable; namespace Content.Server.Stunnable.Systems diff --git a/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraMicrophoneSystem.cs b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraMicrophoneSystem.cs index 4029488159..1f298f32a4 100644 --- a/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraMicrophoneSystem.cs +++ b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraMicrophoneSystem.cs @@ -1,6 +1,7 @@ using Content.Server.Chat.Systems; using Content.Shared.Speech; using Content.Shared.Speech.Components; +using Content.Shared.SurveillanceCamera.Components; using Content.Shared.Whitelist; using Robust.Shared.Player; using static Content.Server.Chat.Systems.ChatSystem; diff --git a/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraSystem.cs b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraSystem.cs index 7f7dbc6c97..7e275c78ce 100644 --- a/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraSystem.cs +++ b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraSystem.cs @@ -1,13 +1,12 @@ using Content.Server.Administration.Logs; using Content.Server.DeviceNetwork.Systems; -using Content.Server.Emp; using Content.Shared.ActionBlocker; using Content.Shared.Database; using Content.Shared.DeviceNetwork; using Content.Shared.DeviceNetwork.Events; using Content.Shared.Power; using Content.Shared.SurveillanceCamera; -using Content.Shared.Verbs; +using Content.Shared.SurveillanceCamera.Components; using Robust.Server.GameObjects; using Robust.Shared.Player; using Robust.Shared.Prototypes; @@ -15,7 +14,7 @@ using Content.Shared.DeviceNetwork.Components; namespace Content.Server.SurveillanceCamera; -public sealed class SurveillanceCameraSystem : EntitySystem +public sealed class SurveillanceCameraSystem : SharedSurveillanceCameraSystem { [Dependency] private readonly IPrototypeManager _prototypeManager = default!; [Dependency] private readonly ActionBlockerSystem _actionBlocker = default!; @@ -57,15 +56,13 @@ public sealed class SurveillanceCameraSystem : EntitySystem public override void Initialize() { + base.Initialize(); + SubscribeLocalEvent(OnShutdown); SubscribeLocalEvent(OnPowerChanged); SubscribeLocalEvent(OnPacketReceived); SubscribeLocalEvent(OnSetName); SubscribeLocalEvent(OnSetNetwork); - SubscribeLocalEvent>(AddVerbs); - - SubscribeLocalEvent(OnEmpPulse); - SubscribeLocalEvent(OnEmpDisabledRemoved); } private void OnPacketReceived(EntityUid uid, SurveillanceCameraComponent component, DeviceNetworkPacketEvent args) @@ -131,26 +128,6 @@ public sealed class SurveillanceCameraSystem : EntitySystem } } - private void AddVerbs(EntityUid uid, SurveillanceCameraComponent component, GetVerbsEvent verbs) - { - if (!_actionBlocker.CanInteract(verbs.User, uid) || !_actionBlocker.CanComplexInteract(verbs.User)) - { - return; - } - - if (component.NameSet && component.NetworkSet) - { - return; - } - - AlternativeVerb verb = new(); - verb.Text = Loc.GetString("surveillance-camera-setup"); - verb.Act = () => OpenSetupInterface(uid, verbs.User, component); - verbs.Verbs.Add(verb); - } - - - private void OnPowerChanged(EntityUid camera, SurveillanceCameraComponent component, ref PowerChangedEvent args) { SetActive(camera, args.Powered, component); @@ -173,6 +150,7 @@ public sealed class SurveillanceCameraSystem : EntitySystem component.CameraId = args.Name; component.NameSet = true; + Dirty(uid, component); UpdateSetupInterface(uid, component); _adminLogger.Add(LogType.Chat, LogImpact.Low, $"{ToPrettyString(args.Actor)} set the name of {ToPrettyString(uid)} to \"{args.Name}.\""); } @@ -198,10 +176,11 @@ public sealed class SurveillanceCameraSystem : EntitySystem _deviceNetworkSystem.SetReceiveFrequency(uid, frequency.Frequency); component.NetworkSet = true; + Dirty(uid, component); UpdateSetupInterface(uid, component); } - private void OpenSetupInterface(EntityUid uid, EntityUid player, SurveillanceCameraComponent? camera = null) + protected override void OpenSetupInterface(EntityUid uid, EntityUid player, SurveillanceCameraComponent? camera = null) { if (!Resolve(uid, ref camera)) return; @@ -271,7 +250,7 @@ public sealed class SurveillanceCameraSystem : EntitySystem UpdateVisuals(camera, component); } - public void SetActive(EntityUid camera, bool setting, SurveillanceCameraComponent? component = null) + public override void SetActive(EntityUid camera, bool setting, SurveillanceCameraComponent? component = null) { if (!Resolve(camera, ref component)) { @@ -418,21 +397,6 @@ public sealed class SurveillanceCameraSystem : EntitySystem _appearance.SetData(uid, SurveillanceCameraVisualsKey.Key, key, appearance); } - - private void OnEmpPulse(EntityUid uid, SurveillanceCameraComponent component, ref EmpPulseEvent args) - { - if (component.Active) - { - args.Affected = true; - args.Disabled = true; - SetActive(uid, false); - } - } - - private void OnEmpDisabledRemoved(EntityUid uid, SurveillanceCameraComponent component, ref EmpDisabledRemoved args) - { - SetActive(uid, true); - } } public sealed class OnSurveillanceCameraViewerAddEvent : EntityEventArgs diff --git a/Content.Server/Tesla/EntitySystem/TeslaCoilSystem.cs b/Content.Server/Tesla/EntitySystem/TeslaCoilSystem.cs index 4fd2f9b6ed..f3cae90b40 100644 --- a/Content.Server/Tesla/EntitySystem/TeslaCoilSystem.cs +++ b/Content.Server/Tesla/EntitySystem/TeslaCoilSystem.cs @@ -1,7 +1,7 @@ -using Content.Server.Power.Components; using Content.Server.Power.EntitySystems; using Content.Server.Tesla.Components; using Content.Server.Lightning; +using Content.Shared.Power.Components; namespace Content.Server.Tesla.EntitySystems; diff --git a/Content.Server/VendingMachines/VendingMachineSystem.cs b/Content.Server/VendingMachines/VendingMachineSystem.cs index df204cf338..86a7b512b6 100644 --- a/Content.Server/VendingMachines/VendingMachineSystem.cs +++ b/Content.Server/VendingMachines/VendingMachineSystem.cs @@ -1,9 +1,7 @@ using System.Linq; using System.Numerics; using Content.Server.Cargo.Systems; -using Content.Server.Emp; using Content.Server.Power.Components; -using Content.Server.Power.EntitySystems; using Content.Server.Vocalization.Systems; using Content.Shared.Cargo; using Content.Shared.Damage; @@ -35,7 +33,6 @@ namespace Content.Server.VendingMachines SubscribeLocalEvent(OnBreak); SubscribeLocalEvent(OnDamageChanged); SubscribeLocalEvent(OnVendingPrice); - SubscribeLocalEvent(OnEmpPulse); SubscribeLocalEvent(OnTryVocalize); SubscribeLocalEvent(OnActivatableUIOpenAttempt); @@ -86,6 +83,7 @@ namespace Content.Server.VendingMachines private void OnBreak(EntityUid uid, VendingMachineComponent vendComponent, BreakageEventArgs eventArgs) { vendComponent.Broken = true; + Dirty(uid, vendComponent); TryUpdateVisualState((uid, vendComponent)); } @@ -94,6 +92,7 @@ namespace Content.Server.VendingMachines if (!args.DamageIncreased && component.Broken) { component.Broken = false; + Dirty(uid, component); TryUpdateVisualState((uid, component)); return; } @@ -257,16 +256,6 @@ namespace Content.Server.VendingMachines args.Price += priceSets.Max(); } - private void OnEmpPulse(EntityUid uid, VendingMachineComponent component, ref EmpPulseEvent args) - { - if (!component.Broken && this.IsPowered(uid, EntityManager)) - { - args.Affected = true; - args.Disabled = true; - component.NextEmpEject = Timing.CurTime; - } - } - private void OnTryVocalize(Entity ent, ref TryVocalizeEvent args) { args.Cancelled |= ent.Comp.Broken; diff --git a/Content.Server/Weapons/Ranged/Systems/GunSystem.Battery.cs b/Content.Server/Weapons/Ranged/Systems/GunSystem.Battery.cs index 4865d08782..d697e2bef1 100644 --- a/Content.Server/Weapons/Ranged/Systems/GunSystem.Battery.cs +++ b/Content.Server/Weapons/Ranged/Systems/GunSystem.Battery.cs @@ -1,7 +1,6 @@ -using Content.Server.Power.Components; using Content.Shared.Damage; using Content.Shared.Damage.Events; -using Content.Shared.FixedPoint; +using Content.Shared.Power; using Content.Shared.PowerCell.Components; using Content.Shared.Projectiles; using Content.Shared.Weapons.Ranged; diff --git a/Content.Server/Xenoarchaeology/Artifact/XAE/Components/XAEEmpInAreaComponent.cs b/Content.Server/Xenoarchaeology/Artifact/XAE/Components/XAEEmpInAreaComponent.cs index 1e9489e9ec..88faf2fdcd 100644 --- a/Content.Server/Xenoarchaeology/Artifact/XAE/Components/XAEEmpInAreaComponent.cs +++ b/Content.Server/Xenoarchaeology/Artifact/XAE/Components/XAEEmpInAreaComponent.cs @@ -22,5 +22,5 @@ public sealed partial class XAEEmpInAreaComponent : Component /// Duration (in seconds) for which devices going to be disabled. /// [DataField] - public float DisableDuration = 60f; + public TimeSpan DisableDuration = TimeSpan.FromSeconds(60); } diff --git a/Content.Server/Xenoarchaeology/Artifact/XAE/XAEChargeBatterySystem.cs b/Content.Server/Xenoarchaeology/Artifact/XAE/XAEChargeBatterySystem.cs index 5e9bf7352b..85ffc75627 100644 --- a/Content.Server/Xenoarchaeology/Artifact/XAE/XAEChargeBatterySystem.cs +++ b/Content.Server/Xenoarchaeology/Artifact/XAE/XAEChargeBatterySystem.cs @@ -1,6 +1,6 @@ -using Content.Server.Power.Components; using Content.Server.Power.EntitySystems; using Content.Server.Xenoarchaeology.Artifact.XAE.Components; +using Content.Shared.Power.Components; using Content.Shared.Xenoarchaeology.Artifact; using Content.Shared.Xenoarchaeology.Artifact.XAE; diff --git a/Content.Server/Xenoarchaeology/Artifact/XAT/XATMagnetSystem.cs b/Content.Server/Xenoarchaeology/Artifact/XAT/XATMagnetSystem.cs index d045682d55..5656182a9e 100644 --- a/Content.Server/Xenoarchaeology/Artifact/XAT/XATMagnetSystem.cs +++ b/Content.Server/Xenoarchaeology/Artifact/XAT/XATMagnetSystem.cs @@ -54,7 +54,7 @@ public sealed class XATMagnetSystem : BaseQueryUpdateXATSystem(ent) || - _inventorySystem.TryGetInventoryEntity(args.Examiner, out _)); + (HasComp(examiner) || + _inventorySystem.TryGetInventoryEntity(examiner, out _)); if (canSeeAccessModification) { diff --git a/Content.Server/Anomaly/Components/AnomalousParticleComponent.cs b/Content.Shared/Anomaly/Components/AnomalousParticleComponent.cs similarity index 95% rename from Content.Server/Anomaly/Components/AnomalousParticleComponent.cs rename to Content.Shared/Anomaly/Components/AnomalousParticleComponent.cs index 5b05522bb9..47c49956c9 100644 --- a/Content.Server/Anomaly/Components/AnomalousParticleComponent.cs +++ b/Content.Shared/Anomaly/Components/AnomalousParticleComponent.cs @@ -1,7 +1,4 @@ -using Content.Shared.Anomaly; -using Content.Shared.Anomaly.Components; - -namespace Content.Server.Anomaly.Components; +namespace Content.Shared.Anomaly.Components; /// /// This is used for projectiles which affect anomalies through colliding with them. diff --git a/Content.Shared/Anomaly/Components/AnomalyComponent.cs b/Content.Shared/Anomaly/Components/AnomalyComponent.cs index fb281ca9a3..47320ece03 100644 --- a/Content.Shared/Anomaly/Components/AnomalyComponent.cs +++ b/Content.Shared/Anomaly/Components/AnomalyComponent.cs @@ -324,3 +324,10 @@ public readonly record struct AnomalyHealthChangedEvent(EntityUid Anomaly, float /// [ByRefEvent] public readonly record struct AnomalyBehaviorChangedEvent(EntityUid Anomaly, ProtoId? Old, ProtoId? New); + +/// +/// Event of anomaly being affected by exotic particle. +/// Is raised when particle collides with artifact. +/// +[ByRefEvent] +public record struct AnomalyAffectedByParticleEvent(EntityUid Anomaly, EntityUid Particle); diff --git a/Content.Shared/Anomaly/Effects/Components/ElectricityAnomalyComponent.cs b/Content.Shared/Anomaly/Effects/Components/ElectricityAnomalyComponent.cs index e48e0ae6a7..c05a3f6e41 100644 --- a/Content.Shared/Anomaly/Effects/Components/ElectricityAnomalyComponent.cs +++ b/Content.Shared/Anomaly/Effects/Components/ElectricityAnomalyComponent.cs @@ -61,5 +61,5 @@ public sealed partial class ElectricityAnomalyComponent : Component /// Duration of devices being disabled by the emp pulse upon going supercritical. /// [DataField, ViewVariables(VVAccess.ReadWrite)] - public float EmpDisabledDuration = 60f; + public TimeSpan EmpDisabledDuration = TimeSpan.FromSeconds(60); } diff --git a/Content.Shared/Bed/Sleep/SleepingSystem.cs b/Content.Shared/Bed/Sleep/SleepingSystem.cs index 141a130053..eca6a8befa 100644 --- a/Content.Shared/Bed/Sleep/SleepingSystem.cs +++ b/Content.Shared/Bed/Sleep/SleepingSystem.cs @@ -14,6 +14,7 @@ using Content.Shared.Mobs; using Content.Shared.Mobs.Components; using Content.Shared.Pointing; using Content.Shared.Popups; +using Content.Shared.Rejuvenate; using Content.Shared.Slippery; using Content.Shared.Sound; using Content.Shared.Sound.Components; @@ -57,7 +58,7 @@ public sealed partial class SleepingSystem : EntitySystem SubscribeLocalEvent(OnDamageChanged); SubscribeLocalEvent(OnZombified); SubscribeLocalEvent(OnMobStateChanged); - SubscribeLocalEvent(OnMapInit); + SubscribeLocalEvent(OnCompInit); SubscribeLocalEvent(OnSpeakAttempt); SubscribeLocalEvent(OnSeeAttempt); SubscribeLocalEvent(OnPointAttempt); @@ -68,6 +69,7 @@ public sealed partial class SleepingSystem : EntitySystem SubscribeLocalEvent(OnInteractHand); SubscribeLocalEvent(OnStunEndAttempt); SubscribeLocalEvent(OnStandUpAttempt); + SubscribeLocalEvent(OnRejuvenate); SubscribeLocalEvent(OnStatusEffectApplied); SubscribeLocalEvent(OnUnbuckleAttempt); @@ -133,7 +135,7 @@ public sealed partial class SleepingSystem : EntitySystem RemComp(ent); } - private void OnMapInit(Entity ent, ref MapInitEvent args) + private void OnCompInit(Entity ent, ref ComponentInit args) { var ev = new SleepStateChangedEvent(true); RaiseLocalEvent(ent, ref ev); @@ -185,6 +187,11 @@ public sealed partial class SleepingSystem : EntitySystem args.Cancelled = true; } + private void OnRejuvenate(Entity ent, ref RejuvenateEvent args) + { + TryWaking((ent.Owner, ent.Comp), true); + } + private void OnExamined(Entity ent, ref ExaminedEvent args) { if (args.IsInDetailsRange) diff --git a/Content.Shared/Clothing/EntitySystems/SharedChameleonClothingSystem.cs b/Content.Shared/Clothing/EntitySystems/SharedChameleonClothingSystem.cs index 18b79bf52b..07aae61f83 100644 --- a/Content.Shared/Clothing/EntitySystems/SharedChameleonClothingSystem.cs +++ b/Content.Shared/Clothing/EntitySystems/SharedChameleonClothingSystem.cs @@ -2,13 +2,16 @@ using System.Linq; using Content.Shared.Access.Components; using Content.Shared.Clothing.Components; using Content.Shared.Contraband; +using Content.Shared.Emp; using Content.Shared.Inventory; using Content.Shared.Inventory.Events; using Content.Shared.Item; using Content.Shared.Lock; using Content.Shared.Tag; using Content.Shared.Verbs; +using Robust.Shared.Network; using Robust.Shared.Prototypes; +using Robust.Shared.Random; using Robust.Shared.Timing; using Robust.Shared.Utility; @@ -23,8 +26,11 @@ public abstract class SharedChameleonClothingSystem : EntitySystem [Dependency] private readonly SharedItemSystem _itemSystem = default!; [Dependency] private readonly SharedAppearanceSystem _appearance = default!; [Dependency] private readonly TagSystem _tag = default!; - [Dependency] protected readonly IGameTiming _timing = default!; + [Dependency] protected readonly IGameTiming Timing = default!; [Dependency] private readonly LockSystem _lock = default!; + [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] protected readonly SharedUserInterfaceSystem UI = default!; + [Dependency] private readonly INetManager _net = default!; private static readonly SlotFlags[] IgnoredSlots = { @@ -32,12 +38,12 @@ public abstract class SharedChameleonClothingSystem : EntitySystem SlotFlags.PREVENTEQUIP, SlotFlags.NONE }; + private static readonly SlotFlags[] Slots = Enum.GetValues().Except(IgnoredSlots).ToArray(); private readonly Dictionary> _data = new(); public readonly Dictionary> ValidVariants = new(); - [Dependency] protected readonly SharedUserInterfaceSystem UI = default!; private static readonly ProtoId WhitelistChameleonTag = "WhitelistChameleon"; @@ -47,6 +53,7 @@ public abstract class SharedChameleonClothingSystem : EntitySystem SubscribeLocalEvent(OnGotEquipped); SubscribeLocalEvent(OnGotUnequipped); SubscribeLocalEvent>(OnVerb); + SubscribeLocalEvent(OnEmpPulse); SubscribeLocalEvent(OnPrototypeReload); PrepareAllVariants(); @@ -97,21 +104,21 @@ public abstract class SharedChameleonClothingSystem : EntitySystem // clothing sprite logic if (TryComp(uid, out ClothingComponent? clothing) && - proto.TryGetComponent("Clothing", out ClothingComponent? otherClothing)) + proto.TryGetComponent(out ClothingComponent? otherClothing, Factory)) { _clothingSystem.CopyVisuals(uid, otherClothing, clothing); } // appearance data logic if (TryComp(uid, out AppearanceComponent? appearance) && - proto.TryGetComponent("Appearance", out AppearanceComponent? appearanceOther)) + proto.TryGetComponent(out AppearanceComponent? appearanceOther, Factory)) { _appearance.AppendData(appearanceOther, uid); Dirty(uid, appearance); } // properly mark contraband - if (proto.TryGetComponent("Contraband", out ContrabandComponent? contra)) + if (proto.TryGetComponent(out ContrabandComponent? contra, Factory)) { EnsureComp(uid, out var current); _contraband.CopyDetails(uid, contra, current); @@ -138,6 +145,24 @@ public abstract class SharedChameleonClothingSystem : EntitySystem }); } + private void OnEmpPulse(EntityUid uid, ChameleonClothingComponent component, ref EmpPulseEvent args) + { + if (!component.AffectedByEmp) + return; + + if (component.EmpContinuous) + component.NextEmpChange = Timing.CurTime + TimeSpan.FromSeconds(1f / component.EmpChangeIntensity); + + if (_net.IsServer) // needs RandomPredicted + { + var pick = GetRandomValidPrototype(component.Slot, component.RequireTag); + SetSelectedPrototype(uid, pick, component: component); + } + + args.Affected = true; + args.Disabled = true; + } + protected virtual void UpdateSprite(EntityUid uid, EntityPrototype proto) { } /// @@ -157,7 +182,7 @@ public abstract class SharedChameleonClothingSystem : EntitySystem return false; // check if it's valid clothing - if (!proto.TryGetComponent("Clothing", out ClothingComponent? clothing)) + if (!proto.TryGetComponent(out ClothingComponent? clothing, Factory)) return false; if (!clothing.Slots.HasFlag(chameleonSlot)) return false; @@ -187,6 +212,14 @@ public abstract class SharedChameleonClothingSystem : EntitySystem return validTargets; } + /// + /// Get a random prototype for a given slot. + /// + public string GetRandomValidPrototype(SlotFlags slot, string? tag = null) + { + return _random.Pick(GetValidTargets(slot, tag).ToList()); + } + protected void PrepareAllVariants() { _data.Clear(); @@ -215,4 +248,9 @@ public abstract class SharedChameleonClothingSystem : EntitySystem } } } + + // TODO: Predict and use component states for the UI + public virtual void SetSelectedPrototype(EntityUid uid, string? protoId, bool forceUpdate = false, + ChameleonClothingComponent? component = null) + { } } diff --git a/Content.Shared/Damage/Components/DamageableComponent.cs b/Content.Shared/Damage/Components/DamageableComponent.cs index 9e4e26e422..1d290181ec 100644 --- a/Content.Shared/Damage/Components/DamageableComponent.cs +++ b/Content.Shared/Damage/Components/DamageableComponent.cs @@ -44,7 +44,7 @@ namespace Content.Shared.Damage /// /// If this data-field is specified, this allows damageable components to be initialized with non-zero damage. /// - [DataField(readOnly: true)] //todo remove this readonly when implementing writing to damagespecifier + [DataField(readOnly: true)] // TODO FULL GAME SAVE public DamageSpecifier Damage = new(); /// diff --git a/Content.Shared/Damage/DamageSpecifier.cs b/Content.Shared/Damage/DamageSpecifier.cs index 00bd416e1f..7bf921baa2 100644 --- a/Content.Shared/Damage/DamageSpecifier.cs +++ b/Content.Shared/Damage/DamageSpecifier.cs @@ -20,6 +20,11 @@ namespace Content.Shared.Damage [DataDefinition, Serializable, NetSerializable] public sealed partial class DamageSpecifier : IEquatable { + // For the record I regret so many of the decisions i made when rewriting damageable + // Why is it just shitting out dictionaries left and right + // One day Arrays, stackalloc spans, and SIMD will save the day. + // TODO DAMAGEABLE REFACTOR + // These exist solely so the wiki works. Please do not touch them or use them. [JsonPropertyName("types")] [DataField("types", customTypeSerializer: typeof(PrototypeIdDictionarySerializer))] diff --git a/Content.Shared/Damage/Systems/DamageableSystem.cs b/Content.Shared/Damage/Systems/DamageableSystem.cs index f3a4f37830..b849227156 100644 --- a/Content.Shared/Damage/Systems/DamageableSystem.cs +++ b/Content.Shared/Damage/Systems/DamageableSystem.cs @@ -2,9 +2,9 @@ using System.Linq; using Content.Shared.CCVar; using Content.Shared.Chemistry; using Content.Shared.Damage.Prototypes; +using Content.Shared.Explosion.EntitySystems; using Content.Shared.FixedPoint; using Content.Shared.Inventory; -using Content.Shared.Mind.Components; using Content.Shared.Mobs.Components; using Content.Shared.Mobs.Systems; using Content.Shared.Radiation.Events; @@ -25,10 +25,10 @@ namespace Content.Shared.Damage [Dependency] private readonly MobThresholdSystem _mobThreshold = default!; [Dependency] private readonly IConfigurationManager _config = default!; [Dependency] private readonly SharedChemistryGuideDataSystem _chemistryGuideData = default!; + [Dependency] private readonly SharedExplosionSystem _explosion = default!; private EntityQuery _appearanceQuery; private EntityQuery _damageableQuery; - private EntityQuery _mindContainerQuery; public float UniversalAllDamageModifier { get; private set; } = 1f; public float UniversalAllHealModifier { get; private set; } = 1f; @@ -52,7 +52,6 @@ namespace Content.Shared.Damage _appearanceQuery = GetEntityQuery(); _damageableQuery = GetEntityQuery(); - _mindContainerQuery = GetEntityQuery(); // Damage modifier CVars are updated and stored here to be queried in other systems. // Note that certain modifiers requires reloading the guidebook. @@ -60,6 +59,7 @@ namespace Content.Shared.Damage { UniversalAllDamageModifier = value; _chemistryGuideData.ReloadAllReagentPrototypes(); + _explosion.ReloadMap(); }, true); Subs.CVar(_config, CCVars.PlaytestAllHealModifier, value => { @@ -80,7 +80,11 @@ namespace Content.Shared.Damage UniversalReagentHealModifier = value; _chemistryGuideData.ReloadAllReagentPrototypes(); }, true); - Subs.CVar(_config, CCVars.PlaytestExplosionDamageModifier, value => UniversalExplosionDamageModifier = value, true); + Subs.CVar(_config, CCVars.PlaytestExplosionDamageModifier, value => + { + UniversalExplosionDamageModifier = value; + _explosion.ReloadMap(); + }, true); Subs.CVar(_config, CCVars.PlaytestThrownDamageModifier, value => UniversalThrownDamageModifier = value, true); Subs.CVar(_config, CCVars.PlaytestTopicalsHealModifier, value => UniversalTopicalsHealModifier = value, true); Subs.CVar(_config, CCVars.PlaytestMobDamageModifier, value => UniversalMobDamageModifier = value, true); @@ -156,6 +160,9 @@ namespace Content.Shared.Damage var data = new DamageVisualizerGroupData(component.DamagePerGroup.Keys.ToList()); _appearance.SetData(uid, DamageVisualizerKeys.DamageUpdateGroups, data, appearance); } + + // TODO DAMAGE + // byref struct event. RaiseLocalEvent(uid, new DamageChangedEvent(component, damageDelta, interruptsDoAfters, origin)); } @@ -171,12 +178,24 @@ namespace Content.Shared.Damage /// Returns a with information about the actual damage changes. This will be /// null if the user had no applicable components that can take damage. /// - public DamageSpecifier? TryChangeDamage(EntityUid? uid, DamageSpecifier damage, bool ignoreResistances = false, - bool interruptsDoAfters = true, DamageableComponent? damageable = null, EntityUid? origin = null) + /// If true, this will ignore the entity's damage modifier ( and skip raising a . + /// Whether the damage should cancel any damage sensitive do-afters + /// The entity that is causing this damage + /// If true, this will skip over applying the universal damage modifiers (see ). + /// + public DamageSpecifier? TryChangeDamage( + EntityUid? uid, + DamageSpecifier damage, + bool ignoreResistances = false, + bool interruptsDoAfters = true, + DamageableComponent? damageable = null, + EntityUid? origin = null, + bool ignoreGlobalModifiers = false) { if (!uid.HasValue || !_damageableQuery.Resolve(uid.Value, ref damageable, false)) { // TODO BODY SYSTEM pass damage onto body system + // BOBBY WHEN? return null; } @@ -195,13 +214,13 @@ namespace Content.Shared.Damage if (!ignoreResistances) { if (damageable.DamageModifierSetId != null && - _prototypeManager.Resolve(damageable.DamageModifierSetId, out var modifierSet)) + _prototypeManager.Resolve(damageable.DamageModifierSetId, out var modifierSet)) { - // TODO DAMAGE PERFORMANCE - // use a local private field instead of creating a new dictionary here.. damage = DamageSpecifier.ApplyModifierSet(damage, modifierSet); } + // TODO DAMAGE + // byref struct event. var ev = new DamageModifyEvent(damage, origin); RaiseLocalEvent(uid.Value, ev); damage = ev.Damage; @@ -212,11 +231,9 @@ namespace Content.Shared.Damage } } - damage = ApplyUniversalAllModifiers(damage); + if (!ignoreGlobalModifiers) + damage = ApplyUniversalAllModifiers(damage); - // TODO DAMAGE PERFORMANCE - // Consider using a local private field instead of creating a new dictionary here. - // Would need to check that nothing ever tries to cache the delta. var delta = new DamageSpecifier(); delta.DamageDict.EnsureCapacity(damage.DamageDict.Count); diff --git a/Content.Shared/Emp/EmpDisabledComponent.cs b/Content.Shared/Emp/EmpDisabledComponent.cs index 9e5a56de83..71748c0be3 100644 --- a/Content.Shared/Emp/EmpDisabledComponent.cs +++ b/Content.Shared/Emp/EmpDisabledComponent.cs @@ -5,24 +5,30 @@ namespace Content.Shared.Emp; /// /// While entity has this component it is "disabled" by EMP. -/// Add desired behaviour in other systems +/// Add desired behaviour in other systems. /// -[RegisterComponent, NetworkedComponent, AutoGenerateComponentPause] +[RegisterComponent, NetworkedComponent] +[AutoGenerateComponentState, AutoGenerateComponentPause] [Access(typeof(SharedEmpSystem))] public sealed partial class EmpDisabledComponent : Component { /// - /// Moment of time when component is removed and entity stops being "disabled" + /// Moment of time when the component is removed and entity stops being "disabled". /// - [DataField("timeLeft", customTypeSerializer: typeof(TimeOffsetSerializer)), ViewVariables(VVAccess.ReadWrite)] - [AutoPausedField] - public TimeSpan DisabledUntil; - - [DataField("effectCoolDown"), ViewVariables(VVAccess.ReadWrite)] - public float EffectCooldown = 3f; + [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))] + [AutoNetworkedField, AutoPausedField] + public TimeSpan DisabledUntil = TimeSpan.Zero; /// - /// When next effect will be spawned + /// Default time between visual effect spawns. + /// This gets a random multiplier. + /// + [DataField, AutoNetworkedField] + public TimeSpan EffectCooldown = TimeSpan.FromSeconds(3); + + /// + /// When next effect will be spawned. + /// TODO: Particle system. /// [AutoPausedField] public TimeSpan TargetTime = TimeSpan.Zero; diff --git a/Content.Shared/Emp/SharedEmpSystem.cs b/Content.Shared/Emp/SharedEmpSystem.cs index deb2afd709..7e6ea58dbc 100644 --- a/Content.Shared/Emp/SharedEmpSystem.cs +++ b/Content.Shared/Emp/SharedEmpSystem.cs @@ -1,21 +1,58 @@ using Content.Shared.Examine; +using Content.Shared.Rejuvenate; +using Robust.Shared.Audio; +using Robust.Shared.Audio.Systems; using Robust.Shared.Map; using Robust.Shared.Timing; +using Robust.Shared.Network; +using Robust.Shared.Prototypes; namespace Content.Shared.Emp; public abstract class SharedEmpSystem : EntitySystem { [Dependency] protected readonly IGameTiming Timing = default!; + [Dependency] private readonly EntityLookupSystem _lookup = default!; + [Dependency] private readonly INetManager _net = default!; + [Dependency] private readonly SharedAudioSystem _audio = default!; + [Dependency] private readonly SharedTransformSystem _transform = default!; + + private HashSet _entSet = new(); public override void Initialize() { base.Initialize(); SubscribeLocalEvent(OnExamine); + SubscribeLocalEvent(OnRemove); + SubscribeLocalEvent(OnRejuvenate); } - protected const string EmpDisabledEffectPrototype = "EffectEmpDisabled"; + public static readonly EntProtoId EmpPulseEffectPrototype = "EffectEmpPulse"; + public static readonly EntProtoId EmpDisabledEffectPrototype = "EffectEmpDisabled"; + public static readonly SoundSpecifier EmpSound = new SoundPathSpecifier("/Audio/Effects/Lightning/lightningbolt.ogg"); + + /// + /// Triggers an EMP pulse at the given location, by first raising an , then by raising on all entities in range. + /// + /// The location to trigger the EMP pulse at. + /// The range of the EMP pulse. + /// The amount of energy consumed by the EMP pulse. In Joule. + /// The duration of the EMP effects. + /// The player that caused the effect. Used for predicted audio. + public void EmpPulse(MapCoordinates mapCoordinates, float range, float energyConsumption, TimeSpan duration, EntityUid? user = null) + { + foreach (var uid in _lookup.GetEntitiesInRange(mapCoordinates, range)) + { + TryEmpEffects(uid, energyConsumption, duration, user); + } + // TODO: replace with PredictedSpawn once it works with animated sprites + if (_net.IsServer) + Spawn(EmpPulseEffectPrototype, mapCoordinates); + + var coordinates = _transform.ToCoordinates(mapCoordinates); + _audio.PlayPredicted(EmpSound, coordinates, user); + } /// /// Triggers an EMP pulse at the given location, by first raising an , then a raising on all entities in range. @@ -24,12 +61,119 @@ public abstract class SharedEmpSystem : EntitySystem /// The range of the EMP pulse. /// The amount of energy consumed by the EMP pulse. /// The duration of the EMP effects. - public virtual void EmpPulse(MapCoordinates coordinates, float range, float energyConsumption, float duration) + /// The player that caused the effect. Used for predicted audio. + public void EmpPulse(EntityCoordinates coordinates, float range, float energyConsumption, TimeSpan duration, EntityUid? user = null) { + _entSet.Clear(); + _lookup.GetEntitiesInRange(coordinates, range, _entSet); + foreach (var uid in _entSet) + { + TryEmpEffects(uid, energyConsumption, duration, user); + } + // TODO: replace with PredictedSpawn once it works with animated sprites + if (_net.IsServer) + Spawn(EmpPulseEffectPrototype, coordinates); + + _audio.PlayPredicted(EmpSound, coordinates, user); + } + + /// + /// Attempts to apply the effects of an EMP pulse onto an entity by first raising an , followed by raising a on it. + /// + /// The entity to apply the EMP effects on. + /// The amount of energy consumed by the EMP. + /// The duration of the EMP effects. + /// The player that caused the EMP. For prediction purposes. + /// If the entity was affected by the EMP. + public bool TryEmpEffects(EntityUid uid, float energyConsumption, TimeSpan duration, EntityUid? user = null) + { + var attemptEv = new EmpAttemptEvent(); + RaiseLocalEvent(uid, ref attemptEv); + if (attemptEv.Cancelled) + return false; + + return DoEmpEffects(uid, energyConsumption, duration, user); + } + + /// + /// Applies the effects of an EMP pulse onto an entity by raising a on it. + /// + /// The entity to apply the EMP effects on. + /// The amount of energy consumed by the EMP. + /// The duration of the EMP effects. + /// The player that caused the EMP. For prediction purposes. + /// If the entity was affected by the EMP. + public bool DoEmpEffects(EntityUid uid, float energyConsumption, TimeSpan duration, EntityUid? user = null) + { + var ev = new EmpPulseEvent(energyConsumption, false, false, duration, user); + RaiseLocalEvent(uid, ref ev); + + // TODO: replace with PredictedSpawn once it works with animated sprites + if (ev.Affected && _net.IsServer) + Spawn(EmpDisabledEffectPrototype, Transform(uid).Coordinates); + + if (!ev.Disabled) + return ev.Affected; + + var disabled = EnsureComp(uid); + disabled.DisabledUntil = Timing.CurTime + duration; + Dirty(uid, disabled); + + return ev.Affected; + } + + public override void Update(float frameTime) + { + base.Update(frameTime); + + var curTime = Timing.CurTime; + var query = EntityQueryEnumerator(); + while (query.MoveNext(out var uid, out var comp)) + { + if (curTime < comp.DisabledUntil) + continue; + + RemComp(uid); + } } private void OnExamine(Entity ent, ref ExaminedEvent args) { args.PushMarkup(Loc.GetString("emp-disabled-comp-on-examine")); } + + private void OnRemove(Entity ent, ref ComponentRemove args) + { + var ev = new EmpDisabledRemovedEvent(); + RaiseLocalEvent(ent, ref ev); + } + + private void OnRejuvenate(Entity ent, ref RejuvenateEvent args) + { + RemCompDeferred(ent); + } } + +/// +/// Raised on an entity before . Cancel this to prevent the emp event being raised. +/// +[ByRefEvent] +public record struct EmpAttemptEvent(bool Cancelled); + +/// +/// Raised on an entity when it gets hit by an EMP Pulse. +/// +/// The amount of energy to remove from batteries. In Joule. +/// Set this is true in the subscription to spawn a visual effect at the entity's location. +/// Set this to ture in the subscription to add to the entity. +/// The duration the entity will be disabled. +/// The player that caused the EMP. For prediction purposes. + +[ByRefEvent] +public record struct EmpPulseEvent(float EnergyConsumption, bool Affected, bool Disabled, TimeSpan Duration, EntityUid? User); + +/// +/// Raised on an entity after is removed. +/// +[ByRefEvent] +public record struct EmpDisabledRemovedEvent(); diff --git a/Content.Shared/EntityEffects/Effects/EmpReactionEffect.cs b/Content.Shared/EntityEffects/Effects/EmpReactionEffect.cs index eee0aeb51b..0f9eacc58d 100644 --- a/Content.Shared/EntityEffects/Effects/EmpReactionEffect.cs +++ b/Content.Shared/EntityEffects/Effects/EmpReactionEffect.cs @@ -27,7 +27,7 @@ public sealed partial class EmpReactionEffect : EventEntityEffect [DataField("duration")] - public float DisableDuration = 15; + public TimeSpan DisableDuration = TimeSpan.FromSeconds(15); protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) => Loc.GetString("reagent-effect-guidebook-emp-reaction-effect", ("chance", Probability)); diff --git a/Content.Shared/EntityEffects/Effects/StatusEffects/GenericStatusEffect.cs b/Content.Shared/EntityEffects/Effects/StatusEffects/GenericStatusEffect.cs index b770023604..652c1b90a1 100644 --- a/Content.Shared/EntityEffects/Effects/StatusEffects/GenericStatusEffect.cs +++ b/Content.Shared/EntityEffects/Effects/StatusEffects/GenericStatusEffect.cs @@ -69,6 +69,7 @@ public sealed partial class GenericStatusEffect : EntityEffect public enum StatusEffectMetabolismType { + Update, Add, Remove, Set diff --git a/Content.Shared/EntityEffects/Effects/StatusEffects/ModifyKnockdown.cs b/Content.Shared/EntityEffects/Effects/StatusEffects/ModifyKnockdown.cs new file mode 100644 index 0000000000..59ca5da0f7 --- /dev/null +++ b/Content.Shared/EntityEffects/Effects/StatusEffects/ModifyKnockdown.cs @@ -0,0 +1,99 @@ +using Content.Shared.Stunnable; +using JetBrains.Annotations; +using Robust.Shared.Prototypes; + +namespace Content.Shared.EntityEffects.Effects.StatusEffects; + +/// +/// Changes the knockdown timer on an entity or causes knockdown. +/// +[UsedImplicitly] +public sealed partial class ModifyKnockdown : EntityEffect +{ + /// + /// Should we only affect those with crawler component? Note if this is false, it will paralyze non-crawler's instead. + /// + [DataField] + public bool Crawling; + + /// + /// Should we drop items when we fall? + /// + [DataField] + public bool Drop; + + /// + /// Time for which knockdown should be applied. Behaviour changes according to . + /// + [DataField] + public TimeSpan Time = TimeSpan.FromSeconds(0.5); + + /// + /// Should this effect add the status effect, remove time from it, or set its cooldown? + /// + [DataField] + public StatusEffectMetabolismType Type = StatusEffectMetabolismType.Add; + + /// + /// Should this effect add knockdown?, remove time from it?, or set its cooldown? + /// + [DataField] + public bool Refresh = true; + + /// + public override void Effect(EntityEffectBaseArgs args) + { + var stunSys = args.EntityManager.EntitySysManager.GetEntitySystem(); + + var time = Time; + if (args is EntityEffectReagentArgs reagentArgs) + time *= reagentArgs.Scale.Float(); + + switch (Type) + { + case StatusEffectMetabolismType.Update: + if (Crawling) + { + stunSys.TryCrawling(args.TargetEntity, time, drop: Drop); + } + else + { + stunSys.TryKnockdown(args.TargetEntity, time, drop: Drop); + } + break; + case StatusEffectMetabolismType.Add: + if (Crawling) + { + stunSys.TryCrawling(args.TargetEntity, time, false, drop: Drop); + } + else + { + stunSys.TryKnockdown(args.TargetEntity, time, false, drop: Drop); + } + break; + case StatusEffectMetabolismType.Remove: + stunSys.AddKnockdownTime(args.TargetEntity, -time); + break; + case StatusEffectMetabolismType.Set: + if (Crawling) + { + stunSys.TryCrawling(args.TargetEntity, time, drop: Drop); + } + else + { + stunSys.TryKnockdown(args.TargetEntity, time, drop: Drop); + } + stunSys.SetKnockdownTime(args.TargetEntity, time); + break; + } + } + + /// + protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) + => Loc.GetString( + "reagent-effect-guidebook-knockdown", + ("chance", Probability), + ("type", Type), + ("time", Time.TotalSeconds) + ); +} diff --git a/Content.Shared/EntityEffects/Effects/StatusEffects/ModifyStatusEffect.cs b/Content.Shared/EntityEffects/Effects/StatusEffects/ModifyStatusEffect.cs index a232d34925..d7bf6482bd 100644 --- a/Content.Shared/EntityEffects/Effects/StatusEffects/ModifyStatusEffect.cs +++ b/Content.Shared/EntityEffects/Effects/StatusEffects/ModifyStatusEffect.cs @@ -19,11 +19,11 @@ public sealed partial class ModifyStatusEffect : EntityEffect [DataField] public float Time = 2.0f; - /// - /// true - refresh status effect time (update to greater value), false - accumulate status effect time. - /// + /// + /// Delay before the effect starts. If another effect is added with a shorter delay, it takes precedence. + /// [DataField] - public bool Refresh = true; + public float Delay = 0f; /// /// Should this effect add the status effect, remove time from it, or set its cooldown? @@ -43,24 +43,32 @@ public sealed partial class ModifyStatusEffect : EntityEffect var duration = TimeSpan.FromSeconds(time); switch (Type) { + case StatusEffectMetabolismType.Update: + statusSys.TryUpdateStatusEffectDuration(args.TargetEntity, EffectProto, duration, Delay > 0 ? TimeSpan.FromSeconds(Delay) : null); + break; case StatusEffectMetabolismType.Add: - if (Refresh) - statusSys.TryUpdateStatusEffectDuration(args.TargetEntity, EffectProto, duration); - else - statusSys.TryAddStatusEffectDuration(args.TargetEntity, EffectProto, duration); + statusSys.TryAddStatusEffectDuration(args.TargetEntity, EffectProto, duration, Delay > 0 ? TimeSpan.FromSeconds(Delay) : null); break; case StatusEffectMetabolismType.Remove: statusSys.TryAddTime(args.TargetEntity, EffectProto, -duration); break; case StatusEffectMetabolismType.Set: - statusSys.TrySetStatusEffectDuration(args.TargetEntity, EffectProto, duration); + statusSys.TrySetStatusEffectDuration(args.TargetEntity, EffectProto, duration, TimeSpan.FromSeconds(Delay)); break; } } /// - protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) - => Loc.GetString( + protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) => + Delay > 0 + ? Loc.GetString( + "reagent-effect-guidebook-status-effect-delay", + ("chance", Probability), + ("type", Type), + ("time", Time), + ("key", prototype.Index(EffectProto).Name), + ("delay", Delay)) + : Loc.GetString( "reagent-effect-guidebook-status-effect", ("chance", Probability), ("type", Type), diff --git a/Content.Shared/Entry/EntryPoint.cs b/Content.Shared/Entry/EntryPoint.cs index df267b08cb..db8d6a6abd 100644 --- a/Content.Shared/Entry/EntryPoint.cs +++ b/Content.Shared/Entry/EntryPoint.cs @@ -27,7 +27,6 @@ namespace Content.Shared.Entry public override void PreInit() { IoCManager.InjectDependencies(this); - SharedContentIoC.Register(); } public override void Shutdown() diff --git a/Content.Shared/Explosion/EntitySystems/SharedExplosionSystem.cs b/Content.Shared/Explosion/EntitySystems/SharedExplosionSystem.cs index d6053c9c3c..ce05cd3eb8 100644 --- a/Content.Shared/Explosion/EntitySystems/SharedExplosionSystem.cs +++ b/Content.Shared/Explosion/EntitySystems/SharedExplosionSystem.cs @@ -69,4 +69,11 @@ public abstract class SharedExplosionSystem : EntitySystem bool addLog = true) { } + + /// + /// This forces the explosion system to re-calculate the explosion intensity required to destroy all airtight entities. + /// + public virtual void ReloadMap() + { + } } diff --git a/Content.Shared/Fluids/Components/PuddleComponent.cs b/Content.Shared/Fluids/Components/PuddleComponent.cs index 105206fece..2138d04149 100644 --- a/Content.Shared/Fluids/Components/PuddleComponent.cs +++ b/Content.Shared/Fluids/Components/PuddleComponent.cs @@ -15,7 +15,7 @@ namespace Content.Shared.Fluids.Components public SoundSpecifier SpillSound = new SoundPathSpecifier("/Audio/Effects/Fluids/splat.ogg"); [DataField] - public FixedPoint2 OverflowVolume = FixedPoint2.New(20); + public FixedPoint2 OverflowVolume = FixedPoint2.New(50); [DataField("solution")] public string SolutionName = "puddle"; diff --git a/Content.Shared/Input/ContentKeyFunctions.cs b/Content.Shared/Input/ContentKeyFunctions.cs index cd5f4cff7b..50ea218b00 100644 --- a/Content.Shared/Input/ContentKeyFunctions.cs +++ b/Content.Shared/Input/ContentKeyFunctions.cs @@ -32,6 +32,9 @@ namespace Content.Shared.Input public static readonly BoundKeyFunction OpenInventoryMenu = "OpenInventoryMenu"; public static readonly BoundKeyFunction SmartEquipBackpack = "SmartEquipBackpack"; public static readonly BoundKeyFunction SmartEquipBelt = "SmartEquipBelt"; + public static readonly BoundKeyFunction SmartEquipPocket1 = "SmartEquipPocket1"; + public static readonly BoundKeyFunction SmartEquipPocket2 = "SmartEquipPocket2"; + public static readonly BoundKeyFunction SmartEquipSuitStorage = "SmartEquipSuitStorage"; public static readonly BoundKeyFunction OpenBackpack = "OpenBackpack"; public static readonly BoundKeyFunction OpenBelt = "OpenBelt"; public static readonly BoundKeyFunction OpenAHelp = "OpenAHelp"; diff --git a/Content.Shared/Interaction/SmartEquipSystem.cs b/Content.Shared/Interaction/SmartEquipSystem.cs index 553a4475cb..7529d8701d 100644 --- a/Content.Shared/Interaction/SmartEquipSystem.cs +++ b/Content.Shared/Interaction/SmartEquipSystem.cs @@ -35,6 +35,9 @@ public sealed class SmartEquipSystem : EntitySystem CommandBinds.Builder .Bind(ContentKeyFunctions.SmartEquipBackpack, InputCmdHandler.FromDelegate(HandleSmartEquipBackpack, handle: false, outsidePrediction: false)) .Bind(ContentKeyFunctions.SmartEquipBelt, InputCmdHandler.FromDelegate(HandleSmartEquipBelt, handle: false, outsidePrediction: false)) + .Bind(ContentKeyFunctions.SmartEquipPocket1, InputCmdHandler.FromDelegate(HandleSmartEquipPocket1, handle: false, outsidePrediction: false)) + .Bind(ContentKeyFunctions.SmartEquipPocket2, InputCmdHandler.FromDelegate(HandleSmartEquipPocket2, handle: false, outsidePrediction: false)) + .Bind(ContentKeyFunctions.SmartEquipSuitStorage, InputCmdHandler.FromDelegate(HandleSmartEquipSuitStorage, handle: false, outsidePrediction: false)) .Register(); } @@ -55,6 +58,21 @@ public sealed class SmartEquipSystem : EntitySystem HandleSmartEquip(session, "belt"); } + private void HandleSmartEquipPocket1(ICommonSession? session) + { + HandleSmartEquip(session, "pocket1"); + } + + private void HandleSmartEquipPocket2(ICommonSession? session) + { + HandleSmartEquip(session, "pocket2"); + } + + private void HandleSmartEquipSuitStorage(ICommonSession? session) + { + HandleSmartEquip(session, "suitstorage"); + } + private void HandleSmartEquip(ICommonSession? session, string equipmentSlot) { if (session is not { } playerSession) diff --git a/Content.Shared/IoC/SharedContentIoC.cs b/Content.Shared/IoC/SharedContentIoC.cs index c20cdbc111..f23b9f8355 100644 --- a/Content.Shared/IoC/SharedContentIoC.cs +++ b/Content.Shared/IoC/SharedContentIoC.cs @@ -5,10 +5,10 @@ namespace Content.Shared.IoC { public static class SharedContentIoC { - public static void Register() + public static void Register(IDependencyCollection deps) { - IoCManager.Register(); - IoCManager.Register(); + deps.Register(); + deps.Register(); } } } diff --git a/Content.Shared/Kitchen/SharedKitchenSpikeSystem.cs b/Content.Shared/Kitchen/SharedKitchenSpikeSystem.cs index cdc831cd67..bae411f356 100644 --- a/Content.Shared/Kitchen/SharedKitchenSpikeSystem.cs +++ b/Content.Shared/Kitchen/SharedKitchenSpikeSystem.cs @@ -7,6 +7,7 @@ using Content.Shared.DoAfter; using Content.Shared.DragDrop; using Content.Shared.Examine; using Content.Shared.Hands; +using Content.Shared.Humanoid; using Content.Shared.IdentityManagement; using Content.Shared.Interaction; using Content.Shared.Interaction.Events; @@ -238,8 +239,11 @@ public sealed class SharedKitchenSpikeSystem : EntitySystem args.Target.Value, ent); + // normally medium severity, but for humanoids high severity, so new players get relay'd to admin alerts. + var logSeverity = HasComp(args.Target) ? LogImpact.High : LogImpact.Medium; + _logger.Add(LogType.Action, - LogImpact.High, + logSeverity, $"{ToPrettyString(args.User):user} put {ToPrettyString(args.Target):target} on the {ToPrettyString(ent):spike}"); _audioSystem.PlayPredicted(ent.Comp.SpikeSound, ent, args.User); @@ -316,8 +320,10 @@ public sealed class SharedKitchenSpikeSystem : EntitySystem { _bodySystem.GibBody(args.Target.Value, true); + var logSeverity = HasComp(args.Target) ? LogImpact.Extreme : LogImpact.High; + _logger.Add(LogType.Gib, - LogImpact.Extreme, + logSeverity, $"{ToPrettyString(args.User):user} finished butchering {ToPrettyString(args.Target):target} on the {ToPrettyString(ent):spike}"); } else @@ -325,8 +331,10 @@ public sealed class SharedKitchenSpikeSystem : EntitySystem EnsureComp(args.Target.Value); _damageableSystem.TryChangeDamage(args.Target, ent.Comp.ButcherDamage, true); + + // Log severity for damaging other entities is normally medium. _logger.Add(LogType.Action, - LogImpact.Extreme, + LogImpact.Medium, $"{ToPrettyString(args.User):user} butchered {ToPrettyString(args.Target):target} on the {ToPrettyString(ent):spike}"); } diff --git a/Content.Shared/Labels/EntitySystems/LabelSystem.cs b/Content.Shared/Labels/EntitySystems/LabelSystem.cs index f60b690929..2b5091b7ad 100644 --- a/Content.Shared/Labels/EntitySystems/LabelSystem.cs +++ b/Content.Shared/Labels/EntitySystems/LabelSystem.cs @@ -54,7 +54,7 @@ public sealed partial class LabelSystem : EntitySystem { label ??= EnsureComp(uid); - label.CurrentLabel = text; + label.CurrentLabel = text == null ? null : FormattedMessage.EscapeText(text); _nameModifier.RefreshNameModifiers(uid); Dirty(uid, label); diff --git a/Content.Shared/Light/EntitySystems/SharedPoweredLightSystem.cs b/Content.Shared/Light/EntitySystems/SharedPoweredLightSystem.cs index 65097f0d06..9ca0a1821b 100644 --- a/Content.Shared/Light/EntitySystems/SharedPoweredLightSystem.cs +++ b/Content.Shared/Light/EntitySystems/SharedPoweredLightSystem.cs @@ -7,6 +7,7 @@ using Content.Shared.DeviceLinking.Events; using Content.Shared.DeviceNetwork; using Content.Shared.DeviceNetwork.Events; using Content.Shared.DoAfter; +using Content.Shared.Emp; using Content.Shared.Hands.EntitySystems; using Content.Shared.Interaction; using Content.Shared.Light.Components; @@ -52,6 +53,7 @@ public abstract class SharedPoweredLightSystem : EntitySystem SubscribeLocalEvent(OnPowerChanged); SubscribeLocalEvent(OnDoAfter); SubscribeLocalEvent(HandleLightDamaged); + SubscribeLocalEvent(OnEmpPulse); } private void OnInit(EntityUid uid, PoweredLightComponent light, ComponentInit args) @@ -230,29 +232,21 @@ public abstract class SharedPoweredLightSystem : EntitySystem /// /// Try to break bulb inside light fixture /// - public bool TryDestroyBulb(EntityUid uid, PoweredLightComponent? light = null) + public bool TryDestroyBulb(EntityUid uid, PoweredLightComponent? light = null, EntityUid? user = null) { if (!Resolve(uid, ref light, false)) return false; - // if we aren't mapinited, - // just null the spawned bulb - if (LifeStage(uid) < EntityLifeStage.MapInitialized) - { - light.HasLampOnSpawn = null; - return true; - } - // check bulb state var bulbUid = GetBulb(uid, light); - if (bulbUid == null || !EntityManager.TryGetComponent(bulbUid.Value, out LightBulbComponent? lightBulb)) + if (bulbUid == null || !TryComp(bulbUid.Value, out var lightBulb)) return false; if (lightBulb.State == LightBulbState.Broken) return false; // break it _bulbSystem.SetState(bulbUid.Value, LightBulbState.Broken, lightBulb); - _bulbSystem.PlayBreakSound(bulbUid.Value, lightBulb); + _bulbSystem.PlayBreakSound(bulbUid.Value, lightBulb, user); UpdateLight(uid, light); return true; } @@ -327,13 +321,18 @@ public abstract class SharedPoweredLightSystem : EntitySystem /// /// Destroy the light bulb if the light took any damage. /// + /// + /// TODO: This should be an IThresholdBehaviour once DestructibleSystem is predicted. + /// public void HandleLightDamaged(EntityUid uid, PoweredLightComponent component, DamageChangedEvent args) { + if (GameTiming.ApplyingState) // The destruction is already networked on its own. + return; + // Was it being repaired, or did it take damage? if (args.DamageIncreased) { - // Eventually, this logic should all be done by this (or some other) system, not a component. - TryDestroyBulb(uid, component); + TryDestroyBulb(uid, component, args.Origin); } } @@ -348,6 +347,12 @@ public abstract class SharedPoweredLightSystem : EntitySystem UpdateLight(uid, component); } + private void OnEmpPulse(EntityUid uid, PoweredLightComponent component, ref EmpPulseEvent args) + { + if (TryDestroyBulb(uid, component)) + args.Affected = true; + } + public void ToggleBlinkingLight(EntityUid uid, PoweredLightComponent light, bool isNowBlinking) { if (light.IsBlinking == isNowBlinking) diff --git a/Content.Shared/Medical/SuitSensors/SharedSuitSensorSystem.cs b/Content.Shared/Medical/SuitSensors/SharedSuitSensorSystem.cs index 2ed1089ba8..6930b029b7 100644 --- a/Content.Shared/Medical/SuitSensors/SharedSuitSensorSystem.cs +++ b/Content.Shared/Medical/SuitSensors/SharedSuitSensorSystem.cs @@ -5,6 +5,7 @@ using Content.Shared.Clothing; using Content.Shared.Damage; using Content.Shared.DeviceNetwork; using Content.Shared.DoAfter; +using Content.Shared.Emp; using Content.Shared.Examine; using Content.Shared.GameTicking; using Content.Shared.Interaction; @@ -49,6 +50,8 @@ public abstract class SharedSuitSensorSystem : EntitySystem SubscribeLocalEvent(OnPlayerSpawn); SubscribeLocalEvent(OnEquipped); SubscribeLocalEvent(OnUnequipped); + SubscribeLocalEvent(OnEmpPulse); + SubscribeLocalEvent(OnEmpFinished); SubscribeLocalEvent(OnExamine); SubscribeLocalEvent>(OnVerb); SubscribeLocalEvent(OnInsert); @@ -133,6 +136,25 @@ public abstract class SharedSuitSensorSystem : EntitySystem Dirty(ent); } + private void OnEmpPulse(Entity ent, ref EmpPulseEvent args) + { + args.Affected = true; + args.Disabled = true; + + ent.Comp.PreviousMode = ent.Comp.Mode; + SetSensor(ent.AsNullable(), SuitSensorMode.SensorOff, null); + + ent.Comp.PreviousControlsLocked = ent.Comp.ControlsLocked; + ent.Comp.ControlsLocked = true; + // SetSensor already calls Dirty + } + + private void OnEmpFinished(Entity ent, ref EmpDisabledRemovedEvent args) + { + SetSensor(ent.AsNullable(), ent.Comp.PreviousMode, null); + ent.Comp.ControlsLocked = ent.Comp.PreviousControlsLocked; + } + private void OnExamine(Entity ent, ref ExaminedEvent args) { if (!args.IsInDetailsRange) diff --git a/Content.Shared/Medical/SuitSensors/SuitSensorComponent.cs b/Content.Shared/Medical/SuitSensors/SuitSensorComponent.cs index b20b7af2c9..19bee1b017 100644 --- a/Content.Shared/Medical/SuitSensors/SuitSensorComponent.cs +++ b/Content.Shared/Medical/SuitSensors/SuitSensorComponent.cs @@ -85,13 +85,13 @@ public sealed partial class SuitSensorComponent : Component /// /// The previous mode of the suit. This is used to restore the state when an EMP effect ends. /// - [DataField, ViewVariables] + [DataField, AutoNetworkedField, ViewVariables] public SuitSensorMode PreviousMode = SuitSensorMode.SensorOff; /// /// The previous locked status of the controls. This is used to restore the state when an EMP effect ends. /// This keeps prisoner jumpsuits/internal implants from becoming unlocked after an EMP. /// - [DataField, ViewVariables] + [DataField, AutoNetworkedField, ViewVariables] public bool PreviousControlsLocked = false; } diff --git a/Content.Shared/Medical/VomitSystem.cs b/Content.Shared/Medical/VomitSystem.cs new file mode 100644 index 0000000000..d398faef20 --- /dev/null +++ b/Content.Shared/Medical/VomitSystem.cs @@ -0,0 +1,140 @@ +using Content.Shared.Body.Components; +using Content.Shared.Body.Systems; +using Content.Shared.Chemistry.Components; +using Content.Shared.Chemistry.EntitySystems; +using Content.Shared.Chemistry.Reagent; +using Content.Shared.Fluids; +using Content.Shared.Forensics.Systems; +using Content.Shared.IdentityManagement; +using Content.Shared.Mobs.Systems; +using Content.Shared.Movement.Systems; +using Content.Shared.Nutrition.Components; +using Content.Shared.Nutrition.EntitySystems; +using Content.Shared.Popups; +using Robust.Shared.Audio; +using Robust.Shared.Audio.Systems; +using Robust.Shared.Network; +using Robust.Shared.Prototypes; + +namespace Content.Shared.Medical; + +public sealed class VomitSystem : EntitySystem +{ + [Dependency] private readonly INetManager _netManager = default!; + [Dependency] private readonly IPrototypeManager _proto = default!; + [Dependency] private readonly HungerSystem _hunger = default!; + [Dependency] private readonly MobStateSystem _mobState = default!; + [Dependency] private readonly MovementModStatusSystem _movementMod = default!; + [Dependency] private readonly ThirstSystem _thirst = default!; + [Dependency] private readonly SharedAudioSystem _audio = default!; + [Dependency] private readonly SharedBloodstreamSystem _bloodstream = default!; + [Dependency] private readonly SharedBodySystem _body = default!; + [Dependency] private readonly SharedForensicsSystem _forensics = default!; + [Dependency] private readonly SharedPopupSystem _popup = default!; + [Dependency] private readonly SharedPuddleSystem _puddle = default!; + [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!; + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(TryBodyVomitSolution); + } + + private const float ChemMultiplier = 0.1f; + + private static readonly ProtoId VomitCollection = "Vomit"; + + private static readonly ProtoId VomitPrototype = "Vomit"; // TODO: Dehardcode vomit prototype + + private readonly SoundSpecifier _vomitSound = new SoundCollectionSpecifier(VomitCollection, + AudioParams.Default.WithVariation(0.2f).WithVolume(-4f)); + + private void TryBodyVomitSolution(Entity ent, ref TryVomitEvent args) + { + if (args.Handled) + return; + + // Main requirement: You have a stomach + var stomachList = _body.GetBodyOrganEntityComps((ent, null)); + if (stomachList.Count == 0) + return; + + // Empty the stomach out into it + foreach (var stomach in stomachList) + { + if (_solutionContainer.ResolveSolution(stomach.Owner, StomachSystem.DefaultSolutionName, ref stomach.Comp1.Solution, out var sol)) + _solutionContainer.TryTransferSolution(stomach.Comp1.Solution.Value, args.Sol, sol.AvailableVolume); + } + + args.Handled = true; + } + + /// + /// Make an entity vomit, if they have a stomach. + /// + public void Vomit(EntityUid uid, float thirstAdded = -40f, float hungerAdded = -40f, bool force = false) + { + // Vomit only if entity is alive + // Ignore condition if force was set to true + if (!force && _mobState.IsDead(uid)) + return; + + // TODO: Need decals + var solution = new Solution(); + + var ev = new TryVomitEvent(solution, force); + RaiseLocalEvent(uid, ref ev); + + if (!ev.Handled) + return; + + // Vomiting makes you hungrier and thirstier + if (TryComp(uid, out var hunger)) + _hunger.ModifyHunger(uid, hungerAdded, hunger); + + if (TryComp(uid, out var thirst)) + _thirst.ModifyThirst(uid, thirst, thirstAdded); + + // It fully empties the stomach, this amount from the chem stream is relatively small + var solutionSize = (MathF.Abs(thirstAdded) + MathF.Abs(hungerAdded)) / 6; + + // Apply a bit of slowdown + _movementMod.TryUpdateMovementSpeedModDuration(uid, MovementModStatusSystem.VomitingSlowdown, TimeSpan.FromSeconds(solutionSize), 0.5f); + + // Adds a tiny amount of the chem stream from earlier along with vomit + if (TryComp(uid, out var bloodStream)) + { + var vomitAmount = solutionSize; + + // Takes 10% of the chemicals removed from the chem stream + if (_solutionContainer.ResolveSolution(uid, bloodStream.ChemicalSolutionName, ref bloodStream.ChemicalSolution)) + { + var vomitChemstreamAmount = _solutionContainer.SplitSolution(bloodStream.ChemicalSolution.Value, vomitAmount); + vomitChemstreamAmount.ScaleSolution(ChemMultiplier); + solution.AddSolution(vomitChemstreamAmount, _proto); + + vomitAmount -= (float)vomitChemstreamAmount.Volume; + } + + // Makes a vomit solution the size of 90% of the chemicals removed from the chemstream + solution.AddReagent(new ReagentId(VomitPrototype, _bloodstream.GetEntityBloodData(uid)), vomitAmount); + } + + if (_puddle.TrySpillAt(uid, solution, out var puddle, false)) + { + _forensics.TransferDna(puddle, uid, false); + } + + + if (!_netManager.IsServer) + return; + + // Force sound to play as spill doesn't work if solution is empty. + _audio.PlayPvs(_vomitSound, uid); + _popup.PopupEntity(Loc.GetString("disease-vomit", ("person", Identity.Entity(uid, EntityManager))), uid); + } +} + +[ByRefEvent] +public record struct TryVomitEvent(Solution Sol, bool Forced = false, bool Handled = false); diff --git a/Content.Shared/Ninja/Components/NinjaSuitComponent.cs b/Content.Shared/Ninja/Components/NinjaSuitComponent.cs index 8b477b2aa5..b1467b4146 100644 --- a/Content.Shared/Ninja/Components/NinjaSuitComponent.cs +++ b/Content.Shared/Ninja/Components/NinjaSuitComponent.cs @@ -72,10 +72,10 @@ public sealed partial class NinjaSuitComponent : Component public float EmpConsumption = 100000f; /// - /// How long the EMP effects last for, in seconds + /// How long the EMP effects last for /// [DataField] - public float EmpDuration = 60f; + public TimeSpan EmpDuration = TimeSpan.FromSeconds(60); } public sealed partial class RecallKatanaEvent : InstantActionEvent; diff --git a/Content.Shared/Ninja/Systems/SharedNinjaSuitSystem.cs b/Content.Shared/Ninja/Systems/SharedNinjaSuitSystem.cs index 3800d15b26..f316b16f6b 100644 --- a/Content.Shared/Ninja/Systems/SharedNinjaSuitSystem.cs +++ b/Content.Shared/Ninja/Systems/SharedNinjaSuitSystem.cs @@ -1,7 +1,7 @@ using Content.Shared.Actions; using Content.Shared.Clothing; using Content.Shared.Clothing.Components; -using Content.Shared.Clothing.EntitySystems; +using Content.Shared.Emp; using Content.Shared.Inventory.Events; using Content.Shared.Item.ItemToggle; using Content.Shared.Item.ItemToggle.Components; @@ -18,8 +18,8 @@ namespace Content.Shared.Ninja.Systems; public abstract class SharedNinjaSuitSystem : EntitySystem { [Dependency] private readonly ActionContainerSystem _actionContainer = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; [Dependency] private readonly ItemToggleSystem _toggle = default!; + [Dependency] private readonly SharedAudioSystem _audio = default!; [Dependency] protected readonly SharedPopupSystem Popup = default!; [Dependency] private readonly SharedSpaceNinjaSystem _ninja = default!; [Dependency] private readonly UseDelaySystem _useDelay = default!; @@ -36,6 +36,7 @@ public abstract class SharedNinjaSuitSystem : EntitySystem SubscribeLocalEvent(OnCreateStarAttempt); SubscribeLocalEvent(OnActivateAttempt); SubscribeLocalEvent(OnUnequipped); + SubscribeLocalEvent(OnEmpAttempt); } private void OnEquipped(Entity ent, ref ClothingGotEquippedEvent args) @@ -168,7 +169,14 @@ public abstract class SharedNinjaSuitSystem : EntitySystem // mark the user as not wearing a suit _ninja.AssignSuit(user, null); // disable glove abilities - if (user.Comp.Gloves is {} uid) + if (user.Comp.Gloves is { } uid) _toggle.TryDeactivate(uid, user: user); } + + private void OnEmpAttempt(Entity ent, ref EmpAttemptEvent args) + { + // ninja suit (battery) is immune to emp + // powercell relays the event to suit + args.Cancelled = true; + } } diff --git a/Content.Shared/NodeContainer/NodeGroups/NodeGroupID.cs b/Content.Shared/NodeContainer/NodeGroups/NodeGroupID.cs index 214e9c50ce..f76a4f9022 100644 --- a/Content.Shared/NodeContainer/NodeGroups/NodeGroupID.cs +++ b/Content.Shared/NodeContainer/NodeGroups/NodeGroupID.cs @@ -16,4 +16,5 @@ public enum NodeGroupID : byte /// /// Teg, + ExCable, } diff --git a/Content.Shared/Nutrition/EntitySystems/IngestionSystem.Utensils.cs b/Content.Shared/Nutrition/EntitySystems/IngestionSystem.Utensils.cs index dfdc03cfe6..a4ef8422bb 100644 --- a/Content.Shared/Nutrition/EntitySystems/IngestionSystem.Utensils.cs +++ b/Content.Shared/Nutrition/EntitySystems/IngestionSystem.Utensils.cs @@ -43,7 +43,7 @@ public sealed partial class IngestionSystem RaiseLocalEvent(target, ref ev); //Prevents food usage with a wrong utensil - if ((ev.Types & utensil.Comp.Types) == 0) + if (ev.Types != UtensilType.None && (ev.Types & utensil.Comp.Types) == 0) { _popup.PopupClient(Loc.GetString("ingestion-try-use-wrong-utensil", ("verb", GetEdibleVerb(target)), ("food", target), ("utensil", utensil.Owner)), user, user); return true; diff --git a/Content.Shared/Nutrition/EntitySystems/IngestionSystem.cs b/Content.Shared/Nutrition/EntitySystems/IngestionSystem.cs index caecc2797e..d3271b7edb 100644 --- a/Content.Shared/Nutrition/EntitySystems/IngestionSystem.cs +++ b/Content.Shared/Nutrition/EntitySystems/IngestionSystem.cs @@ -177,8 +177,10 @@ public sealed partial class IngestionSystem : EntitySystem /// /// Entity being eaten /// Stomachs available to digest - public bool IsDigestibleBy(EntityUid food, List> stomachs) + /// Should we also display popup text if it exists? + public bool IsDigestibleBy(EntityUid food, List> stomachs, out bool popup) { + popup = false; var ev = new IsDigestibleEvent(); RaiseLocalEvent(food, ref ev); @@ -210,6 +212,7 @@ public sealed partial class IngestionSystem : EntitySystem } // If we didn't find a stomach that can digest our food then it doesn't exist. + popup = true; return false; } @@ -247,9 +250,9 @@ public sealed partial class IngestionSystem : EntitySystem return; // Can we digest the specific item we're trying to eat? - if (!IsDigestibleBy(args.Ingested, stomachs)) + if (!IsDigestibleBy(args.Ingested, stomachs, out var popup)) { - if (!args.Ingest) + if (!args.Ingest || !popup) return; if (forceFed) diff --git a/Content.Shared/Power/ChargeEvents.cs b/Content.Shared/Power/ChargeEvents.cs new file mode 100644 index 0000000000..db412e91d9 --- /dev/null +++ b/Content.Shared/Power/ChargeEvents.cs @@ -0,0 +1,33 @@ +namespace Content.Shared.Power; + +/// +/// Raised when a battery's charge or capacity changes (capacity affects relative charge percentage). +/// +[ByRefEvent] +public readonly record struct ChargeChangedEvent(float Charge, float MaxCharge); + +/// +/// Raised when it is necessary to get information about battery charges. +/// +[ByRefEvent] +public sealed class GetChargeEvent : EntityEventArgs +{ + public float CurrentCharge; + public float MaxCharge; +} + +/// +/// Raised when it is necessary to change the current battery charge to a some value. +/// +[ByRefEvent] +public sealed class ChangeChargeEvent : EntityEventArgs +{ + public float OriginalValue; + public float ResidualValue; + + public ChangeChargeEvent(float value) + { + OriginalValue = value; + ResidualValue = value; + } +} diff --git a/Content.Shared/Power/Components/ApcPowerReceiverBatteryComponent.cs b/Content.Shared/Power/Components/ApcPowerReceiverBatteryComponent.cs index 02c8328fa1..92efabd7ab 100644 --- a/Content.Shared/Power/Components/ApcPowerReceiverBatteryComponent.cs +++ b/Content.Shared/Power/Components/ApcPowerReceiverBatteryComponent.cs @@ -6,7 +6,7 @@ namespace Content.Shared.Power.Components; /// /// Attached to APC powered entities that possess a rechargeable internal battery. /// If external power is interrupted, the entity will draw power from this battery instead. -/// Requires and to function. +/// Requires and to function. /// [RegisterComponent, NetworkedComponent, AutoGenerateComponentState] [Access(typeof(SharedPowerNetSystem), typeof(SharedPowerReceiverSystem))] diff --git a/Content.Shared/Power/Components/BatteryComponent.cs b/Content.Shared/Power/Components/BatteryComponent.cs new file mode 100644 index 0000000000..6a2d2a5051 --- /dev/null +++ b/Content.Shared/Power/Components/BatteryComponent.cs @@ -0,0 +1,34 @@ +using Content.Shared.Power.EntitySystems; +using Content.Shared.Guidebook; + +namespace Content.Shared.Power.Components; + +/// +/// Battery node on the pow3r network. Needs other components to connect to actual networks. +/// +[RegisterComponent] +[Virtual] +[Access(typeof(SharedBatterySystem))] +public partial class BatteryComponent : Component +{ + public string SolutionName = "battery"; + + /// + /// Maximum charge of the battery in joules (ie. watt seconds) + /// + [DataField] + [GuidebookData] + public float MaxCharge; + + /// + /// Current charge of the battery in joules (ie. watt seconds) + /// + [DataField("startingCharge")] + public float CurrentCharge; + + /// + /// The price per one joule. Default is 1 credit for 10kJ. + /// + [DataField] + public float PricePerJoule = 0.0001f; +} diff --git a/Content.Shared/Power/Components/ChargerComponent.cs b/Content.Shared/Power/Components/ChargerComponent.cs new file mode 100644 index 0000000000..a3f2f8f424 --- /dev/null +++ b/Content.Shared/Power/Components/ChargerComponent.cs @@ -0,0 +1,36 @@ +using Content.Shared.Whitelist; +using Robust.Shared.GameStates; + +namespace Content.Shared.Power.Components; + +[RegisterComponent, NetworkedComponent] +public sealed partial class ChargerComponent : Component +{ + [ViewVariables] + public CellChargerStatus Status; + + /// + /// The charge rate of the charger, in watts + /// + [DataField] + public float ChargeRate = 20.0f; + + /// + /// The container ID that is holds the entities being charged. + /// + [DataField(required: true)] + public string SlotId = string.Empty; + + /// + /// A whitelist for what entities can be charged by this Charger. + /// + [DataField] + public EntityWhitelist? Whitelist; + + /// + /// Indicates whether the charger is portable and thus subject to EMP effects + /// and bypasses checks for transform, anchored, and ApcPowerReceiverComponent. + /// + [DataField] + public bool Portable = false; +} diff --git a/Content.Shared/Power/EntitySystems/SharedBatterySystem.cs b/Content.Shared/Power/EntitySystems/SharedBatterySystem.cs new file mode 100644 index 0000000000..90931ef9f1 --- /dev/null +++ b/Content.Shared/Power/EntitySystems/SharedBatterySystem.cs @@ -0,0 +1,44 @@ +using Content.Shared.Emp; +using Content.Shared.Power.Components; + +namespace Content.Shared.Power.EntitySystems; + +public abstract class SharedBatterySystem : EntitySystem +{ + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnEmpPulse); + } + + private void OnEmpPulse(EntityUid uid, BatteryComponent component, ref EmpPulseEvent args) + { + args.Affected = true; + UseCharge(uid, args.EnergyConsumption, component); + // Apply a cooldown to the entity's self recharge if needed to avoid it immediately self recharging after an EMP. + TrySetChargeCooldown(uid); + } + + public virtual float UseCharge(EntityUid uid, float value, BatteryComponent? battery = null) + { + return 0f; + } + + public virtual void SetMaxCharge(EntityUid uid, float value, BatteryComponent? battery = null) { } + + public virtual float ChangeCharge(EntityUid uid, float value, BatteryComponent? battery = null) + { + return 0f; + } + + /// + /// Checks if the entity has a self recharge and puts it on cooldown if applicable. + /// + public virtual void TrySetChargeCooldown(EntityUid uid, float value = -1) { } + + public virtual bool TryUseCharge(EntityUid uid, float value, BatteryComponent? battery = null) + { + return false; + } +} diff --git a/Content.Shared/Power/EntitySystems/SharedChargerSystem.cs b/Content.Shared/Power/EntitySystems/SharedChargerSystem.cs new file mode 100644 index 0000000000..a150436bef --- /dev/null +++ b/Content.Shared/Power/EntitySystems/SharedChargerSystem.cs @@ -0,0 +1,20 @@ +using Content.Shared.Emp; +using Content.Shared.Power.Components; + +namespace Content.Shared.Power.EntitySystems; + +public abstract class SharedChargerSystem : EntitySystem +{ + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnEmpPulse); + } + + private void OnEmpPulse(EntityUid uid, ChargerComponent component, ref EmpPulseEvent args) + { + args.Affected = true; + args.Disabled = true; + } +} diff --git a/Content.Shared/Power/PowerMonitoringCableNetworksComponent.cs b/Content.Shared/Power/PowerMonitoringCableNetworksComponent.cs index 75ac8869ed..5a79100d5f 100644 --- a/Content.Shared/Power/PowerMonitoringCableNetworksComponent.cs +++ b/Content.Shared/Power/PowerMonitoringCableNetworksComponent.cs @@ -34,6 +34,6 @@ public struct PowerCableChunk public PowerCableChunk(Vector2i origin) { Origin = origin; - PowerCableData = new int[3]; + PowerCableData = new int[Enum.GetNames(typeof(CableType)).Length]; } } diff --git a/Content.Shared/Power/SharedPower.cs b/Content.Shared/Power/SharedPower.cs index d45fb96cac..554146b731 100644 --- a/Content.Shared/Power/SharedPower.cs +++ b/Content.Shared/Power/SharedPower.cs @@ -31,6 +31,7 @@ namespace Content.Shared.Power HighVoltage, MediumVoltage, Apc, + ExCable } [Serializable, NetSerializable] diff --git a/Content.Shared/PowerCell/SharedPowerCellSystem.cs b/Content.Shared/PowerCell/SharedPowerCellSystem.cs index 3398563e55..0b71a3c24d 100644 --- a/Content.Shared/PowerCell/SharedPowerCellSystem.cs +++ b/Content.Shared/PowerCell/SharedPowerCellSystem.cs @@ -1,4 +1,5 @@ using Content.Shared.Containers.ItemSlots; +using Content.Shared.Emp; using Content.Shared.PowerCell.Components; using Content.Shared.Rejuvenate; using Robust.Shared.Containers; @@ -22,6 +23,8 @@ public abstract class SharedPowerCellSystem : EntitySystem SubscribeLocalEvent(OnCellInserted); SubscribeLocalEvent(OnCellRemoved); SubscribeLocalEvent(OnCellInsertAttempt); + + SubscribeLocalEvent(OnCellEmpAttempt); } private void OnMapInit(Entity ent, ref MapInitEvent args) @@ -71,6 +74,14 @@ public abstract class SharedPowerCellSystem : EntitySystem RaiseLocalEvent(uid, new PowerCellChangedEvent(true), false); } + private void OnCellEmpAttempt(EntityUid uid, PowerCellComponent component, EmpAttemptEvent args) + { + var parent = Transform(uid).ParentUid; + // relay the attempt event to the slot so it can cancel it + if (HasComp(parent)) + RaiseLocalEvent(parent, ref args); + } + public void SetDrawEnabled(Entity ent, bool enabled) { if (!Resolve(ent, ref ent.Comp, false) || ent.Comp.Enabled == enabled) diff --git a/Content.Shared/Radio/Components/HeadsetComponent.cs b/Content.Shared/Radio/Components/HeadsetComponent.cs index 66a0ae8027..28911fb674 100644 --- a/Content.Shared/Radio/Components/HeadsetComponent.cs +++ b/Content.Shared/Radio/Components/HeadsetComponent.cs @@ -1,18 +1,20 @@ using Content.Shared.Inventory; +using Robust.Shared.GameStates; namespace Content.Shared.Radio.Components; /// -/// This component relays radio messages to the parent entity's chat when equipped. +/// This component relays radio messages to the parent entity's chat when equipped. /// -[RegisterComponent] +[RegisterComponent, NetworkedComponent, AutoGenerateComponentState] public sealed partial class HeadsetComponent : Component { - [DataField("enabled")] + [DataField, AutoNetworkedField] public bool Enabled = true; + [DataField, AutoNetworkedField] public bool IsEquipped = false; - [DataField("requiredSlot")] + [DataField, AutoNetworkedField] public SlotFlags RequiredSlot = SlotFlags.EARS; } diff --git a/Content.Shared/Radio/EntitySystems/SharedHeadsetSystem.cs b/Content.Shared/Radio/EntitySystems/SharedHeadsetSystem.cs index 8083c8cd3a..5526e8f133 100644 --- a/Content.Shared/Radio/EntitySystems/SharedHeadsetSystem.cs +++ b/Content.Shared/Radio/EntitySystems/SharedHeadsetSystem.cs @@ -1,3 +1,4 @@ +using Content.Shared.Emp; using Content.Shared.Inventory; using Content.Shared.Inventory.Events; using Content.Shared.Radio.Components; @@ -9,9 +10,11 @@ public abstract class SharedHeadsetSystem : EntitySystem public override void Initialize() { base.Initialize(); + SubscribeLocalEvent>(OnGetDefault); SubscribeLocalEvent(OnGotEquipped); SubscribeLocalEvent(OnGotUnequipped); + SubscribeLocalEvent(OnEmpPulse); } private void OnGetDefault(EntityUid uid, HeadsetComponent component, InventoryRelayedEvent args) @@ -23,16 +26,27 @@ public abstract class SharedHeadsetSystem : EntitySystem } if (TryComp(uid, out EncryptionKeyHolderComponent? keyHolder)) - args.Args.Channel ??= keyHolder.DefaultChannel; + args.Args.Channel ??= keyHolder.DefaultChannel; } protected virtual void OnGotEquipped(EntityUid uid, HeadsetComponent component, GotEquippedEvent args) { component.IsEquipped = args.SlotFlags.HasFlag(component.RequiredSlot); + Dirty(uid, component); } protected virtual void OnGotUnequipped(EntityUid uid, HeadsetComponent component, GotUnequippedEvent args) { component.IsEquipped = false; + Dirty(uid, component); + } + + private void OnEmpPulse(Entity ent, ref EmpPulseEvent args) + { + if (ent.Comp.Enabled) + { + args.Affected = true; + args.Disabled = true; + } } } diff --git a/Content.Shared/StatusEffectNew/Components/StatusEffectComponent.cs b/Content.Shared/StatusEffectNew/Components/StatusEffectComponent.cs index 67ff8b3e61..27764b3aee 100644 --- a/Content.Shared/StatusEffectNew/Components/StatusEffectComponent.cs +++ b/Content.Shared/StatusEffectNew/Components/StatusEffectComponent.cs @@ -9,7 +9,7 @@ namespace Content.Shared.StatusEffectNew.Components; /// Marker component for all status effects - every status effect entity should have it. /// Provides a link between the effect and the affected entity, and some data common to all status effects. /// -[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, AutoGenerateComponentPause] +[RegisterComponent, NetworkedComponent, AutoGenerateComponentState(fieldDeltas: true), AutoGenerateComponentPause] [Access(typeof(StatusEffectsSystem))] [EntityCategory("StatusEffects")] public sealed partial class StatusEffectComponent : Component @@ -20,12 +20,24 @@ public sealed partial class StatusEffectComponent : Component [DataField, AutoNetworkedField] public EntityUid? AppliedTo; + /// + /// When this effect will start. Set to Timespan.Zero to start the effect immediately. + /// + [DataField(customTypeSerializer: typeof(TimeOffsetSerializer)), AutoPausedField, AutoNetworkedField] + public TimeSpan StartEffectTime; + /// /// When this effect will end. If Null, the effect lasts indefinitely. /// [DataField(customTypeSerializer: typeof(TimeOffsetSerializer)), AutoPausedField, AutoNetworkedField] public TimeSpan? EndEffectTime; + /// + /// If true, this status effect has been applied. Used to ensure that only fires once. + /// + [DataField, AutoNetworkedField] + public bool Applied; + /// /// Whitelist, by which it is determined whether this status effect can be imposed on a particular entity. /// diff --git a/Content.Shared/StatusEffectNew/StatusEffectSystem.API.cs b/Content.Shared/StatusEffectNew/StatusEffectSystem.API.cs index 56636c9601..905ad98c6c 100644 --- a/Content.Shared/StatusEffectNew/StatusEffectSystem.API.cs +++ b/Content.Shared/StatusEffectNew/StatusEffectSystem.API.cs @@ -13,13 +13,15 @@ public sealed partial class StatusEffectsSystem /// The target entity to which the effect should be added. /// ProtoId of the status effect entity. Make sure it has StatusEffectComponent on it. /// Duration of status effect. Leave null and the effect will be permanent until it is removed using TryRemoveStatusEffect. + /// The delay of the effect. If a start time already exists, the closest time takes precedence. Leave null for the effect to be instant. /// The EntityUid of the status effect we have just created or null if it doesn't exist. /// True if effect exists and its duration is set properly, false in case effect cannot be applied. public bool TryAddStatusEffectDuration( EntityUid target, EntProtoId effectProto, [NotNullWhen(true)] out EntityUid? statusEffect, - TimeSpan duration + TimeSpan duration, + TimeSpan? delay = null ) { if (duration == TimeSpan.Zero) @@ -30,18 +32,19 @@ public sealed partial class StatusEffectsSystem // We check to make sure time is greater than zero here because sometimes you want to use TryAddStatusEffect to remove duration instead... if (!TryGetStatusEffect(target, effectProto, out statusEffect)) - return TryAddStatusEffect(target, effectProto, out statusEffect, duration); + return TryAddStatusEffect(target, effectProto, out statusEffect, duration, delay); AddStatusEffectTime(statusEffect.Value, duration); + UpdateStatusEffectDelay(statusEffect.Value, delay); return true; } - /// - public bool TryAddStatusEffectDuration(EntityUid target, EntProtoId effectProto, TimeSpan duration) + /// + public bool TryAddStatusEffectDuration(EntityUid target, EntProtoId effectProto, TimeSpan duration, TimeSpan? delay = null) { - return TryAddStatusEffectDuration(target, effectProto, out _, duration); + return TryAddStatusEffectDuration(target, effectProto, out _, duration, delay); } /// @@ -51,13 +54,15 @@ public sealed partial class StatusEffectsSystem /// The target entity to which the effect should be added. /// ProtoId of the status effect entity. Make sure it has StatusEffectComponent on it. /// Duration of status effect. Leave null and the effect will be permanent until it is removed using TryRemoveStatusEffect. + /// The delay of the effect. If a start time already exists, the closest time takes precedence. Leave null for the effect to be instant. /// The EntityUid of the status effect we have just created or null if it doesn't exist. /// True if effect exists and its duration is set properly, false in case effect cannot be applied. public bool TrySetStatusEffectDuration( EntityUid target, EntProtoId effectProto, [NotNullWhen(true)] out EntityUid? statusEffect, - TimeSpan? duration = null + TimeSpan? duration = null, + TimeSpan? delay = null ) { if (duration <= TimeSpan.Zero) @@ -67,17 +72,22 @@ public sealed partial class StatusEffectsSystem } if (!TryGetStatusEffect(target, effectProto, out statusEffect)) - return TryAddStatusEffect(target, effectProto, out statusEffect, duration); + return TryAddStatusEffect(target, effectProto, out statusEffect, duration, delay); - SetStatusEffectEndTime(statusEffect.Value, duration); + if (!_effectQuery.TryComp(statusEffect, out var statusEffectComponent)) + return false; + + var endTime = delay == null || statusEffectComponent.Applied ? _timing.CurTime + duration : _timing.CurTime + delay + duration; + SetStatusEffectEndTime(statusEffect.Value, endTime); + UpdateStatusEffectDelay(statusEffect.Value, delay); return true; } - /// - public bool TrySetStatusEffectDuration(EntityUid target, EntProtoId effectProto, TimeSpan? duration = null) + /// + public bool TrySetStatusEffectDuration(EntityUid target, EntProtoId effectProto, TimeSpan? duration = null, TimeSpan? delay = null) { - return TrySetStatusEffectDuration(target, effectProto, out _, duration); + return TrySetStatusEffectDuration(target, effectProto, out _, duration, delay); } /// @@ -87,13 +97,15 @@ public sealed partial class StatusEffectsSystem /// The target entity to which the effect should be added. /// ProtoId of the status effect entity. Make sure it has StatusEffectComponent on it. /// Duration of status effect. Leave null and the effect will be permanent until it is removed using TryRemoveStatusEffect. + /// The delay of the effect. If a start time already exists, the closest time takes precedence. Leave null for the effect to be instant. /// The EntityUid of the status effect we have just created or null if it doesn't exist. /// True if effect exists and its duration is set properly, false in case effect cannot be applied. public bool TryUpdateStatusEffectDuration( EntityUid target, EntProtoId effectProto, [NotNullWhen(true)] out EntityUid? statusEffect, - TimeSpan? duration = null + TimeSpan? duration = null, + TimeSpan? delay = null ) { if (duration <= TimeSpan.Zero) @@ -103,17 +115,22 @@ public sealed partial class StatusEffectsSystem } if (!TryGetStatusEffect(target, effectProto, out statusEffect)) - return TryAddStatusEffect(target, effectProto, out statusEffect, duration); + return TryAddStatusEffect(target, effectProto, out statusEffect, duration, delay); - UpdateStatusEffectTime(statusEffect.Value, duration); + if (!_effectQuery.TryComp(statusEffect, out var statusEffectComponent)) + return false; + + var endTime = delay == null || statusEffectComponent.Applied ? duration : delay + duration; + UpdateStatusEffectTime(statusEffect.Value, endTime); + UpdateStatusEffectDelay(statusEffect.Value, delay); return true; } - /// - public bool TryUpdateStatusEffectDuration(EntityUid target, EntProtoId effectProto, TimeSpan? duration = null) + /// + public bool TryUpdateStatusEffectDuration(EntityUid target, EntProtoId effectProto, TimeSpan? duration = null, TimeSpan? delay = null) { - return TryUpdateStatusEffectDuration(target, effectProto, out _, duration); + return TryUpdateStatusEffectDuration(target, effectProto, out _, duration, delay); } /// @@ -193,7 +210,7 @@ public sealed partial class StatusEffectsSystem public bool TryGetTime( EntityUid uid, EntProtoId effectProto, - out (EntityUid EffectEnt, TimeSpan? EndEffectTime) time, + out (EntityUid EffectEnt, TimeSpan? EndEffectTime, TimeSpan? StartEffectTime) time, StatusEffectContainerComponent? container = null ) { @@ -209,7 +226,7 @@ public sealed partial class StatusEffectsSystem if (!_effectQuery.TryComp(effect, out var effectComp)) return false; - time = (effect, effectComp.EndEffectTime); + time = (effect, effectComp.EndEffectTime, effectComp.StartEffectTime); return true; } } diff --git a/Content.Shared/StatusEffectNew/StatusEffectsSystem.cs b/Content.Shared/StatusEffectNew/StatusEffectsSystem.cs index 446b3fd3b1..966878b4e3 100644 --- a/Content.Shared/StatusEffectNew/StatusEffectsSystem.cs +++ b/Content.Shared/StatusEffectNew/StatusEffectsSystem.cs @@ -46,6 +46,8 @@ public sealed partial class StatusEffectsSystem : EntitySystem var query = EntityQueryEnumerator(); while (query.MoveNext(out var ent, out var effect)) { + TryApplyStatusEffect((ent, effect)); + if (effect.EndEffectTime is null) continue; @@ -88,9 +90,6 @@ public sealed partial class StatusEffectsSystem : EntitySystem statusComp.AppliedTo = ent; Dirty(args.Entity, statusComp); } - - var ev = new StatusEffectAppliedEvent(ent); - RaiseLocalEvent(args.Entity, ref ev); } private void OnEntityRemoved(Entity ent, ref EntRemovedFromContainerMessage args) @@ -121,6 +120,29 @@ public sealed partial class StatusEffectsSystem : EntitySystem PredictedQueueDel(ent.Owner); } + /// + /// Applies the status effect, i.e. starts it after it has been added. Ensures delayed start times trigger when they should. + /// + /// The status effect entity. + /// Returns true if the effect is applied. + private bool TryApplyStatusEffect(Entity statusEffectEnt) + { + if (!statusEffectEnt.Comp.Applied && + statusEffectEnt.Comp.AppliedTo != null && + _timing.CurTime >= statusEffectEnt.Comp.StartEffectTime) + { + var ev = new StatusEffectAppliedEvent(statusEffectEnt.Comp.AppliedTo.Value); + RaiseLocalEvent(statusEffectEnt, ref ev); + + statusEffectEnt.Comp.Applied = true; + + DirtyField(statusEffectEnt, statusEffectEnt.Comp, nameof(StatusEffectComponent.StartEffectTime)); + return true; + } + + return false; + } + public bool CanAddStatusEffect(EntityUid uid, EntProtoId effectProto) { if (!_proto.Resolve(effectProto, out var effectProtoData)) @@ -148,12 +170,14 @@ public sealed partial class StatusEffectsSystem : EntitySystem /// The target entity to which the effect should be added. /// ProtoId of the status effect entity. Make sure it has StatusEffectComponent on it. /// Duration of status effect. Leave null and the effect will be permanent until it is removed using TryRemoveStatusEffect. + /// The delay of the effect. Leave null and the effect will be immediate. /// The EntityUid of the status effect we have just created or null if we couldn't create one. private bool TryAddStatusEffect( EntityUid target, EntProtoId effectProto, [NotNullWhen(true)] out EntityUid? statusEffect, - TimeSpan? duration = null + TimeSpan? duration = null, + TimeSpan? delay = null ) { statusEffect = null; @@ -177,7 +201,13 @@ public sealed partial class StatusEffectsSystem : EntitySystem return false; statusEffect = effect; - SetStatusEffectEndTime((effect.Value, effectComp), _timing.CurTime + duration); + + var endTime = delay == null ? _timing.CurTime + duration : _timing.CurTime + delay + duration; + SetStatusEffectEndTime((effect.Value, effectComp), endTime); + var startTime = delay == null ? TimeSpan.Zero : _timing.CurTime + delay.Value; + SetStatusEffectStartTime(effect.Value, startTime); + + TryApplyStatusEffect((effect.Value, effectComp)); return true; } @@ -204,6 +234,28 @@ public sealed partial class StatusEffectsSystem : EntitySystem SetStatusEffectEndTime(effect, newEndTime); } + private void UpdateStatusEffectDelay(Entity effect, TimeSpan? delay) + { + if (!_effectQuery.Resolve(effect, ref effect.Comp)) + return; + + // It's already started! + if (_timing.CurTime >= effect.Comp.StartEffectTime) + return; + + var newStartTime = TimeSpan.Zero; + + if (delay is not null) + { + // Don't update time to a smaller timespan... + newStartTime = _timing.CurTime + delay.Value; + if (effect.Comp.StartEffectTime < newStartTime) + return; + } + + SetStatusEffectStartTime(effect, newStartTime); + } + private void AddStatusEffectTime(Entity effect, TimeSpan delta) { if (!_effectQuery.Resolve(effect, ref effect.Comp)) @@ -233,7 +285,26 @@ public sealed partial class StatusEffectsSystem : EntitySystem var ev = new StatusEffectEndTimeUpdatedEvent(appliedTo, endTime); RaiseLocalEvent(ent, ref ev); - Dirty(ent); + DirtyField(ent, ent.Comp, nameof(StatusEffectComponent.EndEffectTime)); + } + + private void SetStatusEffectStartTime(Entity ent, TimeSpan startTime) + { + if (!_effectQuery.Resolve(ent, ref ent.Comp)) + return; + + if (ent.Comp.StartEffectTime == startTime) + return; + + ent.Comp.StartEffectTime = startTime; + + if (ent.Comp.AppliedTo is not { } appliedTo) + return; // Not much we can do! + + var ev = new StatusEffectStartTimeUpdatedEvent(appliedTo, startTime); + RaiseLocalEvent(ent, ref ev); + + DirtyField(ent, ent.Comp, nameof(StatusEffectComponent.StartEffectTime)); } } @@ -262,3 +333,11 @@ public record struct BeforeStatusEffectAddedEvent(EntProtoId Effect, bool Cancel /// The new end time of the status effect, included for convenience. [ByRefEvent] public record struct StatusEffectEndTimeUpdatedEvent(EntityUid Target, TimeSpan? EndTime); + +/// +/// Raised on an effect entity when its is updated in any way. +/// +/// The entity the effect is attached to. +/// The new start time of the status effect, included for convenience. +[ByRefEvent] +public record struct StatusEffectStartTimeUpdatedEvent(EntityUid Target, TimeSpan? StartTime); diff --git a/Content.Shared/Stunnable/SharedStunSystem.Knockdown.cs b/Content.Shared/Stunnable/SharedStunSystem.Knockdown.cs index 3646dc8f28..f484bd012e 100644 --- a/Content.Shared/Stunnable/SharedStunSystem.Knockdown.cs +++ b/Content.Shared/Stunnable/SharedStunSystem.Knockdown.cs @@ -95,7 +95,7 @@ public abstract partial class SharedStunSystem private void OnRejuvenate(Entity entity, ref RejuvenateEvent args) { - SetKnockdownTime(entity, GameTiming.CurTime); + SetKnockdownNextUpdate((entity, entity), GameTiming.CurTime); if (entity.Comp.AutoStand) RemComp(entity); @@ -156,6 +156,19 @@ public abstract partial class SharedStunSystem DirtyField(entity, entity.Comp, nameof(KnockedDownComponent.DoAfterId)); } + /// + /// Sets the time left of the knockdown timer to the inputted value. + /// + /// Entity who's knockdown time we're updating. + /// The time we're updating with. + public void SetKnockdownTime(Entity entity, TimeSpan time) + { + if (!Resolve(entity, ref entity.Comp, false)) + return; + + SetKnockdownNextUpdate(entity, GameTiming.CurTime + time); + } + /// /// Updates the knockdown timer of a knocked down entity with a given inputted time, then dirties the time. /// @@ -170,18 +183,6 @@ public abstract partial class SharedStunSystem AddKnockdownTime(entity, time); } - /// - /// Sets the next update datafield of an entity's to a specific time. - /// - /// Entity whose timer we're updating - /// The exact time we're setting the next update to. - public void SetKnockdownTime(Entity entity, TimeSpan time) - { - entity.Comp.NextUpdate = time; - DirtyField(entity, entity.Comp, nameof(KnockedDownComponent.NextUpdate)); - Alerts.ShowAlert(entity.Owner, KnockdownAlert, null, (GameTiming.CurTime, entity.Comp.NextUpdate)); - } - /// /// Refreshes the amount of time an entity is knocked down to the inputted time, if it is greater than /// the current time left. @@ -195,7 +196,7 @@ public abstract partial class SharedStunSystem var knockedTime = GameTiming.CurTime + time; if (entity.Comp.NextUpdate < knockedTime) - SetKnockdownTime((entity, entity.Comp), knockedTime); + SetKnockdownNextUpdate((entity, entity.Comp), knockedTime); } /// @@ -210,19 +211,35 @@ public abstract partial class SharedStunSystem if (entity.Comp.NextUpdate < GameTiming.CurTime) { - SetKnockdownTime((entity, entity.Comp), GameTiming.CurTime + time); + SetKnockdownNextUpdate((entity, entity.Comp), GameTiming.CurTime + time); return; } - entity.Comp.NextUpdate += time; - DirtyField(entity, entity.Comp, nameof(KnockedDownComponent.NextUpdate)); - Alerts.ShowAlert(entity.Owner, KnockdownAlert, null, (GameTiming.CurTime, entity.Comp.NextUpdate)); + SetKnockdownNextUpdate((entity, entity.Comp), entity.Comp.NextUpdate + time); } #endregion #region Knockdown Logic + /// + /// Sets the next update datafield of an entity's to a specific time. + /// + /// Entity whose timer we're updating + /// The exact time we're setting the next update to. + private void SetKnockdownNextUpdate(Entity entity, TimeSpan time) + { + if (!Resolve(entity, ref entity.Comp, false)) + return; + + if (GameTiming.CurTime > time) + time = GameTiming.CurTime; + + entity.Comp.NextUpdate = time; + DirtyField(entity, entity.Comp, nameof(KnockedDownComponent.NextUpdate)); + Alerts.UpdateAlert(entity.Owner, KnockdownAlert, null, entity.Comp.NextUpdate); + } + private void HandleToggleKnockdown(ICommonSession? session) { if (session is not { } playerSession) diff --git a/Content.Server/SurveillanceCamera/Components/SurveillanceCameraComponent.cs b/Content.Shared/SurveillanceCamera/Components/SurveillanceCameraComponent.cs similarity index 72% rename from Content.Server/SurveillanceCamera/Components/SurveillanceCameraComponent.cs rename to Content.Shared/SurveillanceCamera/Components/SurveillanceCameraComponent.cs index b0d41e52c7..1c5ba8ad17 100644 --- a/Content.Server/SurveillanceCamera/Components/SurveillanceCameraComponent.cs +++ b/Content.Shared/SurveillanceCamera/Components/SurveillanceCameraComponent.cs @@ -1,10 +1,11 @@ using Content.Shared.DeviceNetwork; +using Robust.Shared.GameStates; using Robust.Shared.Prototypes; -namespace Content.Server.SurveillanceCamera; +namespace Content.Shared.SurveillanceCamera.Components; -[RegisterComponent] -[Access(typeof(SurveillanceCameraSystem))] +[RegisterComponent, NetworkedComponent, AutoGenerateComponentState] +[Access(typeof(SharedSurveillanceCameraSystem))] public sealed partial class SurveillanceCameraComponent : Component { // List of active viewers. This is for bookkeeping purposes, @@ -24,23 +25,20 @@ public sealed partial class SurveillanceCameraComponent : Component // If this camera is active or not. Deactivating a camera // will not allow it to obtain any new viewers. - [ViewVariables] - public bool Active { get; set; } = true; + [DataField] + public bool Active = true; // This one isn't easy to deal with. Will require a UI // to change/set this so mapping these in isn't // the most terrible thing possible. - [ViewVariables(VVAccess.ReadWrite)] [DataField("id")] - public string CameraId { get; set; } = "camera"; + public string CameraId = "camera"; - [ViewVariables(VVAccess.ReadWrite)] - [DataField("nameSet")] - public bool NameSet { get; set; } + [DataField, AutoNetworkedField] + public bool NameSet; - [ViewVariables(VVAccess.ReadWrite)] - [DataField("networkSet")] - public bool NetworkSet { get; set; } + [DataField, AutoNetworkedField] + public bool NetworkSet; // This has to be device network frequency prototypes. [DataField("setupAvailableNetworks")] diff --git a/Content.Shared/SurveillanceCamera/SharedSurveillanceCameraSystem.cs b/Content.Shared/SurveillanceCamera/SharedSurveillanceCameraSystem.cs index e76d5516e8..b6743669e9 100644 --- a/Content.Shared/SurveillanceCamera/SharedSurveillanceCameraSystem.cs +++ b/Content.Shared/SurveillanceCamera/SharedSurveillanceCameraSystem.cs @@ -1,8 +1,56 @@ -using Robust.Shared.GameStates; +using Content.Shared.Emp; +using Content.Shared.SurveillanceCamera.Components; +using Content.Shared.Verbs; using Robust.Shared.Serialization; namespace Content.Shared.SurveillanceCamera; +public abstract class SharedSurveillanceCameraSystem : EntitySystem +{ + public override void Initialize() + { + SubscribeLocalEvent>(AddVerbs); + SubscribeLocalEvent(OnEmpPulse); + SubscribeLocalEvent(OnEmpDisabledRemoved); + } + + private void AddVerbs(EntityUid uid, SurveillanceCameraComponent component, GetVerbsEvent args) + { + if (!args.CanInteract || !args.CanComplexInteract) + return; + + if (component.NameSet && component.NetworkSet) + return; + + AlternativeVerb verb = new() + { + Text = Loc.GetString("surveillance-camera-setup"), + Act = () => OpenSetupInterface(uid, args.User, component) + }; + args.Verbs.Add(verb); + } + + private void OnEmpPulse(EntityUid uid, SurveillanceCameraComponent component, ref EmpPulseEvent args) + { + if (component.Active) + { + args.Affected = true; + args.Disabled = true; + SetActive(uid, false); + } + } + + private void OnEmpDisabledRemoved(EntityUid uid, SurveillanceCameraComponent component, ref EmpDisabledRemovedEvent args) + { + SetActive(uid, true); + } + + // TODO: predict the rest of the server side system + public virtual void SetActive(EntityUid camera, bool setting, SurveillanceCameraComponent? component = null) { } + + protected virtual void OpenSetupInterface(EntityUid uid, EntityUid player, SurveillanceCameraComponent? camera = null) { } +} + [Serializable, NetSerializable] public enum SurveillanceCameraVisualsKey : byte { diff --git a/Content.Shared/Trigger/Systems/EmpOnTriggerSystem.cs b/Content.Shared/Trigger/Systems/EmpOnTriggerSystem.cs index 136c4474a2..50fb7a25e4 100644 --- a/Content.Shared/Trigger/Systems/EmpOnTriggerSystem.cs +++ b/Content.Shared/Trigger/Systems/EmpOnTriggerSystem.cs @@ -6,7 +6,6 @@ namespace Content.Shared.Trigger.Systems; public sealed class EmpOnTriggerSystem : EntitySystem { [Dependency] private readonly SharedEmpSystem _emp = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; public override void Initialize() { @@ -25,7 +24,7 @@ public sealed class EmpOnTriggerSystem : EntitySystem if (target == null) return; - _emp.EmpPulse(_transform.GetMapCoordinates(target.Value), ent.Comp.Range, ent.Comp.EnergyConsumption, (float)ent.Comp.DisableDuration.TotalSeconds); + _emp.EmpPulse(Transform(target.Value).Coordinates, ent.Comp.Range, ent.Comp.EnergyConsumption, ent.Comp.DisableDuration, args.User); args.Handled = true; } } diff --git a/Content.Shared/VendingMachines/SharedVendingMachineSystem.cs b/Content.Shared/VendingMachines/SharedVendingMachineSystem.cs index 141183873d..610f4d0efe 100644 --- a/Content.Shared/VendingMachines/SharedVendingMachineSystem.cs +++ b/Content.Shared/VendingMachines/SharedVendingMachineSystem.cs @@ -1,19 +1,19 @@ -using Content.Shared.Emag.Components; -using Robust.Shared.Prototypes; using System.Linq; using Content.Shared.Access.Components; using Content.Shared.Access.Systems; using Content.Shared.Advertise.Components; using Content.Shared.Advertise.Systems; using Content.Shared.DoAfter; +using Content.Shared.Emag.Components; using Content.Shared.Emag.Systems; +using Content.Shared.Emp; using Content.Shared.Interaction; using Content.Shared.Popups; using Content.Shared.Power.EntitySystems; using Robust.Shared.Audio; using Robust.Shared.Audio.Systems; using Robust.Shared.GameStates; -using Robust.Shared.Network; +using Robust.Shared.Prototypes; using Robust.Shared.Random; using Robust.Shared.Timing; @@ -41,6 +41,7 @@ public abstract partial class SharedVendingMachineSystem : EntitySystem SubscribeLocalEvent(OnVendingGetState); SubscribeLocalEvent(OnMapInit); SubscribeLocalEvent(OnEmagged); + SubscribeLocalEvent(OnEmpPulse); SubscribeLocalEvent(OnRestockDoAfter); SubscribeLocalEvent(OnAfterInteract); @@ -83,6 +84,7 @@ public abstract partial class SharedVendingMachineSystem : EntitySystem EjectEnd = component.EjectEnd, DenyEnd = component.DenyEnd, DispenseOnHitEnd = component.DispenseOnHitEnd, + Broken = component.Broken, }; } @@ -145,6 +147,16 @@ public abstract partial class SharedVendingMachineSystem : EntitySystem RestockInventoryFromPrototype(uid, component, component.InitialStockQuality); } + private void OnEmpPulse(Entity ent, ref EmpPulseEvent args) + { + if (!ent.Comp.Broken && _receiver.IsPowered(ent.Owner)) + { + args.Affected = true; + args.Disabled = true; + ent.Comp.NextEmpEject = Timing.CurTime; + } + } + protected virtual void EjectItem(EntityUid uid, VendingMachineComponent? vendComponent = null, bool forceEject = false) { } /// diff --git a/Content.Shared/VendingMachines/VendingMachineComponent.cs b/Content.Shared/VendingMachines/VendingMachineComponent.cs index 6a9d650898..29ff3c654a 100644 --- a/Content.Shared/VendingMachines/VendingMachineComponent.cs +++ b/Content.Shared/VendingMachines/VendingMachineComponent.cs @@ -67,6 +67,7 @@ namespace Content.Shared.VendingMachines public string? NextItemToEject; + [DataField] public bool Broken; /// @@ -300,5 +301,7 @@ namespace Content.Shared.VendingMachines public TimeSpan? DenyEnd; public TimeSpan? DispenseOnHitEnd; + + public bool Broken; } } diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs index f92c5ed3a2..62b68fed6e 100644 --- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs +++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs @@ -58,6 +58,7 @@ public abstract partial class SharedGunSystem Audio.PlayPredicted(component.SoundInsert, uid, args.User); args.Handled = true; UpdateBallisticAppearance(uid, component); + UpdateAmmoCount(args.Target); DirtyField(uid, component, nameof(BallisticAmmoProviderComponent.Entities)); } @@ -153,7 +154,9 @@ public abstract partial class SharedGunSystem Del(ent.Value); } - // repeat if there is more space in the target and more ammo to fill it + UpdateBallisticAppearance(args.Target.Value, component); + UpdateAmmoCount(args.Target.Value); + // repeat if there is more space in the target and more ammo to fill var moreSpace = target.Entities.Count + target.UnspawnedCount < target.Capacity; var moreAmmo = component.Entities.Count + component.UnspawnedCount > 0; args.Repeat = moreSpace && moreAmmo; diff --git a/Content.Shared/Xenoarchaeology/Artifact/Components/XenoArtifactNodeComponent.cs b/Content.Shared/Xenoarchaeology/Artifact/Components/XenoArtifactNodeComponent.cs index 4a8b8ec49f..b18f9cb69d 100644 --- a/Content.Shared/Xenoarchaeology/Artifact/Components/XenoArtifactNodeComponent.cs +++ b/Content.Shared/Xenoarchaeology/Artifact/Components/XenoArtifactNodeComponent.cs @@ -32,7 +32,7 @@ public sealed partial class XenoArtifactNodeComponent : Component /// The entity whose graph this node is a part of. /// [DataField, AutoNetworkedField] - public NetEntity? Attached; + public EntityUid? Attached; #region Durability /// diff --git a/Content.Shared/Xenoarchaeology/Artifact/SharedXenoArtifactSystem.Graph.cs b/Content.Shared/Xenoarchaeology/Artifact/SharedXenoArtifactSystem.Graph.cs index fca5baf10f..24ff50b5ed 100644 --- a/Content.Shared/Xenoarchaeology/Artifact/SharedXenoArtifactSystem.Graph.cs +++ b/Content.Shared/Xenoarchaeology/Artifact/SharedXenoArtifactSystem.Graph.cs @@ -53,8 +53,8 @@ public abstract partial class SharedXenoArtifactSystem /// Throws if requested index doesn't exist on artifact. public Entity GetNode(Entity ent, int index) { - if (ent.Comp.NodeVertices[index] is { } netUid && GetEntity(netUid) is var uid) - return (uid, XenoArtifactNode(uid)); + if (ent.Comp.NodeVertices[index] is { } netUid && GetEntity(netUid) is var uid && _nodeQuery.TryComp(uid, out var comp)) + return (uid, comp); throw new ArgumentException($"index {index} does not correspond to an existing node in {ToPrettyString(ent)}"); } @@ -71,8 +71,8 @@ public abstract partial class SharedXenoArtifactSystem if (index < 0 || index >= ent.Comp.NodeVertices.Length) return false; - if (ent.Comp.NodeVertices[index] is { } netUid && GetEntity(netUid) is var uid) - node = (uid, XenoArtifactNode(uid)); + if (ent.Comp.NodeVertices[index] is { } netUid && GetEntity(netUid) is var uid && _nodeQuery.TryComp(uid, out var comp)) + node = (uid, comp); return node != null; } @@ -102,8 +102,8 @@ public abstract partial class SharedXenoArtifactSystem { foreach (var netNode in ent.Comp.NodeVertices) { - if (TryGetEntity(netNode, out var node)) - yield return (node.Value, XenoArtifactNode(node.Value)); + if (TryGetEntity(netNode, out var node) && _nodeQuery.TryComp(node, out var comp)) + yield return (node.Value, comp); } } @@ -253,7 +253,8 @@ public abstract partial class SharedXenoArtifactSystem return false; var uid = Spawn(entProtoId); - node = (uid, XenoArtifactNode(uid)); + var comp = EnsureComp(uid); + node = (uid, comp); return AddNode(ent, (node.Value, node.Value.Comp), dirty: dirty); } @@ -269,11 +270,10 @@ public abstract partial class SharedXenoArtifactSystem /// True if node adding was successful, false otherwise. public bool AddNode(Entity ent, Entity node, bool dirty = true) { - if (!Resolve(ent, ref ent.Comp)) + if (!Resolve(ent, ref ent.Comp) || !Resolve(node, ref node.Comp, false)) return false; - node.Comp ??= XenoArtifactNode(node); - node.Comp.Attached = GetNetEntity(ent); + node.Comp.Attached = ent.Owner; var nodeIdx = GetFreeNodeIndex((ent, ent.Comp)); _container.Insert(node.Owner, ent.Comp.NodeContainer); @@ -300,11 +300,9 @@ public abstract partial class SharedXenoArtifactSystem /// True if node was removed successfully, false otherwise. public bool RemoveNode(Entity ent, Entity node, bool dirty = true) { - if (!Resolve(ent, ref ent.Comp)) + if (!Resolve(ent, ref ent.Comp) || !Resolve(node, ref node.Comp, false)) return false; - node.Comp ??= XenoArtifactNode(node); - if (!TryGetIndex(ent, node, out var idx)) return false; // node isn't attached to this entity. diff --git a/Content.Shared/Xenoarchaeology/Artifact/SharedXenoArtifactSystem.Node.cs b/Content.Shared/Xenoarchaeology/Artifact/SharedXenoArtifactSystem.Node.cs index 899e578bcf..09a1e0bfea 100644 --- a/Content.Shared/Xenoarchaeology/Artifact/SharedXenoArtifactSystem.Node.cs +++ b/Content.Shared/Xenoarchaeology/Artifact/SharedXenoArtifactSystem.Node.cs @@ -33,21 +33,14 @@ public abstract partial class SharedXenoArtifactSystem SetNodeDurability((ent, ent), nodeComponent.MaxDurability); } - /// Gets node component by node entity uid. - public XenoArtifactNodeComponent XenoArtifactNode(EntityUid uid) - { - return _nodeQuery.Get(uid); - } - public void SetNodeUnlocked(Entity ent) { if (!Resolve(ent, ref ent.Comp)) return; - if (ent.Comp.Attached is not { } netArtifact) + if (ent.Comp.Attached is not { } artifact) return; - var artifact = GetEntity(netArtifact); if (!TryComp(artifact, out var artifactComponent)) return; @@ -197,7 +190,10 @@ public abstract partial class SharedXenoArtifactSystem foreach (var netNode in segment) { var node = GetEntity(netNode); - outSegment.Add((node, XenoArtifactNode(node))); + if (!_nodeQuery.TryComp(node, out var comp)) + continue; + + outSegment.Add((node, comp)); } output.Add(outSegment); @@ -385,7 +381,7 @@ public abstract partial class SharedXenoArtifactSystem return; } - var artifact = _xenoArtifactQuery.Get(GetEntity(nodeComponent.Attached.Value)); + var artifact = _xenoArtifactQuery.Get(nodeComponent.Attached.Value); var nonactiveNodes = GetActiveNodes(artifact); var durabilityEffect = MathF.Pow((float)nodeComponent.Durability / nodeComponent.MaxDurability, 2); diff --git a/Content.Shared/Xenoarchaeology/Artifact/SharedXenoArtifactSystem.Unlock.cs b/Content.Shared/Xenoarchaeology/Artifact/SharedXenoArtifactSystem.Unlock.cs index 57d6502bfb..fedb7f1f60 100644 --- a/Content.Shared/Xenoarchaeology/Artifact/SharedXenoArtifactSystem.Unlock.cs +++ b/Content.Shared/Xenoarchaeology/Artifact/SharedXenoArtifactSystem.Unlock.cs @@ -45,7 +45,7 @@ public abstract partial class SharedXenoArtifactSystem if (!Resolve(ent, ref ent.Comp)) return false; - var artifact = GetEntity(ent.Comp.Attached); + var artifact = ent.Comp.Attached; if (!TryComp(artifact, out var artiComp)) return false; diff --git a/Content.Shared/Xenoarchaeology/Artifact/XAT/BaseQueryUpdateXATSystem.cs b/Content.Shared/Xenoarchaeology/Artifact/XAT/BaseQueryUpdateXATSystem.cs index 5a7fc53e9e..0abad7bdd5 100644 --- a/Content.Shared/Xenoarchaeology/Artifact/XAT/BaseQueryUpdateXATSystem.cs +++ b/Content.Shared/Xenoarchaeology/Artifact/XAT/BaseQueryUpdateXATSystem.cs @@ -31,7 +31,7 @@ public abstract class BaseQueryUpdateXATSystem : BaseXATSystem where T : C if (node.Attached == null) continue; - var artifact = _xenoArtifactQuery.Get(GetEntity(node.Attached.Value)); + var artifact = _xenoArtifactQuery.Get(node.Attached.Value); if (!CanTrigger(artifact, (uid, node))) continue; diff --git a/Content.Shared/Xenoarchaeology/Artifact/XAT/XATDeathSystem.cs b/Content.Shared/Xenoarchaeology/Artifact/XAT/XATDeathSystem.cs index 747bd82feb..50a7b0200e 100644 --- a/Content.Shared/Xenoarchaeology/Artifact/XAT/XATDeathSystem.cs +++ b/Content.Shared/Xenoarchaeology/Artifact/XAT/XATDeathSystem.cs @@ -36,7 +36,7 @@ public sealed class XATDeathSystem : BaseXATSystem if (node.Attached == null) continue; - var artifact = _xenoArtifactQuery.Get(GetEntity(node.Attached.Value)); + var artifact = _xenoArtifactQuery.Get(node.Attached.Value); if (!CanTrigger(artifact, (uid, node))) continue; diff --git a/Content.Tests/ContentUnitTest.cs b/Content.Tests/ContentUnitTest.cs index 827c4e2f43..18938ac4ea 100644 --- a/Content.Tests/ContentUnitTest.cs +++ b/Content.Tests/ContentUnitTest.cs @@ -2,8 +2,8 @@ using System.Collections.Generic; using System.Reflection; using Content.Client.IoC; using Content.Server.IoC; -using Content.Shared.IoC; using Robust.Shared.Analyzers; +using Robust.Shared.IoC; using Robust.UnitTesting; using EntryPoint = Content.Server.Entry.EntryPoint; @@ -15,16 +15,15 @@ namespace Content.Tests protected override void OverrideIoC() { base.OverrideIoC(); - - SharedContentIoC.Register(); + var dependencies = IoCManager.Instance!; if (Project == UnitTestProject.Server) { - ServerContentIoC.Register(); + ServerContentIoC.Register(dependencies); } else if (Project == UnitTestProject.Client) { - ClientContentIoC.Register(); + ClientContentIoC.Register(dependencies); } } diff --git a/Resources/Audio/Effects/Gasp/attributions.yml b/Resources/Audio/Effects/Gasp/attributions.yml index 8d84b770f3..481b9f2f28 100644 --- a/Resources/Audio/Effects/Gasp/attributions.yml +++ b/Resources/Audio/Effects/Gasp/attributions.yml @@ -30,3 +30,10 @@ license: "CC-BY-SA-3.0" copyright: "Taken from tgstation at https://github.com/tgstation/tgstation/commit/948ad3dd5b22803a01cd74c27f37e509dc61395b" source: "https://github.com/tgstation/tgstation/blob/948ad3dd5b22803a01cd74c27f37e509dc61395b/sound/voice/moth/moth_death.ogg" + +- files: + - vox_DeathGasp.ogg + - vox_gasp.ogg + license: "CC-BY-SA-3.0" + copyright: "Made by TrixxedHeart, modified from shriek1.ogg" + source: "https://github.com/space-wizards/space-station-14/pull/39914" diff --git a/Resources/Audio/Effects/Gasp/vox_DeathGasp.ogg b/Resources/Audio/Effects/Gasp/vox_DeathGasp.ogg new file mode 100644 index 0000000000..b2883b6a10 Binary files /dev/null and b/Resources/Audio/Effects/Gasp/vox_DeathGasp.ogg differ diff --git a/Resources/Audio/Effects/Gasp/vox_gasp.ogg b/Resources/Audio/Effects/Gasp/vox_gasp.ogg new file mode 100644 index 0000000000..c475dafc06 Binary files /dev/null and b/Resources/Audio/Effects/Gasp/vox_gasp.ogg differ diff --git a/Resources/Audio/Voice/Talk/attributions.yml b/Resources/Audio/Voice/Talk/attributions.yml index e4347315ff..b9efbeb3f2 100644 --- a/Resources/Audio/Voice/Talk/attributions.yml +++ b/Resources/Audio/Voice/Talk/attributions.yml @@ -33,9 +33,9 @@ source: "https://github.com/goonstation/goonstation/tree/eb3e7df6292d23f6af2f18b4372d3a8ba4b0fda7/sound/misc/talk" - files: ["vox.ogg","vox_ask.ogg","vox_exclaim.ogg" ] - license: "CC-BY-NC-SA-3.0" - copyright: "Derived from shriek1.ogg by Errant" - source: "https://github.com/goonstation/goonstation/tree/eb3e7df6292d23f6af2f18b4372d3a8ba4b0fda7/sound/misc/talk" + license: "CC-BY-SA-3.0" + copyright: "Derived from shriek1.ogg (originally from Paradise Station) by Errant" + source: "https://github.com/ParadiseSS13/Paradise/commit/43e60ab01eda88fe30eb93612614bde836e55fe4" - files: ["vulp.ogg, vulp_ask.ogg, vulp_exclaim.ogg"] license: "CC-BY-NC-SA-3.0" diff --git a/Resources/Audio/Voice/Vox/attributions.yml b/Resources/Audio/Voice/Vox/attributions.yml new file mode 100644 index 0000000000..dd31a9c4cd --- /dev/null +++ b/Resources/Audio/Voice/Vox/attributions.yml @@ -0,0 +1,30 @@ +- files: + - shriek1.ogg + license: "CC-BY-SA-3.0" + copyright: "Taken from https://github.com/ParadiseSS13/Paradise/blob/master/sound/voice/shriek1.ogg" + source: "https://github.com/ParadiseSS13/Paradise/commit/43e60ab01eda88fe30eb93612614bde836e55fe4" + +- files: + - vox_laugh.ogg + license: "CC-BY-SA-3.0" + copyright: "Made by Errant, modified from shriek1.ogg" + source: "https://github.com/space-wizards/space-station-14/commit/2b0f227940d9163e06ac75e0f6af7140fb3fd11f" + +- files: + - vox_cough.ogg + license: "CC-BY-SA-3.0" + copyright: "Made by TrixxedHeart, modified from vox_laugh.ogg" + source: "https://github.com/space-wizards/space-station-14/pull/39914" + +- files: + - vox_sigh.ogg + license: "CC-BY-SA-3.0" + copyright: "Made by TrixxedHeart, modified from shriek1.ogg" + source: "https://github.com/space-wizards/space-station-14/pull/39914" + +- files: + - vox_cry.ogg + license: "CC0-1.0" + copyright: "raptorgoesextinct.wav by Nerdwizard78" + source: "https://freesound.org/people/Nerdwizard78/sounds/643928/" + diff --git a/Resources/Audio/Voice/Vox/vox_cough.ogg b/Resources/Audio/Voice/Vox/vox_cough.ogg new file mode 100644 index 0000000000..7815d83273 Binary files /dev/null and b/Resources/Audio/Voice/Vox/vox_cough.ogg differ diff --git a/Resources/Audio/Voice/Vox/vox_cry.ogg b/Resources/Audio/Voice/Vox/vox_cry.ogg new file mode 100644 index 0000000000..1b6001723b Binary files /dev/null and b/Resources/Audio/Voice/Vox/vox_cry.ogg differ diff --git a/Resources/Audio/Voice/Vox/vox_sigh.ogg b/Resources/Audio/Voice/Vox/vox_sigh.ogg new file mode 100644 index 0000000000..b8661da0d5 Binary files /dev/null and b/Resources/Audio/Voice/Vox/vox_sigh.ogg differ diff --git a/Resources/Audio/Weapons/attributions.yml b/Resources/Audio/Weapons/attributions.yml index 310b01b728..989e2472f6 100644 --- a/Resources/Audio/Weapons/attributions.yml +++ b/Resources/Audio/Weapons/attributions.yml @@ -82,8 +82,13 @@ license: "CC0-1.0" copyright: "Taken from ScreamStudio on freesound.org" source: "https://freesound.org/people/ScreamStudio/sounds/392617/" - + - files: ["pop.ogg"] license: "CC0-1.0" copyright: "Taken from 0ne_one111yt on freesound.org" source: "https://freesound.org/people/0ne_one111yt/sounds/478213/" + +- files: ["utilityknifeopen.ogg, utilityknifeclose.ogg"] + license: "CC0-1.0" + copyright: "Taken from FilmOrbit on freesound.org" + source: "https://freesound.org/s/554299/" diff --git a/Resources/Audio/Weapons/utilityknifeclose.ogg b/Resources/Audio/Weapons/utilityknifeclose.ogg new file mode 100644 index 0000000000..8c620d2165 Binary files /dev/null and b/Resources/Audio/Weapons/utilityknifeclose.ogg differ diff --git a/Resources/Audio/Weapons/utilityknifeopen.ogg b/Resources/Audio/Weapons/utilityknifeopen.ogg new file mode 100644 index 0000000000..5053c8089c Binary files /dev/null and b/Resources/Audio/Weapons/utilityknifeopen.ogg differ diff --git a/Resources/Changelog/Admin.yml b/Resources/Changelog/Admin.yml index ee370ce4b6..3ac6c8e461 100644 --- a/Resources/Changelog/Admin.yml +++ b/Resources/Changelog/Admin.yml @@ -1437,5 +1437,15 @@ Entries: id: 174 time: '2025-09-22T06:22:25.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/40360 +- author: IProduceWidgets + changes: + - message: The Homing Rod smite. Does what it says on the tin. + type: Add + - message: The Slowming Rod smite. Slowly chases the target, and destroys everything + on the way. + type: Add + id: 175 + time: '2025-09-25T21:43:53.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/40246 Name: Admin Order: 2 diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 20907405fe..c30974ca1f 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,75 +1,4 @@ Entries: -- author: K-Dynamic - changes: - - message: Industrial advanced welders may be found in welding supplies lockers. - type: Tweak - id: 8491 - time: '2025-05-15T03:55:54.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/36977 -- author: BlitzTheSquishy - changes: - - message: You're no longer allowed to fire the Hristov or Mosin one handed anymore. - type: Tweak - id: 8492 - time: '2025-05-15T04:12:24.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/33708 -- author: metalgearsloth - changes: - - message: Predict bed action when you buckle to a sleepable entity. - type: Tweak - id: 8493 - time: '2025-05-15T12:52:25.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/37414 -- author: Chartman95 - changes: - - message: Soaked Smokes retain their 40u max capacity. - type: Tweak - id: 8494 - time: '2025-05-15T14:47:31.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/37482 -- author: lzk228 - changes: - - message: Recycler can shred clothing that can be butchered. - type: Tweak - id: 8495 - time: '2025-05-15T23:44:49.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/31518 -- author: metalgearsloth - changes: - - message: Raise shuttle speed cap from 20 to 60m/s. - type: Tweak - id: 8496 - time: '2025-05-16T12:04:29.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/37505 -- author: metalgearsloth - changes: - - message: The pulling hand blocker is now predicted. - type: Tweak - id: 8497 - time: '2025-05-16T12:44:46.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/37504 -- author: BigfootBravo - changes: - - message: Vox can now eat untagged human food again! - type: Fix - id: 8498 - time: '2025-05-16T19:05:49.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/37497 -- author: EmoGarbage404 - changes: - - message: The guidebook is now more explicit about how damage/healing from chemicals - is split. - type: Tweak - id: 8499 - time: '2025-05-16T21:19:02.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/37507 -- author: EmoGarbage404 - changes: - - message: Fixed the mining asteroid not having a name. - type: Fix - id: 8500 - time: '2025-05-17T01:27:11.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/37513 - author: EmoGarbage404 changes: - message: You can now patch holes in the floors of the evac shuttle and ATS. @@ -3955,3 +3884,82 @@ id: 9001 time: '2025-09-24T23:13:14.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/35294 +- author: SignalSender + changes: + - message: 'Added new purchasable crate: "random instrument collection" a crate + containing 7 random instruments, each of different variety, with the chance + for rare instruments' + type: Add + id: 9002 + time: '2025-09-25T19:55:02.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/40532 +- author: IProduceWidgets + changes: + - message: Explosive cord and detonators have been added for precise demolition! + type: Add + id: 9003 + time: '2025-09-25T21:33:28.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/25875 +- author: Hitlinemoss + changes: + - message: The autolathe and uniform printer can now produce towels. + type: Add + id: 9004 + time: '2025-09-25T21:53:15.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/40160 +- author: SirWarock + changes: + - message: Rollerbed sprites now don't stack when a patient is buckled to it! + type: Fix + id: 9005 + time: '2025-09-25T23:57:25.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/40550 +- author: Princess-Cheeseballs + changes: + - message: You can now put plushies in your cotton burgers. + type: Fix + id: 9006 + time: '2025-09-26T04:22:41.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/40276 +- author: CraftyRenter + changes: + - message: Closet health reduced to 50 + type: Tweak + - message: Locker health increased to 75 + type: Tweak + - message: Secure locker health incresed to 150 + type: Tweak + - message: Secure lockers now make a sound when broken. + type: Add + id: 9007 + time: '2025-09-26T20:04:33.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/35671 +- author: SlamBamActionman + changes: + - message: Nocturine now causes sleep after a 6 second delay. + type: Tweak + id: 9008 + time: '2025-09-26T20:05:34.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/40231 +- author: Princess-Cheeseballs + changes: + - message: Added the Vulpkanin Plushie + type: Add + id: 9009 + time: '2025-09-27T07:21:30.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/40303 +- author: Princess-Cheeseballs + changes: + - message: Meth, Hyperzine and other stimulants properly reduce Knockdown and Stun + durations again. + type: Fix + id: 9010 + time: '2025-09-27T10:19:30.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/39547 +- author: TrixxedHeart + changes: + - message: Added 5 new Vox sounds, (Death gasp, Cough, Cry, Gasp, and Sigh) + type: Add + id: 9011 + time: '2025-09-27T17:01:14.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/39914 diff --git a/Resources/Changelog/Maps.yml b/Resources/Changelog/Maps.yml index c9cb2f4890..eba4933919 100644 --- a/Resources/Changelog/Maps.yml +++ b/Resources/Changelog/Maps.yml @@ -717,4 +717,18 @@ id: 86 time: '2025-09-20T18:37:58.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/40393 +- author: F1restar4 + changes: + - message: On Fland, reworked the TEG room and setup + type: Tweak + id: 87 + time: '2025-09-25T19:37:30.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/40534 +- author: F1restar4 + changes: + - message: On Exo, linked the bolts of engineering's airlocks to space + type: Tweak + id: 88 + time: '2025-09-25T21:36:16.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/40546 Order: 1 diff --git a/Resources/ConfigPresets/WizardsDen/leviathan.toml b/Resources/ConfigPresets/WizardsDen/leviathan.toml index e09ad092b0..f96d04589b 100644 --- a/Resources/ConfigPresets/WizardsDen/leviathan.toml +++ b/Resources/ConfigPresets/WizardsDen/leviathan.toml @@ -4,6 +4,10 @@ [game] hostname = "[EN] Wizard's Den Leviathan [US East 1]" +panic_bunker.enabled = false +panic_bunker.disable_with_admins = false +panic_bunker.enable_without_admins = false +panic_bunker.custom_reason = "" [hub] tags = "lang:en,region:am_n_e,rp:low" diff --git a/Resources/ConfigPresets/WizardsDen/wizardsDen.toml b/Resources/ConfigPresets/WizardsDen/wizardsDen.toml index bf34b51808..6d2259e350 100644 --- a/Resources/ConfigPresets/WizardsDen/wizardsDen.toml +++ b/Resources/ConfigPresets/WizardsDen/wizardsDen.toml @@ -11,7 +11,7 @@ panic_bunker.min_overall_minutes = 120 panic_bunker.disable_with_admins = true panic_bunker.enable_without_admins = true panic_bunker.show_reason = true -panic_bunker.custom_reason = "You have not played on a Wizard's Den server long enough to connect to this server. Please play on Wizard's Den Lizard until you have more playtime." +panic_bunker.custom_reason = "You have not played on a Wizard's Den server long enough to connect to this server. Please play on Wizard's Den Lizard or Wizard's Den Leviathan until you have more playtime." # IPIntel stuff ipintel_enabled = true diff --git a/Resources/Credits/GitHub.txt b/Resources/Credits/GitHub.txt index dc25c12071..f3ea41018f 100644 --- a/Resources/Credits/GitHub.txt +++ b/Resources/Credits/GitHub.txt @@ -1 +1 @@ -0leshe, 0tito, 0x6273, 12rabbits, 1337dakota, 13spacemen, 154942, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 27alaing, 2DSiggy, 3nderall, 4310v343k, 4dplanner, 5tickman, 612git, 778b, 96flo, aaron, abadaba695, Ablankmann, abregado, Absolute-Potato, Absotively, achookh, Acruid, ActiveMammmoth, actually-reb, ada-please, adamsong, Adeinitas, adm2play, Admiral-Obvious-001, adrian, Adrian16199, Ady4ik, Aearo-Deepwater, Aerocrux, Aeshus, Aexolott, Aexxie, africalimedrop, afrokada, AftrLite, AgentSmithRadio, Agoichi, Ahion, aiden, Aidenkrz, Aisu9, ajcm, AJCM-git, AjexRose, Alekshhh, alexalexmax, alexkar598, AlexMorgan3817, alexum418, alexumandxgabriel08x, Alice4267, Alithsko, Alkheemist, alliephante, ALMv1, Alpaccalypse, Alpha-Two, AlphaQwerty, Altoids1, amatwiedle, amylizzle, ancientpower, Andre19926, Andrew-Fall, AndrewEyeke, AndrewFenriz, AndreyCamper, Anzarot121, ApolloVector, Appiah, ar4ill, Arcane-Waffle, archee1, ArchPigeon, ArchRBX, areitpog, Arendian, areyouconfused, arimah, Arkanic, ArkiveDev, armoks, Arteben, ArthurMousatov, ArtisticRoomba, artur, Artxmisery, ArZarLordOfMango, as334, AsikKEsel, AsnDen, asperger-sind, aspiringLich, astriloqua, august-sun, AutoOtter, AverageNotDoingAnythingEnjoyer, avghdev, Awlod, azzyisnothere, AzzyIsNotHere, B-Kirill, B3CKDOOR, baa14453, BackeTako, BadaBoomie, Bakke, BananaFlambe, Baptr0b0t, BarryNorfolk, BasedUser, beck-thompson, beesterman, bellwetherlogic, ben, benbryant0, benev0, benjamin-burges, BGare, bhespiritu, bibbly, BigfootBravo, BIGZi0348, bingojohnson, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, blitzthesquishy, bloodrizer, Bloody2372, blueDev2, Boaz1111, BobdaBiscuit, BobTheSleder, boiled-water-tsar, Bokser815, bolantej, Booblesnoot42, Boolean-Buckeye, botanySupremist, brainfood1183, BramvanZijp, Brandon-Huu, breeplayx3, BriBrooo, Bright0, brndd, bryce0110, BubblegumBlue, buletsponge, buntobaggins, bvelliquette, BWTCK, byondfuckery, c0rigin, c4llv07e, CaasGit, Caconym27, Calecute, Callmore, Camdot, capnsockless, CaptainMaru, captainsqrbeard, Carbonhell, Carolyn3114, Carou02, carteblanche4me, catdotjs, catlord, Catofquestionableethics, CatTheSystem, CawsForConcern, Centronias, Chaboricks, chairbender, Chaoticaa, Charlese2, charlie, chartman, ChaseFlorom, chavonadelal, Cheackraze, CheddaCheez, cheesePizza2, CheesePlated, Chief-Engineer, chillyconmor, christhirtle, chromiumboy, Chronophylos, Chubbicous, Chubbygummibear, Ciac32, ciaran, citrea, civilCornball, claustro305, Clement-O, clyf, Clyybber, CMDR-Piboy314, cnv41, coco, cohanna, Cohnway, Cojoke-dot, ColdAutumnRain, Colin-Tel, collinlunn, ComicIronic, Compilatron144, CookieMasterT, coolboy911, CoolioDudio, coolmankid12345, Coolsurf6, cooperwallace, corentt, CormosLemming, CrafterKolyan, crazybrain23, Crazydave91920, creadth, CrigCrag, CroilBird, Crotalus, CrudeWax, cryals, CrzyPotato, cubixthree, cutemoongod, Cyberboss, d34d10cc, DadeKuma, Daemon, daerSeebaer, dahnte, dakamakat, DamianX, dan, dangerrevolution, daniel-cr, DanSAussieITS, Daracke, Darkenson, DawBla, Daxxi3, dch-GH, ddeegan, de0rix, Deahaka, dean, DEATHB4DEFEAT, Deatherd, deathride58, DebugOk, Decappi, Decortex, Deeeeja, deepdarkdepths, DeepwaterCreations, Deerstop, degradka, Delete69, deltanedas, DenisShvalov, DerbyX, derek, dersheppard, Deserty0, Detintinto, DevilishMilk, devinschubert14, dexlerxd, dffdff2423, DieselMohawk, DieselMohawkTheSequel, digitalic, Dimastra, DinnerCalzone, DinoWattz, Disp-Dev, DisposableCrewmember42, dissidentbullet, DjfjdfofdjfjD, doc-michael, docnite, Doctor-Cpu, DogZeroX, dolgovmi, dontbetank, Doomsdrayk, Doru991, DoubleRiceEddiedd, DoutorWhite, DR-DOCTOR-EVIL-EVIL, Dragonjspider, dragonryan06, drakewill-CRL, Drayff, dreamlyjack, DrEnzyme, dribblydrone, DrMelon, drongood12, DrSingh, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, DuckManZach, Duddino, dukevanity, duskyjay, Dutch-VanDerLinde, dvir001, dylanstrategie, dylanwhittingham, Dynexust, Easypoller, echo, eclips_e, eden077, EEASAS, Efruit, efzapa, Ekkosangen, ElectroSR, elsie, elthundercloud, Elysium206, Emisse, emmafornash, EmoGarbage404, Endecc, EnrichedCaramel, Entvari, eoineoineoin, ephememory, eris, erohrs2, ERORR404V1, Errant-4, ertanic, esguard, estacaoespacialpirata, eugene, ewokswagger, exincore, exp111, f0x-n3rd, F1restar4, FacePluslll, Fahasor, FairlySadPanda, farrellka-dev, FATFSAAM2, Feluk6174, ficcialfaint, Fiftyllama, Fildrance, FillerVK, FinnishPaladin, firenamefn, Firewars763, FirinMaLazors, Fishfish458, fl-oz, Flareguy, flashgnash, FlipBrooke, FluffiestFloof, FluffMe, FluidRock, flymo5678, foboscheshir, FoLoKe, fooberticus, ForestNoises, forgotmyotheraccount, forkeyboards, forthbridge, Fortune117, foxhorn, freeman2651, freeze2222, frobnic8, Froffy025, Fromoriss, froozigiusz, FrostMando, FrostRibbon, Funce, FungiFellow, FunTust, Futuristic-OK, GalacticChimp, gamer3107, Gamewar360, gansulalan, GaussiArson, Gaxeer, gbasood, gcoremans, Geekyhobo, genderGeometries, GeneralGaws, Genkail, Gentleman-Bird, geraeumig, Ghagliiarghii, Git-Nivrak, githubuser508, gituhabu, GlassEclipse, GnarpGnarp, GNF54, godisdeadLOL, goet, GoldenCan, Goldminermac, Golinth, golubgik, GoodWheatley, Gorox221, GR1231, gradientvera, graevy, GraniteSidewalk, GreaseMonk, greenrock64, GreyMario, GrownSamoyedDog, GTRsound, gusxyz, Gyrandola, h3half, hamurlik, Hanzdegloker, HappyRoach, Hardly3D, harikattar, Hayden, he1acdvv, Hebi, Helix-ctrl, helm4142, Henry, HerCoyote23, Hi-Im-Shot, HighTechPuddle, Hitlinemoss, hiucko, hivehum, Hmeister-fake, Hmeister-real, Hobbitmax, hobnob, HoidC, Holinka4ever, holyssss, HoofedEar, Hoolny, hord-brayden, Hoshizora, Hreno, Hrosts, htmlsystem, Huaqas, hubismal, Hugal31, Huxellberger, Hyenh, hyperb1, hyperDelegate, hyphenationc, i-justuser-i, iaada, iacore, IamVelcroboy, Ian321, icekot8, icesickleone, iczero, iglov, IgorAnt028, igorsaux, ike709, illersaver, Illiux, Ilushkins33, Ilya246, IlyaElDunaev, imatsoup, IMCB, impubbi, imrenq, imweax, indeano, Injazz, Insineer, insoPL, IntegerTempest, Interrobang01, Intoxicating-Innocence, IProduceWidgets, itsmethom, Itzbenz, iztokbajcar, Jackal298, Jackrost, jacksonzck, Jacktastic09, Jackw2As, jacob, jamessimo, janekvap, Jark255, Jarmer123, Jaskanbe, JasperJRoth, jbox144, JCGWE30, JerryImMouse, jerryimmouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JimGamemaster, jimmy12or, JIPDawg, jjtParadox, jkwookee, jmcb, JohnGinnane, johnku1, Jophire, joshepvodka, JpegOfAFrog, jproads, JrInventor05, Jrpl, jukereise, juliangiebel, JustArt1m, JustCone14, justdie12, justin, justintether, JustinTrotter, JustinWinningham, justtne, K-Dynamic, k3yw, Kadeo64, Kaga-404, kaiserbirch, KaiShibaa, kalane15, kalanosh, KamTheSythe, Kanashi-Panda, katzenminer, kbailey-git, Keelin, Keer-Sar, KEEYNy, keikiru, Kelrak, kerisargit, keronshb, KIBORG04, KieueCaprie, Killerqu00, Kimpes, KingFroozy, kira-er, kiri-yoshikage, Kirillcas, Kirus59, Kistras, Kit0vras, KittenColony, Kittygyat, klaypexx, Kmc2000, Ko4ergaPunk, kognise, kokoc9n, komunre, KonstantinAngelov, kontakt, kosticia, koteq, kotobdev, Kowlin, KrasnoshchekovPavel, Krosus777, Krunklehorn, Kupie, kxvvv, Kyoth25f, kyupolaris, kzhanik, LaCumbiaDelCoronavirus, lajolico, Lamrr, lanedon, LankLTE, laok233, lapatison, larryrussian, lawdog4817, Lazzi0706, leander-0, leonardo-dabepis, leonidussaks, leonsfriedrich, LeoSantich, lettern, LetterN, Level10Cybermancer, LEVELcat, lever1209, LevitatingTree, Lgibb18, lgruthes, LightVillet, lilazero, liltenhead, linkbro1, linkuyx, Litraxx, little-meow-meow, LittleBuilderJane, LittleNorthStar, LittleNyanCat, lizelive, ljm862, lmsnoise, localcc, lokachop, lolman360, Lomcastar, Lordbrandon12, LordCarve, LordEclipse, lucas, LucasTheDrgn, luckyshotpictures, LudwigVonChesterfield, luegamer, luizwritescode, Lukasz825700516, luminight, lunarcomets, Lusatia, Luxeator, lvvova1, Lyndomen, lyroth001, lzimann, lzk228, M1tht1c, M3739, M4rchy-S, M87S, mac6na6na, MACMAN2003, Macoron, magicalus, magmodius, magnuscrowe, maland1, malchanceux, MaloTV, manelnavola, ManelNavola, Mangohydra, marboww, Markek1, MarkerWicker, marlyn, matt, Matz05, max, MaxNox7, maylokana, MehimoNemo, MeltedPixel, memeproof, MendaxxDev, Menshin, Mephisto72, MerrytheManokit, Mervill, metalgearsloth, MetalSage, MFMessage, mhamsterr, michaelcu, micheel665, mifia, MilenVolf, MilonPL, Minemoder5000, Minty642, minus1over12, Mirino97, mirrorcult, misandrie, MishaUnity, MissKay1994, MisterImp, MisterMecky, Mith-randalf, Mixelz, mjarduk, MjrLandWhale, mkanke-real, MLGTASTICa, mnva0, moderatelyaware, modern-nm, mokiros, momo, Moneyl, monotheonist, Moomoobeef, moony, Morb0, MossyGreySlope, mr-bo-jangles, Mr0maks, MrFippik, mrrobdemo, muburu, MureixloI, murolem, musicmanvr, MWKane, Myakot, Myctai, N3X15, nabegator, nails-n-tape, Nairodian, Naive817, NakataRin, namespace-Memory, Nannek, NazrinNya, neutrino-laser, NickPowers43, nikitosych, nikthechampiongr, Nimfar11, ninruB, Nirnael, NIXC, nkokic, NkoKirkto, nmajask, noctyrnal, noelkathegod, noirogen, nok-ko, NonchalantNoob, NoobyLegion, Nopey, not-gavnaed, notafet, notquitehadouken, notsodana, noudoit, noverd, Nox38, NuclearWinter, nukashimika, nuke-haus, NULL882, nullarmo, nyeogmi, Nylux, Nyranu, Nyxilath, och-och, OctoRocket, OldDanceJacket, OliverOtter, onesch, OneZerooo0, OnyxTheBrave, opl-, Orange-Winds, OrangeMoronage9622, OrbitSystem07, Orsoniks, osjarw, Ostaf, othymer, OttoMaticode, Owai-Seek, packmore, paige404, paigemaeforrest, pali6, Palladinium, Pangogie, panzer-iv1, partyaddict, patrikturi, PaulRitter, pavlockblaine03, peccneck, Peptide90, peptron1, perryprog, PeterFuto, PetMudstone, pewter-wiz, pgraycs, PGrayCS, Pgriha, phantom-lily, pheenty, philingham, Phill101, Phooooooooooooooooooooooooooooooosphate, phunnyguy, PicklOH, PilgrimViis, Pill-U, pinkbat5, Piras314, Pireax, Pissachu, pissdemon, Pixel8-dev, PixeltheAertistContrib, PixelTheKermit, PJB3005, Plasmaguy, plinyvic, Plykiya, poeMota, pofitlo, pointer-to-null, pok27, poklj, PolterTzi, PoorMansDreams, PopGamer45, portfiend, potato1234x, PotentiallyTom, PotRoastPiggy, Princess-Cheeseballs, ProfanedBane, PROG-MohamedDwidar, Prole0, ProPandaBear, PrPleGoo, ps3moira, Pspritechologist, Psychpsyo, psykana, psykzz, PuceTint, pumkin69, PuroSlavKing, PursuitInAshes, Putnam3145, py01, Pyrovi, qrtDaniil, qrwas, Quantum-cross, quasr-9, quatre, QueerNB, QuietlyWhisper, qwerltaz, Radezolid, RadioMull, Radosvik, Radrark, Rainbeon, Rainfey, Raitononai, Ramlik, RamZ, randy10122, Rane, Ranger6012, Rapidgame7, ravage123321, rbertoche, RedBookcase, Redfire1331, Redict, RedlineTriad, redmushie, RednoWCirabrab, ReeZer2, RemberBM, RemieRichards, RemTim, rene-descartes2021, Renlou, retequizzle, rhsvenson, rich-dunne, RieBi, riggleprime, RIKELOLDABOSS, rinary1, Rinkashikachi, riolume, rlebell33, RobbyTheFish, robinthedragon, Rockdtben, Rohesie, rok-povsic, rokudara-sen, rolfero, RomanNovo, rosieposieeee, Roudenn, router, ruddygreat, rumaks, RumiTiger, Ruzihm, S1rFl0, S1ss3l, Saakra, Sadie-silly, saga3152, saintmuntzer, Salex08, sam, samgithubaccount, Samuka-C, SaphireLattice, SapphicOverload, sarahon, sativaleanne, SaveliyM360, sBasalto, ScalyChimp, ScarKy0, ScholarNZL, schrodinger71, scrato, Scribbles0, scrivoy, scruq445, scuffedjays, ScumbagDog, SeamLesss, Segonist, semensponge, sephtasm, ser1-1y, Serkket, sewerpig, SG6732, sh18rw, Shaddap1, ShadeAware, ShadowCommander, shadowtheprotogen546, shaeone, shampunj, shariathotpatrol, SharkSnake98, shibechef, Siginanto, SignalWalker, siigiil, silicon14wastaken, Simyon264, sirdragooon, Sirionaut, Sk1tch, SkaldetSkaeg, Skarletto, Skrauz, Skybailey-dev, skye, Skyedra, SlamBamActionman, slarticodefast, Slava0135, sleepyyapril, slimmslamm, Slyfox333, Smugman, snebl, snicket, sniperchance, Snowni, snowsignal, SolidSyn, SolidusSnek, solstar2, SonicHDC, SoulFN, SoulSloth, Soundwavesghost, soupkilove, southbridge-fur, sowelipililimute, Soydium, spacelizard, SpaceLizardSky, SpaceManiac, SpaceRox1244, SpaceyLady, Spangs04, spanky-spanky, Sparlight, spartak, SpartanKadence, spderman3333, SpeltIncorrectyl, Spessmann, SphiraI, SplinterGP, spoogemonster, sporekto, sporkyz, ssdaniel24, stalengd, stanberytrask, Stanislav4ix, StanTheCarpenter, starbuckss14, Stealthbomber16, Steffo99, stellar-novas, stewie523, stomf, Stop-Signs, stopbreaking, stopka-html, StrawberryMoses, Stray-Pyramid, strO0pwafel, Strol20, StStevens, Subversionary, sunbear-dev, supergdpwyl, superjj18, Supernorn, SurrealShibe, SweetAplle, SweptWasTaken, SyaoranFox, Sybil, SYNCHRONIC, Szunti, t, Tainakov, takemysoult, taonewt, tap, TaralGit, Taran, taurie, Tayrtahn, tday93, teamaki, TeenSarlacc, TekuNut, telyonok, TemporalOroboros, tentekal, terezi4real, Terraspark4941, texcruize, Tezzaide, TGODiamond, TGRCdev, tgrkzus, ThatGuyUSA, ThatOneGoblin25, thatrandomcanadianguy, TheArturZh, TheBlueYowie, thecopbennet, TheCze, TheDarkElites, thedraccx, TheEmber, TheFlyingSentry, TheIntoxicatedCat, thekilk, themias, theomund, TheProNoob678, TherapyGoth, ThereDrD0, TheShuEd, thetolbean, thevinter, TheWaffleJesus, thinbug0, ThunderBear2006, timothyteakettle, TimrodDX, timurjavid, tin-man-tim, TiniestShark, Titian3, tk-a369, tkdrg, tmtmtl30, ToastEnjoyer, Toby222, TokenStyle, Tollhouse, Toly65, tom-leys, tomasalves8, Tomeno, Tonydatguy, topy, tornado-technology, TornadoTechnology, tosatur, TotallyLemon, ToxicSonicFan04, Tr1bute, travis-g-reid, treytipton, trixxedbit, TrixxedHeart, tropicalhibi, truepaintgit, Truoizys, Tryded, TsjipTsjip, Tunguso4ka, TurboTrackerss14, tyashley, Tyler-IN, TytosB, Tyzemol, UbaserB, ubis1, UBlueberry, uhbg, UKNOWH, UltimateJester, Unbelievable-Salmon, underscorex5, UnicornOnLSD, Unisol, unusualcrow, Uriende, UristMcDorf, user424242420, Utmanarn, Vaaankas, valentfingerov, valquaint, Varen, Vasilis, VasilisThePikachu, veliebm, Velken, VelonacepsCalyxEggs, veprolet, VerinSenpai, veritable-calamity, Veritius, Vermidia, vero5123, verslebas, vexerot, vgskye, viceemargo, VigersRay, violet754, Visne, vitopigno, vitusveit, vlad, vlados1408, VMSolidus, vmzd, VoidMeticulous, voidnull000, volotomite, volundr-, Voomra, Vordenburg, vorkathbruh, Vortebo, vulppine, wachte1, wafehling, walksanatora, Warentan, WarMechanic, Watermelon914, weaversam8, wertanchik, whateverusername0, whatston3, widgetbeck, Will-Oliver-Br, Willhelm53, WilliamECrew, willicassi, Winkarst-cpu, wirdal, wixoaGit, WlarusFromDaSpace, Wolfkey-SomeoneElseTookMyUsername, wrexbe, wtcwr68, xeri7, xkreksx, xprospero, xRiriq, xsainteer, YanehCheck, yathxyz, Ygg01, YotaXP, youarereadingthis, YoungThugSS14, Yousifb26, youtissoum, yunii, yuriykiss, YuriyKiss, zach-hill, Zadeon, Zalycon, zamp, Zandario, Zap527, Zealith-Gamer, ZelteHonor, zero, ZeroDiamond, ZeWaka, zHonys, zionnBE, ZNixian, Zokkie, ZoldorfTheWizard, zonespace27, Zylofan, Zymem, zzylex +0leshe, 0tito, 0x6273, 12rabbits, 1337dakota, 13spacemen, 154942, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 27alaing, 2DSiggy, 3nderall, 4310v343k, 4dplanner, 5tickman, 612git, 778b, 96flo, aaron, abadaba695, Ablankmann, abregado, Absolute-Potato, Absotively, achookh, Acruid, ActiveMammmoth, actually-reb, ada-please, adamsong, Adeinitas, adm2play, Admiral-Obvious-001, adrian, Adrian16199, Ady4ik, Aearo-Deepwater, Aerocrux, Aeshus, Aexolott, Aexxie, africalimedrop, afrokada, AftrLite, AgentSmithRadio, Agoichi, Ahion, aiden, Aidenkrz, Aisu9, ajcm, AJCM-git, AjexRose, Alekshhh, alexalexmax, alexkar598, AlexMorgan3817, alexum418, alexumandxgabriel08x, Alice4267, Alithsko, Alkheemist, alliephante, ALMv1, Alpaccalypse, Alpha-Two, AlphaQwerty, Altoids1, amatwiedle, amylizzle, ancientpower, Andre19926, Andrew-Fall, AndrewEyeke, AndrewFenriz, AndreyCamper, Anzarot121, ApolloVector, Appiah, ar4ill, Arcane-Waffle, archee1, ArchPigeon, ArchRBX, areitpog, Arendian, areyouconfused, arimah, Arkanic, ArkiveDev, armoks, Arteben, ArthurMousatov, ArtisticRoomba, artur, Artxmisery, ArZarLordOfMango, as334, AsikKEsel, AsnDen, asperger-sind, aspiringLich, astriloqua, august-sun, AutoOtter, AverageNotDoingAnythingEnjoyer, avghdev, Awlod, AzzyIsNotHere, azzyisnothere, B-Kirill, B3CKDOOR, baa14453, BackeTako, BadaBoomie, Bakke, BananaFlambe, Baptr0b0t, BarryNorfolk, BasedUser, beck-thompson, beesterman, bellwetherlogic, ben, benbryant0, benev0, benjamin-burges, BGare, bhespiritu, bibbly, BigfootBravo, BIGZi0348, bingojohnson, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, blitzthesquishy, bloodrizer, Bloody2372, blueDev2, Boaz1111, BobdaBiscuit, BobTheSleder, boiled-water-tsar, Bokser815, bolantej, Booblesnoot42, Boolean-Buckeye, botanySupremist, brainfood1183, BramvanZijp, Brandon-Huu, breeplayx3, BriBrooo, Bright0, brndd, bryce0110, BubblegumBlue, buletsponge, buntobaggins, bvelliquette, BWTCK, byondfuckery, c0rigin, c4llv07e, CaasGit, Caconym27, Calecute, Callmore, Camdot, capnsockless, CaptainMaru, captainsqrbeard, Carbonhell, Carolyn3114, Carou02, carteblanche4me, catdotjs, catlord, Catofquestionableethics, CatTheSystem, CawsForConcern, Centronias, Chaboricks, chairbender, Chaoticaa, Charlese2, charlie, chartman, ChaseFlorom, chavonadelal, Cheackraze, CheddaCheez, cheesePizza2, CheesePlated, Chief-Engineer, chillyconmor, christhirtle, chromiumboy, Chronophylos, Chubbicous, Chubbygummibear, Ciac32, ciaran, citrea, civilCornball, claustro305, Clement-O, clyf, Clyybber, CMDR-Piboy314, cnv41, coco, cohanna, Cohnway, Cojoke-dot, ColdAutumnRain, Colin-Tel, collinlunn, ComicIronic, Compilatron144, CookieMasterT, coolboy911, CoolioDudio, coolmankid12345, Coolsurf6, cooperwallace, corentt, CormosLemming, CrafterKolyan, CraftyRenter, crazybrain23, Crazydave91920, creadth, CrigCrag, CroilBird, Crotalus, CrudeWax, cryals, CrzyPotato, cubixthree, cutemoongod, Cyberboss, d34d10cc, DadeKuma, Daemon, daerSeebaer, dahnte, dakamakat, DamianX, dan, dangerrevolution, daniel-cr, DanSAussieITS, Daracke, Darkenson, DawBla, Daxxi3, dch-GH, ddeegan, de0rix, Deahaka, dean, DEATHB4DEFEAT, Deatherd, deathride58, DebugOk, Decappi, Decortex, Deeeeja, deepdarkdepths, DeepwaterCreations, Deerstop, degradka, Delete69, deltanedas, DenisShvalov, DerbyX, derek, dersheppard, Deserty0, Detintinto, DevilishMilk, devinschubert14, dexlerxd, dffdff2423, DieselMohawk, DieselMohawkTheSequel, digitalic, Dimastra, DinnerCalzone, DinoWattz, Disp-Dev, DisposableCrewmember42, dissidentbullet, DjfjdfofdjfjD, doc-michael, docnite, Doctor-Cpu, DogZeroX, dolgovmi, dontbetank, Doomsdrayk, Doru991, DoubleRiceEddiedd, DoutorWhite, DR-DOCTOR-EVIL-EVIL, Dragonjspider, dragonryan06, drakewill-CRL, Drayff, dreamlyjack, DrEnzyme, dribblydrone, DrMelon, drongood12, DrSingh, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, DuckManZach, Duddino, dukevanity, duskyjay, Dutch-VanDerLinde, dvir001, dylanstrategie, dylanwhittingham, Dynexust, Easypoller, echo, eclips_e, eden077, EEASAS, Efruit, efzapa, Ekkosangen, ElectroSR, elsie, elthundercloud, Elysium206, Emisse, emmafornash, EmoGarbage404, Endecc, EnrichedCaramel, Entvari, eoineoineoin, ephememory, eris, erohrs2, ERORR404V1, Errant-4, ertanic, esguard, estacaoespacialpirata, eugene, ewokswagger, exincore, exp111, f0x-n3rd, F1restar4, FacePluslll, Fahasor, FairlySadPanda, farrellka-dev, FATFSAAM2, Feluk6174, ficcialfaint, Fiftyllama, Fildrance, FillerVK, FinnishPaladin, firenamefn, Firewars763, FirinMaLazors, Fishfish458, fl-oz, Flareguy, flashgnash, FlipBrooke, FluffiestFloof, FluffMe, FluidRock, flymo5678, foboscheshir, FoLoKe, fooberticus, ForestNoises, forgotmyotheraccount, forkeyboards, forthbridge, Fortune117, foxhorn, freeman2651, freeze2222, frobnic8, Froffy025, Fromoriss, froozigiusz, FrostMando, FrostRibbon, Funce, FungiFellow, FunTust, Futuristic-OK, GalacticChimp, gamer3107, Gamewar360, gansulalan, GaussiArson, Gaxeer, gbasood, gcoremans, Geekyhobo, genderGeometries, GeneralGaws, Genkail, Gentleman-Bird, geraeumig, Ghagliiarghii, Git-Nivrak, githubuser508, gituhabu, GlassEclipse, GnarpGnarp, GNF54, godisdeadLOL, goet, GoldenCan, Goldminermac, Golinth, golubgik, GoodWheatley, Gorox221, GR1231, gradientvera, graevy, GraniteSidewalk, GreaseMonk, greenrock64, GreyMario, GrownSamoyedDog, GTRsound, gusxyz, Gyrandola, h3half, hamurlik, Hanzdegloker, HappyRoach, Hardly3D, harikattar, Hayden, he1acdvv, Hebi, Helix-ctrl, helm4142, Henry, HerCoyote23, Hi-Im-Shot, HighTechPuddle, Hitlinemoss, hiucko, hivehum, Hmeister-fake, Hmeister-real, Hobbitmax, hobnob, HoidC, Holinka4ever, holyssss, HoofedEar, Hoolny, hord-brayden, hoshizora-sayo, Hreno, Hrosts, htmlsystem, Huaqas, hubismal, Hugal31, Huxellberger, Hyenh, hyperb1, hyperDelegate, hyphenationc, i-justuser-i, iaada, iacore, IamVelcroboy, Ian321, icekot8, icesickleone, iczero, iglov, IgorAnt028, igorsaux, ike709, illersaver, Illiux, Ilushkins33, Ilya246, IlyaElDunaev, imatsoup, IMCB, impubbi, imrenq, imweax, indeano, Injazz, Insineer, insoPL, IntegerTempest, Interrobang01, Intoxicating-Innocence, IProduceWidgets, itsmethom, Itzbenz, iztokbajcar, Jackal298, Jackrost, jacksonzck, Jacktastic09, Jackw2As, jacob, jamessimo, janekvap, Jark255, Jarmer123, Jaskanbe, JasperJRoth, jbox144, JCGWE30, JerryImMouse, jerryimmouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JimGamemaster, jimmy12or, JIPDawg, jjtParadox, jkwookee, jmcb, JohnGinnane, johnku1, Jophire, joshepvodka, JpegOfAFrog, jproads, JrInventor05, Jrpl, jukereise, juliangiebel, JustArt1m, JustCone14, justdie12, justin, justintether, JustinTrotter, JustinWinningham, justtne, K-Dynamic, k3yw, Kadeo64, Kaga-404, kaiserbirch, KaiShibaa, kalane15, kalanosh, KamTheSythe, Kanashi-Panda, katzenminer, kbailey-git, Keelin, Keer-Sar, KEEYNy, keikiru, Kelrak, kerisargit, keronshb, KIBORG04, KieueCaprie, Killerqu00, Kimpes, KingFroozy, kira-er, kiri-yoshikage, Kirillcas, Kirus59, Kistras, Kit0vras, KittenColony, Kittygyat, klaypexx, Kmc2000, Ko4ergaPunk, kognise, kokoc9n, komunre, KonstantinAngelov, kontakt, kosticia, koteq, kotobdev, Kowlin, KrasnoshchekovPavel, Krosus777, Krunklehorn, Kupie, kxvvv, Kyoth25f, kyupolaris, kzhanik, LaCumbiaDelCoronavirus, lajolico, Lamrr, lanedon, LankLTE, laok233, lapatison, larryrussian, lawdog4817, Lazzi0706, leander-0, leonardo-dabepis, leonidussaks, leonsfriedrich, LeoSantich, LetterN, lettern, Level10Cybermancer, LEVELcat, lever1209, LevitatingTree, Lgibb18, lgruthes, LightVillet, lilazero, liltenhead, linkbro1, linkuyx, Litraxx, little-meow-meow, LittleBuilderJane, LittleNorthStar, LittleNyanCat, lizelive, ljm862, lmsnoise, localcc, lokachop, lolman360, Lomcastar, Lordbrandon12, LordCarve, LordEclipse, lucas, LucasTheDrgn, luckyshotpictures, LudwigVonChesterfield, luegamer, luizwritescode, Lukasz825700516, luminight, lunarcomets, Lusatia, Luxeator, lvvova1, Lyndomen, lyroth001, lzimann, lzk228, M1tht1c, M3739, M4rchy-S, M87S, mac6na6na, MACMAN2003, Macoron, magicalus, magmodius, magnuscrowe, maland1, malchanceux, MaloTV, ManelNavola, manelnavola, Mangohydra, marboww, Markek1, MarkerWicker, marlyn, matt, Matz05, max, MaxNox7, maylokana, MehimoNemo, MeltedPixel, memeproof, MendaxxDev, Menshin, Mephisto72, MerrytheManokit, Mervill, metalgearsloth, MetalSage, MFMessage, mhamsterr, michaelcu, micheel665, mifia, MilenVolf, MilonPL, Minemoder5000, Minty642, minus1over12, Mirino97, mirrorcult, misandrie, MishaUnity, MissKay1994, MisterImp, MisterMecky, Mith-randalf, Mixelz, mjarduk, MjrLandWhale, mkanke-real, MLGTASTICa, mnva0, moderatelyaware, modern-nm, mokiros, momo, Moneyl, monotheonist, Moomoobeef, moony, Morb0, MossyGreySlope, mr-bo-jangles, Mr0maks, MrFippik, mrrobdemo, muburu, MureixloI, murolem, musicmanvr, MWKane, Myakot, Myctai, N3X15, nabegator, nails-n-tape, Nairodian, Naive817, NakataRin, namespace-Memory, Nannek, NazrinNya, neutrino-laser, NickPowers43, nikitosych, nikthechampiongr, Nimfar11, ninruB, Nirnael, NIXC, nkokic, NkoKirkto, nmajask, noctyrnal, noelkathegod, noirogen, nok-ko, NonchalantNoob, NoobyLegion, Nopey, not-gavnaed, notafet, notquitehadouken, notsodana, noudoit, noverd, Nox38, NuclearWinter, nukashimika, nuke-haus, NULL882, nullarmo, nyeogmi, Nylux, Nyranu, Nyxilath, och-och, OctoRocket, OldDanceJacket, OliverOtter, onesch, OneZerooo0, OnsenCapy, OnyxTheBrave, opl-, Orange-Winds, OrangeMoronage9622, OrbitSystem07, Orsoniks, osjarw, Ostaf, othymer, OttoMaticode, Owai-Seek, packmore, paige404, paigemaeforrest, pali6, Palladinium, Pangogie, panzer-iv1, partyaddict, patrikturi, PaulRitter, pavlockblaine03, peccneck, Peptide90, peptron1, perryprog, PeterFuto, PetMudstone, pewter-wiz, pgraycs, PGrayCS, Pgriha, phantom-lily, pheenty, philingham, Phill101, Phooooooooooooooooooooooooooooooosphate, phunnyguy, PicklOH, PilgrimViis, Pill-U, pinkbat5, Piras314, Pireax, Pissachu, pissdemon, Pixel8-dev, PixeltheAertistContrib, PixelTheKermit, PJB3005, Plasmaguy, plinyvic, Plykiya, poeMota, pofitlo, pointer-to-null, pok27, poklj, PolterTzi, PoorMansDreams, PopGamer45, portfiend, potato1234x, PotentiallyTom, PotRoastPiggy, Princess-Cheeseballs, ProfanedBane, PROG-MohamedDwidar, Prole0, ProPandaBear, PrPleGoo, ps3moira, Pspritechologist, Psychpsyo, psykana, psykzz, PuceTint, pumkin69, PuroSlavKing, PursuitInAshes, Putnam3145, py01, Pyrovi, qrtDaniil, qrwas, Quantum-cross, quasr-9, quatre, QueerNB, QuietlyWhisper, qwerltaz, Radezolid, RadioMull, Radosvik, Radrark, Rainbeon, Rainfey, Raitononai, Ramlik, RamZ, randy10122, Rane, Ranger6012, Rapidgame7, ravage123321, rbertoche, RedBookcase, Redfire1331, Redict, RedlineTriad, redmushie, RednoWCirabrab, ReeZer2, RemberBM, RemieRichards, RemTim, rene-descartes2021, Renlou, retequizzle, rhailrake, rhsvenson, rich-dunne, RieBi, riggleprime, RIKELOLDABOSS, rinary1, Rinkashikachi, riolume, rlebell33, RobbyTheFish, robinthedragon, Rockdtben, Rohesie, rok-povsic, rokudara-sen, rolfero, RomanNovo, rosieposieeee, Roudenn, router, ruddygreat, rumaks, RumiTiger, Ruzihm, S1rFl0, S1ss3l, Saakra, Sadie-silly, saga3152, saintmuntzer, Salex08, sam, samgithubaccount, Samuka-C, SaphireLattice, SapphicOverload, sarahon, sativaleanne, SaveliyM360, sBasalto, ScalyChimp, ScarKy0, ScholarNZL, schrodinger71, scrato, Scribbles0, scrivoy, scruq445, scuffedjays, ScumbagDog, SeamLesss, Segonist, semensponge, sephtasm, ser1-1y, Serkket, sewerpig, SG6732, sh18rw, Shaddap1, ShadeAware, ShadowCommander, shadowtheprotogen546, shaeone, shampunj, shariathotpatrol, SharkSnake98, shibechef, Siginanto, signalsender, SignalWalker, siigiil, silicon14wastaken, Simyon264, sirdragooon, Sirionaut, sirwarock, Sk1tch, SkaldetSkaeg, Skarletto, Skrauz, Skybailey-dev, skye, Skyedra, SlamBamActionman, slarticodefast, Slava0135, sleepyyapril, slimmslamm, Slyfox333, Smugman, snebl, snicket, sniperchance, Snowni, snowsignal, SolidSyn, SolidusSnek, solstar2, SonicHDC, SoulFN, SoulSloth, Soundwavesghost, soupkilove, southbridge-fur, sowelipililimute, Soydium, spacelizard, SpaceLizardSky, SpaceManiac, SpaceRox1244, SpaceyLady, Spangs04, spanky-spanky, Sparlight, spartak, SpartanKadence, spderman3333, SpeltIncorrectyl, Spessmann, SphiraI, SplinterGP, spoogemonster, sporekto, sporkyz, ssdaniel24, stalengd, stanberytrask, Stanislav4ix, StanTheCarpenter, starbuckss14, Stealthbomber16, Steffo99, stellar-novas, stewie523, stomf, Stop-Signs, stopbreaking, stopka-html, StrawberryMoses, Stray-Pyramid, strO0pwafel, Strol20, StStevens, Subversionary, sunbear-dev, supergdpwyl, superjj18, Supernorn, SurrealShibe, SweetAplle, SweptWasTaken, SyaoranFox, Sybil, SYNCHRONIC, Szunti, t, Tainakov, takemysoult, taonewt, tap, TaralGit, Taran, taurie, Tayrtahn, tday93, teamaki, TeenSarlacc, TekuNut, telyonok, TemporalOroboros, tentekal, terezi4real, Terraspark4941, texcruize, Tezzaide, TGODiamond, TGRCdev, tgrkzus, ThatGuyUSA, ThatOneGoblin25, thatrandomcanadianguy, TheArturZh, TheBlueYowie, thecopbennet, TheCze, TheDarkElites, thedraccx, TheEmber, TheFlyingSentry, TheIntoxicatedCat, thekilk, themias, theomund, TheProNoob678, TherapyGoth, ThereDrD0, TheShuEd, thetolbean, thevinter, TheWaffleJesus, thinbug0, ThunderBear2006, timothyteakettle, TimrodDX, timurjavid, tin-man-tim, TiniestShark, Titian3, tk-a369, tkdrg, tmtmtl30, ToastEnjoyer, Toby222, TokenStyle, Tollhouse, Toly65, tom-leys, tomasalves8, Tomeno, Tonydatguy, topy, tornado-technology, TornadoTechnology, tosatur, TotallyLemon, ToxicSonicFan04, Tr1bute, travis-g-reid, treytipton, trixxedbit, TrixxedHeart, tropicalhibi, truepaintgit, Truoizys, Tryded, TsjipTsjip, Tunguso4ka, TurboTrackerss14, tyashley, Tyler-IN, TytosB, Tyzemol, UbaserB, ubis1, UBlueberry, uhbg, UKNOWH, UltimateJester, Unbelievable-Salmon, underscorex5, UnicornOnLSD, Unisol, unusualcrow, Uriende, UristMcDorf, user424242420, Utmanarn, Vaaankas, valentfingerov, valquaint, Varen, Vasilis, VasilisThePikachu, veliebm, Velken, VelonacepsCalyxEggs, veprolet, VerinSenpai, veritable-calamity, Veritius, Vermidia, vero5123, verslebas, vexerot, vgskye, viceemargo, VigersRay, violet754, Visne, vitopigno, vitusveit, vlad, vlados1408, VMSolidus, vmzd, VoidMeticulous, voidnull000, volotomite, volundr-, Voomra, Vordenburg, vorkathbruh, Vortebo, vulppine, wachte1, wafehling, walksanatora, Warentan, WarMechanic, Watermelon914, weaversam8, wertanchik, whateverusername0, whatston3, widgetbeck, Will-Oliver-Br, Willhelm53, WilliamECrew, willicassi, Winkarst-cpu, wirdal, wixoaGit, WlarusFromDaSpace, Wolfkey-SomeoneElseTookMyUsername, wrexbe, wtcwr68, xeri7, xkreksx, xprospero, xRiriq, xsainteer, YanehCheck, yathxyz, Ygg01, YotaXP, youarereadingthis, YoungThugSS14, Yousifb26, youtissoum, yunii, YuriyKiss, yuriykiss, zach-hill, Zadeon, Zalycon, zamp, Zandario, Zap527, Zealith-Gamer, ZelteHonor, zero, ZeroDiamond, ZeWaka, zHonys, zionnBE, ZNixian, Zokkie, ZoldorfTheWizard, zonespace27, Zylofan, Zymem, zzylex diff --git a/Resources/Locale/en-US/administration/smites.ftl b/Resources/Locale/en-US/administration/smites.ftl index 794077a484..e8dfbd2055 100644 --- a/Resources/Locale/en-US/administration/smites.ftl +++ b/Resources/Locale/en-US/administration/smites.ftl @@ -60,6 +60,8 @@ admin-smite-nyanify-name = Cat Ears admin-smite-kill-sign-name = Kill Sign admin-smite-omni-accent-name = Omni-Accent admin-smite-crawler-name = Crawler +admin-smite-homing-rod-name = Homing Rod +admin-smite-homing-rod-slow-name = Slowming Rod admin-smite-silicon-laws-bound-name = Become Silicon ## Smite descriptions @@ -107,6 +109,8 @@ admin-smite-terminate-description = Creates a Terminator ghost role with the sol admin-smite-super-slip-description = Slips them really, really hard. admin-smite-omni-accent-description = Makes the target speak with almost every accent available. admin-smite-crawler-description = Makes the target fall down and be unable to stand up. Remove their hands too for added effect! +admin-smite-homing-rod-description = Launches a homing immovable rod straight at them. +admin-smite-homing-rod-slow-description = Launches a slow moving homing immovable rod straight at them. admin-smite-silicon-laws-bound-description = Makes the target bound to silicon laws. Law 2, jump out of the window. ## Tricks descriptions diff --git a/Resources/Locale/en-US/cargo/bounties.ftl b/Resources/Locale/en-US/cargo/bounties.ftl index 02eb49250a..694f26249a 100644 --- a/Resources/Locale/en-US/cargo/bounties.ftl +++ b/Resources/Locale/en-US/cargo/bounties.ftl @@ -138,7 +138,7 @@ bounty-description-bandana = Bzzzt... Transmission from prison planet OC-1001: bounty-description-steak = The vegetarian cook is refusing to make us anything with meat, and the lizards are getting restless. Can you smuggle us a few steaks to keep them happy? bounty-description-banana = Hi station! Botany won't gimme any more. They said slipping the HoS out an open airlock wasn't funny! Can you believe it? Help me out! HONK. bounty-description-beer = Some nefarious agent has stolen every single drink in the bar. Yes, everything. Help tide us over until we can find them. -bounty-description-hi-viz-vest = The clown stole the AME controller and won't back. It's pretty dark in here. Some hi-viz vests would make seeing each other in the dark a little more bearable. +bounty-description-hi-viz-vest = The clown stole the AME controller and won't give it back. It's pretty dark in here. Some hi-viz vests would make seeing each other in the dark a little more bearable. bounty-description-torch = The chef made all the monkeys and kobolds at once, and they rebelled and took over the cargo shuttle. They're demanding supplies and free passage to a jungle planet, and we're giving in to their demands. All they need now is a few torches. bounty-description-medkit-box = CentComm is putting on a play set in a hospital, and needs some props. Just send us some empty medkit boxes, and the show will go on! bounty-description-cardboard-box = "The Cardborgs Cometh" is a new play premiering tomorrow, and the costuming team is woefully unprepared. Send us some boxes to work with. @@ -146,4 +146,4 @@ bounty-description-wine = The new librarian and the Quartermaster are falling he bounty-description-cotton-boll = A massive swarm of mothroaches ate all the paper and cloth on the station. Send us some cotton to help keep our winged crewmembers fed. bounty-description-microwave-machine-board = Mr. Giggles thought it'd be funny to stick forks in all the kitchen microwaves. Help us replace them before the chefs start making clown burgers. bounty-description-flashes = GREETINGS \[Station] WE REQUIRE 6 FLASHES DUE TO A NORMAL \[TrainingExercise] WITH SECURITY. EVERYTHING IS \[Normal]. -bounty-description-ring = On this EXTRAORDINARY day there will be a wedding between the Gelts, but Mr. Gelt has lost the rings, send a pair of rings. +bounty-description-ring = On this EXTRAORDINARY day there will be a wedding between the Gelts, but Mr. Gelt has lost the rings. They need a new pair. diff --git a/Resources/Locale/en-US/construction/recipes/crates.ftl b/Resources/Locale/en-US/construction/recipes/crates.ftl index 393b7784a1..c5b2b47c32 100644 --- a/Resources/Locale/en-US/construction/recipes/crates.ftl +++ b/Resources/Locale/en-US/construction/recipes/crates.ftl @@ -1,3 +1,4 @@ construction-recipe-crate-freezer = crate freezer construction-recipe-big-box = large cardboard box construction-recipe-box-cardboard = small cardboard box +construction-recipe-box-tote = circuit tote diff --git a/Resources/Locale/en-US/datasets/arcade_villain.ftl b/Resources/Locale/en-US/datasets/arcade_villain.ftl new file mode 100644 index 0000000000..b1cb2d5973 --- /dev/null +++ b/Resources/Locale/en-US/datasets/arcade_villain.ftl @@ -0,0 +1,40 @@ +# Verbs +arcade-villain-verbs-fight-1 = Annihilate +arcade-villain-verbs-fight-2 = Defeat +arcade-villain-verbs-fight-3 = Destroy +arcade-villain-verbs-fight-4 = Own +arcade-villain-verbs-fight-5 = Pwn +arcade-villain-verbs-fight-6 = Robust +arcade-villain-verbs-fight-7 = Romance +arcade-villain-verbs-fight-8 = Save +arcade-villain-verbs-fight-9 = Stop +arcade-villain-verbs-fight-10 = Strike + +# Enemy names +arcade-villain-names-enemy-first-1 = Duke +arcade-villain-names-enemy-first-2 = Farmer +arcade-villain-names-enemy-first-3 = General +arcade-villain-names-enemy-first-4 = Lord +arcade-villain-names-enemy-first-5 = Professor +arcade-villain-names-enemy-first-6 = the Automatic +arcade-villain-names-enemy-first-7 = the Cuban +arcade-villain-names-enemy-first-8 = the Dread King +arcade-villain-names-enemy-first-9 = the Evil +arcade-villain-names-enemy-first-10 = the Great +arcade-villain-names-enemy-first-11 = the Space + +arcade-villain-names-enemy-last-1 = Crushulon +arcade-villain-names-enemy-last-2 = ERPer +arcade-villain-names-enemy-last-3 = Ectoplasm +arcade-villain-names-enemy-last-4 = Griefer +arcade-villain-names-enemy-last-5 = Jeff +arcade-villain-names-enemy-last-6 = Lizard Man +arcade-villain-names-enemy-last-7 = Melonoid +arcade-villain-names-enemy-last-8 = Murdertron +arcade-villain-names-enemy-last-9 = Peteoid +arcade-villain-names-enemy-last-10 = Ruin +arcade-villain-names-enemy-last-11 = Sorcerer +arcade-villain-names-enemy-last-12 = Uhangoid +arcade-villain-names-enemy-last-13 = Unicorn +arcade-villain-names-enemy-last-14 = Vhakoid +arcade-villain-names-enemy-last-15 = slime diff --git a/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl b/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl index 9869aa1da5..98ee2543c1 100644 --- a/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl +++ b/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl @@ -167,6 +167,9 @@ ui-options-static-storage-ui = Lock storage window to hotbar ui-options-function-smart-equip-backpack = Smart-equip to backpack ui-options-function-smart-equip-belt = Smart-equip to belt +ui-options-function-smart-equip-suit-storage = Smart-equip to suit storage +ui-options-function-smart-equip-pocket1 = Smart-equip to pocket 1 +ui-options-function-smart-equip-pocket2 = Smart-equip to pocket 2 ui-options-function-open-backpack = Open backpack ui-options-function-open-belt = Open belt ui-options-function-throw-item-in-hand = Throw item diff --git a/Resources/Locale/en-US/guidebook/chemistry/effects.ftl b/Resources/Locale/en-US/guidebook/chemistry/effects.ftl index cd7bb21af2..07c908c035 100644 --- a/Resources/Locale/en-US/guidebook/chemistry/effects.ftl +++ b/Resources/Locale/en-US/guidebook/chemistry/effects.ftl @@ -104,6 +104,10 @@ reagent-effect-guidebook-even-health-change = reagent-effect-guidebook-status-effect = { $type -> + [update]{ $chance -> + [1] Causes + *[other] cause + } {LOC($key)} for at least {NATURALFIXED($time, 3)} {MANY("second", $time)} without accumulation [add] { $chance -> [1] Causes *[other] cause @@ -118,6 +122,42 @@ reagent-effect-guidebook-status-effect = } {NATURALFIXED($time, 3)} {MANY("second", $time)} of {LOC($key)} } +reagent-effect-guidebook-status-effect-delay = + { $type -> + [add] { $chance -> + [1] Causes + *[other] cause + } {LOC($key)} for at least {NATURALFIXED($time, 3)} {MANY("second", $time)} with accumulation + *[set] { $chance -> + [1] Causes + *[other] cause + } {LOC($key)} for at least {NATURALFIXED($time, 3)} {MANY("second", $time)} without accumulation + [remove]{ $chance -> + [1] Removes + *[other] remove + } {NATURALFIXED($time, 3)} {MANY("second", $time)} of {LOC($key)} + } after a {NATURALFIXED($delay, 3)} second delay + +reagent-effect-guidebook-knockdown = + { $type -> + [update]{ $chance -> + [1] Causes + *[other] cause + } {LOC($key)} for at least {NATURALFIXED($time, 3)} {MANY("second", $time)} without accumulation + [add] { $chance -> + [1] Causes + *[other] cause + } knockdown for at least {NATURALFIXED($time, 3)} {MANY("second", $time)} with accumulation + *[set] { $chance -> + [1] Causes + *[other] cause + } knockdown for at least {NATURALFIXED($time, 3)} {MANY("second", $time)} without accumulation + [remove]{ $chance -> + [1] Removes + *[other] remove + } {NATURALFIXED($time, 3)} {MANY("second", $time)} of knockdown + } + reagent-effect-guidebook-set-solution-temperature-effect = { $chance -> [1] Sets diff --git a/Resources/Locale/en-US/job/job-description.ftl b/Resources/Locale/en-US/job/job-description.ftl index fea5928ad2..414f59fb18 100644 --- a/Resources/Locale/en-US/job/job-description.ftl +++ b/Resources/Locale/en-US/job/job-description.ftl @@ -8,14 +8,14 @@ job-description-brigmedic = Fight in the rear of the security service, for the l job-description-cadet = Learn the basics of arresting criminals and managing the brig. Listen to your supervisors and feel free to ask them for any help. job-description-captain = Keep the station running, delegate work to the other heads of staff, and exert your will. job-description-cargotech = Deal with requisitions and deliveries, pilot the cargo shuttle to the trade station and back, and work with others to make ludicrous amounts of cash and then waste it all gambling. -job-description-ce = Manage the engineering department to ensure power, atmospherics, and the hull are in perfect shape. +job-description-ce = Manage the Engineering department to ensure power, atmospherics, and the hull are in perfect shape. job-description-centcomoff = Act as an ambassador to the newest state-of-the-art space station in Nanotrasen's fleet. job-description-chaplain = Preach the good word of your deity and religion, and conduct spiritual healing and miracles with your bible. job-description-chef = Keep the station fed with a variety of food items, butcher dead animals to ensure ammonia doesn't leak, and help keep the bar lively. job-description-chemist = Produce medicinal drugs for the doctors to use, research ethically dubious rare chemicals, and produce weapons of war when enemies of the station arrive. job-description-clown = Entertain the crew through elaborate slapstick routines or terrible jokes. -job-description-cmo = Manage the resources and personnel of the medical department to keep the crew alive. -job-description-paramedic = Rescue critically injured patients all over the station, sometimes outside too. Stablize them, give them a ride to medbay, and get back out there! +job-description-cmo = Manage the resources and personnel of the Medical department to keep the crew alive. +job-description-paramedic = Rescue critically injured patients all over the station, sometimes outside too. Stabilize them, give them a ride to the medbay, and get back out there! job-description-detective = Investigate crime scenes using forensic tools, ensure that the guilty party is found, and have a couple smokes. job-description-doctor = Diagnose and heal crewmembers through medicinal chemicals, advanced medicine, and defibrillators. Make sure the dead don't rot, and that cadavers are in the morgue. job-description-engineer = Keep the station's main engine & solars active, optimize the power network, and make emergency repairs using your hardsuit in spaced areas. @@ -25,7 +25,7 @@ job-description-ertjanitor = Ensure that the station is properly cleaned--for mo job-description-ertleader = Lead the Emergency Response Team in dealing with threats to Nanotrasen assets. job-description-ertmedic = Ensure that the crew of the station is kept alive and healthy. job-description-ertsecurity = Ensure that any active threats to the station are put to rest. -job-description-hop = Handle access reassignment fairly using your ID console, manage the service department, and keep Ian safe. +job-description-hop = Handle access reassignment fairly using your ID console, manage the Service department, and keep Ian safe. job-description-hos = Manage your security force and keep them efficient, quell dissent, and keep the other heads of staff safe. job-description-intern = Learn the basics of administering medicine, basic chemicals and using medical tools. job-description-janitor = Keep the station clean of any trash or slipping hazards, and help deal with rat infestations. @@ -35,15 +35,15 @@ job-description-mime = Entertain the crew without speaking or writing, and engag job-description-musician = Entertain the crew with your unique musical talent, and acquire new instruments to mess around with. job-description-passenger = Enjoy your stay aboard the station with no obligations! job-description-psychologist = Provide emotional support to traumatized crew. Currently available on Box, Marathon and Oasis. -job-description-qm = Manage the supplies of the station & the cargo department, keep the salvage specialists working, make sure all orders are fulfilled, and keep the money flowing. -job-description-rd = Manage the science department, unlocking technologies, acquiring & researching artifacts, and performing experiments. -job-description-research-assistant = Learn the basics of how to research various artifacts, anomalies and robotics. +job-description-qm = Manage the supplies of the station & the Cargo department, keep the salvage specialists working, make sure all orders are fulfilled, and keep the money flowing. +job-description-rd = Manage the Science department, unlocking technologies, acquiring & researching artifacts, and performing experiments. +job-description-research-assistant = Learn the basics of robotics and how to research various artifacts & anomalies. job-description-reporter = Entertain & inform the crew with your vibrant journalism through wireless cameras, the radio and the news. Currently available on Bagel Station, Convex, Core, Train and Oasis. -job-description-salvagespec = Use the salvage magnet to draw in detatched scraps & asteroids to loot and enrich the station, build a salvage ship and then travel to new planets, while fighting off any space fauna along the way. +job-description-salvagespec = Use the salvage magnet to draw in detached scraps & asteroids to loot and enrich the station, build a salvage ship and then travel to new planets, while fighting off any space fauna along the way. job-description-scientist = Research alien artifacts, unlock new technologies, build newer and better machines around the station, and make everything run more efficiently. job-description-security = Catch criminals and enemies of the station, enforce the law, and ensure that the station does not fall into disarray. job-description-serviceworker = Learn the basics of bartending, cooking, and growing plants. job-description-station-ai = Follow your laws, serve the crew. job-description-visitor = Enjoy your visit to the station. -job-description-warden = Patrol the security department, ensure that no one is stealing from the armory, and make sure that all prisoners are processed and let out when their time is up. +job-description-warden = Patrol the Security department, ensure that no one is stealing from the armory, and make sure that all prisoners are processed and let out when their time is up. job-description-zookeeper = Put on a joyful display of cute animals and space carps for all the crew to see. Currently available on Oasis. diff --git a/Resources/Locale/en-US/machine-linking/receiver_ports.ftl b/Resources/Locale/en-US/machine-linking/receiver_ports.ftl index 40dc681405..7d91b41851 100644 --- a/Resources/Locale/en-US/machine-linking/receiver_ports.ftl +++ b/Resources/Locale/en-US/machine-linking/receiver_ports.ftl @@ -11,10 +11,10 @@ signal-port-name-off-receiver = Off signal-port-description-off-receiver = Turns a device off. signal-port-name-forward = Forward -signal-port-description-forward = Makes a device (e.g. conveyer) operate in the normal direction. +signal-port-description-forward = Makes a device (e.g. conveyor) operate in the normal direction. signal-port-name-reverse = Reverse -signal-port-description-reverse = Makes a device (e.g. conveyer) operate in the reverse direction. +signal-port-description-reverse = Makes a device (e.g. conveyor) operate in the reverse direction. signal-port-name-open = Open signal-port-description-open = Opens a device. diff --git a/Resources/Locale/en-US/nutrition/components/food-sequence.ftl b/Resources/Locale/en-US/nutrition/components/food-sequence.ftl index 3d1d9be565..24d3521e76 100644 --- a/Resources/Locale/en-US/nutrition/components/food-sequence.ftl +++ b/Resources/Locale/en-US/nutrition/components/food-sequence.ftl @@ -156,6 +156,7 @@ food-sequence-cotton-burger-content-plushie-xeno = xeno food-sequence-cotton-burger-content-plushie-penguin = peng food-sequence-cotton-burger-content-plushie-human = uristmc food-sequence-cotton-burger-content-plushie-moth = fluff +food-sequence-cotton-burger-content-plushie-vulp = vulp food-sequence-cotton-burger-content-plushie-ian = corgi food-sequence-cotton-burger-content-among-pequeno = sus diff --git a/Resources/Locale/en-US/stack/stacks.ftl b/Resources/Locale/en-US/stack/stacks.ftl index acc7cdba64..6ff0906b83 100644 --- a/Resources/Locale/en-US/stack/stacks.ftl +++ b/Resources/Locale/en-US/stack/stacks.ftl @@ -36,6 +36,10 @@ stack-hv-cable = {$amount -> [1] hv cable *[other] hv cables } +stack-explosive-cord = {$amount -> + [1] explosive cord + *[other] explosive cords +} stack-wood-plank = {$amount -> [1] wood plank *[other] wood planks diff --git a/Resources/Locale/en-US/tips.ftl b/Resources/Locale/en-US/tips.ftl index a4066e43f3..2cd3ec8e63 100644 --- a/Resources/Locale/en-US/tips.ftl +++ b/Resources/Locale/en-US/tips.ftl @@ -76,7 +76,7 @@ tips-dataset-75 = As the Captain, you are one of the highest priority targets on tips-dataset-76 = As the Captain, always take the nuclear disk and pinpointer with you every shift. It's a good idea to give one of these to another head you can trust with keeping it safe. tips-dataset-77 = As the Captain, you have absolute access and control over the station, but this does not mean that being a horrible person won't result in mutiny. tips-dataset-78 = As the Captain, try to be active and patrol the station. Staying in the bridge might be tempting, but you'll just end up putting a bigger target on your back! -tips-dataset-79 = As a Scientist, you can try random things on an artifact while the scanner is on cooldown to speed up the point extraction process significantly. +tips-dataset-79 = As a Scientist, you can use the node scanner to see when an artifact is able to react to triggers, and which triggers it is currently reacting to; each number it shows corresponds to a different trigger! tips-dataset-80 = As a Scientist, you can utilize upgraded versions of machines to increase its effectiveness. This can make certain machines significantly better; salvage will love you if you upgrade their ore processor! tips-dataset-81 = As a Scientist, you can build cyborgs using positronic brains and a chassis, they are just as useful as a new crew member. tips-dataset-82 = As a Medical Doctor, try to be wary of overdosing your patients, especially if someone else has already been on the scene. Overdoses are often lethal to patients in crit! diff --git a/Resources/Locale/ru-RU/datasets/arcade_villain.ftl b/Resources/Locale/ru-RU/datasets/arcade_villain.ftl new file mode 100644 index 0000000000..4396f22d77 --- /dev/null +++ b/Resources/Locale/ru-RU/datasets/arcade_villain.ftl @@ -0,0 +1,40 @@ +# Verbs +arcade-villain-verbs-fight-1 = Победи +arcade-villain-verbs-fight-2 = Аннигилируй +arcade-villain-verbs-fight-3 = Спаси +arcade-villain-verbs-fight-4 = Ударь +arcade-villain-verbs-fight-5 = Останови +arcade-villain-verbs-fight-6 = Уничтожь +arcade-villain-verbs-fight-7 = Заробасти +arcade-villain-verbs-fight-8 = Добейся +arcade-villain-verbs-fight-9 = Отымей +arcade-villain-verbs-fight-10 = Заовни + +# Enemy names +arcade-villain-names-enemy-first-1 = Автоматический +arcade-villain-names-enemy-first-2 = Фермер +arcade-villain-names-enemy-first-3 = Лорд +arcade-villain-names-enemy-first-4 = Профессор +arcade-villain-names-enemy-first-5 = Кубинец +arcade-villain-names-enemy-first-6 = Злой +arcade-villain-names-enemy-first-7 = Грозный Король +arcade-villain-names-enemy-first-8 = Космический +arcade-villain-names-enemy-first-9 = Лорд +arcade-villain-names-enemy-first-10 = Могучий +arcade-villain-names-enemy-first-11 = Герцог + +arcade-villain-names-enemy-last-1 = Единорог +arcade-villain-names-enemy-last-2 = Киллертрон +arcade-villain-names-enemy-last-3 = Волшебник +arcade-villain-names-enemy-last-4 = Руина +arcade-villain-names-enemy-last-5 = Джефф +arcade-villain-names-enemy-last-6 = Эктоплазма +arcade-villain-names-enemy-last-7 = Мелоноид +arcade-villain-names-enemy-last-8 = Крушелон +arcade-villain-names-enemy-last-9 = Ухангоид +arcade-villain-names-enemy-last-10 = Вакоид +arcade-villain-names-enemy-last-11 = Петеоид +arcade-villain-names-enemy-last-12 = слайм +arcade-villain-names-enemy-last-13 = Грифер +arcade-villain-names-enemy-last-14 = ЕРПшер +arcade-villain-names-enemy-last-15 = Человек-ящерица diff --git a/Resources/Maps/elkridge.yml b/Resources/Maps/elkridge.yml index e3b6021c07..385b0358aa 100644 --- a/Resources/Maps/elkridge.yml +++ b/Resources/Maps/elkridge.yml @@ -1,11 +1,11 @@ meta: format: 7 category: Map - engineVersion: 266.0.0 + engineVersion: 267.2.0 forkId: "" forkVersion: "" - time: 08/31/2025 08:35:35 - entityCount: 18658 + time: 09/29/2025 02:22:45 + entityCount: 18698 maps: - 1 grids: @@ -106,7 +106,7 @@ entities: version: 7 1,-2: ind: 1,-2 - tiles: ggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAABAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAABAAAAAAAAAQAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAA8AAAAAAAAPAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAEAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAIAAAAAADAAEAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAACAAAAAAAAABAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAABAAAAAAAAggAAAAAAAAEAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAAgAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAEAAAAAAACCAAAAAAAADwAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAA8AAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAABAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAA== + tiles: ggAAAAAAAAIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAACAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAACAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAgAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAgAAAAAAAIIAAAAAAAABAAAAAAAAAQAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAIAAAAAADAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAACAAAAAAAAABAAAAAAAAAQAAAAAAAA8AAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAEAAAAAAAAPAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAABAAAAAAAAggAAAAAAAAEAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAAgAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAEAAAAAAACCAAAAAAAADwAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAA8AAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAABAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAA== version: 7 2,-2: ind: 2,-2 @@ -114,7 +114,7 @@ entities: version: 7 0,-2: ind: 0,-2 - tiles: YgAAAAABAIIAAAAAAAABAAAAAAAAIAAAAAADAAEAAAAAAAABAAAAAAAAAQAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAYAAAAAAwCCAAAAAAAABgAAAAADAIIAAAAAAACCAAAAAAAAggAAAAAAAGIAAAAAAgABAAAAAAAAIAAAAAADACAAAAAAAgAgAAAAAAEAIAAAAAABACAAAAAAAwCCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAABiAAAAAAAAggAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAEAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAYgAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAIAAAAAACACAAAAAAAgAgAAAAAAIAIAAAAAABACAAAAAAAwCCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAAGAAAAAAAAggAAAAAAAIIAAAAAAABiAAAAAAEAAQAAAAAAACAAAAAAAQAgAAAAAAAAIAAAAAACACAAAAAAAgAgAAAAAAEAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAEAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAYgAAAAADAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAGIAAAAAAwABAAAAAAAABgAAAAAAAIIAAAAAAACCAAAAAAAAAQAAAAAAAIIAAAAAAACCAAAAAAAAAQAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAQAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAIAAAAAAAACAAAAAAAwAgAAAAAAEAIAAAAAACAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAACAAAAAAAwAgAAAAAAAAIAAAAAADACAAAAAAAQABAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAcAAAAAAAAHAAAAAAAAABAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAYAAAAAAwAgAAAAAAEAIAAAAAACACAAAAAAAAAgAAAAAAMAggAAAAAAAAYAAAAAAQCCAAAAAAAAggAAAAAAAHAAAAAAAABwAAAAAAAAIAAAAAABACAAAAAAAwCCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAIAAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAAgAAAAAAMAIAAAAAACACAAAAAAAAAgAAAAAAMAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAACAAAAAAAQAgAAAAAAEAIAAAAAABAIIAAAAAAAABAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAQAAAAAAACAAAAAAAgAgAAAAAAAAIAAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAAgAAAAAAIAIAAAAAABACAAAAAAAgCCAAAAAAAAAQAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAAgAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAEAAAAAAAABAAAAAAAAIAAAAAACACAAAAAAAACCAAAAAAAAggAAAAAAAAEAAAAAAACCAAAAAAAAggAAAAAAAAIAAAAAAACCAAAAAAAAAQAAAAAAAIIAAAAAAAACAAAAAAAAAgAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAA== + tiles: YgAAAAABAIIAAAAAAAABAAAAAAAAIAAAAAADAAEAAAAAAAABAAAAAAAAAQAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAYAAAAAAwCCAAAAAAAABgAAAAADAIIAAAAAAACCAAAAAAAAggAAAAAAAGIAAAAAAgABAAAAAAAAIAAAAAADACAAAAAAAgAgAAAAAAEAIAAAAAABACAAAAAAAwCCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAABiAAAAAAAAggAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAEAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAYgAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAIAAAAAACACAAAAAAAgAgAAAAAAIAIAAAAAABACAAAAAAAwCCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAAGAAAAAAAAggAAAAAAAIIAAAAAAABiAAAAAAEAAQAAAAAAACAAAAAAAQAgAAAAAAAAIAAAAAACACAAAAAAAgAgAAAAAAEAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAEAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAYgAAAAADAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAGIAAAAAAwABAAAAAAAABgAAAAAAAIIAAAAAAACCAAAAAAAAAQAAAAAAAIIAAAAAAACCAAAAAAAAAQAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAQAAAAAAAIIAAAAAAACCAAAAAAAAIAAAAAAAACAAAAAAAwAgAAAAAAEAIAAAAAACAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAACAAAAAAAwAgAAAAAAAAIAAAAAADACAAAAAAAQABAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAcAAAAAAAAHAAAAAAAAABAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAYAAAAAAwAgAAAAAAEAIAAAAAACACAAAAAAAAAgAAAAAAMAggAAAAAAAAYAAAAAAQCCAAAAAAAAggAAAAAAAHAAAAAAAABwAAAAAAAAIAAAAAABACAAAAAAAwCCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAIAAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAAgAAAAAAMAIAAAAAACACAAAAAAAAAgAAAAAAMAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAACAAAAAAAQAgAAAAAAEAIAAAAAABAIIAAAAAAAABAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAQAAAAAAACAAAAAAAgAgAAAAAAAAIAAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAAgAAAAAAIAIAAAAAABACAAAAAAAgCCAAAAAAAAAQAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAAgAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAEAAAAAAAABAAAAAAAAIAAAAAACACAAAAAAAACCAAAAAAAAggAAAAAAAAEAAAAAAACCAAAAAAAAggAAAAAAAAIAAAAAAACCAAAAAAAAAQAAAAAAAIIAAAAAAAACAAAAAAAAAgAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAA== version: 7 3,-2: ind: 3,-2 @@ -150,7 +150,7 @@ entities: version: 7 1,-3: ind: 1,-3 - tiles: ggAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAIIAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAgAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAgAAAAAAAIIAAAAAAAACAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAgAAAAAAAIIAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAACCAAAAAAAAAgAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAgAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAgAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAIAAAAAAACCAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAAggAAAAAAAAIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAACAAAAAAAAggAAAAAAAAIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAQAAAAAAAIIAAAAAAACCAAAAAAAAAQAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAA== + tiles: ggAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACCAAAAAAAAAgAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAgAAAAAAAIIAAAAAAAACAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAgAAAAAAAIIAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAACCAAAAAAAAAgAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAgAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAgAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAIAAAAAAACCAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAAggAAAAAAAAIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAIAAAAAAACCAAAAAAAAAQAAAAAAAIIAAAAAAACCAAAAAAAAAQAAAAAAAAIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAA== version: 7 -1,-3: ind: -1,-3 @@ -174,15 +174,15 @@ entities: version: 7 2,-3: ind: 2,-3 - tiles: AgAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIIAAAAAAACCAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAACCAAAAAAAAggAAAAAAAAIAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAggAAAAAAAIIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAIIAAAAAAACCAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAgAAAAAAAIIAAAAAAAACAAAAAAAAggAAAAAAAIIAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAgAAAAAAAIIAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAACCAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAIAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAIIAAAAAAACCAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAgAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAgAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAIAAAAAAACCAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAAggAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAgAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAACAAAAAAAAggAAAAAAAAIAAAAAAACCAAAAAAAAggAAAAAAAAIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAEAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAA== + tiles: ggAAAAAAAIIAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIIAAAAAAACCAAAAAAAAAgAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAACCAAAAAAAAggAAAAAAAAIAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAggAAAAAAAIIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAgAAAAAAAIIAAAAAAAACAAAAAAAAggAAAAAAAIIAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAgAAAAAAAIIAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAACCAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAIAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAIIAAAAAAACCAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAgAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAgAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAIAAAAAAACCAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAAggAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAgAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAACAAAAAAAAggAAAAAAAAIAAAAAAACCAAAAAAAAggAAAAAAAAIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAEAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAA== version: 7 1,-4: ind: 1,-4 - tiles: ggAAAAAAAAIAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIIAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACCAAAAAAAAAgAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIIAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACCAAAAAAAAAgAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIIAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACCAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAggAAAAAAAAIAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIIAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACCAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAggAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAIIAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAACCAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAggAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAA== + tiles: ggAAAAAAAAIAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIIAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACCAAAAAAAAAgAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIIAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACCAAAAAAAAAgAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIIAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACCAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAggAAAAAAAAIAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIIAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACCAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAggAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAIIAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACCAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAggAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAA== version: 7 2,-4: ind: 2,-4 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA== + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAAIIAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA== version: 7 -3,0: ind: -3,0 @@ -401,6 +401,12 @@ entities: 14500: -13.032157,-26.195295 14501: -13.032157,-24.21092 14513: -9.030031,-15.125096 + - node: + color: '#D4D4D493' + id: Bot + decals: + 15150: 18,-24 + 15151: 18,-23 - node: color: '#D4D4D496' id: Bot @@ -425,12 +431,8 @@ entities: 11489: 26,-42 11490: 27,-42 11491: 28,-42 - 11826: 17,-29 - 11827: 18,-29 11828: 17,-21 11829: 18,-21 - 11830: 27,-28 - 11831: 27,-29 11985: 31,-19 11986: 31,-20 12008: 35,-7 @@ -472,6 +474,11 @@ entities: 14516: -13,-30 14517: -11,-29 14518: -11,-30 + - node: + color: '#D4D4D493' + id: BotGreyscale + decals: + 15154: 21,-24 - node: color: '#D4D4D496' id: BotGreyscale @@ -514,7 +521,6 @@ entities: 12557: 50,-21 12558: 53,-18 12559: 56,-21 - 12623: 20,-25 13397: -41,14 13398: -40,14 - node: @@ -2632,14 +2638,18 @@ entities: 8792: 19,34 8793: 20,34 8794: 20,35 + - node: + color: '#D4D4D493' + id: Delivery + decals: + 15152: 17,-23 + 15153: 17,-24 - node: color: '#D4D4D496' id: Delivery decals: 8732: 17,36 11842: 16,-24 - 11843: 16,-25 - 11844: 16,-26 13686: 5,-30 13687: 6,-30 13688: 6,-32 @@ -3330,16 +3340,12 @@ entities: 11720: 45,-7 11915: 19,-29 11916: 17,-27 - 11917: 16,-25 - 11918: 17,-23 - 11919: 19,-25 11920: 20,-23 11921: 22,-25 11922: 21,-21 11923: 24,-21 11924: 28,-22 11925: 29,-19 - 11932: 27,-29 11933: 25,-28 11934: 28,-26 11935: 29,-25 @@ -4398,13 +4404,11 @@ entities: 11951: 25,-29 11952: 27,-25 11953: 26,-22 - 11954: 19,-28 11970: 18,-16 11988: 31,-19 11989: 23,-13 11990: 29,-27 11991: 32,-27 - 11997: 22,-28 12000: 43,19 12364: -31,21 12365: -29,19 @@ -5103,13 +5107,11 @@ entities: 11633: 3,-6 11640: 6,-6 11955: 18,-26 - 11956: 17,-24 11957: 20,-22 11958: 28,-25 11959: 23,-27 11960: 20,-24 11961: 23,-22 - 11962: 21,-28 11992: 30,-27 11993: 31,-42 12372: -30,21 @@ -5794,11 +5796,8 @@ entities: 11941: 24,-22 11942: 21,-24 11943: 22,-23 - 11944: 20,-28 - 11945: 17,-26 11946: 29,-21 11995: 33,-42 - 11996: 23,-28 12376: -30,20 12377: -25,20 12378: -26,22 @@ -7296,13 +7295,22 @@ entities: 10654: 46,-23 12248: -26,21 12610: 56,-24 + - node: + color: '#D4D4D493' + id: WarnCornerSmallSE + decals: + 15168: 18,-26 - node: color: '#D4D4D496' id: WarnCornerSmallSE decals: - 11841: 20,-28 11914: 29,-42 12609: 50,-18 + - node: + color: '#D4D4D493' + id: WarnCornerSmallSW + decals: + 15169: 22,-26 - node: color: '#D4D4D496' id: WarnCornerSmallSW @@ -7322,6 +7330,11 @@ entities: 5476: 10,21 5477: 10,19 5478: 11,19 + - node: + color: '#D4D4D493' + id: WarnLineE + decals: + 15159: 20,-33 - node: color: '#D4D4D496' id: WarnLineE @@ -7437,11 +7450,9 @@ entities: 11047: -5,11 11061: 23,3 11581: -4,-9 - 11900: 19,-30 11902: 19,-33 11903: 26,-30 11904: 29,-20 - 11905: 22,-33 11998: 43,19 12080: -18,23 12093: -14,26 @@ -7738,6 +7749,15 @@ entities: id: WarnLineGreyscaleW decals: 14421: -13,-23 + - node: + color: '#D4D4D493' + id: WarnLineN + decals: + 15163: 29,-47 + 15164: 33,-47 + 15165: 19,-26 + 15166: 20,-26 + 15167: 21,-26 - node: color: '#D4D4D496' id: WarnLineN @@ -7770,8 +7790,6 @@ entities: 10397: -25,-46 10398: -14,-42 10499: 41,-31 - 10505: 29,-45 - 10506: 33,-45 10513: 37,-21 10514: 41,-25 10531: 29,-15 @@ -7857,9 +7875,6 @@ entities: 11055: -11,39 11578: -7,-10 11579: -2,-8 - 11837: 21,-28 - 11838: 22,-28 - 11839: 23,-28 11889: 16,-22 11890: 16,-28 11895: 28,-18 @@ -7920,6 +7935,11 @@ entities: 14871: 13,-15 14905: 9,-16 14931: -16,-10 + - node: + color: '#D4D4D493' + id: WarnLineS + decals: + 15160: 20,-33 - node: color: '#D4D4D496' id: WarnLineS @@ -8038,10 +8058,7 @@ entities: 11060: 23,3 11580: -4,-9 11897: 29,-20 - 11898: 19,-30 11899: 19,-33 - 11901: 25,-30 - 11906: 22,-33 11999: 43,19 12081: -18,23 12090: -15,24 @@ -8115,6 +8132,12 @@ entities: 14925: -19,-9 14926: -13,-12 14928: -14,-5 + - node: + color: '#D4D4D493' + id: WarnLineW + decals: + 15161: 29,-47 + 15162: 33,-47 - node: color: '#D4D4D496' id: WarnLineW @@ -8148,13 +8171,8 @@ entities: 10396: -25,-46 10399: -14,-42 10500: 41,-31 - 10503: 29,-45 - 10504: 33,-45 10511: 37,-21 10512: 41,-25 - 10525: 30,-44 - 10526: 31,-44 - 10527: 32,-44 10528: 40,-16 10529: 34,-16 10530: 29,-15 @@ -8240,7 +8258,6 @@ entities: 11577: -7,-10 11834: 21,-30 11835: 22,-30 - 11836: 23,-30 11891: 16,-22 11892: 16,-28 11893: 28,-18 @@ -8655,7 +8672,6 @@ entities: 6559: -36,-22 11975: 22,-32 11976: 21,-30 - 11981: 23,-31 12001: 21,-25 12002: 25,-22 12004: 32,-39 @@ -8689,7 +8705,6 @@ entities: id: burnt1 decals: 11294: 30,-45 - 11295: 31,-44 11296: 32,-46 - node: cleanable: True @@ -8756,7 +8771,6 @@ entities: 3603: 45,14 5665: -4,5 6483: 4,21 - 11978: 23,-30 12003: 26,-29 12007: 32,-32 12857: 28,16 @@ -8798,7 +8812,6 @@ entities: 6315: -42,-37 6558: -34,-27 6692: -21,-8 - 11977: 23,-32 12349: -28,11 13209: -34,30 13216: -29,28 @@ -8810,7 +8823,6 @@ entities: decals: 11297: 30,-46 11298: 32,-45 - 11299: 30,-44 - node: cleanable: True angle: 2.251474735072685 rad @@ -9358,7 +9370,8 @@ entities: 10,-5: 0: 24831 11,-4: - 0: 7423 + 3: 3327 + 0: 4096 11,-3: 0: 4369 2: 17604 @@ -9366,13 +9379,14 @@ entities: 11,-2: 0: 61408 11,-5: - 0: 65229 + 3: 65228 + 0: 1 11,-1: 0: 60942 11,0: 0: 61006 12,-4: - 0: 8191 + 3: 8191 12,-3: 3: 15 2: 39408 @@ -9415,35 +9429,59 @@ entities: 3: 49152 2: 2184 4,-8: - 0: 59562 + 2: 8738 + 4: 8 + 3: 2176 3,-8: 0: 35727 4,-7: - 0: 65519 + 2: 14 + 0: 1568 + 5: 34816 3,-7: - 0: 29567 + 0: 15167 4,-6: - 0: 61423 + 0: 61287 + 6: 8 + 5: 128 3,-6: 0: 52294 4,-9: - 0: 32768 - 2: 2050 - 3: 1576 - 5,-7: - 0: 65535 - 5,-6: - 0: 65535 + 2: 11778 + 3: 40 5,-8: - 3: 3822 + 3: 819 + 2: 34952 + 5,-7: + 2: 15 + 7: 256 + 8: 4096 + 9: 512 + 5: 59392 + 10: 1024 + 5,-6: + 11: 1 + 5: 16946 + 0: 46468 + 7: 2120 + 5,-9: + 2: 36616 + 3: 131 6,-7: - 0: 65535 + 5: 1286 + 10: 8704 + 11: 4096 + 0: 51432 6,-6: - 0: 65535 + 0: 65485 + 5: 48 + 7: 2 6,-5: 2: 4080 6,-8: - 0: 59118 + 0: 42666 + 10: 4 + 5: 16448 6,-9: 0: 61166 7,-8: @@ -9472,19 +9510,20 @@ entities: 0: 4605 3: 49152 10,-7: - 0: 64529 - 3: 12 + 0: 12305 + 3: 52236 10,-6: 0: 65520 10,-9: 0: 16384 - 4: 1 + 12: 1 2: 2444 3: 1600 11,-7: - 0: 65518 + 3: 65518 11,-6: - 0: 56782 + 0: 4352 + 3: 52430 11,-8: 3: 3822 11,-9: @@ -9493,13 +9532,13 @@ entities: 12,-8: 3: 1911 12,-7: - 0: 16383 + 3: 16383 2: 49152 12,-6: - 0: 63453 + 3: 63453 2: 2082 12,-5: - 0: 15831 + 3: 15831 2: 49704 0,-8: 0: 7645 @@ -9535,54 +9574,48 @@ entities: 3: 28672 2: 35 13,-8: - 3: 2321 - 0: 28672 + 3: 30993 2: 224 13,-7: - 0: 32767 + 3: 32767 2: 32768 13,-6: - 0: 55215 + 3: 55215 2: 10320 13,-5: - 0: 32679 + 3: 32679 2: 32856 13,-9: 3: 4352 13,-4: - 0: 32767 + 3: 32767 14,-8: 2: 240 - 3: 3840 - 0: 16384 + 3: 20224 14,-7: - 0: 61439 + 3: 61439 2: 4096 14,-6: - 0: 65501 + 3: 65501 2: 34 14,-5: - 0: 60895 + 3: 60895 2: 4640 14,-4: - 0: 20479 + 3: 20479 15,-8: 2: 34864 15,-7: - 0: 4881 - 3: 17472 + 3: 22353 2: 34952 15,-6: - 0: 13073 - 3: 68 + 3: 13141 2: 34952 15,-5: - 0: 4371 - 3: 17472 + 3: 21843 2: 34952 15,-4: - 0: 275 - 3: 68 + 3: 343 2: 34952 13,-3: 2: 240 @@ -9855,7 +9888,7 @@ entities: 4,-10: 3: 793 2: 8226 - 5: 2048 + 13: 2048 4,-13: 3: 4369 2: 17508 @@ -9864,11 +9897,8 @@ entities: 3: 36096 5,-10: 3: 2051 - 5: 768 + 13: 768 2: 32904 - 5,-9: - 3: 3459 - 2: 520 5,-12: 2: 40960 6,-12: @@ -9879,25 +9909,24 @@ entities: 6,-10: 0: 61166 6,-13: - 2: 32768 + 2: 34944 7,-12: - 2: 4356 - 3: 52224 + 2: 4369 + 3: 3276 7,-11: - 2: 1 + 2: 15 0: 65280 - 3: 12 7,-10: 0: 65535 7,-13: - 2: 65100 + 2: 5372 8,-12: - 3: 4352 - 2: 52361 + 14: 1 + 3: 272 + 2: 52428 8,-11: - 3: 1 + 2: 143 0: 29440 - 2: 140 8,-10: 0: 30583 -4,-12: @@ -10091,7 +10120,7 @@ entities: -8,7: 0: 28397 8,-13: - 2: 62225 + 2: 51697 9,-12: 2: 36864 9,-11: @@ -10100,17 +10129,17 @@ entities: 9,-10: 2: 4113 3: 268 - 6: 3072 + 15: 3072 9,-9: 2: 1025 3: 2832 - 4: 12 + 12: 12 10,-11: 2: 295 3: 17920 10,-10: 3: 1025 - 6: 256 + 15: 256 2: 18508 10,-12: 2: 8192 @@ -10722,108 +10751,72 @@ entities: - volume: 2500 temperature: 293.15 moles: - - 21.824879 - - 82.10312 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 21.824879 + Nitrogen: 82.10312 - volume: 2500 temperature: 235 moles: - - 27.225372 - - 102.419266 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 27.225372 + Nitrogen: 102.419266 - volume: 2500 immutable: True + moles: {} + - volume: 2500 + temperature: 293.15 + moles: {} + - volume: 2500 + temperature: 166.07811 + moles: {} + - volume: 2500 + temperature: 293.14987 moles: - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 21.824879 + Nitrogen: 82.10312 + - volume: 2500 + temperature: 293.14996 + moles: + Oxygen: 21.824879 + Nitrogen: 82.10312 + - volume: 2500 + temperature: 293.14993 + moles: + Oxygen: 21.824879 + Nitrogen: 82.10312 + - volume: 2500 + temperature: 293.1497 + moles: + Oxygen: 21.824879 + Nitrogen: 82.10312 + - volume: 2500 + temperature: 293.14972 + moles: + Oxygen: 21.824879 + Nitrogen: 82.10312 + - volume: 2500 + temperature: 293.14975 + moles: + Oxygen: 21.824879 + Nitrogen: 82.10312 + - volume: 2500 + temperature: 293.1498 + moles: + Oxygen: 21.824879 + Nitrogen: 82.10312 - volume: 2500 temperature: 293.15 moles: - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Nitrogen: 6666.982 - volume: 2500 temperature: 293.15 moles: - - 0 - - 6666.982 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Plasma: 6666.982 + - volume: 2500 + temperature: 220.53748 + moles: {} - volume: 2500 temperature: 293.15 moles: - - 0 - - 0 - - 0 - - 6666.982 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - volume: 2500 - temperature: 293.15 - moles: - - 6666.982 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 6666.982 chunkSize: 4 - type: GasTileOverlay - type: RadiationGridResistance @@ -10893,6 +10886,24 @@ entities: container: 16950 - proto: ActionToggleLight entities: + - uid: 4689 + mapInit: true + paused: true + components: + - type: Transform + parent: 5084 + - type: Action + originalIconColor: '#FFFFFFFF' + container: 5084 + - uid: 4690 + mapInit: true + paused: true + components: + - type: Transform + parent: 10913 + - type: Action + originalIconColor: '#FFFFFFFF' + container: 10913 - uid: 18263 mapInit: true paused: true @@ -11176,8 +11187,11 @@ entities: name: air alarm (TEG Burn Chamber) - type: Transform rot: 3.141592653589793 rad - pos: 24.5,-28.5 + pos: 24.5,-26.5 parent: 2 + - type: AccessReader + accessListsOriginal: + - - Atmospherics - type: DeviceList devices: - 7952 @@ -11196,8 +11210,8 @@ entities: - 2891 - 1719 - 1029 - - 1028 - 9755 + - 16194 - type: Fixtures fixtures: {} - uid: 6106 @@ -11694,7 +11708,7 @@ entities: parent: 2 - type: DeviceList devices: - - 2624 + - 16607 - type: Fixtures fixtures: {} - uid: 12724 @@ -12469,7 +12483,6 @@ entities: parent: 2 - type: DeviceList devices: - - 1028 - 9755 - 9011 - 7484 @@ -12477,6 +12490,7 @@ entities: - 13834 - 13835 - 13850 + - 16194 - type: Fixtures fixtures: {} - uid: 14605 @@ -13100,11 +13114,10 @@ entities: parent: 2 - proto: AirlockAtmosphericsGlassLocked entities: - - uid: 1762 + - uid: 183 components: - - type: MetaData - name: glass airlock (TEG) - type: Transform + rot: 3.141592653589793 rad pos: 25.5,-29.5 parent: 2 - uid: 2307 @@ -13795,6 +13808,34 @@ entities: - type: Transform pos: 12.5,-38.5 parent: 2 + - uid: 2454 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 18.5,-25.5 + parent: 2 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 3139: + - - DoorStatus + - DoorBolt + - uid: 3139 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 17.5,-26.5 + parent: 2 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 2454: + - - DoorStatus + - DoorBolt + lastSignals: + DoorStatus: True - uid: 5592 components: - type: Transform @@ -13834,30 +13875,6 @@ entities: 7698: - - DoorStatus - DoorBolt - - uid: 9751 - components: - - type: Transform - pos: 19.5,-29.5 - parent: 2 - - type: DeviceLinkSink - invokeCounter: 1 - - type: DeviceLinkSource - linkedPorts: - 12652: - - - DoorStatus - - DoorBolt - - uid: 12652 - components: - - type: Transform - pos: 19.5,-32.5 - parent: 2 - - type: DeviceLinkSink - invokeCounter: 1 - - type: DeviceLinkSource - linkedPorts: - 9751: - - - DoorStatus - - DoorBolt - proto: AirlockExternalGlassLocked entities: - uid: 6194 @@ -14522,11 +14539,6 @@ entities: parent: 2 - proto: AirlockMaintEngiLocked entities: - - uid: 1159 - components: - - type: Transform - pos: 16.5,-27.5 - parent: 2 - uid: 6385 components: - type: MetaData @@ -15518,15 +15530,6 @@ entities: - type: Transform pos: 42.5,-2.5 parent: 2 - - uid: 2624 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 31.5,-43.5 - parent: 2 - - type: DeviceNetwork - deviceLists: - - 12674 - uid: 2891 components: - type: Transform @@ -15583,8 +15586,12 @@ entities: - uid: 7952 components: - type: Transform - pos: 22.5,-31.5 + rot: -1.5707963267948966 rad + pos: 20.5,-29.5 parent: 2 + - type: AccessReader + accessListsOriginal: + - - Atmospherics - type: DeviceNetwork deviceLists: - 5566 @@ -16362,6 +16369,14 @@ entities: - type: DeviceNetwork deviceLists: - 11209 + - uid: 16607 + components: + - type: Transform + pos: 31.5,-45.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 12674 - uid: 17017 components: - type: Transform @@ -17816,6 +17831,31 @@ entities: - type: Transform pos: 55.5,3.5 parent: 2 + - uid: 1506 + components: + - type: Transform + pos: 20.5,-31.5 + parent: 2 + - uid: 1548 + components: + - type: Transform + pos: 19.5,-29.5 + parent: 2 + - uid: 1600 + components: + - type: Transform + pos: 20.5,-29.5 + parent: 2 + - uid: 1611 + components: + - type: Transform + pos: 19.5,-30.5 + parent: 2 + - uid: 1613 + components: + - type: Transform + pos: 20.5,-30.5 + parent: 2 - uid: 1615 components: - type: Transform @@ -17826,6 +17866,11 @@ entities: - type: Transform pos: 51.5,3.5 parent: 2 + - uid: 1641 + components: + - type: Transform + pos: 19.5,-31.5 + parent: 2 - uid: 1731 components: - type: Transform @@ -18131,6 +18176,11 @@ entities: - type: Transform pos: 53.5,2.5 parent: 2 + - uid: 10760 + components: + - type: Transform + pos: 31.5,-46.5 + parent: 2 - uid: 10862 components: - type: Transform @@ -18191,46 +18241,16 @@ entities: - type: Transform pos: 53.5,1.5 parent: 2 - - uid: 13986 - components: - - type: Transform - pos: 30.5,-43.5 - parent: 2 - - uid: 13987 - components: - - type: Transform - pos: 30.5,-44.5 - parent: 2 - uid: 13988 components: - type: Transform pos: 30.5,-45.5 parent: 2 - - uid: 13989 - components: - - type: Transform - pos: 31.5,-43.5 - parent: 2 - - uid: 13990 - components: - - type: Transform - pos: 31.5,-44.5 - parent: 2 - uid: 13991 components: - type: Transform pos: 31.5,-45.5 parent: 2 - - uid: 13992 - components: - - type: Transform - pos: 32.5,-43.5 - parent: 2 - - uid: 13993 - components: - - type: Transform - pos: 32.5,-44.5 - parent: 2 - uid: 13994 components: - type: Transform @@ -18256,36 +18276,6 @@ entities: - type: Transform pos: 21.5,-31.5 parent: 2 - - uid: 15906 - components: - - type: Transform - pos: 22.5,-29.5 - parent: 2 - - uid: 15988 - components: - - type: Transform - pos: 22.5,-30.5 - parent: 2 - - uid: 16086 - components: - - type: Transform - pos: 22.5,-31.5 - parent: 2 - - uid: 16120 - components: - - type: Transform - pos: 23.5,-29.5 - parent: 2 - - uid: 16193 - components: - - type: Transform - pos: 23.5,-30.5 - parent: 2 - - uid: 16194 - components: - - type: Transform - pos: 23.5,-31.5 - parent: 2 - uid: 16752 components: - type: Transform @@ -18501,36 +18491,11 @@ entities: - type: Transform pos: 10.5,-57.5 parent: 2 - - uid: 17654 - components: - - type: Transform - pos: 17.5,-33.5 - parent: 2 - uid: 17655 components: - type: Transform pos: 17.5,-34.5 parent: 2 - - uid: 17656 - components: - - type: Transform - pos: 18.5,-33.5 - parent: 2 - - uid: 17657 - components: - - type: Transform - pos: 20.5,-33.5 - parent: 2 - - uid: 17658 - components: - - type: Transform - pos: 22.5,-33.5 - parent: 2 - - uid: 17659 - components: - - type: Transform - pos: 23.5,-33.5 - parent: 2 - uid: 17660 components: - type: Transform @@ -21516,6 +21481,31 @@ entities: - type: Transform pos: 51.5,-18.5 parent: 2 + - uid: 18683 + components: + - type: Transform + pos: 30.5,-46.5 + parent: 2 + - uid: 18684 + components: + - type: Transform + pos: 32.5,-46.5 + parent: 2 + - uid: 18685 + components: + - type: Transform + pos: 32.5,-47.5 + parent: 2 + - uid: 18686 + components: + - type: Transform + pos: 31.5,-47.5 + parent: 2 + - uid: 18687 + components: + - type: Transform + pos: 30.5,-47.5 + parent: 2 - proto: AtmosFixFreezerMarker entities: - uid: 787 @@ -22386,15 +22376,20 @@ entities: - CivilianServices - proto: BlastDoor entities: - - uid: 2360 + - uid: 1159 components: - type: Transform - pos: 33.5,-44.5 + pos: 29.5,-46.5 parent: 2 - - uid: 2600 + - uid: 1501 components: - type: Transform - pos: 29.5,-44.5 + pos: 20.5,-32.5 + parent: 2 + - uid: 1729 + components: + - type: Transform + pos: 33.5,-46.5 parent: 2 - uid: 3058 components: @@ -22411,11 +22406,6 @@ entities: - type: Transform pos: -35.5,-53.5 parent: 2 - - uid: 12655 - components: - - type: Transform - pos: 22.5,-32.5 - parent: 2 - uid: 14013 components: - type: Transform @@ -22695,12 +22685,12 @@ entities: - uid: 155 components: - type: Transform - pos: 17.69725,-30.234056 + pos: 15.557259,-25.289797 parent: 2 - uid: 10439 components: - type: Transform - pos: 17.369125,-31.702805 + pos: 15.430426,-25.380375 parent: 2 - proto: BoxEnvelope entities: @@ -22955,17 +22945,16 @@ entities: rot: 1.5707963267948966 rad pos: 4.5,-4.5 parent: 2 + - uid: 1137 + components: + - type: Transform + pos: 19.5,-32.5 + parent: 2 - uid: 1875 components: - type: Transform pos: -32.5,-53.5 parent: 2 - - uid: 2578 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 20.5,-28.5 - parent: 2 - uid: 2583 components: - type: Transform @@ -22977,11 +22966,6 @@ entities: rot: 3.141592653589793 rad pos: 33.5,-42.5 parent: 2 - - uid: 2912 - components: - - type: Transform - pos: 21.5,-32.5 - parent: 2 - uid: 3092 components: - type: Transform @@ -23045,6 +23029,12 @@ entities: rot: -1.5707963267948966 rad pos: 52.5,9.5 parent: 2 + - uid: 9630 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 22.5,-26.5 + parent: 2 - uid: 11098 components: - type: Transform @@ -24023,6 +24013,11 @@ entities: - type: Transform pos: 9.5,-25.5 parent: 2 + - uid: 1497 + components: + - type: Transform + pos: 33.5,-44.5 + parent: 2 - uid: 1529 components: - type: Transform @@ -24078,6 +24073,11 @@ entities: - type: Transform pos: 40.5,-5.5 parent: 2 + - uid: 1706 + components: + - type: Transform + pos: 19.5,-32.5 + parent: 2 - uid: 1714 components: - type: Transform @@ -24093,11 +24093,6 @@ entities: - type: Transform pos: 20.5,-33.5 parent: 2 - - uid: 1729 - components: - - type: Transform - pos: 22.5,-32.5 - parent: 2 - uid: 1738 components: - type: Transform @@ -26068,11 +26063,6 @@ entities: - type: Transform pos: 8.5,-24.5 parent: 2 - - uid: 5728 - components: - - type: Transform - pos: 14.5,-24.5 - parent: 2 - uid: 5729 components: - type: Transform @@ -28253,6 +28243,11 @@ entities: - type: Transform pos: 44.5,-24.5 parent: 2 + - uid: 8892 + components: + - type: Transform + pos: 13.5,-23.5 + parent: 2 - uid: 8893 components: - type: Transform @@ -28313,11 +28308,6 @@ entities: - type: Transform pos: 29.5,-38.5 parent: 2 - - uid: 8936 - components: - - type: Transform - pos: 31.5,-44.5 - parent: 2 - uid: 8937 components: - type: Transform @@ -29348,11 +29338,6 @@ entities: - type: Transform pos: 29.5,24.5 parent: 2 - - uid: 9752 - components: - - type: Transform - pos: 19.5,-32.5 - parent: 2 - uid: 9798 components: - type: Transform @@ -31133,11 +31118,6 @@ entities: - type: Transform pos: -8.5,-41.5 parent: 2 - - uid: 10760 - components: - - type: Transform - pos: 22.5,-30.5 - parent: 2 - uid: 10778 components: - type: Transform @@ -31573,11 +31553,6 @@ entities: - type: Transform pos: -21.5,13.5 parent: 2 - - uid: 12552 - components: - - type: Transform - pos: 22.5,-31.5 - parent: 2 - uid: 12570 components: - type: Transform @@ -32188,6 +32163,11 @@ entities: - type: Transform pos: -5.5,46.5 parent: 2 + - uid: 13992 + components: + - type: Transform + pos: 31.5,-44.5 + parent: 2 - uid: 14014 components: - type: Transform @@ -34348,6 +34328,11 @@ entities: - type: Transform pos: 44.5,-24.5 parent: 2 + - uid: 1028 + components: + - type: Transform + pos: 27.5,-22.5 + parent: 2 - uid: 1060 components: - type: Transform @@ -34383,11 +34368,6 @@ entities: - type: Transform pos: 33.5,-1.5 parent: 2 - - uid: 1110 - components: - - type: Transform - pos: 25.5,-23.5 - parent: 2 - uid: 1117 components: - type: Transform @@ -34783,11 +34763,6 @@ entities: - type: Transform pos: 9.5,-25.5 parent: 2 - - uid: 1733 - components: - - type: Transform - pos: 14.5,-24.5 - parent: 2 - uid: 1734 components: - type: Transform @@ -34828,6 +34803,11 @@ entities: - type: Transform pos: 12.5,-37.5 parent: 2 + - uid: 1858 + components: + - type: Transform + pos: 13.5,-23.5 + parent: 2 - uid: 1887 components: - type: Transform @@ -34968,6 +34948,16 @@ entities: - type: Transform pos: 32.5,-10.5 parent: 2 + - uid: 2317 + components: + - type: Transform + pos: 28.5,-22.5 + parent: 2 + - uid: 2343 + components: + - type: Transform + pos: 25.5,-22.5 + parent: 2 - uid: 2407 components: - type: Transform @@ -34983,6 +34973,11 @@ entities: - type: Transform pos: 32.5,-22.5 parent: 2 + - uid: 2437 + components: + - type: Transform + pos: 26.5,-22.5 + parent: 2 - uid: 2446 components: - type: Transform @@ -35096,12 +35091,7 @@ entities: - uid: 2638 components: - type: Transform - pos: 29.5,-23.5 - parent: 2 - - uid: 2642 - components: - - type: Transform - pos: 28.5,-23.5 + pos: 24.5,-22.5 parent: 2 - uid: 2648 components: @@ -35408,11 +35398,6 @@ entities: - type: Transform pos: 32.5,58.5 parent: 2 - - uid: 3459 - components: - - type: Transform - pos: 27.5,-23.5 - parent: 2 - uid: 3464 components: - type: Transform @@ -35518,11 +35503,6 @@ entities: - type: Transform pos: 13.5,-26.5 parent: 2 - - uid: 4689 - components: - - type: Transform - pos: 26.5,-23.5 - parent: 2 - uid: 4749 components: - type: Transform @@ -36868,11 +36848,6 @@ entities: - type: Transform pos: 34.5,36.5 parent: 2 - - uid: 7812 - components: - - type: Transform - pos: 23.5,-24.5 - parent: 2 - uid: 7863 components: - type: Transform @@ -36928,11 +36903,6 @@ entities: - type: Transform pos: 35.5,-9.5 parent: 2 - - uid: 7902 - components: - - type: Transform - pos: 24.5,-23.5 - parent: 2 - uid: 8047 components: - type: Transform @@ -38148,6 +38118,11 @@ entities: - type: Transform pos: -22.5,28.5 parent: 2 + - uid: 18660 + components: + - type: Transform + pos: 23.5,-21.5 + parent: 2 - proto: CableHVStack entities: - uid: 7465 @@ -38180,7 +38155,7 @@ entities: - uid: 167 components: - type: Transform - pos: 25.877134,-23.859426 + pos: 25.939465,-23.18824 parent: 2 - uid: 1459 components: @@ -45798,10 +45773,10 @@ entities: - type: Transform pos: 40.5,-29.5 parent: 2 - - uid: 2549 + - uid: 8509 components: - type: Transform - pos: 16.5,-25.5 + pos: 16.5,-23.5 parent: 2 - uid: 14407 components: @@ -46591,12 +46566,6 @@ entities: rot: 1.5707963267948966 rad pos: 23.5,-39.5 parent: 2 - - uid: 2343 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 24.5,-23.5 - parent: 2 - uid: 2369 components: - type: Transform @@ -46605,14 +46574,7 @@ entities: - uid: 2380 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 23.5,-24.5 - parent: 2 - - uid: 2437 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 22.5,-23.5 + pos: 22.5,-22.5 parent: 2 - uid: 2439 components: @@ -46737,16 +46699,6 @@ entities: - type: Transform pos: 16.5,-50.5 parent: 2 - - uid: 2907 - components: - - type: Transform - pos: 19.5,-31.5 - parent: 2 - - uid: 2908 - components: - - type: Transform - pos: 19.5,-30.5 - parent: 2 - uid: 2915 components: - type: Transform @@ -46807,6 +46759,11 @@ entities: - type: Transform pos: -22.5,1.5 parent: 2 + - uid: 3459 + components: + - type: Transform + pos: 23.5,-21.5 + parent: 2 - uid: 3481 components: - type: Transform @@ -47177,12 +47134,6 @@ entities: - type: Transform pos: 25.5,40.5 parent: 2 - - uid: 8104 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 27.5,-26.5 - parent: 2 - uid: 8112 components: - type: Transform @@ -47629,12 +47580,6 @@ entities: rot: 3.141592653589793 rad pos: 24.5,-13.5 parent: 2 - - uid: 9212 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 27.5,-25.5 - parent: 2 - uid: 9215 components: - type: Transform @@ -49136,11 +49081,6 @@ entities: - type: Transform pos: 18.5,-11.5 parent: 2 - - uid: 12551 - components: - - type: Transform - pos: 29.5,-24.5 - parent: 2 - uid: 12560 components: - type: Transform @@ -50520,6 +50460,11 @@ entities: - type: Transform pos: -16.5,2.5 parent: 2 + - uid: 18659 + components: + - type: Transform + pos: 24.5,-22.5 + parent: 2 - proto: CellRechargerCircuitboard entities: - uid: 8500 @@ -52686,6 +52631,11 @@ entities: - type: Transform pos: 7.5,-35.5 parent: 2 + - uid: 13993 + components: + - type: Transform + pos: 12.5,-27.5 + parent: 2 - uid: 14236 components: - type: Transform @@ -52717,18 +52667,8 @@ entities: immutable: False temperature: 293.147 moles: - - 1.7459903 - - 6.568249 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 1.7459903 + Nitrogen: 6.568249 - uid: 17131 components: - type: Transform @@ -52749,11 +52689,6 @@ entities: - type: Transform pos: -31.5,17.5 parent: 2 - - uid: 18330 - components: - - type: Transform - pos: 14.5,-26.5 - parent: 2 - proto: ClosetRadiationSuitFilled entities: - uid: 2119 @@ -53099,8 +53034,22 @@ entities: - uid: 5084 components: - type: Transform - pos: 24.286795,-23.132805 + pos: 24.202892,-22.207497 parent: 2 + - type: HandheldLight + toggleActionEntity: 4689 + - type: ContainerContainer + containers: + cell_slot: !type:ContainerSlot + showEnts: False + occludes: True + ent: null + actions: !type:Container + showEnts: False + occludes: True + ents: + - 4689 + - type: ActionsContainer - uid: 18262 components: - type: Transform @@ -54543,18 +54492,8 @@ entities: immutable: False temperature: 293.14673 moles: - - 1.7459903 - - 6.568249 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 1.7459903 + Nitrogen: 6.568249 - proto: CrateEmptySpawner entities: - uid: 13465 @@ -54599,18 +54538,8 @@ entities: immutable: False temperature: 293.14673 moles: - - 1.7459903 - - 6.568249 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 1.7459903 + Nitrogen: 6.568249 - type: ContainerContainer containers: entity_storage: !type:Container @@ -54647,18 +54576,8 @@ entities: immutable: False temperature: 293.14673 moles: - - 1.8968438 - - 7.1357465 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 1.8968438 + Nitrogen: 7.1357465 - type: ContainerContainer containers: entity_storage: !type:Container @@ -54811,18 +54730,8 @@ entities: immutable: False temperature: 234.99791 moles: - - 2.1780298 - - 8.193542 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 2.1780298 + Nitrogen: 8.193542 - type: ContainerContainer containers: entity_storage: !type:Container @@ -54948,18 +54857,8 @@ entities: immutable: False temperature: 293.14673 moles: - - 1.7459903 - - 6.568249 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 1.7459903 + Nitrogen: 6.568249 - proto: CrateServiceCustomSmokable entities: - uid: 17117 @@ -63953,16 +63852,6 @@ entities: - 11357 - 13789 - 14119 - - uid: 1028 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 25.5,-29.5 - parent: 2 - - type: DeviceNetwork - deviceLists: - - 5980 - - 14552 - uid: 1029 components: - type: Transform @@ -64878,6 +64767,16 @@ entities: - 15232 - 14859 - 15069 + - uid: 16194 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 25.5,-29.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 14552 + - 5980 - uid: 16465 components: - type: Transform @@ -64999,8 +64898,22 @@ entities: - uid: 10913 components: - type: Transform - pos: 24.50801,-23.654537 + pos: 24.583393,-22.732859 parent: 2 + - type: HandheldLight + toggleActionEntity: 4690 + - type: ContainerContainer + containers: + cell_slot: !type:ContainerSlot + showEnts: False + occludes: True + ent: null + actions: !type:Container + showEnts: False + occludes: True + ents: + - 4690 + - type: ActionsContainer - proto: FlippoLighter entities: - uid: 8615 @@ -65375,14 +65288,14 @@ entities: pos: 34.5,-39.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#CFB05BFF' - uid: 2429 components: - type: Transform pos: 25.5,-39.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#CFB05BFF' - uid: 5981 components: - type: Transform @@ -65437,14 +65350,6 @@ entities: parent: 2 - proto: GasMixer entities: - - uid: 183 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 18.5,-27.5 - parent: 2 - - type: AtmosPipeColor - color: '#CFB05BFF' - uid: 871 components: - type: Transform @@ -65461,16 +65366,18 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0055CCFF' -- proto: GasOutletInjector - entities: - - uid: 1132 + - uid: 18662 components: - type: Transform - rot: 3.141592653589793 rad - pos: 22.5,-30.5 + rot: 1.5707963267948966 rad + pos: 19.5,-22.5 parent: 2 + - type: AtmosPipeLayers + pipeLayer: Secondary - type: AtmosPipeColor color: '#CFB05BFF' +- proto: GasOutletInjector + entities: - uid: 2232 components: - type: Transform @@ -65501,28 +65408,38 @@ entities: rot: -1.5707963267948966 rad pos: 38.5,-39.5 parent: 2 - - uid: 2622 + - uid: 2613 components: - type: Transform rot: 3.141592653589793 rad - pos: 30.5,-43.5 + pos: 20.5,-30.5 parent: 2 + - type: AtmosPipeLayers + pipeLayer: Secondary + - type: AtmosPipeColor + color: '#CFB05BFF' - uid: 5602 components: - type: Transform rot: 1.5707963267948966 rad pos: 21.5,-37.5 parent: 2 -- proto: GasPassiveVent - entities: - - uid: 1137 + - uid: 9213 components: - type: Transform rot: 3.141592653589793 rad - pos: 19.5,-33.5 + pos: 30.5,-45.5 parent: 2 - - type: AtmosPipeColor - color: '#98BF67FF' +- proto: GasPassiveVent + entities: + - uid: 2360 + components: + - type: Transform + rot: -3.141592653589793 rad + pos: 19.5,-31.5 + parent: 2 + - type: AtmosPipeLayers + pipeLayer: Tertiary - uid: 2415 components: - type: Transform @@ -65549,12 +65466,6 @@ entities: rot: 3.141592653589793 rad pos: 40.5,-39.5 parent: 2 - - uid: 3448 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 32.5,-43.5 - parent: 2 - uid: 7769 components: - type: Transform @@ -65585,6 +65496,12 @@ entities: rot: 1.5707963267948966 rad pos: -27.5,13.5 parent: 2 + - uid: 13989 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 32.5,-45.5 + parent: 2 - uid: 15451 components: - type: Transform @@ -65593,6 +65510,33 @@ entities: parent: 2 - type: AtmosPipeColor color: '#990000FF' + - uid: 18669 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 18.5,-27.5 + parent: 2 + - type: AtmosPipeColor + color: '#98BF67FF' + - uid: 18688 + components: + - type: Transform + rot: -3.141592653589793 rad + pos: 17.5,-32.5 + parent: 2 + - type: AtmosPipeLayers + pipeLayer: Tertiary + - uid: 18692 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 32.5,-46.5 + parent: 2 + - uid: 18693 + components: + - type: Transform + pos: 34.5,-44.5 + parent: 2 - proto: GasPipeBend entities: - uid: 145 @@ -65712,22 +65656,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#5B9ECFFF' - - uid: 1157 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 25.5,-26.5 - parent: 2 - - type: AtmosPipeColor - color: '#CF5B6EFF' - - uid: 1182 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 23.5,-26.5 - parent: 2 - - type: AtmosPipeColor - color: '#CF5B6EFF' - uid: 1449 components: - type: Transform @@ -65743,14 +65671,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#5B9ECFFF' - - uid: 1548 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 25.5,-31.5 - parent: 2 - - type: AtmosPipeColor - color: '#CFB05BFF' - uid: 1563 components: - type: Transform @@ -65766,6 +65686,14 @@ entities: parent: 2 - type: AtmosPipeColor color: '#990000FF' + - uid: 1883 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 21.5,-24.5 + parent: 2 + - type: AtmosPipeColor + color: '#CF5B6EFF' - uid: 1933 components: - type: Transform @@ -65774,6 +65702,14 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 2318 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 17.5,-25.5 + parent: 2 + - type: AtmosPipeColor + color: '#98BF67FF' - uid: 2375 components: - type: Transform @@ -65781,7 +65717,7 @@ entities: pos: 25.5,-40.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#CFB05BFF' - uid: 2425 components: - type: Transform @@ -65797,12 +65733,14 @@ entities: - type: Transform pos: 40.5,-38.5 parent: 2 - - uid: 2448 + - uid: 2459 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 17.5,-27.5 + rot: -3.141592653589793 rad + pos: 25.5,-31.5 parent: 2 + - type: AtmosPipeColor + color: '#CFB05BFF' - uid: 2491 components: - type: Transform @@ -65810,7 +65748,31 @@ entities: pos: 34.5,-40.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#CFB05BFF' + - uid: 2600 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 19.5,-31.5 + parent: 2 + - type: AtmosPipeColor + color: '#CF5B6EFF' + - uid: 2616 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 21.5,-31.5 + parent: 2 + - type: AtmosPipeColor + color: '#CF5B6EFF' + - uid: 2617 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 19.5,-23.5 + parent: 2 + - type: AtmosPipeColor + color: '#CF5B6EFF' - uid: 3132 components: - type: Transform @@ -65826,14 +65788,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 3509 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 19.5,-25.5 - parent: 2 - - type: AtmosPipeColor - color: '#98BF67FF' - uid: 4260 components: - type: Transform @@ -65887,28 +65841,13 @@ entities: - type: Transform anchored: False rot: -1.5707963267948966 rad - pos: 27.349804,-22.364613 + pos: 27.575356,-21.553947 parent: 2 - type: Physics canCollide: True bodyType: Dynamic - type: AtmosPipeColor color: '#5B9ECFFF' - - uid: 4688 - components: - - type: Transform - pos: 25.5,-27.5 - parent: 2 - - type: AtmosPipeColor - color: '#CFB05BFF' - - uid: 4707 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 21.5,-31.5 - parent: 2 - - type: AtmosPipeColor - color: '#CF5B6EFF' - uid: 4734 components: - type: Transform @@ -67749,11 +67688,11 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 16619 + - uid: 16611 components: - type: Transform rot: -1.5707963267948966 rad - pos: 23.5,-31.5 + pos: 25.5,-24.5 parent: 2 - type: AtmosPipeColor color: '#CF5B6EFF' @@ -67848,6 +67787,59 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 18666 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 17.5,-27.5 + parent: 2 + - type: AtmosPipeColor + color: '#98BF67FF' + - uid: 18690 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 17.5,-30.5 + parent: 2 + - type: AtmosPipeLayers + pipeLayer: Tertiary + - uid: 18695 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 34.5,-46.5 + parent: 2 +- proto: GasPipeBendAlt1 + entities: + - uid: 7812 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 19.5,-23.5 + parent: 2 + - type: AtmosPipeColor + color: '#CFB05BFF' + - uid: 12552 + components: + - type: Transform + pos: 20.5,-22.5 + parent: 2 + - type: AtmosPipeColor + color: '#CFB05BFF' + - uid: 12808 + components: + - type: Transform + pos: 25.5,-25.5 + parent: 2 + - type: AtmosPipeColor + color: '#CFB05BFF' +- proto: GasPipeBendAlt2 + entities: + - uid: 18691 + components: + - type: Transform + pos: 19.5,-30.5 + parent: 2 - proto: GasPipeBroken entities: - uid: 2699 @@ -68037,6 +68029,15 @@ entities: rot: 1.5707963267948966 rad pos: 34.5,-37.5 parent: 2 +- proto: GasPipeManifold + entities: + - uid: 1907 + components: + - type: Transform + pos: 25.5,-27.5 + parent: 2 + - type: AtmosPipeColor + color: '#CFB05BFF' - proto: GasPipeSensorDistribution entities: - uid: 392 @@ -68051,16 +68052,18 @@ entities: - uid: 1461 components: - type: Transform - pos: 21.5,-21.5 + rot: -1.5707963267948966 rad + pos: 22.5,-20.5 parent: 2 - type: AtmosPipeColor color: '#5B9ECFFF' - proto: GasPipeSensorTEGHot entities: - - uid: 1507 + - uid: 2970 components: - type: Transform - pos: 21.5,-26.5 + rot: -1.5707963267948966 rad + pos: 22.5,-23.5 parent: 2 - type: AtmosPipeColor color: '#CF5B6EFF' @@ -68872,6 +68875,12 @@ entities: rot: -1.5707963267948966 rad pos: 33.5,-36.5 parent: 2 + - uid: 1157 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 30.5,-44.5 + parent: 2 - uid: 1211 components: - type: Transform @@ -68886,14 +68895,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 1382 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 26.5,-31.5 - parent: 2 - - type: AtmosPipeColor - color: '#CFB05BFF' - uid: 1438 components: - type: Transform @@ -68908,13 +68909,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#CF5B6EFF' - - uid: 1474 - components: - - type: Transform - pos: 23.5,-28.5 - parent: 2 - - type: AtmosPipeColor - color: '#CF5B6EFF' - uid: 1476 components: - type: Transform @@ -68922,21 +68916,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#CF5B6EFF' - - uid: 1494 - components: - - type: Transform - pos: 23.5,-29.5 - parent: 2 - - type: AtmosPipeColor - color: '#CF5B6EFF' - - uid: 1497 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 22.5,-28.5 - parent: 2 - - type: AtmosPipeColor - color: '#CFB05BFF' - uid: 1500 components: - type: Transform @@ -68944,21 +68923,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#CF5B6EFF' - - uid: 1505 - components: - - type: Transform - pos: 23.5,-27.5 - parent: 2 - - type: AtmosPipeColor - color: '#CF5B6EFF' - - uid: 1506 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 25.5,-28.5 - parent: 2 - - type: AtmosPipeColor - color: '#CFB05BFF' - uid: 1508 components: - type: Transform @@ -68966,14 +68930,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#CFB05BFF' - - uid: 1509 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 25.5,-29.5 - parent: 2 - - type: AtmosPipeColor - color: '#CFB05BFF' - uid: 1557 components: - type: Transform @@ -68981,70 +68937,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#CFB05BFF' - - uid: 1600 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 22.5,-29.5 - parent: 2 - - type: AtmosPipeColor - color: '#CFB05BFF' - - uid: 1611 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 25.5,-30.5 - parent: 2 - - type: AtmosPipeColor - color: '#CFB05BFF' - - uid: 1641 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 23.5,-27.5 - parent: 2 - - type: AtmosPipeColor - color: '#CFB05BFF' - - uid: 1657 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 19.5,-32.5 - parent: 2 - - type: AtmosPipeColor - color: '#98BF67FF' - - uid: 1703 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 19.5,-29.5 - parent: 2 - - type: AtmosPipeColor - color: '#98BF67FF' - - uid: 1704 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 19.5,-31.5 - parent: 2 - - type: AtmosPipeColor - color: '#98BF67FF' - - uid: 1706 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 19.5,-30.5 - parent: 2 - - type: AtmosPipeColor - color: '#98BF67FF' - - uid: 1708 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 19.5,-27.5 - parent: 2 - - type: AtmosPipeColor - color: '#98BF67FF' - uid: 1723 components: - type: Transform @@ -69136,6 +69028,13 @@ entities: rot: 1.5707963267948966 rad pos: 20.5,-38.5 parent: 2 + - uid: 2291 + components: + - type: Transform + pos: 25.5,-28.5 + parent: 2 + - type: AtmosPipeColor + color: '#CFB05BFF' - uid: 2324 components: - type: Transform @@ -69143,6 +69042,26 @@ entities: parent: 2 - type: AtmosPipeColor color: '#990000FF' + - uid: 2326 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 32.5,-44.5 + parent: 2 + - uid: 2364 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 30.5,-43.5 + parent: 2 + - uid: 2365 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 20.5,-23.5 + parent: 2 + - type: AtmosPipeColor + color: '#CF5B6EFF' - uid: 2386 components: - type: Transform @@ -69276,7 +69195,7 @@ entities: pos: 27.5,-40.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#CFB05BFF' - uid: 2419 components: - type: Transform @@ -69320,7 +69239,7 @@ entities: pos: 28.5,-40.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#CFB05BFF' - uid: 2434 components: - type: Transform @@ -69342,7 +69261,7 @@ entities: pos: 26.5,-40.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#CFB05BFF' - uid: 2442 components: - type: Transform @@ -69387,7 +69306,7 @@ entities: pos: 29.5,-40.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#CFB05BFF' - uid: 2475 components: - type: Transform @@ -69395,7 +69314,7 @@ entities: pos: 30.5,-40.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#CFB05BFF' - uid: 2476 components: - type: Transform @@ -69403,7 +69322,7 @@ entities: pos: 31.5,-40.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#CFB05BFF' - uid: 2477 components: - type: Transform @@ -69411,7 +69330,7 @@ entities: pos: 32.5,-40.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#CFB05BFF' - uid: 2478 components: - type: Transform @@ -69419,7 +69338,7 @@ entities: pos: 33.5,-40.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#CFB05BFF' - uid: 2479 components: - type: Transform @@ -69471,10 +69390,25 @@ entities: components: - type: Transform rot: -1.5707963267948966 rad - pos: 24.5,-22.5 + pos: 24.5,-21.5 parent: 2 - type: AtmosPipeColor color: '#5B9ECFFF' + - uid: 2580 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 21.5,-26.5 + parent: 2 + - type: AtmosPipeColor + color: '#CF5B6EFF' + - uid: 2599 + components: + - type: Transform + pos: 25.5,-30.5 + parent: 2 + - type: AtmosPipeColor + color: '#CFB05BFF' - uid: 2621 components: - type: Transform @@ -69485,11 +69419,11 @@ entities: - type: Transform pos: 30.5,-42.5 parent: 2 - - uid: 2632 + - uid: 2642 components: - type: Transform rot: -1.5707963267948966 rad - pos: 22.5,-24.5 + pos: 20.5,-25.5 parent: 2 - type: AtmosPipeColor color: '#CF5B6EFF' @@ -69516,6 +69450,13 @@ entities: parent: 2 - type: AtmosPipeColor color: '#990000FF' + - uid: 2908 + components: + - type: Transform + pos: 19.5,-29.5 + parent: 2 + - type: AtmosPipeColor + color: '#CF5B6EFF' - uid: 2935 components: - type: Transform @@ -69651,14 +69592,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 3518 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 22.5,-20.5 - parent: 2 - - type: AtmosPipeColor - color: '#5B9ECFFF' - uid: 3521 components: - type: Transform @@ -69698,6 +69631,14 @@ entities: parent: 2 - type: AtmosPipeColor color: '#990000FF' + - uid: 3670 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 19.5,-27.5 + parent: 2 + - type: AtmosPipeColor + color: '#CF5B6EFF' - uid: 3682 components: - type: Transform @@ -69713,6 +69654,14 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 4043 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 19.5,-26.5 + parent: 2 + - type: AtmosPipeColor + color: '#CF5B6EFF' - uid: 4245 components: - type: Transform @@ -69841,17 +69790,13 @@ entities: - type: Physics canCollide: True bodyType: Dynamic - - uid: 4690 + - uid: 4688 components: - type: Transform - anchored: False - pos: 27.552929,-21.458363 + pos: 19.5,-25.5 parent: 2 - - type: Physics - canCollide: True - bodyType: Dynamic - type: AtmosPipeColor - color: '#5B9ECFFF' + color: '#CF5B6EFF' - uid: 4735 components: - type: Transform @@ -70254,6 +70199,18 @@ entities: parent: 2 - type: AtmosPipeColor color: '#990000FF' + - uid: 5728 + components: + - type: Transform + anchored: False + rot: 1.5707963267948966 rad + pos: 23.477146,-24.778582 + parent: 2 + - type: Physics + canCollide: True + bodyType: Dynamic + - type: AtmosPipeColor + color: '#CF5B6EFF' - uid: 5732 components: - type: Transform @@ -70767,6 +70724,16 @@ entities: parent: 2 - type: AtmosPipeColor color: '#5B9ECFFF' + - uid: 7481 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 20.5,-29.5 + parent: 2 + - type: AtmosPipeLayers + pipeLayer: Secondary + - type: AtmosPipeColor + color: '#CFB05BFF' - uid: 7768 components: - type: Transform @@ -70804,6 +70771,14 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 7814 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 17.5,-26.5 + parent: 2 + - type: AtmosPipeColor + color: '#98BF67FF' - uid: 7927 components: - type: Transform @@ -78417,6 +78392,15 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 13833 + components: + - type: Transform + pos: 25.5,-26.5 + parent: 2 + - type: AtmosPipeLayers + pipeLayer: Secondary + - type: AtmosPipeColor + color: '#CFB05BFF' - uid: 13838 components: - type: Transform @@ -78472,6 +78456,13 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 13987 + components: + - type: Transform + pos: 19.5,-28.5 + parent: 2 + - type: AtmosPipeColor + color: '#CF5B6EFF' - uid: 14003 components: - type: Transform @@ -79262,6 +79253,13 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 15988 + components: + - type: Transform + pos: 25.5,-29.5 + parent: 2 + - type: AtmosPipeColor + color: '#CFB05BFF' - uid: 16218 components: - type: Transform @@ -79270,39 +79268,26 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 16607 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 19.5,-27.5 - parent: 2 - - type: AtmosPipeColor - color: '#CFB05BFF' - - uid: 16608 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 21.5,-27.5 - parent: 2 - - type: AtmosPipeColor - color: '#CFB05BFF' - uid: 16609 components: - type: Transform - anchored: False - pos: 19.624798,-26.375345 + rot: 1.5707963267948966 rad + pos: 22.5,-24.5 parent: 2 - - type: Physics - canCollide: True - bodyType: Dynamic - type: AtmosPipeColor - color: '#98BF67FF' + color: '#CF5B6EFF' + - uid: 16610 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 33.5,-46.5 + parent: 2 - uid: 16612 components: - type: Transform anchored: False - rot: 1.5707963267948966 rad - pos: 26.07494,-22.344095 + rot: -1.5707963267948966 rad + pos: 26.632946,-21.662188 parent: 2 - type: Physics canCollide: True @@ -79310,19 +79295,11 @@ entities: - type: AtmosPipeColor color: '#5B9ECFFF' - uid: 16613 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 25.5,-25.5 - parent: 2 - - type: AtmosPipeColor - color: '#CF5B6EFF' - - uid: 16614 components: - type: Transform anchored: False rot: 1.5707963267948966 rad - pos: 24.54369,-26.67222 + pos: 24.473694,-24.16264 parent: 2 - type: Physics canCollide: True @@ -79719,6 +79696,103 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 18663 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 18.5,-25.5 + parent: 2 + - type: AtmosPipeColor + color: '#98BF67FF' + - uid: 18667 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 19.5,-24.5 + parent: 2 + - type: AtmosPipeColor + color: '#CF5B6EFF' + - uid: 18682 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 32.5,-43.5 + parent: 2 +- proto: GasPipeStraightAlt1 + entities: + - uid: 2448 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 24.5,-25.5 + parent: 2 + - type: AtmosPipeColor + color: '#CFB05BFF' + - uid: 2549 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 20.5,-26.5 + parent: 2 + - type: AtmosPipeColor + color: '#CFB05BFF' + - uid: 2578 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 20.5,-28.5 + parent: 2 + - type: AtmosPipeColor + color: '#CFB05BFF' + - uid: 2632 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 21.5,-25.5 + parent: 2 + - type: AtmosPipeColor + color: '#CFB05BFF' + - uid: 4707 + components: + - type: Transform + pos: 20.5,-23.5 + parent: 2 + - type: AtmosPipeColor + color: '#CFB05BFF' + - uid: 7485 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 20.5,-27.5 + parent: 2 + - type: AtmosPipeColor + color: '#CFB05BFF' + - uid: 17654 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 23.5,-25.5 + parent: 2 + - type: AtmosPipeColor + color: '#CFB05BFF' + - uid: 17657 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 26.5,-31.5 + parent: 2 + - type: AtmosPipeLayers + pipeLayer: Primary + - type: AtmosPipeColor + color: '#CFB05BFF' +- proto: GasPipeStraightAlt2 + entities: + - uid: 10798 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 18.5,-30.5 + parent: 2 - proto: GasPipeTJunction entities: - uid: 428 @@ -79846,13 +79920,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 1613 - components: - - type: Transform - pos: 22.5,-27.5 - parent: 2 - - type: AtmosPipeColor - color: '#CFB05BFF' - uid: 1618 components: - type: Transform @@ -79887,8 +79954,8 @@ entities: - uid: 2182 components: - type: Transform - rot: 3.141592653589793 rad - pos: 21.5,-22.5 + rot: -3.141592653589793 rad + pos: 21.5,-21.5 parent: 2 - type: AtmosPipeColor color: '#5B9ECFFF' @@ -79907,6 +79974,14 @@ entities: parent: 2 - type: AtmosPipeColor color: '#5B9ECFFF' + - uid: 2455 + components: + - type: Transform + rot: -3.141592653589793 rad + pos: 21.5,-23.5 + parent: 2 + - type: AtmosPipeColor + color: '#CF5B6EFF' - uid: 2485 components: - type: Transform @@ -79921,13 +79996,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#990000FF' - - uid: 3139 - components: - - type: Transform - pos: 21.5,-24.5 - parent: 2 - - type: AtmosPipeColor - color: '#CF5B6EFF' - uid: 3490 components: - type: Transform @@ -79958,6 +80026,14 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 4063 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 21.5,-25.5 + parent: 2 + - type: AtmosPipeColor + color: '#CF5B6EFF' - uid: 4447 components: - type: Transform @@ -81498,18 +81574,10 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 16611 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 21.5,-25.5 - parent: 2 - - type: AtmosPipeColor - color: '#CF5B6EFF' - uid: 16616 components: - type: Transform - pos: 25.5,-22.5 + pos: 25.5,-21.5 parent: 2 - type: AtmosPipeColor color: '#5B9ECFFF' @@ -81517,7 +81585,7 @@ entities: components: - type: Transform rot: -1.5707963267948966 rad - pos: 25.5,-24.5 + pos: 25.5,-23.5 parent: 2 - type: AtmosPipeColor color: '#CF5B6EFF' @@ -81537,19 +81605,23 @@ entities: parent: 2 - type: AtmosPipeColor color: '#990000FF' -- proto: GasPort +- proto: GasPipeTJunctionAlt1 entities: - - uid: 1710 + - uid: 2366 components: - type: Transform - rot: 3.141592653589793 rad - pos: 18.5,-28.5 + rot: 1.5707963267948966 rad + pos: 20.5,-25.5 parent: 2 + - type: AtmosPipeColor + color: '#CFB05BFF' +- proto: GasPort + entities: - uid: 2451 components: - type: Transform rot: 1.5707963267948966 rad - pos: 20.5,-22.5 + pos: 20.5,-21.5 parent: 2 - type: AtmosPipeColor color: '#5B9ECFFF' @@ -81561,12 +81633,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#990000FF' - - uid: 2580 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 17.5,-28.5 - parent: 2 - uid: 2626 components: - type: Transform @@ -81584,11 +81650,30 @@ entities: - uid: 16618 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 20.5,-24.5 + pos: 21.5,-22.5 parent: 2 - type: AtmosPipeColor color: '#CF5B6EFF' + - uid: 18671 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 18.5,-23.5 + parent: 2 + - type: AtmosPipeLayers + pipeLayer: Secondary + - type: AtmosPipeColor + color: '#CFB05BFF' + - uid: 18672 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 18.5,-22.5 + parent: 2 + - type: AtmosPipeLayers + pipeLayer: Secondary + - type: AtmosPipeColor + color: '#CFB05BFF' - proto: GasPressurePump entities: - uid: 985 @@ -81624,22 +81709,6 @@ entities: rot: 1.5707963267948966 rad pos: 25.5,-36.5 parent: 2 - - uid: 2454 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 20.5,-27.5 - parent: 2 - - type: AtmosPipeColor - color: '#CFB05BFF' - - uid: 2455 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 24.5,-27.5 - parent: 2 - - type: AtmosPipeColor - color: '#CFB05BFF' - uid: 2501 components: - type: Transform @@ -81669,6 +81738,14 @@ entities: - type: Transform pos: 30.5,-41.5 parent: 2 + - uid: 3518 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 19.5,-25.5 + parent: 2 + - type: AtmosPipeColor + color: '#98BF67FF' - uid: 3780 components: - type: Transform @@ -81704,14 +81781,42 @@ entities: - type: Transform pos: -25.5,14.5 parent: 2 - - uid: 16610 +- proto: GasPressurePumpAlt1 + entities: + - uid: 3509 + components: + - type: Transform + pos: 20.5,-24.5 + parent: 2 + - type: AtmosPipeColor + color: '#CFB05BFF' + - uid: 17656 components: - type: Transform rot: -1.5707963267948966 rad - pos: 20.5,-25.5 + pos: 22.5,-25.5 parent: 2 - type: AtmosPipeColor - color: '#98BF67FF' + color: '#CFB05BFF' +- proto: GasPressureRegulator + entities: + - uid: 18689 + components: + - type: Transform + pos: 17.5,-31.5 + parent: 2 + - type: AtmosPipeLayers + pipeLayer: Tertiary + - type: GasPressureRegulator + threshold: 95000 + - uid: 18694 + components: + - type: Transform + rot: -3.141592653589793 rad + pos: 34.5,-45.5 + parent: 2 + - type: GasPressureRegulator + threshold: 95000 - proto: GasThermoMachineFreezer entities: - uid: 153 @@ -81758,16 +81863,6 @@ entities: parent: 2 - proto: GasValve entities: - - uid: 1501 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 19.5,-28.5 - parent: 2 - - type: GasValve - open: False - - type: AtmosPipeColor - color: '#98BF67FF' - uid: 2497 components: - type: Transform @@ -81779,7 +81874,7 @@ entities: - uid: 16615 components: - type: Transform - pos: 25.5,-23.5 + pos: 25.5,-22.5 parent: 2 - type: GasValve open: False @@ -84434,7 +84529,7 @@ entities: components: - type: Transform rot: 1.5707963267948966 rad - pos: 22.5,-22.5 + pos: 22.5,-21.5 parent: 2 - type: AtmosPipeColor color: '#5B9ECFFF' @@ -84442,7 +84537,7 @@ entities: components: - type: Transform rot: -1.5707963267948966 rad - pos: 24.5,-24.5 + pos: 24.5,-23.5 parent: 2 - type: AtmosPipeColor color: '#CF5B6EFF' @@ -84560,11 +84655,6 @@ entities: - type: Transform pos: -27.5,27.5 parent: 2 - - uid: 14235 - components: - - type: Transform - pos: 13.5,-23.5 - parent: 2 - uid: 15195 components: - type: Transform @@ -84629,12 +84719,12 @@ entities: - uid: 2327 components: - type: Transform - pos: 17.19725,-30.234056 + pos: 15.303592,-25.688347 parent: 2 - - uid: 5585 + - uid: 5265 components: - type: Transform - pos: 17.75975,-31.71843 + pos: 15.792807,-25.706463 parent: 2 - proto: Grille entities: @@ -84826,6 +84916,21 @@ entities: - type: Transform pos: 58.5,-28.5 parent: 2 + - uid: 1505 + components: + - type: Transform + pos: 27.5,-48.5 + parent: 2 + - uid: 1507 + components: + - type: Transform + pos: 35.5,-48.5 + parent: 2 + - uid: 1509 + components: + - type: Transform + pos: 35.5,-47.5 + parent: 2 - uid: 1517 components: - type: Transform @@ -84961,6 +85066,17 @@ entities: - type: Transform pos: -3.5,-27.5 parent: 2 + - uid: 1703 + components: + - type: Transform + pos: 29.5,-50.5 + parent: 2 + - uid: 1704 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 22.5,-30.5 + parent: 2 - uid: 1707 components: - type: Transform @@ -85244,6 +85360,11 @@ entities: rot: 1.5707963267948966 rad pos: 24.5,-39.5 parent: 2 + - uid: 2449 + components: + - type: Transform + pos: 20.5,-28.5 + parent: 2 - uid: 2457 components: - type: Transform @@ -85336,26 +85457,6 @@ entities: - type: Transform pos: 35.5,-46.5 parent: 2 - - uid: 2613 - components: - - type: Transform - pos: 29.5,-48.5 - parent: 2 - - uid: 2615 - components: - - type: Transform - pos: 31.5,-48.5 - parent: 2 - - uid: 2616 - components: - - type: Transform - pos: 32.5,-48.5 - parent: 2 - - uid: 2617 - components: - - type: Transform - pos: 33.5,-48.5 - parent: 2 - uid: 2635 components: - type: Transform @@ -85486,6 +85587,11 @@ entities: - type: Transform pos: 14.5,-36.5 parent: 2 + - uid: 3448 + components: + - type: Transform + pos: 19.5,-28.5 + parent: 2 - uid: 3480 components: - type: Transform @@ -85995,12 +86101,23 @@ entities: - type: Transform pos: -42.5,12.5 parent: 2 + - uid: 5548 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 30.5,-44.5 + parent: 2 - uid: 5568 components: - type: Transform rot: 3.141592653589793 rad pos: 23.5,-19.5 parent: 2 + - uid: 5585 + components: + - type: Transform + pos: 27.5,-47.5 + parent: 2 - uid: 5600 components: - type: Transform @@ -86021,6 +86138,12 @@ entities: - type: Transform pos: -7.5,-30.5 parent: 2 + - uid: 5945 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 21.5,-26.5 + parent: 2 - uid: 6004 components: - type: Transform @@ -86607,11 +86730,6 @@ entities: rot: -1.5707963267948966 rad pos: -9.5,34.5 parent: 2 - - uid: 7485 - components: - - type: Transform - pos: 20.5,-30.5 - parent: 2 - uid: 7486 components: - type: Transform @@ -87315,11 +87433,6 @@ entities: rot: -1.5707963267948966 rad pos: 52.5,-28.5 parent: 2 - - uid: 8892 - components: - - type: Transform - pos: 23.5,-28.5 - parent: 2 - uid: 8946 components: - type: Transform @@ -87364,6 +87477,12 @@ entities: rot: 3.141592653589793 rad pos: 26.5,-19.5 parent: 2 + - uid: 9212 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 19.5,-26.5 + parent: 2 - uid: 9232 components: - type: Transform @@ -87397,11 +87516,6 @@ entities: - type: Transform pos: -28.5,39.5 parent: 2 - - uid: 9754 - components: - - type: Transform - pos: 22.5,-28.5 - parent: 2 - uid: 10038 components: - type: Transform @@ -87623,6 +87737,11 @@ entities: rot: 1.5707963267948966 rad pos: -31.5,-4.5 parent: 2 + - uid: 13986 + components: + - type: Transform + pos: 31.5,-50.5 + parent: 2 - uid: 14002 components: - type: Transform @@ -87973,6 +88092,12 @@ entities: - type: Transform pos: -4.5,60.5 parent: 2 + - uid: 15906 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 20.5,-26.5 + parent: 2 - uid: 15959 components: - type: Transform @@ -87990,6 +88115,16 @@ entities: - type: Transform pos: 18.5,7.5 parent: 2 + - uid: 16086 + components: + - type: Transform + pos: 33.5,-50.5 + parent: 2 + - uid: 16120 + components: + - type: Transform + pos: 32.5,-50.5 + parent: 2 - uid: 16127 components: - type: Transform @@ -88096,6 +88231,12 @@ entities: - type: Transform pos: 52.5,-12.5 parent: 2 + - uid: 16621 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 31.5,-44.5 + parent: 2 - uid: 16636 components: - type: Transform @@ -88327,6 +88468,18 @@ entities: - type: Transform pos: 62.5,4.5 parent: 2 + - uid: 18664 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 18.5,-30.5 + parent: 2 + - uid: 18677 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 32.5,-44.5 + parent: 2 - proto: GrilleBroken entities: - uid: 8042 @@ -88346,6 +88499,11 @@ entities: - type: Transform pos: 8.5,-57.5 parent: 2 + - uid: 1657 + components: + - type: Transform + pos: 30.5,-50.5 + parent: 2 - uid: 1755 components: - type: Transform @@ -88641,11 +88799,6 @@ entities: - type: Transform pos: 22.5,-43.5 parent: 2 - - uid: 14184 - components: - - type: Transform - pos: 30.5,-48.5 - parent: 2 - uid: 14696 components: - type: Transform @@ -88825,6 +88978,21 @@ entities: parent: 2 - proto: HeatExchanger entities: + - uid: 2910 + components: + - type: Transform + pos: 19.5,-30.5 + parent: 2 + - type: AtmosPipeColor + color: '#CF5B6EFF' + - uid: 2967 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 20.5,-31.5 + parent: 2 + - type: AtmosPipeColor + color: '#CF5B6EFF' - uid: 5583 components: - type: Transform @@ -88857,22 +89025,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#5B9ECFFF' - - uid: 16620 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 23.5,-30.5 - parent: 2 - - type: AtmosPipeColor - color: '#CF5B6EFF' - - uid: 16621 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 22.5,-31.5 - parent: 2 - - type: AtmosPipeColor - color: '#CF5B6EFF' - uid: 16622 components: - type: Transform @@ -89063,8 +89215,10 @@ entities: - uid: 2464 components: - type: Transform - pos: 29.5,-24.5 + pos: 27.5,-24.5 parent: 2 + - type: Pullable + prevFixedRotation: True - proto: HolopadEngineeringBreakroom entities: - uid: 14767 @@ -89542,7 +89696,7 @@ entities: - uid: 4537 components: - type: Transform - pos: 27.425327,-26.450254 + pos: 27.359158,-26.352468 parent: 2 - proto: InflatableDoor entities: @@ -89551,36 +89705,50 @@ entities: - type: Transform pos: 23.5,29.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 3743 components: - type: Transform pos: 49.5,-0.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 11798 components: - type: Transform pos: 7.5,-38.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 13788 components: - type: Transform pos: 28.5,0.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 15383 components: - type: Transform pos: 53.5,-0.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 16109 components: - type: Transform pos: -22.5,49.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 16110 components: - type: Transform pos: -21.5,34.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - proto: InflatableWall entities: - uid: 1102 @@ -89588,76 +89756,106 @@ entities: - type: Transform pos: 24.5,29.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7317 components: - type: Transform pos: -6.5,54.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 10391 components: - type: Transform pos: -42.5,-17.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 10398 components: - type: Transform pos: 4.5,12.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 10399 components: - type: Transform pos: 16.5,21.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 10401 components: - type: Transform pos: -2.5,47.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 10410 components: - type: Transform pos: 21.5,29.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 10411 components: - type: Transform pos: 22.5,29.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 10422 components: - type: Transform pos: 46.5,19.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 10423 components: - type: Transform pos: 42.5,30.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 10424 components: - type: Transform pos: 44.5,30.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 16108 components: - type: Transform pos: -21.5,49.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 18128 components: - type: Transform pos: -2.5,35.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 18253 components: - type: Transform pos: 55.5,-1.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 18254 components: - type: Transform pos: 54.5,1.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - proto: InflatableWallStack5 entities: - uid: 10457 @@ -90326,11 +90524,11 @@ entities: - type: MetaData name: lockable button (Blast Door) - type: Transform - pos: 21.5,-32.5 + pos: 19.5,-32.5 parent: 2 - type: DeviceLinkSource linkedPorts: - 12655: + 1501: - - Pressed - Toggle - type: Fixtures @@ -90654,18 +90852,8 @@ entities: immutable: False temperature: 293.14673 moles: - - 1.8856695 - - 7.0937095 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 1.8856695 + Nitrogen: 7.0937095 - type: ContainerContainer containers: entity_storage: !type:Container @@ -90837,18 +91025,8 @@ entities: immutable: False temperature: 293.14673 moles: - - 1.8856695 - - 7.0937095 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 1.8856695 + Nitrogen: 7.0937095 - type: ContainerContainer containers: entity_storage: !type:Container @@ -90876,18 +91054,8 @@ entities: immutable: False temperature: 293.14673 moles: - - 1.7459903 - - 6.568249 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 1.7459903 + Nitrogen: 6.568249 - type: ContainerContainer containers: entity_storage: !type:Container @@ -91037,18 +91205,8 @@ entities: immutable: False temperature: 293.14673 moles: - - 1.8977377 - - 7.139109 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 1.8977377 + Nitrogen: 7.139109 - type: ContainerContainer containers: entity_storage: !type:Container @@ -91076,18 +91234,8 @@ entities: immutable: False temperature: 293.14673 moles: - - 1.8856695 - - 7.0937095 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 1.8856695 + Nitrogen: 7.0937095 - type: ContainerContainer containers: entity_storage: !type:Container @@ -91451,8 +91599,10 @@ entities: - uid: 1732 components: - type: Transform - pos: 17.5,-22.5 + pos: 29.5,-24.5 parent: 2 + - type: Pullable + prevFixedRotation: True - uid: 1787 components: - type: Transform @@ -92546,11 +92696,6 @@ entities: - type: Transform pos: 40.5,-37.5 parent: 2 - - uid: 2909 - components: - - type: Transform - pos: 16.5,-24.5 - parent: 2 - uid: 2973 components: - type: Transform @@ -92601,6 +92746,11 @@ entities: - type: Transform pos: 12.5,-24.5 parent: 2 + - uid: 18670 + components: + - type: Transform + pos: 17.5,-22.5 + parent: 2 - proto: PackPaperRollingFilters entities: - uid: 17120 @@ -93034,16 +93184,16 @@ entities: - type: Transform pos: 40.5,-26.5 parent: 2 + - uid: 1860 + components: + - type: Transform + pos: 17.5,-23.5 + parent: 2 - uid: 2726 components: - type: Transform pos: 40.5,-27.5 parent: 2 - - uid: 2910 - components: - - type: Transform - pos: 16.5,-23.5 - parent: 2 - uid: 8249 components: - type: Transform @@ -93130,7 +93280,7 @@ entities: - uid: 14413 components: - type: Transform - pos: 31.53195,-44.930218 + pos: 31.458847,-46.12517 parent: 2 - proto: PlushieDiona entities: @@ -93381,10 +93531,10 @@ entities: fixtures: {} - proto: PosterLegitFoamForceAd entities: - - uid: 2970 + - uid: 12740 components: - type: Transform - pos: 18.5,-29.5 + pos: 16.5,-25.5 parent: 2 - type: Fixtures fixtures: {} @@ -93793,8 +93943,8 @@ entities: - uid: 5671 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 19.5,-31.5 + rot: 3.141592653589793 rad + pos: 31.5,-47.5 parent: 2 - uid: 7119 components: @@ -93808,12 +93958,6 @@ entities: rot: 3.141592653589793 rad pos: 22.5,-12.5 parent: 2 - - uid: 7481 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 23.5,-31.5 - parent: 2 - uid: 8084 components: - type: Transform @@ -93832,6 +93976,12 @@ entities: rot: 1.5707963267948966 rad pos: -6.5,-35.5 parent: 2 + - uid: 8936 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 19.5,-31.5 + parent: 2 - uid: 11874 components: - type: Transform @@ -94124,12 +94274,6 @@ entities: - type: Transform pos: -23.5,-28.5 parent: 2 - - uid: 14414 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 31.5,-45.5 - parent: 2 - uid: 14685 components: - type: Transform @@ -94466,12 +94610,6 @@ entities: rot: 1.5707963267948966 rad pos: -0.5,38.5 parent: 2 - - uid: 5945 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 17.5,-26.5 - parent: 2 - uid: 5977 components: - type: Transform @@ -95396,6 +95534,12 @@ entities: - type: Transform pos: 39.5,-26.5 parent: 2 + - uid: 2639 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 19.5,-24.5 + parent: 2 - uid: 4498 components: - type: Transform @@ -95798,6 +95942,23 @@ entities: rot: 3.141592653589793 rad pos: -24.5,-23.5 parent: 2 + - uid: 18697 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 17.5,-29.5 + parent: 2 + - uid: 18698 + components: + - type: Transform + pos: 21.5,-33.5 + parent: 2 + - uid: 18699 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 23.5,-28.5 + parent: 2 - proto: Protolathe entities: - uid: 14514 @@ -98245,84 +98406,121 @@ entities: - type: Transform pos: 37.5,-39.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 1405 components: - type: Transform pos: 37.5,-37.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 1408 components: - type: Transform pos: 37.5,-35.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 1702 components: - type: Transform pos: 1.5,-31.5 parent: 2 + - type: DeltaPressure + gridUid: 2 + - uid: 1708 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 22.5,-30.5 + parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 1870 components: - type: Transform pos: 1.5,-29.5 parent: 2 - - uid: 2291 + - type: DeltaPressure + gridUid: 2 + - uid: 2321 components: - type: Transform - pos: 32.5,-42.5 - parent: 2 - - uid: 2317 - components: - - type: Transform - pos: 23.5,-28.5 - parent: 2 - - uid: 2318 - components: - - type: Transform - pos: 30.5,-42.5 - parent: 2 - - uid: 2320 - components: - - type: Transform - pos: 31.5,-42.5 - parent: 2 - - uid: 2326 - components: - - type: Transform - pos: 20.5,-30.5 + pos: 19.5,-28.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 2381 components: - type: Transform rot: 1.5707963267948966 rad pos: 22.5,-37.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 2469 components: - type: Transform rot: 1.5707963267948966 rad pos: 22.5,-39.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 2473 components: - type: Transform rot: 1.5707963267948966 rad pos: 22.5,-35.5 parent: 2 - - uid: 2967 + - type: DeltaPressure + gridUid: 2 + - uid: 9754 components: - type: Transform - pos: 22.5,-28.5 - parent: 2 - - uid: 5974 - components: - - type: Transform - pos: 24.5,-30.5 + pos: 20.5,-28.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 12687 components: - type: Transform pos: 21.5,-28.5 parent: 2 + - type: DeltaPressure + gridUid: 2 + - uid: 14235 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 18.5,-30.5 + parent: 2 + - type: DeltaPressure + gridUid: 2 + - uid: 18678 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 31.5,-44.5 + parent: 2 + - type: DeltaPressure + gridUid: 2 + - uid: 18679 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 30.5,-44.5 + parent: 2 + - type: DeltaPressure + gridUid: 2 + - uid: 18680 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 32.5,-44.5 + parent: 2 + - type: DeltaPressure + gridUid: 2 - proto: ReinforcedWindow entities: - uid: 79 @@ -98331,1143 +98529,1625 @@ entities: rot: 3.141592653589793 rad pos: 26.5,-19.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 325 components: - type: Transform pos: 45.5,-10.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 990 components: - type: Transform pos: -6.5,-26.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 1030 components: - type: Transform pos: 7.5,-15.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 1122 components: - type: Transform rot: 3.141592653589793 rad pos: 25.5,-19.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 1125 components: - type: Transform pos: 30.5,-23.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 1126 components: - type: Transform pos: 30.5,-21.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 1131 components: - type: Transform pos: 38.5,-11.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 1165 components: - type: Transform pos: 35.5,-13.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 1169 components: - type: Transform pos: -41.5,19.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 1247 components: - type: Transform pos: -38.5,21.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 1261 components: - type: Transform pos: -2.5,-31.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 1356 components: - type: Transform pos: 37.5,-19.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 1357 components: - type: Transform pos: 37.5,-21.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 1359 components: - type: Transform pos: 45.5,-19.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 1360 components: - type: Transform pos: 45.5,-20.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 1361 components: - type: Transform pos: 45.5,-21.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 1401 components: - type: Transform pos: 35.5,-40.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 1404 components: - type: Transform pos: 35.5,-34.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 1561 components: - type: Transform pos: 3.5,38.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 1582 components: - type: Transform pos: 32.5,-25.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 1654 components: - type: Transform pos: -2.5,-29.5 parent: 2 + - type: DeltaPressure + gridUid: 2 + - uid: 1762 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 19.5,-26.5 + parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 1839 components: - type: Transform pos: -1.5,-35.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 1865 components: - type: Transform pos: 0.5,-35.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 1873 components: - type: Transform pos: -6.5,-25.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 1931 components: - type: Transform pos: -0.5,-16.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 1950 components: - type: Transform pos: -3.5,-27.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 1959 components: - type: Transform pos: -9.5,-23.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 1965 components: - type: Transform pos: 2.5,-16.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 1992 components: - type: Transform pos: -15.5,-34.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 2002 components: - type: Transform pos: 15.5,-36.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 2013 components: - type: Transform pos: 14.5,-36.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 2018 components: - type: Transform pos: -13.5,-29.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 2105 components: - type: Transform pos: -5.5,-27.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 2208 components: - type: Transform pos: 35.5,-38.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 2218 components: - type: Transform pos: 35.5,-36.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 2219 components: - type: Transform pos: 35.5,-39.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 2222 components: - type: Transform pos: 35.5,-35.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 2223 components: - type: Transform pos: 35.5,-37.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 2298 components: - type: Transform pos: 45.5,-9.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 2438 components: - type: Transform pos: 24.5,-19.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 2517 components: - type: Transform pos: 35.5,-17.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 2541 components: - type: Transform pos: 36.5,-13.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 2631 components: - type: Transform pos: 29.5,14.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 2651 components: - type: Transform pos: -32.5,-50.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 2660 components: - type: Transform pos: 12.5,-15.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 2722 components: - type: Transform pos: 29.5,-11.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 2727 components: - type: Transform pos: 45.5,-11.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 2770 components: - type: Transform pos: -11.5,-7.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 2963 components: - type: Transform rot: 3.141592653589793 rad pos: 23.5,-19.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 3193 components: - type: Transform pos: -35.5,-4.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 3647 components: - type: Transform rot: -1.5707963267948966 rad pos: -66.5,-28.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 3648 components: - type: Transform rot: -1.5707963267948966 rad pos: -65.5,-28.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 3649 components: - type: Transform rot: -1.5707963267948966 rad pos: -64.5,-28.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 3650 components: - type: Transform rot: -1.5707963267948966 rad pos: -64.5,-32.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 3651 components: - type: Transform rot: -1.5707963267948966 rad pos: -66.5,-32.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 3652 components: - type: Transform rot: -1.5707963267948966 rad pos: -65.5,-32.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 3653 components: - type: Transform rot: -1.5707963267948966 rad pos: -58.5,-28.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 3654 components: - type: Transform rot: -1.5707963267948966 rad pos: -56.5,-28.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 3655 components: - type: Transform rot: -1.5707963267948966 rad pos: -57.5,-28.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 3656 components: - type: Transform rot: -1.5707963267948966 rad pos: -56.5,-32.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 3657 components: - type: Transform rot: -1.5707963267948966 rad pos: -57.5,-32.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 3658 components: - type: Transform rot: -1.5707963267948966 rad pos: -58.5,-32.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 3659 components: - type: Transform rot: -1.5707963267948966 rad pos: -50.5,-28.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 3660 components: - type: Transform rot: -1.5707963267948966 rad pos: -49.5,-28.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 3661 components: - type: Transform rot: -1.5707963267948966 rad pos: -48.5,-28.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 3662 components: - type: Transform rot: -1.5707963267948966 rad pos: -48.5,-32.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 3663 components: - type: Transform rot: -1.5707963267948966 rad pos: -49.5,-32.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 3664 components: - type: Transform rot: -1.5707963267948966 rad pos: -50.5,-32.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 3673 components: - type: Transform pos: -48.5,-14.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 3679 components: - type: Transform pos: -49.5,-14.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 3681 components: - type: Transform pos: -50.5,-14.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 3718 components: - type: Transform pos: -56.5,-11.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 3720 components: - type: Transform pos: -56.5,-12.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 4023 components: - type: Transform rot: -1.5707963267948966 rad pos: 31.5,20.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 4024 components: - type: Transform rot: -1.5707963267948966 rad pos: 32.5,20.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 4326 components: - type: Transform rot: 1.5707963267948966 rad pos: -32.5,-4.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 4342 components: - type: Transform rot: 1.5707963267948966 rad pos: -33.5,-4.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 4348 components: - type: Transform rot: 1.5707963267948966 rad pos: -43.5,-7.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 4349 components: - type: Transform rot: 1.5707963267948966 rad pos: -40.5,-4.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 4353 components: - type: Transform rot: 1.5707963267948966 rad pos: -41.5,-4.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 4360 components: - type: Transform pos: -39.5,-4.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 4366 components: - type: Transform rot: 1.5707963267948966 rad pos: -37.5,-4.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 4367 components: - type: Transform rot: 1.5707963267948966 rad pos: -36.5,-4.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 4378 components: - type: Transform rot: 1.5707963267948966 rad pos: -43.5,-8.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 4380 components: - type: Transform rot: 1.5707963267948966 rad pos: -43.5,-6.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 4422 components: - type: Transform pos: 19.5,41.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 4507 components: - type: Transform pos: -27.5,-8.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 4563 components: - type: Transform pos: -23.5,-8.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 4579 components: - type: Transform pos: -29.5,-2.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 4581 components: - type: Transform pos: -23.5,-2.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 4588 components: - type: Transform pos: -23.5,-3.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 5177 components: - type: Transform pos: -21.5,43.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 5264 components: - type: Transform pos: -19.5,-6.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 5444 components: - type: Transform pos: -33.5,6.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 5458 components: - type: Transform pos: -41.5,21.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 5479 components: - type: Transform pos: -38.5,20.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 5502 components: - type: Transform pos: -8.5,20.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 5509 components: - type: Transform pos: -8.5,21.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 5552 components: - type: Transform pos: -38.5,19.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 5615 components: - type: Transform pos: -13.5,-27.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 5788 components: - type: Transform pos: -15.5,-32.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 5791 components: - type: Transform pos: -13.5,-28.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 5956 components: - type: Transform pos: 11.5,-15.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 5959 components: - type: Transform pos: -19.5,-7.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 6148 components: - type: Transform pos: -7.5,-31.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 6258 components: - type: Transform pos: -23.5,-4.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 6280 components: - type: Transform pos: -32.5,-49.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 6355 components: - type: Transform pos: 36.5,-17.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 6482 components: - type: Transform pos: 3.5,37.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 6494 components: - type: Transform pos: 15.5,40.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 6495 components: - type: Transform pos: 14.5,40.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 6498 components: - type: Transform pos: 13.5,40.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 6499 components: - type: Transform rot: 3.141592653589793 rad pos: 18.5,41.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 6508 components: - type: Transform pos: 5.5,41.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 6510 components: - type: Transform pos: 11.5,41.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 6546 components: - type: Transform pos: 2.5,41.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 6547 components: - type: Transform pos: 1.5,41.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 6548 components: - type: Transform pos: 0.5,41.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 6662 components: - type: Transform pos: -21.5,42.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 6763 components: - type: Transform pos: -32.5,12.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 6937 components: - type: Transform pos: -21.5,22.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 6950 components: - type: Transform rot: -1.5707963267948966 rad pos: -26.5,11.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 6989 components: - type: Transform pos: -29.5,36.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7042 components: - type: Transform pos: -9.5,35.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7054 components: - type: Transform pos: -9.5,42.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7056 components: - type: Transform pos: -9.5,43.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7057 components: - type: Transform pos: -9.5,41.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7059 components: - type: Transform pos: -9.5,34.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7061 components: - type: Transform pos: -9.5,37.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7063 components: - type: Transform pos: -9.5,36.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7064 components: - type: Transform pos: -9.5,44.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7065 components: - type: Transform pos: -9.5,48.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7066 components: - type: Transform pos: -9.5,49.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7067 components: - type: Transform pos: -9.5,51.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7068 components: - type: Transform pos: -9.5,50.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7137 components: - type: Transform rot: -1.5707963267948966 rad pos: -15.5,57.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7191 components: - type: Transform rot: -1.5707963267948966 rad pos: -1.5,48.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7192 components: - type: Transform rot: -1.5707963267948966 rad pos: -1.5,47.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7193 components: - type: Transform rot: -1.5707963267948966 rad pos: -1.5,46.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7655 components: - type: Transform rot: 3.141592653589793 rad pos: 20.5,41.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7658 components: - type: Transform rot: 3.141592653589793 rad pos: 24.5,43.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7781 components: - type: Transform rot: -1.5707963267948966 rad pos: 32.5,32.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7782 components: - type: Transform rot: -1.5707963267948966 rad pos: 31.5,32.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7893 components: - type: Transform pos: -28.5,0.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7904 components: - type: Transform pos: 29.5,-12.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7997 components: - type: Transform pos: -27.5,36.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 8010 components: - type: Transform rot: 3.141592653589793 rad pos: 60.5,0.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 8011 components: - type: Transform rot: 3.141592653589793 rad pos: 50.5,-1.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 8012 components: - type: Transform rot: 3.141592653589793 rad pos: 52.5,-1.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 8028 components: - type: Transform rot: 3.141592653589793 rad pos: 60.5,-1.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 8029 components: - type: Transform rot: 3.141592653589793 rad pos: 58.5,-3.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 8030 components: - type: Transform rot: 3.141592653589793 rad pos: 57.5,-3.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 8031 components: - type: Transform rot: 3.141592653589793 rad pos: 56.5,-3.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 8054 components: - type: Transform pos: 43.5,33.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 8092 components: - type: Transform pos: -28.5,1.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 8095 components: - type: Transform pos: 38.5,-9.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 8156 components: - type: Transform rot: 1.5707963267948966 rad pos: 54.5,5.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 8229 components: - type: Transform pos: 34.5,-4.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 8236 components: - type: Transform rot: 1.5707963267948966 rad pos: 24.5,-34.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 8349 components: - type: Transform pos: -35.5,33.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 8786 components: - type: Transform rot: 1.5707963267948966 rad pos: 24.5,-40.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 8788 components: - type: Transform rot: 1.5707963267948966 rad pos: 24.5,-37.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 9602 components: - type: Transform pos: -35.5,32.5 parent: 2 + - type: DeltaPressure + gridUid: 2 + - uid: 9751 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 32.5,-42.5 + parent: 2 + - type: DeltaPressure + gridUid: 2 + - uid: 9752 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 21.5,-26.5 + parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 10527 components: - type: Transform pos: -38.5,-49.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 10763 components: - type: Transform rot: 3.141592653589793 rad pos: 27.5,-19.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 10981 components: - type: Transform pos: -11.5,-5.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 11070 components: - type: Transform pos: -15.5,-10.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 11139 components: - type: Transform pos: -28.5,36.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 11171 components: - type: Transform rot: -1.5707963267948966 rad pos: -26.5,12.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 11221 components: - type: Transform rot: 1.5707963267948966 rad pos: -13.5,19.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 11234 components: - type: Transform pos: -20.5,22.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 11722 components: - type: Transform pos: -7.5,-18.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 11736 components: - type: Transform pos: -10.5,-17.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 11774 components: - type: Transform pos: -10.5,-16.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 11911 components: - type: Transform pos: -11.5,-6.5 parent: 2 + - type: DeltaPressure + gridUid: 2 + - uid: 12551 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 30.5,-42.5 + parent: 2 + - type: DeltaPressure + gridUid: 2 + - uid: 12652 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 20.5,-26.5 + parent: 2 + - type: DeltaPressure + gridUid: 2 + - uid: 12655 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 24.5,-30.5 + parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 12713 components: - type: Transform rot: 1.5707963267948966 rad pos: 24.5,-39.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 12757 components: - type: Transform pos: -11.5,11.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 12902 components: - type: Transform rot: -1.5707963267948966 rad pos: -26.5,13.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 13451 components: - type: Transform rot: 3.141592653589793 rad pos: -11.5,-48.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 13452 components: - type: Transform rot: 3.141592653589793 rad pos: -13.5,-48.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 13637 components: - type: Transform pos: 21.5,-11.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 13854 components: - type: Transform rot: 1.5707963267948966 rad pos: 24.5,-36.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 13972 components: - type: Transform pos: -16.5,14.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 14139 components: - type: Transform pos: 49.5,12.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 14530 components: - type: Transform rot: 1.5707963267948966 rad pos: -31.5,-4.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 14533 components: - type: Transform rot: 1.5707963267948966 rad pos: 24.5,-35.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 14535 components: - type: Transform rot: 1.5707963267948966 rad pos: 24.5,-38.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 14773 components: - type: Transform pos: -41.5,20.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 14828 components: - type: Transform rot: 1.5707963267948966 rad pos: -14.5,19.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 14867 components: - type: Transform rot: -1.5707963267948966 rad pos: -19.5,22.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 14918 components: - type: Transform pos: 36.5,-7.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 15142 components: - type: Transform pos: -39.5,-49.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 15244 components: - type: Transform rot: 1.5707963267948966 rad pos: -23.5,43.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 15262 components: - type: Transform pos: -34.5,6.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 15348 components: - type: Transform pos: 47.5,32.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 15706 components: - type: Transform pos: -32.5,-51.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 15725 components: - type: Transform rot: 1.5707963267948966 rad pos: -23.5,42.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 15922 components: - type: Transform rot: 3.141592653589793 rad pos: -44.5,-33.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 15923 components: - type: Transform rot: 3.141592653589793 rad pos: -44.5,-34.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 16116 components: - type: Transform pos: -24.5,47.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 17069 components: - type: Transform pos: -45.5,-48.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 17070 components: - type: Transform pos: -45.5,-47.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 17071 components: - type: Transform pos: -45.5,-46.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 17079 components: - type: Transform rot: 3.141592653589793 rad pos: -44.5,-39.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 17625 components: - type: Transform pos: 26.5,43.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 17630 components: - type: Transform pos: 21.5,43.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 18037 components: - type: Transform pos: -7.5,-30.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 18038 components: - type: Transform pos: -7.5,-32.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 18040 components: - type: Transform pos: -18.5,14.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 18167 components: - type: Transform rot: 1.5707963267948966 rad pos: 58.5,5.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 18603 components: - type: Transform pos: 47.5,-7.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 18604 components: - type: Transform pos: 49.5,-5.5 parent: 2 + - type: DeltaPressure + gridUid: 2 + - uid: 18681 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 31.5,-42.5 + parent: 2 + - type: DeltaPressure + gridUid: 2 - proto: RemoteSignaller entities: - uid: 16085 components: - type: Transform - pos: 27.644077,-26.481504 + pos: 27.638123,-26.403055 parent: 2 - proto: ResearchAndDevelopmentServer entities: @@ -99982,7 +100662,7 @@ entities: - uid: 12557 components: - type: Transform - pos: 27.53975,-25.585697 + pos: 27.540348,-25.700294 parent: 2 - uid: 12684 components: @@ -100044,91 +100724,123 @@ entities: - type: Transform pos: 49.5,-28.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 1513 components: - type: Transform pos: 47.5,-28.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 1514 components: - type: Transform pos: 46.5,-28.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 1515 components: - type: Transform pos: 48.5,-28.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 1540 components: - type: Transform rot: 1.5707963267948966 rad pos: -11.5,14.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 3436 components: - type: Transform rot: -1.5707963267948966 rad pos: -1.5,-3.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 4706 components: - type: Transform pos: 20.5,16.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 5080 components: - type: Transform pos: 21.5,16.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 6000 components: - type: Transform rot: -1.5707963267948966 rad pos: -1.5,-6.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 6001 components: - type: Transform rot: -1.5707963267948966 rad pos: -1.5,-5.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 6002 components: - type: Transform rot: -1.5707963267948966 rad pos: -1.5,-4.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 11215 components: - type: Transform rot: 1.5707963267948966 rad pos: -11.5,13.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 14372 components: - type: Transform rot: -1.5707963267948966 rad pos: 7.5,-0.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 16219 components: - type: Transform rot: -1.5707963267948966 rad pos: 7.5,-1.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 16221 components: - type: Transform rot: -1.5707963267948966 rad pos: 7.5,0.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 16222 components: - type: Transform rot: -1.5707963267948966 rad pos: 7.5,1.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - proto: ShuttersNormalOpen entities: - uid: 755 @@ -100137,289 +100849,395 @@ entities: rot: -1.5707963267948966 rad pos: -28.5,1.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 996 components: - type: Transform rot: -1.5707963267948966 rad pos: -28.5,0.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 1576 components: - type: Transform rot: -1.5707963267948966 rad pos: -13.5,-28.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 2142 components: - type: Transform rot: -1.5707963267948966 rad pos: -13.5,-27.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 2332 components: - type: Transform pos: 35.5,6.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 3047 components: - type: Transform rot: -1.5707963267948966 rad pos: -15.5,-34.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 3135 components: - type: Transform rot: 1.5707963267948966 rad pos: -11.5,-5.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 4121 components: - type: Transform pos: 35.5,-17.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 4607 components: - type: Transform rot: -1.5707963267948966 rad pos: -43.5,-8.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 4881 components: - type: Transform rot: -1.5707963267948966 rad pos: -29.5,-2.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 5557 components: - type: Transform rot: 1.5707963267948966 rad pos: -11.5,-6.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7324 components: - type: Transform pos: 35.5,-13.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 8014 components: - type: Transform rot: 1.5707963267948966 rad pos: -11.5,-7.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 8122 components: - type: Transform pos: 36.5,-13.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 8126 components: - type: Transform pos: 36.5,-17.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 9651 components: - type: Transform pos: 36.5,6.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 9655 components: - type: Transform pos: 37.5,6.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 11048 components: - type: Transform rot: 1.5707963267948966 rad pos: -23.5,-4.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 11066 components: - type: Transform pos: -11.5,-8.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 11085 components: - type: Transform rot: -1.5707963267948966 rad pos: -43.5,-7.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 11086 components: - type: Transform rot: -1.5707963267948966 rad pos: -43.5,-6.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 11087 components: - type: Transform pos: -41.5,-4.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 11088 components: - type: Transform pos: -40.5,-4.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 11089 components: - type: Transform pos: -39.5,-4.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 11090 components: - type: Transform pos: -37.5,-4.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 11091 components: - type: Transform pos: -36.5,-4.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 11092 components: - type: Transform pos: -35.5,-4.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 11093 components: - type: Transform pos: -33.5,-4.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 11094 components: - type: Transform pos: -32.5,-4.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 11182 components: - type: Transform pos: -21.5,22.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 11766 components: - type: Transform rot: -1.5707963267948966 rad pos: -13.5,-29.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 11783 components: - type: Transform rot: -1.5707963267948966 rad pos: -15.5,-32.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 12813 components: - type: Transform rot: 1.5707963267948966 rad pos: 3.5,38.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 13977 components: - type: Transform rot: 1.5707963267948966 rad pos: -23.5,-3.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 13978 components: - type: Transform rot: 1.5707963267948966 rad pos: -23.5,-2.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 14681 components: - type: Transform pos: -19.5,22.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 15086 components: - type: Transform pos: -20.5,22.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 15186 components: - type: Transform pos: -1.5,-35.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 15189 components: - type: Transform pos: 0.5,-35.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 15279 components: - type: Transform pos: -31.5,-4.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 16146 components: - type: Transform pos: 1.5,18.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 16147 components: - type: Transform pos: 2.5,18.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 16155 components: - type: Transform pos: 0.5,41.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 16156 components: - type: Transform pos: 1.5,41.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 16157 components: - type: Transform pos: 2.5,41.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 16159 components: - type: Transform rot: 1.5707963267948966 rad pos: 3.5,37.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 16173 components: - type: Transform pos: 31.5,20.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 16174 components: - type: Transform pos: 32.5,20.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 18094 components: - type: Transform rot: 1.5707963267948966 rad pos: 18.5,8.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 18095 components: - type: Transform rot: 1.5707963267948966 rad pos: 18.5,7.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 18096 components: - type: Transform rot: 1.5707963267948966 rad pos: 18.5,6.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 18097 components: - type: Transform rot: 1.5707963267948966 rad pos: 18.5,5.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 18098 components: - type: Transform rot: 1.5707963267948966 rad pos: 18.5,4.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - proto: ShuttleConsoleCircuitboard entities: - uid: 2192 @@ -100452,6 +101270,21 @@ entities: fixtures: {} - proto: SignalButton entities: + - uid: 1733 + components: + - type: MetaData + name: signal button (Blast Door) + - type: Transform + rot: 3.141592653589793 rad + pos: 22.5,-26.5 + parent: 2 + - type: DeviceLinkSource + linkedPorts: + 1501: + - - Pressed + - Toggle + - type: Fixtures + fixtures: {} - uid: 18100 components: - type: MetaData @@ -100512,21 +101345,6 @@ entities: - Toggle - type: Fixtures fixtures: {} - - uid: 2449 - components: - - type: MetaData - name: signal button (Blast Door) - - type: Transform - rot: 3.141592653589793 rad - pos: 20.5,-28.5 - parent: 2 - - type: DeviceLinkSource - linkedPorts: - 12655: - - - Pressed - - Toggle - - type: Fixtures - fixtures: {} - uid: 2643 components: - type: MetaData @@ -100537,10 +101355,10 @@ entities: parent: 2 - type: DeviceLinkSource linkedPorts: - 2600: + 1729: - - Pressed - Toggle - 2360: + 1159: - - Pressed - Toggle - type: Fixtures @@ -102362,9 +103180,10 @@ entities: fixtures: {} - proto: SignFlammableMed entities: - - uid: 5548 + - uid: 2907 components: - type: Transform + rot: 3.141592653589793 rad pos: 27.5,-29.5 parent: 2 - type: Fixtures @@ -102574,7 +103393,7 @@ entities: - uid: 15250 components: - type: Transform - pos: 16.5,-26.5 + pos: 23.566967,-26.26917 parent: 2 - type: Fixtures fixtures: {} @@ -105248,12 +106067,7 @@ entities: - type: Transform pos: 39.5,-26.5 parent: 2 - - uid: 4043 - components: - - type: Transform - pos: 27.5,-28.5 - parent: 2 - - uid: 4063 + - uid: 4125 components: - type: Transform pos: 27.5,-27.5 @@ -105271,6 +106085,11 @@ entities: parent: 2 - type: Physics bodyType: Static + - uid: 17659 + components: + - type: Transform + pos: 27.5,-28.5 + parent: 2 - proto: StrangePill entities: - uid: 17111 @@ -105534,18 +106353,8 @@ entities: immutable: False temperature: 293.14673 moles: - - 1.7459903 - - 6.568249 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 1.7459903 + Nitrogen: 6.568249 - uid: 6619 components: - type: Transform @@ -105617,18 +106426,8 @@ entities: immutable: False temperature: 293.14673 moles: - - 1.7459903 - - 6.568249 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 1.7459903 + Nitrogen: 6.568249 - type: ContainerContainer containers: entity_storage: !type:Container @@ -105649,18 +106448,8 @@ entities: immutable: False temperature: 293.14673 moles: - - 1.7459903 - - 6.568249 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 1.7459903 + Nitrogen: 6.568249 - type: ContainerContainer containers: entity_storage: !type:Container @@ -107946,12 +108735,24 @@ entities: rot: 3.141592653589793 rad pos: 27.5,5.5 parent: 2 + - uid: 1890 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 27.5,-26.5 + parent: 2 - uid: 2251 components: - type: Transform rot: -1.5707963267948966 rad pos: -44.5,-13.5 parent: 2 + - uid: 2622 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 27.5,-25.5 + parent: 2 - uid: 3110 components: - type: Transform @@ -108180,12 +108981,6 @@ entities: rot: 1.5707963267948966 rad pos: -3.5,19.5 parent: 2 - - uid: 9217 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 27.5,-25.5 - parent: 2 - uid: 9504 components: - type: Transform @@ -108240,11 +109035,6 @@ entities: - type: Transform pos: -16.5,8.5 parent: 2 - - uid: 12808 - components: - - type: Transform - pos: 27.5,-26.5 - parent: 2 - uid: 12856 components: - type: Transform @@ -109295,26 +110085,26 @@ entities: parent: 2 - proto: TegCenter entities: - - uid: 10798 + - uid: 7902 components: - type: Transform - pos: 23.5,-23.5 + pos: 23.5,-22.5 parent: 2 - proto: TegCirculator entities: - uid: 1095 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 23.5,-22.5 + rot: -1.5707963267948966 rad + pos: 23.5,-23.5 parent: 2 - type: PointLight color: '#FF3300FF' - - uid: 7814 + - uid: 1110 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 23.5,-24.5 + rot: 1.5707963267948966 rad + pos: 23.5,-21.5 parent: 2 - type: PointLight color: '#FF3300FF' @@ -109482,31 +110272,43 @@ entities: - type: Transform pos: -29.5,-43.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 2056 components: - type: Transform pos: -18.5,-33.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 2795 components: - type: Transform pos: -4.5,-33.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 6711 components: - type: Transform pos: -29.5,-43.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 10537 components: - type: Transform pos: -12.5,-36.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 15863 components: - type: Transform pos: -26.5,-43.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - proto: TobaccoSeeds entities: - uid: 15669 @@ -110701,6 +111503,12 @@ entities: - type: Transform pos: -24.5,4.5 parent: 2 + - uid: 1132 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 19.5,-32.5 + parent: 2 - uid: 1133 components: - type: Transform @@ -110731,6 +111539,11 @@ entities: - type: Transform pos: 49.5,-33.5 parent: 2 + - uid: 1182 + components: + - type: Transform + pos: 29.5,-45.5 + parent: 2 - uid: 1191 components: - type: Transform @@ -110874,6 +111687,11 @@ entities: - type: Transform pos: 37.5,-32.5 parent: 2 + - uid: 1382 + components: + - type: Transform + pos: 33.5,-44.5 + parent: 2 - uid: 1410 components: - type: Transform @@ -110921,6 +111739,11 @@ entities: - type: Transform pos: 61.5,-18.5 parent: 2 + - uid: 1474 + components: + - type: Transform + pos: 29.5,-48.5 + parent: 2 - uid: 1478 components: - type: Transform @@ -111123,6 +111946,12 @@ entities: - type: Transform pos: 4.5,-20.5 parent: 2 + - uid: 1855 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 24.5,-26.5 + parent: 2 - uid: 1868 components: - type: Transform @@ -111475,6 +112304,12 @@ entities: - type: Transform pos: 33.5,-42.5 parent: 2 + - uid: 2320 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 18.5,-28.5 + parent: 2 - uid: 2328 components: - type: Transform @@ -111485,32 +112320,12 @@ entities: - type: Transform pos: -69.5,-31.5 parent: 2 - - uid: 2364 - components: - - type: Transform - pos: 31.5,-46.5 - parent: 2 - - uid: 2365 - components: - - type: Transform - pos: 29.5,-46.5 - parent: 2 - - uid: 2366 - components: - - type: Transform - pos: 29.5,-43.5 - parent: 2 - uid: 2382 components: - type: Transform rot: 1.5707963267948966 rad pos: 22.5,-34.5 parent: 2 - - uid: 2459 - components: - - type: Transform - pos: 15.5,-26.5 - parent: 2 - uid: 2498 components: - type: Transform @@ -111575,10 +112390,17 @@ entities: - type: Transform pos: 13.5,-28.5 parent: 2 - - uid: 2599 + - uid: 2615 components: - type: Transform - pos: 33.5,-45.5 + rot: 3.141592653589793 rad + pos: 22.5,-31.5 + parent: 2 + - uid: 2624 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 23.5,-26.5 parent: 2 - uid: 2630 components: @@ -111591,11 +112413,6 @@ entities: rot: 1.5707963267948966 rad pos: 57.5,-28.5 parent: 2 - - uid: 2639 - components: - - type: Transform - pos: 20.5,-32.5 - parent: 2 - uid: 2647 components: - type: Transform @@ -111653,6 +112470,12 @@ entities: - type: Transform pos: 11.5,-36.5 parent: 2 + - uid: 2912 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 15.5,-26.5 + parent: 2 - uid: 2957 components: - type: Transform @@ -111889,12 +112712,6 @@ entities: - type: Transform pos: -49.5,-10.5 parent: 2 - - uid: 3670 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 18.5,-29.5 - parent: 2 - uid: 3677 components: - type: Transform @@ -112244,6 +113061,12 @@ entities: - type: Transform pos: 8.5,-23.5 parent: 2 + - uid: 4123 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 18.5,-24.5 + parent: 2 - uid: 4127 components: - type: Transform @@ -113062,6 +113885,11 @@ entities: - type: Transform pos: 6.5,-19.5 parent: 2 + - uid: 5974 + components: + - type: Transform + pos: 33.5,-47.5 + parent: 2 - uid: 5997 components: - type: Transform @@ -114066,6 +114894,12 @@ entities: rot: 3.141592653589793 rad pos: 44.5,-3.5 parent: 2 + - uid: 8104 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 16.5,-24.5 + parent: 2 - uid: 8109 components: - type: Transform @@ -114222,10 +115056,11 @@ entities: - type: Transform pos: -38.5,27.5 parent: 2 - - uid: 9213 + - uid: 9217 components: - type: Transform - pos: 27.5,-29.5 + rot: -1.5707963267948966 rad + pos: 16.5,-27.5 parent: 2 - uid: 9234 components: @@ -114272,11 +115107,6 @@ entities: - type: Transform pos: -25.5,34.5 parent: 2 - - uid: 9630 - components: - - type: Transform - pos: 20.5,-28.5 - parent: 2 - uid: 10385 components: - type: Transform @@ -114475,11 +115305,6 @@ entities: - type: Transform pos: 21.5,-32.5 parent: 2 - - uid: 12669 - components: - - type: Transform - pos: 18.5,-31.5 - parent: 2 - uid: 12680 components: - type: Transform @@ -114495,15 +115320,11 @@ entities: - type: Transform pos: 16.5,-20.5 parent: 2 - - uid: 12740 - components: - - type: Transform - pos: 18.5,-32.5 - parent: 2 - uid: 12768 components: - type: Transform - pos: 23.5,-32.5 + rot: 3.141592653589793 rad + pos: 17.5,-24.5 parent: 2 - uid: 12783 components: @@ -114597,11 +115418,6 @@ entities: rot: 3.141592653589793 rad pos: 41.5,19.5 parent: 2 - - uid: 13833 - components: - - type: Transform - pos: 15.5,-25.5 - parent: 2 - uid: 13873 components: - type: Transform @@ -114702,6 +115518,12 @@ entities: - type: Transform pos: -39.5,13.5 parent: 2 + - uid: 13990 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 16.5,-25.5 + parent: 2 - uid: 14010 components: - type: Transform @@ -114722,6 +115544,12 @@ entities: - type: Transform pos: 14.5,-6.5 parent: 2 + - uid: 14184 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 24.5,-27.5 + parent: 2 - uid: 14190 components: - type: Transform @@ -115118,6 +115946,18 @@ entities: - type: Transform pos: -31.5,5.5 parent: 2 + - uid: 16614 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 18.5,-32.5 + parent: 2 + - uid: 16619 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 16.5,-31.5 + parent: 2 - uid: 16642 components: - type: Transform @@ -115315,6 +116155,12 @@ entities: - type: Transform pos: 21.5,44.5 parent: 2 + - uid: 17658 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 22.5,-26.5 + parent: 2 - uid: 18163 components: - type: Transform @@ -115327,6 +116173,34 @@ entities: rot: 1.5707963267948966 rad pos: 60.5,2.5 parent: 2 + - uid: 18330 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 18.5,-26.5 + parent: 2 + - uid: 18661 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 22.5,-28.5 + parent: 2 + - uid: 18665 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 22.5,-29.5 + parent: 2 + - uid: 18668 + components: + - type: Transform + pos: 22.5,-32.5 + parent: 2 + - uid: 18673 + components: + - type: Transform + pos: 31.5,-48.5 + parent: 2 - proto: WallReinforcedRust entities: - uid: 9 @@ -115730,6 +116604,11 @@ entities: - type: Transform pos: -11.5,-18.5 parent: 2 + - uid: 1494 + components: + - type: Transform + pos: 29.5,-44.5 + parent: 2 - uid: 1639 components: - type: Transform @@ -115845,21 +116724,6 @@ entities: - type: Transform pos: -38.5,-53.5 parent: 2 - - uid: 1855 - components: - - type: Transform - pos: 29.5,-45.5 - parent: 2 - - uid: 1858 - components: - - type: Transform - pos: 30.5,-46.5 - parent: 2 - - uid: 1860 - components: - - type: Transform - pos: 32.5,-46.5 - parent: 2 - uid: 1869 components: - type: Transform @@ -115870,16 +116734,6 @@ entities: - type: Transform pos: 37.5,-7.5 parent: 2 - - uid: 1883 - components: - - type: Transform - pos: 33.5,-46.5 - parent: 2 - - uid: 1890 - components: - - type: Transform - pos: 33.5,-43.5 - parent: 2 - uid: 1891 components: - type: Transform @@ -115900,11 +116754,6 @@ entities: - type: Transform pos: -7.5,-44.5 parent: 2 - - uid: 1907 - components: - - type: Transform - pos: 17.5,-32.5 - parent: 2 - uid: 1909 components: - type: Transform @@ -116217,11 +117066,6 @@ entities: - type: Transform pos: -46.5,-28.5 parent: 2 - - uid: 2321 - components: - - type: Transform - pos: 20.5,-29.5 - parent: 2 - uid: 2322 components: - type: Transform @@ -117911,12 +118755,6 @@ entities: - type: Transform pos: 8.5,41.5 parent: 2 - - uid: 5265 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 17.5,-29.5 - parent: 2 - uid: 5266 components: - type: Transform @@ -117991,7 +118829,7 @@ entities: - uid: 5570 components: - type: Transform - pos: 20.5,-31.5 + pos: 29.5,-47.5 parent: 2 - uid: 5629 components: @@ -118213,11 +119051,6 @@ entities: rot: 1.5707963267948966 rad pos: -11.5,26.5 parent: 2 - - uid: 8509 - components: - - type: Transform - pos: 18.5,-30.5 - parent: 2 - uid: 8617 components: - type: Transform @@ -118457,6 +119290,12 @@ entities: - type: Transform pos: -12.5,-4.5 parent: 2 + - uid: 12669 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 27.5,-29.5 + parent: 2 - uid: 12682 components: - type: Transform @@ -118690,6 +119529,12 @@ entities: rot: 1.5707963267948966 rad pos: -24.5,58.5 parent: 2 + - uid: 14414 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 18.5,-31.5 + parent: 2 - uid: 14427 components: - type: Transform @@ -118933,6 +119778,11 @@ entities: - type: Transform pos: -10.5,59.5 parent: 2 + - uid: 16193 + components: + - type: Transform + pos: 33.5,-45.5 + parent: 2 - uid: 16309 components: - type: Transform @@ -118958,6 +119808,18 @@ entities: - type: Transform pos: -21.5,10.5 parent: 2 + - uid: 16608 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 18.5,-29.5 + parent: 2 + - uid: 16620 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 16.5,-30.5 + parent: 2 - uid: 16639 components: - type: Transform @@ -119106,6 +119968,21 @@ entities: - type: Transform pos: 60.5,3.5 parent: 2 + - uid: 18674 + components: + - type: Transform + pos: 33.5,-48.5 + parent: 2 + - uid: 18675 + components: + - type: Transform + pos: 32.5,-48.5 + parent: 2 + - uid: 18676 + components: + - type: Transform + pos: 30.5,-48.5 + parent: 2 - proto: WallSolid entities: - uid: 6 @@ -119778,6 +120655,12 @@ entities: rot: 1.5707963267948966 rad pos: 23.5,1.5 parent: 2 + - uid: 1710 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 14.5,-24.5 + parent: 2 - uid: 1767 components: - type: Transform @@ -119820,6 +120703,12 @@ entities: - type: Transform pos: 23.5,35.5 parent: 2 + - uid: 2909 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 14.5,-26.5 + parent: 2 - uid: 2923 components: - type: Transform @@ -120425,12 +121314,6 @@ entities: - type: Transform pos: -18.5,-34.5 parent: 2 - - uid: 4125 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 16.5,-31.5 - parent: 2 - uid: 4141 components: - type: Transform @@ -121724,12 +122607,6 @@ entities: - type: Transform pos: -16.5,3.5 parent: 2 - - uid: 4123 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 16.5,-30.5 - parent: 2 - uid: 4502 components: - type: Transform @@ -123647,18 +124524,8 @@ entities: immutable: False temperature: 293.14673 moles: - - 1.8856695 - - 7.0937095 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 1.8856695 + Nitrogen: 7.0937095 - type: ContainerContainer containers: entity_storage: !type:Container @@ -123702,18 +124569,8 @@ entities: immutable: False temperature: 293.14673 moles: - - 1.7459903 - - 6.568249 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 1.7459903 + Nitrogen: 6.568249 - type: ContainerContainer containers: entity_storage: !type:Container @@ -124093,12 +124950,12 @@ entities: - uid: 2968 components: - type: Transform - pos: 17.525375,-30.562181 + pos: 15.502901,-25.561535 parent: 2 - uid: 9231 components: - type: Transform - pos: 17.57225,-31.343431 + pos: 15.412306,-25.452839 parent: 2 - proto: WeaponShotgunEnforcerRubber entities: @@ -124239,32 +125096,44 @@ entities: rot: -1.5707963267948966 rad pos: -8.5,-38.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 12763 components: - type: Transform pos: -17.5,-14.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 13490 components: - type: Transform pos: -16.5,-14.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 15932 components: - type: Transform rot: 1.5707963267948966 rad pos: -43.5,-35.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 16656 components: - type: Transform pos: -26.5,7.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 16657 components: - type: Transform pos: -25.5,7.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - proto: WindoorCargoLocked entities: - uid: 851 @@ -124273,30 +125142,40 @@ entities: rot: -1.5707963267948966 rad pos: 10.5,27.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 9496 components: - type: Transform rot: -1.5707963267948966 rad pos: 17.5,36.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 14121 components: - type: Transform rot: 1.5707963267948966 rad pos: 9.5,24.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 14186 components: - type: Transform rot: 1.5707963267948966 rad pos: 9.5,29.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 16384 components: - type: Transform rot: 1.5707963267948966 rad pos: 9.5,28.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - proto: WindoorHydroponicsLocked entities: - uid: 6727 @@ -124305,6 +125184,8 @@ entities: rot: 3.141592653589793 rad pos: 15.5,12.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - proto: WindoorKitchenHydroponicsLocked entities: - uid: 4458 @@ -124313,12 +125194,16 @@ entities: rot: 3.141592653589793 rad pos: 14.5,2.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 4493 components: - type: Transform rot: 3.141592653589793 rad pos: 13.5,2.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - proto: WindoorSecure entities: - uid: 1899 @@ -124327,6 +125212,8 @@ entities: rot: 3.141592653589793 rad pos: 0.5,-16.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - type: DeviceLinkSource @@ -124343,6 +125230,8 @@ entities: rot: 3.141592653589793 rad pos: 1.5,-16.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - type: DeviceLinkSource @@ -124359,12 +125248,16 @@ entities: rot: 1.5707963267948966 rad pos: -11.5,-8.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 16149 components: - type: Transform rot: -1.5707963267948966 rad pos: 24.5,12.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - proto: WindoorSecureArmoryLocked entities: - uid: 1806 @@ -124372,6 +125265,8 @@ entities: - type: Transform pos: -4.5,-27.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - type: DeviceLinkSource @@ -124385,6 +125280,8 @@ entities: rot: -1.5707963267948966 rad pos: 5.5,-30.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - proto: WindoorSecureAtmosphericsLocked entities: - uid: 6394 @@ -124393,6 +125290,8 @@ entities: rot: 3.141592653589793 rad pos: 31.5,-25.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - proto: WindoorSecureBrigLocked entities: - uid: 2070 @@ -124401,6 +125300,8 @@ entities: rot: 3.141592653589793 rad pos: -4.5,-27.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - type: DeviceLinkSource @@ -124416,12 +125317,16 @@ entities: rot: -1.5707963267948966 rad pos: 29.5,15.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 3973 components: - type: Transform rot: 1.5707963267948966 rad pos: 24.5,12.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - proto: WindoorSecureCommandLocked entities: - uid: 1118 @@ -124430,24 +125335,32 @@ entities: rot: -1.5707963267948966 rad pos: 27.5,-2.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 2067 components: - type: Transform rot: -1.5707963267948966 rad pos: -41.5,15.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 4301 components: - type: Transform rot: -1.5707963267948966 rad pos: -43.5,20.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 5372 components: - type: Transform rot: -1.5707963267948966 rad pos: -39.5,25.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - proto: WindoorSecureEngineeringLocked entities: - uid: 1156 @@ -124456,6 +125369,8 @@ entities: rot: 3.141592653589793 rad pos: 23.5,-10.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - proto: WindoorSecureHeadOfPersonnelLocked entities: - uid: 2732 @@ -124464,6 +125379,8 @@ entities: rot: -1.5707963267948966 rad pos: -11.5,-8.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - proto: WindoorSecureJanitorLocked entities: - uid: 7437 @@ -124472,6 +125389,8 @@ entities: rot: -1.5707963267948966 rad pos: -2.5,9.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - proto: WindoorSecureMedicalLocked entities: - uid: 4099 @@ -124482,12 +125401,16 @@ entities: rot: -1.5707963267948966 rad pos: 24.5,25.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 8184 components: - type: Transform rot: 3.141592653589793 rad pos: 27.5,5.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - proto: WindoorSecureSalvageLocked entities: - uid: 7307 @@ -124495,18 +125418,24 @@ entities: - type: Transform pos: 25.5,45.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7632 components: - type: Transform rot: 1.5707963267948966 rad pos: 17.5,36.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 17632 components: - type: Transform rot: 1.5707963267948966 rad pos: 24.5,40.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - proto: WindoorSecureScienceLocked entities: - uid: 4296 @@ -124515,54 +125444,72 @@ entities: rot: 3.141592653589793 rad pos: -27.5,18.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 4721 components: - type: Transform rot: 3.141592653589793 rad pos: -29.5,18.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 5258 components: - type: Transform rot: 3.141592653589793 rad pos: -25.5,18.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 6846 components: - type: Transform rot: 3.141592653589793 rad pos: -13.5,23.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 10615 components: - type: Transform rot: 3.141592653589793 rad pos: -27.5,31.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 11146 components: - type: Transform rot: 3.141592653589793 rad pos: -14.5,23.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 11200 components: - type: Transform rot: 3.141592653589793 rad pos: -24.5,31.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 14469 components: - type: Transform rot: 3.141592653589793 rad pos: -11.5,19.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 15541 components: - type: Transform rot: 3.141592653589793 rad pos: -10.5,19.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - proto: WindoorSecureSecurityLawyerLocked entities: - uid: 3534 @@ -124572,6 +125519,8 @@ entities: - type: Transform pos: -37.5,-38.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - proto: WindoorSecureSecurityLocked entities: - uid: 1047 @@ -124580,11 +125529,15 @@ entities: rot: 1.5707963267948966 rad pos: 18.5,-6.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 1850 components: - type: Transform pos: 1.5,-16.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - type: DeviceLinkSource @@ -124600,6 +125553,8 @@ entities: - type: Transform pos: 0.5,-16.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - type: DeviceLinkSource @@ -124616,18 +125571,24 @@ entities: rot: -1.5707963267948966 rad pos: -1.5,-17.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 3570 components: - type: Transform rot: 3.141592653589793 rad pos: -35.5,-32.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7480 components: - type: Transform rot: -1.5707963267948966 rad pos: -4.5,29.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - proto: WindoorServiceLocked entities: - uid: 3122 @@ -124636,6 +125597,8 @@ entities: rot: 3.141592653589793 rad pos: -18.5,-24.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - proto: Window entities: - uid: 158 @@ -124643,181 +125606,251 @@ entities: - type: Transform pos: -5.5,-1.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 182 components: - type: Transform pos: -5.5,2.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 397 components: - type: Transform pos: 18.5,4.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 398 components: - type: Transform pos: 18.5,5.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 966 components: - type: Transform pos: 18.5,7.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 3152 components: - type: Transform pos: -22.5,-36.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 3153 components: - type: Transform pos: -23.5,-36.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 3154 components: - type: Transform pos: -24.5,-36.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 3180 components: - type: Transform pos: -26.5,-33.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 3181 components: - type: Transform pos: -26.5,-35.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 3415 components: - type: Transform pos: -37.5,-26.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 3416 components: - type: Transform pos: -37.5,-23.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 3944 components: - type: Transform rot: 1.5707963267948966 rad pos: 35.5,6.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 3945 components: - type: Transform rot: 1.5707963267948966 rad pos: 36.5,6.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 3946 components: - type: Transform rot: 1.5707963267948966 rad pos: 37.5,6.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 4157 components: - type: Transform pos: 11.5,18.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 4158 components: - type: Transform pos: 10.5,18.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 4204 components: - type: Transform pos: 1.5,18.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 4205 components: - type: Transform pos: 2.5,18.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 4306 components: - type: Transform rot: 1.5707963267948966 rad pos: -33.5,-19.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 4307 components: - type: Transform rot: 1.5707963267948966 rad pos: -35.5,-19.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 5499 components: - type: Transform pos: -29.5,-35.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 5501 components: - type: Transform pos: -29.5,-33.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 8265 components: - type: Transform pos: -4.5,21.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 10519 components: - type: Transform pos: -21.5,-17.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 10526 components: - type: Transform pos: -20.5,-17.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 11239 components: - type: Transform pos: -19.5,-40.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 13996 components: - type: Transform pos: 18.5,8.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 14025 components: - type: Transform pos: -18.5,-40.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 15000 components: - type: Transform pos: 18.5,-14.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 15433 components: - type: Transform pos: -5.5,-7.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 15680 components: - type: Transform pos: -5.5,-6.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 15708 components: - type: Transform pos: -32.5,-39.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 15709 components: - type: Transform pos: -32.5,-37.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 16912 components: - type: Transform pos: 18.5,6.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - proto: WindowDirectional entities: - uid: 239 @@ -124825,69 +125858,93 @@ entities: - type: Transform pos: 7.5,-1.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 610 components: - type: Transform pos: 9.5,24.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 1686 components: - type: Transform rot: 1.5707963267948966 rad pos: 18.5,-1.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 1689 components: - type: Transform rot: 1.5707963267948966 rad pos: 18.5,2.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 3121 components: - type: Transform rot: 1.5707963267948966 rad pos: -19.5,-24.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 4033 components: - type: Transform rot: -1.5707963267948966 rad pos: 26.5,8.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 4169 components: - type: Transform rot: -1.5707963267948966 rad pos: 12.5,19.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 4170 components: - type: Transform rot: -1.5707963267948966 rad pos: 12.5,21.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 5913 components: - type: Transform pos: -18.5,-14.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 11118 components: - type: Transform pos: 9.5,28.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 13809 components: - type: Transform rot: 3.141592653589793 rad pos: 16.5,12.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 16200 components: - type: Transform rot: -1.5707963267948966 rad pos: 15.5,12.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - proto: WindowFrostedDirectional entities: - uid: 161 @@ -124895,53 +125952,71 @@ entities: - type: Transform pos: -1.5,-6.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 208 components: - type: Transform rot: 3.141592653589793 rad pos: -2.5,-3.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 3900 components: - type: Transform rot: -1.5707963267948966 rad pos: 35.5,11.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 3902 components: - type: Transform rot: -1.5707963267948966 rad pos: 37.5,11.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 5428 components: - type: Transform rot: 3.141592653589793 rad pos: 0.5,-3.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 5989 components: - type: Transform rot: 3.141592653589793 rad pos: -1.5,-3.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 5990 components: - type: Transform rot: 3.141592653589793 rad pos: -0.5,-3.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 15929 components: - type: Transform rot: 1.5707963267948966 rad pos: -43.5,-36.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 15930 components: - type: Transform pos: -43.5,-34.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - proto: WindowReinforcedDirectional entities: - uid: 555 @@ -124950,465 +126025,623 @@ entities: rot: 1.5707963267948966 rad pos: -10.5,-6.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 1045 components: - type: Transform rot: 1.5707963267948966 rad pos: 18.5,-7.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 1106 components: - type: Transform rot: 1.5707963267948966 rad pos: 32.5,-28.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 1193 components: - type: Transform rot: 3.141592653589793 rad pos: 32.5,22.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 1614 components: - type: Transform rot: -1.5707963267948966 rad pos: 27.5,-3.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 1616 components: - type: Transform rot: -1.5707963267948966 rad pos: 27.5,-1.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 1798 components: - type: Transform rot: -1.5707963267948966 rad pos: 5.5,-31.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 1861 components: - type: Transform rot: -1.5707963267948966 rad pos: -1.5,-18.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 1881 components: - type: Transform rot: -1.5707963267948966 rad pos: 5.5,-29.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 1986 components: - type: Transform rot: 1.5707963267948966 rad pos: 32.5,-27.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 2888 components: - type: Transform rot: 3.141592653589793 rad pos: 24.5,-10.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 3507 components: - type: Transform rot: 3.141592653589793 rad pos: -36.5,-32.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 3525 components: - type: Transform rot: 3.141592653589793 rad pos: -34.5,-38.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 3530 components: - type: Transform rot: -1.5707963267948966 rad pos: -33.5,-37.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 3572 components: - type: Transform pos: -36.5,-38.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 3573 components: - type: Transform rot: 1.5707963267948966 rad pos: -35.5,-38.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 3585 components: - type: Transform rot: 1.5707963267948966 rad pos: -29.5,22.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 3820 components: - type: Transform rot: -1.5707963267948966 rad pos: -39.5,24.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 3901 components: - type: Transform rot: 1.5707963267948966 rad pos: 32.5,-26.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 3970 components: - type: Transform rot: -1.5707963267948966 rad pos: 24.5,10.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 3971 components: - type: Transform rot: -1.5707963267948966 rad pos: 24.5,11.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 3972 components: - type: Transform rot: 3.141592653589793 rad pos: 24.5,11.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 4098 components: - type: Transform rot: -1.5707963267948966 rad pos: 24.5,26.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 4207 components: - type: Transform rot: 3.141592653589793 rad pos: 30.5,22.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 4217 components: - type: Transform rot: -1.5707963267948966 rad pos: -25.5,22.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 4520 components: - type: Transform rot: 3.141592653589793 rad pos: 22.5,-10.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 4567 components: - type: Transform rot: 1.5707963267948966 rad pos: 15.5,1.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 4568 components: - type: Transform rot: 1.5707963267948966 rad pos: 15.5,0.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 4628 components: - type: Transform rot: -1.5707963267948966 rad pos: -34.5,-5.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 4629 components: - type: Transform rot: 1.5707963267948966 rad pos: -38.5,-5.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 4632 components: - type: Transform pos: -42.5,-5.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 4636 components: - type: Transform rot: 3.141592653589793 rad pos: -42.5,-9.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 4640 components: - type: Transform rot: -1.5707963267948966 rad pos: -35.5,-9.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 4641 components: - type: Transform rot: -1.5707963267948966 rad pos: -37.5,-9.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 4642 components: - type: Transform rot: -1.5707963267948966 rad pos: -39.5,-8.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 4644 components: - type: Transform pos: -39.5,-7.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 4645 components: - type: Transform rot: -1.5707963267948966 rad pos: -37.5,-8.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 4646 components: - type: Transform rot: -1.5707963267948966 rad pos: -35.5,-8.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 4647 components: - type: Transform rot: -1.5707963267948966 rad pos: -39.5,-9.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 4648 components: - type: Transform rot: 1.5707963267948966 rad pos: -42.5,-5.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 4649 components: - type: Transform rot: -1.5707963267948966 rad pos: -38.5,-5.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 4654 components: - type: Transform pos: -37.5,-7.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 4655 components: - type: Transform pos: -35.5,-7.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 5074 components: - type: Transform rot: -1.5707963267948966 rad pos: -39.5,26.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 5149 components: - type: Transform rot: 3.141592653589793 rad pos: -28.5,18.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 5302 components: - type: Transform rot: -1.5707963267948966 rad pos: -27.5,18.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 5453 components: - type: Transform rot: -1.5707963267948966 rad pos: -41.5,16.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 5478 components: - type: Transform rot: -1.5707963267948966 rad pos: -41.5,14.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 5705 components: - type: Transform pos: -35.5,-38.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 6360 components: - type: Transform rot: 3.141592653589793 rad pos: 29.5,-29.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 6392 components: - type: Transform rot: 3.141592653589793 rad pos: 32.5,-29.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7479 components: - type: Transform rot: -1.5707963267948966 rad pos: -4.5,30.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7844 components: - type: Transform pos: 1.5,38.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 8413 components: - type: Transform rot: 3.141592653589793 rad pos: -23.5,31.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 9085 components: - type: Transform rot: 3.141592653589793 rad pos: 28.5,5.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 9086 components: - type: Transform rot: 3.141592653589793 rad pos: 26.5,5.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 9087 components: - type: Transform rot: -1.5707963267948966 rad pos: 26.5,5.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 9088 components: - type: Transform rot: -1.5707963267948966 rad pos: 26.5,4.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 9572 components: - type: Transform rot: 3.141592653589793 rad pos: -29.5,31.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 9629 components: - type: Transform rot: 1.5707963267948966 rad pos: 15.5,-0.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 10606 components: - type: Transform rot: -1.5707963267948966 rad pos: -27.5,17.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 11131 components: - type: Transform rot: -1.5707963267948966 rad pos: -25.5,18.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 11183 components: - type: Transform rot: 3.141592653589793 rad pos: -24.5,18.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 11246 components: - type: Transform rot: 3.141592653589793 rad pos: -26.5,18.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 12915 components: - type: Transform rot: -1.5707963267948966 rad pos: -2.5,8.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 12916 components: - type: Transform rot: -1.5707963267948966 rad pos: -2.5,10.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 13952 components: - type: Transform rot: 3.141592653589793 rad pos: -26.5,31.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 14206 components: - type: Transform pos: 24.5,38.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 14207 components: - type: Transform rot: 1.5707963267948966 rad pos: -10.5,-4.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 14468 components: - type: Transform rot: 3.141592653589793 rad pos: -9.5,19.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 14646 components: - type: Transform rot: 1.5707963267948966 rad pos: -10.5,-5.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 15148 components: - type: Transform rot: 1.5707963267948966 rad pos: -35.5,-37.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 16179 components: - type: Transform rot: -1.5707963267948966 rad pos: 37.5,-14.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 16180 components: - type: Transform rot: -1.5707963267948966 rad pos: 37.5,-16.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 16192 components: - type: Transform rot: 1.5707963267948966 rad pos: -10.5,-7.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 16286 components: - type: Transform rot: 3.141592653589793 rad pos: 31.5,-29.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 16383 components: - type: Transform rot: -1.5707963267948966 rad pos: -25.5,17.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 16501 components: - type: Transform rot: 1.5707963267948966 rad pos: -18.5,26.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 16981 components: - type: Transform pos: -1.5,-38.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - proto: WoodblockInstrument entities: - uid: 18236 diff --git a/Resources/Maps/exo.yml b/Resources/Maps/exo.yml index e3fe78ff28..58d864740a 100644 --- a/Resources/Maps/exo.yml +++ b/Resources/Maps/exo.yml @@ -1,11 +1,11 @@ meta: format: 7 category: Map - engineVersion: 266.0.0 + engineVersion: 267.1.0 forkId: "" forkVersion: "" - time: 09/10/2025 20:15:35 - entityCount: 19959 + time: 09/25/2025 21:06:16 + entityCount: 19960 maps: - 1 grids: @@ -8820,6 +8820,15 @@ entities: - type: Transform pos: -13.5,-69.5 parent: 2 + - type: AccessReader + accessListsOriginal: [] + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 18143: + - - DoorStatus + - InputB - proto: AirlockExternalGlass entities: - uid: 543 @@ -9049,6 +9058,13 @@ entities: - type: Transform pos: -16.5,-69.5 parent: 2 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 18143: + - - DoorStatus + - InputA - uid: 16699 components: - type: Transform @@ -9059,6 +9075,16 @@ entities: - type: Transform pos: -15.5,-72.5 parent: 2 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 5745: + - - DoorStatus + - DoorBolt + 5774: + - - DoorStatus + - DoorBolt - proto: AirlockExternalGlassLocked entities: - uid: 201 @@ -9091,6 +9117,11 @@ entities: - type: Transform pos: -11.5,-81.5 parent: 2 + - type: DeviceLinkSource + linkedPorts: + 6303: + - - DoorStatus + - DoorBolt - uid: 1649 components: - type: Transform @@ -9138,6 +9169,8 @@ entities: - type: Transform pos: -11.5,-78.5 parent: 2 + - type: DeviceLinkSink + invokeCounter: 1 - type: DeviceLinkSource linkedPorts: 1487: @@ -10045,7 +10078,7 @@ entities: pos: 11.5,-30.5 parent: 2 - type: Door - secondsUntilStateChange: -244104.44 + secondsUntilStateChange: -245383 state: Opening - type: DeviceLinkSource lastSignals: @@ -10401,7 +10434,7 @@ entities: pos: 34.5,-36.5 parent: 2 - type: Door - secondsUntilStateChange: -19602.13 + secondsUntilStateChange: -20880.693 state: Opening - type: DeviceLinkSource lastSignals: @@ -88100,6 +88133,22 @@ entities: parent: 2 - proto: LogicGateOr entities: + - uid: 18143 + components: + - type: Transform + anchored: True + pos: -14.5,-70.5 + parent: 2 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 18305: + - - Output + - DoorBolt + - type: Physics + canCollide: False + bodyType: Static - uid: 18350 components: - type: Transform diff --git a/Resources/Maps/fland.yml b/Resources/Maps/fland.yml index f95822aa70..2551bd58ff 100644 --- a/Resources/Maps/fland.yml +++ b/Resources/Maps/fland.yml @@ -1,11 +1,11 @@ meta: format: 7 category: Map - engineVersion: 264.0.0 + engineVersion: 267.1.0 forkId: "" forkVersion: "" - time: 07/22/2025 16:38:44 - entityCount: 36085 + time: 09/24/2025 21:56:25 + entityCount: 36083 maps: - 1 grids: @@ -425,7 +425,7 @@ entities: version: 7 6,-3: ind: 6,-3 - tiles: HwAAAAABAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAbAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH0AAAAAAAB9AAAAAAAAAAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAbQAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB9AAAAAAAAfQAAAAAAAAAAAAAAAABsAAAAAAAAfgAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAH4AAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfQAAAAAAAH0AAAAAAAAAAAAAAAAAbAAAAAAAAH4AAAAAAABsAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB9AAAAAAAAAAAAAAAAAGwAAAAAAAB+AAAAAAAAbAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB/AAAAAAAABwAAAAAAAAcAAAAAAwAHAAAAAAAABwAAAAAAAAcAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAABsAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAgAAAAAAAAAAH0AAAAAAAAAAAAAAAAAbAAAAAAAAH4AAAAAAABsAAAAAAAAfgAAAAAAAGwAAAAAAABsAAAAAAAAfgAAAAAAAH8AAAAAAAB/AAAAAAAAfwAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB9AAAAAAAAAAAAAAAAAH4AAAAAAABtAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH8AAAAAAAB9AAAAAAAAfQAAAAAAAH0AAAAAAAB9AAAAAAAAfQAAAAAAAH0AAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB/AAAAAAAAfQAAAAAAAH0AAAAAAAB9AAAAAAAAfQAAAAAAAH0AAAAAAAB9AAAAAAAAbAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH0AAAAAAAB9AAAAAAAAfQAAAAAAAGwAAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAAAAAAAAAABsAAAAAAAAfgAAAAAAAG0AAAAAAABtAAAAAAAAbQAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAAAAAAAAAAAbAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAAAAAAAAAAGwAAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB9AAAAAAAAfQAAAAAAAAAAAAAAAABsAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB/AAAAAAAAfwAAAAAAAH0AAAAAAAB9AAAAAAAAfQAAAAAAAH0AAAAAAAAAAAAAAAAAfgAAAAAAAG0AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfwAAAAAAAAcAAAAAAAAHAAAAAAAAfgAAAAAAAAAAAAAAAAB9AAAAAAAAAAAAAAAAAA== + tiles: HwAAAAABAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAbAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH0AAAAAAAB9AAAAAAAAAAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAbQAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB9AAAAAAAAfQAAAAAAAAAAAAAAAABsAAAAAAAAfgAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAH4AAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfQAAAAAAAH0AAAAAAAAAAAAAAAAAbAAAAAAAAH4AAAAAAABsAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB9AAAAAAAAfQAAAAAAAGwAAAAAAAB+AAAAAAAAbAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB9AAAAAAAAfQAAAAAAAH0AAAAAAAB9AAAAAAAAfQAAAAAAAH0AAAAAAAB9AAAAAAAAfQAAAAAAAAAAAAAAAABsAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfQAAAAAAAH0AAAAAAAB9AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH0AAAAAAAAAAAAAAAAAbAAAAAAAAH4AAAAAAABsAAAAAAAAfgAAAAAAAGwAAAAAAABsAAAAAAAAfgAAAAAAAH0AAAAAAAB9AAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB9AAAAAAAAfQAAAAAAAH4AAAAAAABtAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfQAAAAAAAH0AAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfQAAAAAAAH0AAAAAAAB9AAAAAAAAbAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAGwAAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfQAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABsAAAAAAAAfgAAAAAAAG0AAAAAAABtAAAAAAAAbQAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH0AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAbAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB9AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAGwAAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAbAAAAAAAAGwAAAAAAAB+AAAAAAAAfQAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABsAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAfgAAAAAAAH0AAAAAAAB9AAAAAAAAfQAAAAAAAH0AAAAAAAB9AAAAAAAAfgAAAAAAAG0AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB9AAAAAAAAAAAAAAAAAA== version: 7 6,-2: ind: 6,-2 @@ -437,7 +437,7 @@ entities: version: 7 7,-3: ind: 7,-3 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH0AAAAAAAB9AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAACQB9AAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAADAAcAAAAAAAAHAAAAAAYABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAAfQAAAAAAAH0AAAAAAAAAAAAAAAAABwAAAAABAAcAAAAAAAB+AAAAAAAABwAAAAAIAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAABwAAAAAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAAHAAAAAAAAfgAAAAAAAH4AAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAH4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAAHAAAAAAAAfgAAAAAAAH0AAAAAAAB9AAAAAAAAfQAAAAAAAH4AAAAAAAB+AAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAABwAAAAAAAAcAAAAAAwAAAAAAAAAAAAAAAAAAAAcAAAAAAAB+AAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAB+AAAAAAAAfgAAAAAAAAcAAAAAAAAHAAAAAAEABwAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAAfgAAAAAAAH4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAcAAAAAAAB+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAAHAAAAAAAAfgAAAAAAAA== + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAH0AAAAAAAB9AAAAAAAAfQAAAAAAAH0AAAAAAAB9AAAAAAAAfQAAAAAAAH0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB9AAAAAAAAAAAAAAAAAAAAAAAAAAB9AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAH0AAAAAAAB9AAAAAAAAfQAAAAAAAH0AAAAAAAB9AAAAAAAAfQAAAAAAAH0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH0AAAAAAAB9AAAAAAAAfQAAAAAAAH0AAAAAAAB9AAAAAAAAAAAAAAAAAAAAAAAAAAB9AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAACQB9AAAAAAAAfQAAAAAAAH0AAAAAAAB9AAAAAAAABwAAAAADAAcAAAAAAAAHAAAAAAYABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAAfgAAAAAAAH0AAAAAAAB9AAAAAAAABwAAAAABAAcAAAAAAAB+AAAAAAAABwAAAAAIAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAABwAAAAAGAH4AAAAAAAB9AAAAAAAAfQAAAAAAAAcAAAAAAAAHAAAAAAAAfgAAAAAAAH4AAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAH4AAAAAAAB+AAAAAAAAfQAAAAAAAH0AAAAAAAAHAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAAHAAAAAAAAfgAAAAAAAH0AAAAAAAB9AAAAAAAAfQAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH0AAAAAAAAHAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAABwAAAAAAAAcAAAAAAwAAAAAAAAAAAAAAAAAAAAcAAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB9AAAAAAAAfQAAAAAAAAcAAAAAAAB+AAAAAAAAfgAAAAAAAAcAAAAAAAAHAAAAAAEABwAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAAfgAAAAAAAH4AAAAAAAB9AAAAAAAAfQAAAAAAAH0AAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAcAAAAAAAB+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAAHAAAAAAAAfgAAAAAAAA== version: 7 8,-2: ind: 8,-2 @@ -10179,7 +10179,6 @@ entities: 3540: 55,-35 5154: 122,-23 5939: 121,-17 - 7924: 107,-36 - node: color: '#EFC541FF' id: WarnCornerNW @@ -10194,7 +10193,6 @@ entities: 4667: 28,-34 5153: 118,-23 5938: 120,-17 - 7922: 105,-36 - node: color: '#EFC541FF' id: WarnCornerSE @@ -10212,7 +10210,6 @@ entities: 4994: 66,-8 5155: 122,-27 5937: 121,-18 - 7923: 107,-38 - node: cleanable: True color: '#FFFFFFFF' @@ -10238,7 +10235,6 @@ entities: 4995: 68,-8 5148: 118,-27 5936: 120,-18 - 7921: 105,-38 - node: color: '#52B4E996' id: WarnCornerSmallGreyscaleNE @@ -10472,6 +10468,13 @@ entities: 5726: 20,18 5727: 19,18 5728: 18,18 + - node: + color: '#951710FF' + id: WarnLineE + decals: + 9429: 105,-38 + 9430: 105,-37 + 9431: 105,-36 - node: color: '#9FED5896' id: WarnLineE @@ -10702,6 +10705,13 @@ entities: 4261: 19,62 8663: 15,48 8664: 15,49 + - node: + color: '#951710FF' + id: WarnLineGreyscaleE + decals: + 9432: 105,-38 + 9433: 105,-37 + 9434: 105,-36 - node: color: '#D381C996' id: WarnLineGreyscaleE @@ -10863,6 +10873,13 @@ entities: 8701: 17,-17 8702: 16,-17 8703: 15,-17 + - node: + color: '#18A2D5FF' + id: WarnLineGreyscaleS + decals: + 9426: 103,-40 + 9427: 104,-40 + 9428: 105,-40 - node: color: '#334E6DC8' id: WarnLineGreyscaleS @@ -11045,6 +11062,13 @@ entities: 3998: 7,38 3999: 7,39 7690: 103,-17 + - node: + color: '#18A2D5FF' + id: WarnLineN + decals: + 9423: 103,-40 + 9424: 105,-40 + 9425: 104,-40 - node: color: '#9FED5896' id: WarnLineN @@ -11239,9 +11263,6 @@ entities: 7212: 49,44 7213: 48,44 7214: 47,44 - 7917: 109,-38 - 7918: 110,-38 - 7925: 106,-38 8593: -38,-7 8594: -40,-10 8636: 100,-36 @@ -11462,7 +11483,6 @@ entities: 6392: 120,45 6393: 120,53 6640: 75,55 - 7927: 105,-37 8430: 99,30 8431: 99,31 8432: 99,33 @@ -11674,9 +11694,6 @@ entities: 7207: 49,42 7208: 51,42 7209: 52,42 - 7919: 109,-36 - 7920: 110,-36 - 7926: 106,-36 8427: 96,32 8428: 97,32 8429: 98,32 @@ -14713,7 +14730,7 @@ entities: 0: 256 3: 17476 27,-12: - 3: 18022 + 3: 50790 0: 16 27,-17: 3: 20224 @@ -14768,7 +14785,8 @@ entities: 0: 15 3: 3840 25,-11: - 0: 3003 + 0: 819 + 3: 2184 25,-10: 0: 65535 25,-9: @@ -14776,35 +14794,37 @@ entities: 25,-8: 0: 1423 26,-11: - 0: 10239 - 3: 49152 + 3: 831 26,-10: - 0: 2 - 2: 60928 - 3: 12 + 0: 13119 + 3: 34816 26,-9: - 2: 14 - 0: 58880 - 3: 2048 + 0: 819 + 3: 2184 26,-8: 0: 119 27,-11: - 0: 17 - 3: 62532 + 3: 52295 27,-10: - 3: 239 - 0: 26112 + 0: 1 + 3: 14 + 2: 60928 27,-9: - 3: 18272 - 0: 6 + 3: 20224 + 2: 14 27,-8: 3: 22357 0: 32768 + 28,-12: + 3: 61440 28,-11: - 3: 12288 + 3: 65280 28,-10: - 3: 51 + 3: 26223 0: 34944 + 28,-9: + 3: 1890 + 0: 2180 25,-6: 0: 62259 25,-5: @@ -14876,8 +14896,10 @@ entities: 32,-6: 3: 256 0: 58444 - 28,-9: - 0: 2180 + 29,-12: + 3: 61440 + 29,-11: + 3: 40857 29,-10: 0: 2527 30,-10: @@ -15715,108 +15737,31 @@ entities: - volume: 2500 temperature: 293.15 moles: - - 21.824879 - - 82.10312 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 21.824879 + Nitrogen: 82.10312 - volume: 2500 temperature: 235 moles: - - 27.225372 - - 102.419266 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 27.225372 + Nitrogen: 102.419266 - volume: 2500 temperature: 293.15 - moles: - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + moles: {} - volume: 2500 immutable: True - moles: - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + moles: {} - volume: 2500 temperature: 293.15 moles: - - 0 - - 6666.982 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Nitrogen: 6666.982 - volume: 2500 temperature: 293.15 moles: - - 6666.982 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 6666.982 - volume: 2500 temperature: 293.15 moles: - - 0 - - 0 - - 0 - - 6666.982 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Plasma: 6666.982 chunkSize: 4 - type: GasTileOverlay - type: RadiationGridResistance @@ -15856,6 +15801,8 @@ entities: - 588 - 571 - 587 + - type: Fixtures + fixtures: {} - uid: 611 components: - type: Transform @@ -15870,6 +15817,8 @@ entities: - 530 - 568 - 20459 + - type: Fixtures + fixtures: {} - uid: 612 components: - type: Transform @@ -15892,6 +15841,8 @@ entities: - 451 - 423 - 420 + - type: Fixtures + fixtures: {} - uid: 613 components: - type: Transform @@ -15917,11 +15868,15 @@ entities: - 452 - 389 - 453 + - type: Fixtures + fixtures: {} - uid: 614 components: - type: Transform pos: -17.5,27.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 615 components: - type: Transform @@ -15932,18 +15887,24 @@ entities: devices: - 569 - 537 + - type: Fixtures + fixtures: {} - uid: 616 components: - type: Transform rot: -1.5707963267948966 rad pos: -15.5,11.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 617 components: - type: Transform rot: 3.141592653589793 rad pos: -12.5,7.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 1546 components: - type: Transform @@ -15954,6 +15915,8 @@ entities: devices: - 1544 - 1541 + - type: Fixtures + fixtures: {} - uid: 2036 components: - type: Transform @@ -15978,6 +15941,8 @@ entities: - 1548 - 1547 - 1549 + - type: Fixtures + fixtures: {} - uid: 2038 components: - type: Transform @@ -15988,6 +15953,8 @@ entities: devices: - 1616 - 1617 + - type: Fixtures + fixtures: {} - uid: 2039 components: - type: Transform @@ -15998,6 +15965,8 @@ entities: devices: - 2550 - 2549 + - type: Fixtures + fixtures: {} - uid: 2071 components: - type: Transform @@ -16022,6 +15991,8 @@ entities: - 1548 - 1547 - 1549 + - type: Fixtures + fixtures: {} - uid: 2117 components: - type: Transform @@ -16040,6 +16011,8 @@ entities: - 2204 - 2193 - 2194 + - type: Fixtures + fixtures: {} - uid: 2205 components: - type: Transform @@ -16052,6 +16025,8 @@ entities: - 2192 - 2190 - 2191 + - type: Fixtures + fixtures: {} - uid: 4541 components: - type: Transform @@ -16062,6 +16037,8 @@ entities: devices: - 4468 - 4469 + - type: Fixtures + fixtures: {} - uid: 4587 components: - type: Transform @@ -16078,6 +16055,8 @@ entities: - 1811 - 1812 - 1813 + - type: Fixtures + fixtures: {} - uid: 4676 components: - type: Transform @@ -16090,6 +16069,8 @@ entities: - 4666 - 4667 - 4669 + - type: Fixtures + fixtures: {} - uid: 6226 components: - type: Transform @@ -16106,6 +16087,8 @@ entities: - 6225 - 6223 - 6224 + - type: Fixtures + fixtures: {} - uid: 6231 components: - type: Transform @@ -16122,6 +16105,8 @@ entities: - 4603 - 6229 - 6228 + - type: Fixtures + fixtures: {} - uid: 6273 components: - type: Transform @@ -16137,6 +16122,8 @@ entities: - 6288 - 5659 - 5660 + - type: Fixtures + fixtures: {} - uid: 6274 components: - type: Transform @@ -16150,6 +16137,8 @@ entities: - 6289 - 5644 - 5643 + - type: Fixtures + fixtures: {} - uid: 6275 components: - type: Transform @@ -16163,6 +16152,8 @@ entities: - 5723 - 5722 - 6292 + - type: Fixtures + fixtures: {} - uid: 6277 components: - type: Transform @@ -16174,6 +16165,8 @@ entities: - 6279 - 5668 - 5669 + - type: Fixtures + fixtures: {} - uid: 6284 components: - type: Transform @@ -16183,6 +16176,8 @@ entities: - type: DeviceList devices: - 5705 + - type: Fixtures + fixtures: {} - uid: 6285 components: - type: Transform @@ -16193,6 +16188,8 @@ entities: devices: - 5721 - 5720 + - type: Fixtures + fixtures: {} - uid: 6286 components: - type: Transform @@ -16203,6 +16200,8 @@ entities: devices: - 5753 - 5704 + - type: Fixtures + fixtures: {} - uid: 6293 components: - type: Transform @@ -16212,6 +16211,8 @@ entities: devices: - 5533 - 5550 + - type: Fixtures + fixtures: {} - uid: 6910 components: - type: Transform @@ -16235,6 +16236,8 @@ entities: - 1807 - 6908 - 6907 + - type: Fixtures + fixtures: {} - uid: 6913 components: - type: Transform @@ -16261,6 +16264,8 @@ entities: - 6822 - 1555 - 1554 + - type: Fixtures + fixtures: {} - uid: 6915 components: - type: Transform @@ -16276,6 +16281,8 @@ entities: - 6917 - 6904 - 6905 + - type: Fixtures + fixtures: {} - uid: 7415 components: - type: Transform @@ -16288,6 +16295,8 @@ entities: - 10585 - 10584 - 8941 + - type: Fixtures + fixtures: {} - uid: 8168 components: - type: Transform @@ -16302,6 +16311,8 @@ entities: - 7558 - 35981 - 8477 + - type: Fixtures + fixtures: {} - uid: 8417 components: - type: Transform @@ -16330,6 +16341,8 @@ entities: - 9345 - 36052 - 25507 + - type: Fixtures + fixtures: {} - uid: 8619 components: - type: Transform @@ -16347,6 +16360,8 @@ entities: - 8617 - 8600 - 8599 + - type: Fixtures + fixtures: {} - uid: 8622 components: - type: Transform @@ -16364,6 +16379,8 @@ entities: - 8596 - 8595 - 8638 + - type: Fixtures + fixtures: {} - uid: 8623 components: - type: Transform @@ -16381,6 +16398,8 @@ entities: - 8634 - 8597 - 8598 + - type: Fixtures + fixtures: {} - uid: 8625 components: - type: Transform @@ -16396,6 +16415,8 @@ entities: - 8636 - 8567 - 8557 + - type: Fixtures + fixtures: {} - uid: 8628 components: - type: Transform @@ -16412,6 +16433,8 @@ entities: - 8618 - 8542 - 8541 + - type: Fixtures + fixtures: {} - uid: 8629 components: - type: Transform @@ -16422,6 +16445,8 @@ entities: - 8452 - 8453 - 8069 + - type: Fixtures + fixtures: {} - uid: 8630 components: - type: Transform @@ -16432,6 +16457,8 @@ entities: devices: - 8533 - 8532 + - type: Fixtures + fixtures: {} - uid: 8633 components: - type: Transform @@ -16451,6 +16478,8 @@ entities: - 8614 - 8552 - 8553 + - type: Fixtures + fixtures: {} - uid: 8882 components: - type: Transform @@ -16470,6 +16499,8 @@ entities: - 7589 - 9345 - 36052 + - type: Fixtures + fixtures: {} - uid: 8902 components: - type: Transform @@ -16481,6 +16512,8 @@ entities: - 8886 - 8893 - 8932 + - type: Fixtures + fixtures: {} - uid: 9002 components: - type: Transform @@ -16492,6 +16525,8 @@ entities: - 8105 - 8955 - 10458 + - type: Fixtures + fixtures: {} - uid: 9461 components: - type: Transform @@ -16502,6 +16537,8 @@ entities: - 10362 - 8891 - 8985 + - type: Fixtures + fixtures: {} - uid: 10591 components: - type: Transform @@ -16518,6 +16555,8 @@ entities: - 9460 - 10435 - 10297 + - type: Fixtures + fixtures: {} - uid: 11473 components: - type: Transform @@ -16533,6 +16572,8 @@ entities: - 10091 - 10092 - 11485 + - type: Fixtures + fixtures: {} - uid: 11475 components: - type: Transform @@ -16559,6 +16600,8 @@ entities: - 10058 - 11047 - 11048 + - type: Fixtures + fixtures: {} - uid: 11477 components: - type: Transform @@ -16581,6 +16624,8 @@ entities: - 10097 - 10098 - 10099 + - type: Fixtures + fixtures: {} - uid: 11479 components: - type: Transform @@ -16595,6 +16640,8 @@ entities: - 11486 - 11127 - 11128 + - type: Fixtures + fixtures: {} - uid: 11480 components: - type: Transform @@ -16604,6 +16651,8 @@ entities: devices: - 11129 - 11126 + - type: Fixtures + fixtures: {} - uid: 11481 components: - type: Transform @@ -16622,6 +16671,8 @@ entities: - 11487 - 9951 - 9950 + - type: Fixtures + fixtures: {} - uid: 13028 components: - type: Transform @@ -16640,6 +16691,8 @@ entities: - 12766 - 12762 - 12763 + - type: Fixtures + fixtures: {} - uid: 13105 components: - type: Transform @@ -16650,6 +16703,8 @@ entities: - 13104 - 13103 - 13102 + - type: Fixtures + fixtures: {} - uid: 14577 components: - type: Transform @@ -16670,11 +16725,15 @@ entities: - 14442 - 14441 - 14450 + - type: Fixtures + fixtures: {} - uid: 14578 components: - type: Transform pos: 36.5,-18.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 14579 components: - type: Transform @@ -16691,6 +16750,8 @@ entities: - 14587 - 14524 - 14525 + - type: Fixtures + fixtures: {} - uid: 14581 components: - type: Transform @@ -16709,6 +16770,8 @@ entities: - 14586 - 14526 - 14527 + - type: Fixtures + fixtures: {} - uid: 14582 components: - type: Transform @@ -16730,6 +16793,8 @@ entities: - 14588 - 14585 - 14584 + - type: Fixtures + fixtures: {} - uid: 14594 components: - type: Transform @@ -16748,6 +16813,8 @@ entities: - 14602 - 14522 - 14523 + - type: Fixtures + fixtures: {} - uid: 14595 components: - type: Transform @@ -16763,6 +16830,8 @@ entities: - 14442 - 14453 - 14452 + - type: Fixtures + fixtures: {} - uid: 14596 components: - type: Transform @@ -16774,6 +16843,8 @@ entities: - 14448 - 14299 - 14295 + - type: Fixtures + fixtures: {} - uid: 14597 components: - type: Transform @@ -16788,6 +16859,8 @@ entities: - 14449 - 14281 - 14283 + - type: Fixtures + fixtures: {} - uid: 14598 components: - type: Transform @@ -16798,6 +16871,8 @@ entities: devices: - 14498 - 14490 + - type: Fixtures + fixtures: {} - uid: 14599 components: - type: Transform @@ -16808,6 +16883,8 @@ entities: devices: - 14342 - 14343 + - type: Fixtures + fixtures: {} - uid: 14600 components: - type: Transform @@ -16822,12 +16899,16 @@ entities: - 14451 - 14330 - 14331 + - type: Fixtures + fixtures: {} - uid: 14601 components: - type: Transform rot: 1.5707963267948966 rad pos: 26.5,-24.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 17665 components: - type: Transform @@ -16845,6 +16926,8 @@ entities: - 17720 - 17721 - 18744 + - type: Fixtures + fixtures: {} - uid: 17757 components: - type: Transform @@ -16862,6 +16945,8 @@ entities: - 17755 - 17748 - 17747 + - type: Fixtures + fixtures: {} - uid: 17760 components: - type: Transform @@ -16878,6 +16963,8 @@ entities: - 17593 - 17544 - 17543 + - type: Fixtures + fixtures: {} - uid: 17763 components: - type: Transform @@ -16898,6 +16985,8 @@ entities: - 17394 - 17393 - 18743 + - type: Fixtures + fixtures: {} - uid: 17764 components: - type: Transform @@ -16921,6 +17010,8 @@ entities: - 17591 - 17460 - 17461 + - type: Fixtures + fixtures: {} - uid: 17767 components: - type: Transform @@ -16934,6 +17025,8 @@ entities: - 17580 - 17391 - 17392 + - type: Fixtures + fixtures: {} - uid: 17768 components: - type: Transform @@ -16948,6 +17041,8 @@ entities: - 17784 - 17406 - 17405 + - type: Fixtures + fixtures: {} - uid: 17771 components: - type: Transform @@ -16962,6 +17057,8 @@ entities: - 17594 - 17399 - 17297 + - type: Fixtures + fixtures: {} - uid: 17772 components: - type: Transform @@ -16972,11 +17069,15 @@ entities: devices: - 17502 - 17500 + - type: Fixtures + fixtures: {} - uid: 17775 components: - type: Transform pos: 34.5,47.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 17776 components: - type: Transform @@ -16991,6 +17092,8 @@ entities: - 17778 - 17607 - 17608 + - type: Fixtures + fixtures: {} - uid: 17779 components: - type: Transform @@ -17009,6 +17112,8 @@ entities: - 17596 - 17389 - 17387 + - type: Fixtures + fixtures: {} - uid: 17787 components: - type: Transform @@ -17023,6 +17128,8 @@ entities: - 17756 - 17501 - 17499 + - type: Fixtures + fixtures: {} - uid: 18171 components: - type: Transform @@ -17037,12 +17144,19 @@ entities: - 17785 - 17401 - 17398 - - uid: 20643 + - type: Fixtures + fixtures: {} + - uid: 24651 components: - type: Transform rot: -1.5707963267948966 rad - pos: 104.5,-38.5 + pos: 106.5,-38.5 parent: 13329 + - type: DeviceList + devices: + - 24652 + - type: Fixtures + fixtures: {} - uid: 25907 components: - type: Transform @@ -17052,6 +17166,8 @@ entities: devices: - 22683 - 22684 + - type: Fixtures + fixtures: {} - uid: 25908 components: - type: Transform @@ -17068,6 +17184,8 @@ entities: - 25502 - 22670 - 22669 + - type: Fixtures + fixtures: {} - uid: 25911 components: - type: Transform @@ -17084,6 +17202,8 @@ entities: - 25508 - 22686 - 22685 + - type: Fixtures + fixtures: {} - uid: 25912 components: - type: Transform @@ -17098,6 +17218,8 @@ entities: - 25948 - 24035 - 24027 + - type: Fixtures + fixtures: {} - uid: 25915 components: - type: Transform @@ -17115,6 +17237,8 @@ entities: - 25004 - 25944 - 23661 + - type: Fixtures + fixtures: {} - uid: 25918 components: - type: Transform @@ -17127,6 +17251,8 @@ entities: - 23801 - 23802 - 25949 + - type: Fixtures + fixtures: {} - uid: 25919 components: - type: Transform @@ -17140,6 +17266,8 @@ entities: - 25942 - 24893 - 24892 + - type: Fixtures + fixtures: {} - uid: 25922 components: - type: Transform @@ -17152,6 +17280,8 @@ entities: - 25945 - 25091 - 25415 + - type: Fixtures + fixtures: {} - uid: 25923 components: - type: Transform @@ -17166,6 +17296,8 @@ entities: - 25939 - 25362 - 25361 + - type: Fixtures + fixtures: {} - uid: 25925 components: - type: Transform @@ -17189,6 +17321,8 @@ entities: - 25877 - 22720 - 22730 + - type: Fixtures + fixtures: {} - uid: 25927 components: - type: Transform @@ -17202,6 +17336,8 @@ entities: - 23461 - 25455 - 25456 + - type: Fixtures + fixtures: {} - uid: 25929 components: - type: Transform @@ -17214,6 +17350,8 @@ entities: - 25941 - 20227 - 25505 + - type: Fixtures + fixtures: {} - uid: 25931 components: - type: Transform @@ -17227,6 +17365,8 @@ entities: - 25946 - 25403 - 25404 + - type: Fixtures + fixtures: {} - uid: 25934 components: - type: Transform @@ -17241,6 +17381,8 @@ entities: - 21383 - 25384 - 25402 + - type: Fixtures + fixtures: {} - uid: 25935 components: - type: Transform @@ -17252,6 +17394,8 @@ entities: - 21384 - 25401 - 25380 + - type: Fixtures + fixtures: {} - uid: 27684 components: - type: Transform @@ -17264,6 +17408,8 @@ entities: - 21541 - 27659 - 27677 + - type: Fixtures + fixtures: {} - uid: 27685 components: - type: Transform @@ -17276,6 +17422,8 @@ entities: - 27681 - 27649 - 27676 + - type: Fixtures + fixtures: {} - uid: 27686 components: - type: Transform @@ -17286,6 +17434,8 @@ entities: devices: - 27679 - 27660 + - type: Fixtures + fixtures: {} - uid: 28233 components: - type: Transform @@ -17302,6 +17452,8 @@ entities: - 28231 - 28198 - 28196 + - type: Fixtures + fixtures: {} - uid: 28271 components: - type: Transform @@ -17320,6 +17472,8 @@ entities: - 21366 - 28269 - 28268 + - type: Fixtures + fixtures: {} - uid: 28335 components: - type: Transform @@ -17337,6 +17491,8 @@ entities: - 21404 - 28320 - 28333 + - type: Fixtures + fixtures: {} - uid: 28834 components: - type: Transform @@ -17353,6 +17509,8 @@ entities: - 28830 - 28831 - 29280 + - type: Fixtures + fixtures: {} - uid: 28837 components: - type: Transform @@ -17372,6 +17530,8 @@ entities: - 28801 - 28794 - 28795 + - type: Fixtures + fixtures: {} - uid: 28838 components: - type: Transform @@ -17387,6 +17547,8 @@ entities: - 28902 - 28264 - 28267 + - type: Fixtures + fixtures: {} - uid: 28841 components: - type: Transform @@ -17404,6 +17566,8 @@ entities: - 28803 - 28787 - 28786 + - type: Fixtures + fixtures: {} - uid: 28894 components: - type: Transform @@ -17423,6 +17587,8 @@ entities: - 28807 - 8263 - 8256 + - type: Fixtures + fixtures: {} - uid: 28897 components: - type: Transform @@ -17441,6 +17607,8 @@ entities: - 28806 - 28889 - 28888 + - type: Fixtures + fixtures: {} - uid: 28899 components: - type: Transform @@ -17457,6 +17625,8 @@ entities: - 28805 - 28890 - 28891 + - type: Fixtures + fixtures: {} - uid: 28901 components: - type: Transform @@ -17479,6 +17649,8 @@ entities: - 28804 - 28843 - 28842 + - type: Fixtures + fixtures: {} - uid: 30674 components: - type: Transform @@ -17488,6 +17660,8 @@ entities: devices: - 30316 - 30302 + - type: Fixtures + fixtures: {} - uid: 30675 components: - type: Transform @@ -17497,6 +17671,8 @@ entities: devices: - 30315 - 30303 + - type: Fixtures + fixtures: {} - uid: 31260 components: - type: Transform @@ -17511,6 +17687,8 @@ entities: - 31256 - 31134 - 31135 + - type: Fixtures + fixtures: {} - uid: 31262 components: - type: Transform @@ -17536,6 +17714,8 @@ entities: - 21412 - 21411 - 21410 + - type: Fixtures + fixtures: {} - uid: 31264 components: - type: Transform @@ -17546,6 +17726,8 @@ entities: - 31166 - 31148 - 31258 + - type: Fixtures + fixtures: {} - uid: 31265 components: - type: Transform @@ -17555,6 +17737,8 @@ entities: devices: - 31165 - 31164 + - type: Fixtures + fixtures: {} - uid: 31266 components: - type: Transform @@ -17564,6 +17748,8 @@ entities: devices: - 31136 - 31132 + - type: Fixtures + fixtures: {} - uid: 35618 components: - type: Transform @@ -17573,6 +17759,8 @@ entities: devices: - 29840 - 29841 + - type: Fixtures + fixtures: {} - uid: 35619 components: - type: Transform @@ -17583,6 +17771,8 @@ entities: devices: - 29843 - 29838 + - type: Fixtures + fixtures: {} - uid: 35620 components: - type: Transform @@ -17593,6 +17783,8 @@ entities: devices: - 29751 - 29752 + - type: Fixtures + fixtures: {} - uid: 35621 components: - type: Transform @@ -17602,6 +17794,8 @@ entities: devices: - 29839 - 29842 + - type: Fixtures + fixtures: {} - uid: 35622 components: - type: Transform @@ -17611,6 +17805,8 @@ entities: devices: - 29846 - 29847 + - type: Fixtures + fixtures: {} - uid: 35623 components: - type: Transform @@ -17621,6 +17817,8 @@ entities: devices: - 29844 - 29845 + - type: Fixtures + fixtures: {} - uid: 35624 components: - type: Transform @@ -17633,6 +17831,8 @@ entities: - 29866 - 29864 - 29863 + - type: Fixtures + fixtures: {} - proto: AirCanister entities: - uid: 4699 @@ -18903,6 +19103,36 @@ entities: - type: Transform pos: 42.5,54.5 parent: 13329 +- proto: AirlockExternalGlassAtmosphericsLocked + entities: + - uid: 20646 + components: + - type: Transform + pos: 108.5,-39.5 + parent: 13329 + - type: AccessReader + accessListsOriginal: [] + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 23632: + - - DoorStatus + - DoorBolt + - uid: 23632 + components: + - type: Transform + pos: 106.5,-39.5 + parent: 13329 + - type: AccessReader + accessListsOriginal: [] + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 20646: + - - DoorStatus + - DoorBolt - proto: AirlockExternalGlassCargoLocked entities: - uid: 10110 @@ -21544,6 +21774,12 @@ entities: - type: Transform pos: 23.5,50.5 parent: 13329 + - uid: 24652 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 110.5,-36.5 + parent: 13329 - uid: 25501 components: - type: Transform @@ -21869,6 +22105,8 @@ entities: - type: Transform pos: -11.5,11.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 668 components: - type: MetaData @@ -21876,6 +22114,8 @@ entities: - type: Transform pos: -20.5,23.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 669 components: - type: MetaData @@ -21884,6 +22124,8 @@ entities: rot: 3.141592653589793 rad pos: -10.5,23.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 671 components: - type: MetaData @@ -21892,6 +22134,8 @@ entities: rot: 3.141592653589793 rad pos: -6.5,30.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 672 components: - type: MetaData @@ -21899,6 +22143,8 @@ entities: - type: Transform pos: -4.5,30.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 673 components: - type: MetaData @@ -21907,6 +22153,8 @@ entities: rot: 3.141592653589793 rad pos: -4.5,33.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 1507 components: - type: MetaData @@ -21914,6 +22162,8 @@ entities: - type: Transform pos: 4.5,14.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 1665 components: - type: MetaData @@ -21921,6 +22171,8 @@ entities: - type: Transform pos: -2.5,7.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 1990 components: - type: MetaData @@ -21929,6 +22181,8 @@ entities: rot: 1.5707963267948966 rad pos: -12.5,1.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 1991 components: - type: MetaData @@ -21936,12 +22190,16 @@ entities: - type: Transform pos: -15.5,1.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 2118 components: - type: Transform rot: 3.141592653589793 rad pos: -8.5,-11.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 2276 components: - type: MetaData @@ -21950,6 +22208,8 @@ entities: rot: -1.5707963267948966 rad pos: -16.5,-9.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 4153 components: - type: MetaData @@ -21957,6 +22217,8 @@ entities: - type: Transform pos: -32.5,28.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 4154 components: - type: MetaData @@ -21965,6 +22227,8 @@ entities: rot: -1.5707963267948966 rad pos: -26.5,36.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 4470 components: - type: MetaData @@ -21973,6 +22237,8 @@ entities: rot: 1.5707963267948966 rad pos: -26.5,41.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 4618 components: - type: MetaData @@ -21980,6 +22246,8 @@ entities: - type: Transform pos: -36.5,51.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 5754 components: - type: MetaData @@ -21987,6 +22255,8 @@ entities: - type: Transform pos: -26.5,59.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 5755 components: - type: MetaData @@ -21994,6 +22264,8 @@ entities: - type: Transform pos: -18.5,56.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 5756 components: - type: MetaData @@ -22002,6 +22274,8 @@ entities: rot: 3.141592653589793 rad pos: -11.5,53.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 5757 components: - type: MetaData @@ -22009,6 +22283,8 @@ entities: - type: Transform pos: -22.5,63.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 5758 components: - type: MetaData @@ -22016,6 +22292,8 @@ entities: - type: Transform pos: -20.5,74.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 5759 components: - type: MetaData @@ -22024,6 +22302,8 @@ entities: rot: 1.5707963267948966 rad pos: -12.5,71.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 5760 components: - type: MetaData @@ -22031,6 +22311,8 @@ entities: - type: Transform pos: -14.5,67.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 5901 components: - type: MetaData @@ -22038,6 +22320,8 @@ entities: - type: Transform pos: -34.5,59.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 6824 components: - type: MetaData @@ -22045,6 +22329,8 @@ entities: - type: Transform pos: 6.5,31.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 8479 components: - type: MetaData @@ -22053,6 +22339,8 @@ entities: rot: -1.5707963267948966 rad pos: 44.5,7.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 8678 components: - type: MetaData @@ -22060,11 +22348,15 @@ entities: - type: Transform pos: 21.5,16.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 8679 components: - type: Transform pos: 30.5,15.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 8682 components: - type: MetaData @@ -22073,11 +22365,15 @@ entities: rot: 1.5707963267948966 rad pos: 48.5,6.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 8683 components: - type: Transform pos: 32.5,8.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 8684 components: - type: MetaData @@ -22086,6 +22382,8 @@ entities: rot: 1.5707963267948966 rad pos: 26.5,20.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 8685 components: - type: MetaData @@ -22093,6 +22391,8 @@ entities: - type: Transform pos: 36.5,23.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 8686 components: - type: MetaData @@ -22100,6 +22400,8 @@ entities: - type: Transform pos: 19.5,27.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 9991 components: - type: MetaData @@ -22108,6 +22410,8 @@ entities: rot: 1.5707963267948966 rad pos: -6.5,-24.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 9992 components: - type: MetaData @@ -22116,12 +22420,16 @@ entities: rot: 1.5707963267948966 rad pos: -2.5,-23.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 9993 components: - type: Transform rot: 1.5707963267948966 rad pos: -3.5,-21.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 9994 components: - type: MetaData @@ -22130,6 +22438,8 @@ entities: rot: 1.5707963267948966 rad pos: -4.5,-15.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 10644 components: - type: MetaData @@ -22138,6 +22448,8 @@ entities: rot: 1.5707963267948966 rad pos: 32.5,10.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 10792 components: - type: MetaData @@ -22146,6 +22458,8 @@ entities: rot: 1.5707963267948966 rad pos: 12.5,2.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 10793 components: - type: MetaData @@ -22154,6 +22468,8 @@ entities: rot: 1.5707963267948966 rad pos: 12.5,0.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 10915 components: - type: MetaData @@ -22161,6 +22477,8 @@ entities: - type: Transform pos: 16.5,-28.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 11226 components: - type: MetaData @@ -22168,6 +22486,8 @@ entities: - type: Transform pos: 9.5,-19.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 11227 components: - type: MetaData @@ -22176,6 +22496,8 @@ entities: rot: -1.5707963267948966 rad pos: 10.5,-13.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 11228 components: - type: MetaData @@ -22184,11 +22506,15 @@ entities: rot: 1.5707963267948966 rad pos: 14.5,-13.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 12004 components: - type: Transform pos: -13.5,-17.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 12901 components: - type: MetaData @@ -22196,6 +22522,8 @@ entities: - type: Transform pos: -41.5,-48.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 12902 components: - type: MetaData @@ -22204,6 +22532,8 @@ entities: rot: -1.5707963267948966 rad pos: -37.5,-38.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 13399 components: - type: MetaData @@ -22211,6 +22541,8 @@ entities: - type: Transform pos: -36.5,-3.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 13421 components: - type: MetaData @@ -22218,6 +22550,8 @@ entities: - type: Transform pos: -29.5,-23.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 14609 components: - type: MetaData @@ -22225,6 +22559,8 @@ entities: - type: Transform pos: 34.5,-18.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 14610 components: - type: MetaData @@ -22232,6 +22568,8 @@ entities: - type: Transform pos: 49.5,-24.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 14611 components: - type: MetaData @@ -22240,6 +22578,8 @@ entities: rot: 1.5707963267948966 rad pos: 49.5,-20.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 14612 components: - type: MetaData @@ -22247,6 +22587,8 @@ entities: - type: Transform pos: 53.5,-28.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 14613 components: - type: MetaData @@ -22255,6 +22597,8 @@ entities: rot: 1.5707963267948966 rad pos: 40.5,-34.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 14614 components: - type: MetaData @@ -22263,6 +22607,8 @@ entities: rot: 1.5707963267948966 rad pos: 33.5,-31.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 14615 components: - type: MetaData @@ -22270,6 +22616,8 @@ entities: - type: Transform pos: 39.5,-14.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 14616 components: - type: MetaData @@ -22278,6 +22626,8 @@ entities: rot: 1.5707963267948966 rad pos: 46.5,-40.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 14617 components: - type: MetaData @@ -22285,6 +22635,8 @@ entities: - type: Transform pos: 35.5,-32.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 14921 components: - type: MetaData @@ -22293,6 +22645,8 @@ entities: rot: 1.5707963267948966 rad pos: 26.5,-26.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 17512 components: - type: MetaData @@ -22300,6 +22654,8 @@ entities: - type: Transform pos: 21.5,52.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 17788 components: - type: MetaData @@ -22307,6 +22663,8 @@ entities: - type: Transform pos: 3.5,51.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 17789 components: - type: MetaData @@ -22315,6 +22673,8 @@ entities: rot: 1.5707963267948966 rad pos: 9.5,39.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 17790 components: - type: MetaData @@ -22322,6 +22682,8 @@ entities: - type: Transform pos: 4.5,42.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 17791 components: - type: MetaData @@ -22329,6 +22691,8 @@ entities: - type: Transform pos: 23.5,42.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 17793 components: - type: MetaData @@ -22336,6 +22700,8 @@ entities: - type: Transform pos: 13.5,52.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 17794 components: - type: MetaData @@ -22343,6 +22709,8 @@ entities: - type: Transform pos: 6.5,57.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 17795 components: - type: MetaData @@ -22350,6 +22718,8 @@ entities: - type: Transform pos: 3.5,64.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 17796 components: - type: MetaData @@ -22357,6 +22727,8 @@ entities: - type: Transform pos: 24.5,61.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 17797 components: - type: MetaData @@ -22365,6 +22737,8 @@ entities: rot: 1.5707963267948966 rad pos: 31.5,44.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 17935 components: - type: MetaData @@ -22372,6 +22746,8 @@ entities: - type: Transform pos: 21.5,46.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 19258 components: - type: MetaData @@ -22379,6 +22755,8 @@ entities: - type: Transform pos: 28.5,-45.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 19259 components: - type: MetaData @@ -22386,6 +22764,8 @@ entities: - type: Transform pos: 26.5,-54.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 19316 components: - type: MetaData @@ -22393,6 +22773,8 @@ entities: - type: Transform pos: 26.5,-40.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 19856 components: - type: MetaData @@ -22400,6 +22782,8 @@ entities: - type: Transform pos: 51.5,-44.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 23958 components: - type: MetaData @@ -22408,6 +22792,8 @@ entities: rot: 1.5707963267948966 rad pos: 112.5,-24.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 24147 components: - type: MetaData @@ -22416,6 +22802,8 @@ entities: rot: -1.5707963267948966 rad pos: 53.5,-5.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 24148 components: - type: MetaData @@ -22424,6 +22812,8 @@ entities: rot: 3.141592653589793 rad pos: 62.5,-6.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 24149 components: - type: MetaData @@ -22431,6 +22821,8 @@ entities: - type: Transform pos: 72.5,-7.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 24150 components: - type: MetaData @@ -22438,6 +22830,8 @@ entities: - type: Transform pos: 69.5,-7.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 24206 components: - type: MetaData @@ -22445,6 +22839,8 @@ entities: - type: Transform pos: 66.5,-17.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 24207 components: - type: MetaData @@ -22452,6 +22848,8 @@ entities: - type: Transform pos: 80.5,-17.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 24208 components: - type: MetaData @@ -22460,6 +22858,8 @@ entities: rot: -1.5707963267948966 rad pos: 78.5,-25.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 24408 components: - type: MetaData @@ -22467,6 +22867,8 @@ entities: - type: Transform pos: 78.5,-32.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 24409 components: - type: MetaData @@ -22474,6 +22876,8 @@ entities: - type: Transform pos: 99.5,-32.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 24410 components: - type: MetaData @@ -22481,6 +22885,8 @@ entities: - type: Transform pos: 96.5,-18.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 24992 components: - type: MetaData @@ -22489,6 +22895,8 @@ entities: rot: -1.5707963267948966 rad pos: 31.5,-10.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 25131 components: - type: MetaData @@ -22496,11 +22904,15 @@ entities: - type: Transform pos: 100.5,-44.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 25552 components: - type: Transform pos: 85.5,4.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 25553 components: - type: MetaData @@ -22509,6 +22921,8 @@ entities: rot: 1.5707963267948966 rad pos: 88.5,-2.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 25554 components: - type: MetaData @@ -22516,6 +22930,8 @@ entities: - type: Transform pos: 96.5,-1.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 25555 components: - type: MetaData @@ -22524,6 +22940,8 @@ entities: rot: -1.5707963267948966 rad pos: 75.5,-1.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 25556 components: - type: MetaData @@ -22531,6 +22949,8 @@ entities: - type: Transform pos: 83.5,-9.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 25557 components: - type: MetaData @@ -22538,6 +22958,8 @@ entities: - type: Transform pos: 92.5,-9.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 25558 components: - type: MetaData @@ -22546,6 +22968,8 @@ entities: rot: 3.141592653589793 rad pos: 88.5,4.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 25559 components: - type: MetaData @@ -22553,6 +22977,8 @@ entities: - type: Transform pos: 80.5,2.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 27375 components: - type: MetaData @@ -22560,6 +22986,8 @@ entities: - type: Transform pos: 121.5,-4.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 27376 components: - type: MetaData @@ -22567,11 +22995,15 @@ entities: - type: Transform pos: 123.5,4.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 27377 components: - type: Transform pos: 115.5,13.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 27540 components: - type: MetaData @@ -22579,6 +23011,8 @@ entities: - type: Transform pos: 91.5,31.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 27601 components: - type: MetaData @@ -22587,6 +23021,8 @@ entities: rot: 1.5707963267948966 rad pos: 85.5,34.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 28343 components: - type: MetaData @@ -22594,6 +23030,8 @@ entities: - type: Transform pos: 60.5,35.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 28344 components: - type: MetaData @@ -22602,6 +23040,8 @@ entities: rot: -1.5707963267948966 rad pos: 67.5,30.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 28345 components: - type: MetaData @@ -22609,6 +23049,8 @@ entities: - type: Transform pos: 76.5,36.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 28346 components: - type: MetaData @@ -22616,6 +23058,8 @@ entities: - type: Transform pos: 69.5,17.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 28347 components: - type: MetaData @@ -22623,6 +23067,8 @@ entities: - type: Transform pos: 60.5,19.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 28348 components: - type: MetaData @@ -22631,6 +23077,8 @@ entities: rot: 1.5707963267948966 rad pos: 80.5,23.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 28655 components: - type: MetaData @@ -22638,6 +23086,8 @@ entities: - type: Transform pos: 86.5,17.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 28663 components: - type: MetaData @@ -22645,6 +23095,8 @@ entities: - type: Transform pos: 92.5,24.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 29956 components: - type: MetaData @@ -22653,6 +23105,8 @@ entities: rot: 1.5707963267948966 rad pos: 94.5,49.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 29957 components: - type: MetaData @@ -22660,6 +23114,8 @@ entities: - type: Transform pos: 104.5,57.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 29958 components: - type: MetaData @@ -22667,6 +23123,8 @@ entities: - type: Transform pos: 104.5,45.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 29959 components: - type: MetaData @@ -22675,6 +23133,8 @@ entities: rot: 1.5707963267948966 rad pos: 125.5,49.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 30393 components: - type: MetaData @@ -22683,6 +23143,8 @@ entities: rot: -1.5707963267948966 rad pos: 92.5,48.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 30394 components: - type: MetaData @@ -22690,6 +23152,8 @@ entities: - type: Transform pos: 85.5,57.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 30395 components: - type: MetaData @@ -22697,6 +23161,8 @@ entities: - type: Transform pos: 82.5,48.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 30396 components: - type: MetaData @@ -22705,6 +23171,8 @@ entities: rot: 3.141592653589793 rad pos: 79.5,48.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 30786 components: - type: MetaData @@ -22712,6 +23180,8 @@ entities: - type: Transform pos: 57.5,49.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 30787 components: - type: MetaData @@ -22720,6 +23190,8 @@ entities: rot: -1.5707963267948966 rad pos: 66.5,55.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 30788 components: - type: MetaData @@ -22728,6 +23200,8 @@ entities: rot: -1.5707963267948966 rad pos: 74.5,58.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 30789 components: - type: MetaData @@ -22736,6 +23210,8 @@ entities: rot: -1.5707963267948966 rad pos: 75.5,48.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 30935 components: - type: MetaData @@ -22743,6 +23219,8 @@ entities: - type: Transform pos: 51.5,41.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 31969 components: - type: MetaData @@ -22750,6 +23228,8 @@ entities: - type: Transform pos: -35.5,11.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 32798 components: - type: MetaData @@ -22758,12 +23238,16 @@ entities: rot: 3.141592653589793 rad pos: 96.5,4.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 33745 components: - type: Transform rot: 1.5707963267948966 rad pos: 31.5,56.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 34017 components: - type: MetaData @@ -22771,6 +23255,8 @@ entities: - type: Transform pos: 54.5,65.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: APCHyperCapacity entities: - uid: 920 @@ -22780,6 +23266,8 @@ entities: - type: Transform pos: -14.5,27.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: ArtistCircuitBoard entities: - uid: 35744 @@ -28431,6 +28919,56 @@ entities: - type: Transform pos: -39.5,-8.5 parent: 13329 + - uid: 20637 + components: + - type: Transform + pos: 111.5,-35.5 + parent: 13329 + - uid: 20638 + components: + - type: Transform + pos: 109.5,-35.5 + parent: 13329 + - uid: 20642 + components: + - type: Transform + pos: 109.5,-36.5 + parent: 13329 + - uid: 20643 + components: + - type: Transform + pos: 110.5,-37.5 + parent: 13329 + - uid: 20644 + components: + - type: Transform + pos: 111.5,-37.5 + parent: 13329 + - uid: 20645 + components: + - type: Transform + pos: 109.5,-37.5 + parent: 13329 + - uid: 20658 + components: + - type: Transform + pos: 110.5,-38.5 + parent: 13329 + - uid: 23630 + components: + - type: Transform + pos: 110.5,-35.5 + parent: 13329 + - uid: 23853 + components: + - type: Transform + pos: 111.5,-36.5 + parent: 13329 + - uid: 23938 + components: + - type: Transform + pos: 110.5,-36.5 + parent: 13329 - uid: 26397 components: - type: Transform @@ -28566,51 +29104,6 @@ entities: - type: Transform pos: 93.5,-25.5 parent: 13329 - - uid: 26433 - components: - - type: Transform - pos: 105.5,-37.5 - parent: 13329 - - uid: 26434 - components: - - type: Transform - pos: 105.5,-36.5 - parent: 13329 - - uid: 26435 - components: - - type: Transform - pos: 105.5,-35.5 - parent: 13329 - - uid: 26436 - components: - - type: Transform - pos: 106.5,-37.5 - parent: 13329 - - uid: 26437 - components: - - type: Transform - pos: 106.5,-36.5 - parent: 13329 - - uid: 26438 - components: - - type: Transform - pos: 106.5,-35.5 - parent: 13329 - - uid: 26439 - components: - - type: Transform - pos: 107.5,-37.5 - parent: 13329 - - uid: 26440 - components: - - type: Transform - pos: 107.5,-36.5 - parent: 13329 - - uid: 26441 - components: - - type: Transform - pos: 107.5,-35.5 - parent: 13329 - proto: AtmosFixFreezerMarker entities: - uid: 32355 @@ -29015,6 +29508,8 @@ entities: - type: Transform pos: -6.5,16.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: BarSignOfficerBeersky entities: - uid: 34453 @@ -29022,6 +29517,8 @@ entities: - type: Transform pos: 85.5,-55.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: BarSignTheBirdCage entities: - uid: 34192 @@ -29029,6 +29526,8 @@ entities: - type: Transform pos: 42.5,65.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: BarSignZocalo entities: - uid: 4805 @@ -29036,6 +29535,8 @@ entities: - type: Transform pos: -23.5,33.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: BaseComputer entities: - uid: 6358 @@ -29787,6 +30288,12 @@ entities: - type: Transform pos: 99.5,-27.5 parent: 13329 + - uid: 23642 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 110.5,-38.5 + parent: 13329 - uid: 25540 components: - type: Transform @@ -29802,11 +30309,6 @@ entities: - type: Transform pos: 94.5,-13.5 parent: 13329 - - uid: 26442 - components: - - type: Transform - pos: 108.5,-36.5 - parent: 13329 - uid: 27054 components: - type: Transform @@ -30992,11 +31494,15 @@ entities: - Open - - Timer - AutoClose + - type: Fixtures + fixtures: {} - uid: 10576 components: - type: Transform pos: 26.5,4.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: BrokenBottle entities: - uid: 18218 @@ -31128,6 +31634,12 @@ entities: rot: -1.5707963267948966 rad pos: 22.478048,12.226272 parent: 13329 + - uid: 23690 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 109.5,-40.5 + parent: 13329 - proto: ButtonFrameExit entities: - uid: 20552 @@ -43701,6 +44213,16 @@ entities: - type: Transform pos: 130.5,44.5 parent: 13329 + - uid: 20660 + components: + - type: Transform + pos: 106.5,-35.5 + parent: 13329 + - uid: 20661 + components: + - type: Transform + pos: 106.5,-37.5 + parent: 13329 - uid: 22344 components: - type: Transform @@ -43976,11 +44498,46 @@ entities: - type: Transform pos: 130.5,50.5 parent: 13329 + - uid: 22526 + components: + - type: Transform + pos: 109.5,-36.5 + parent: 13329 + - uid: 22713 + components: + - type: Transform + pos: 107.5,-36.5 + parent: 13329 + - uid: 22727 + components: + - type: Transform + pos: 108.5,-36.5 + parent: 13329 + - uid: 22735 + components: + - type: Transform + pos: 106.5,-36.5 + parent: 13329 - uid: 22904 components: - type: Transform pos: 109.5,-21.5 parent: 13329 + - uid: 23625 + components: + - type: Transform + pos: 105.5,-36.5 + parent: 13329 + - uid: 23626 + components: + - type: Transform + pos: 104.5,-36.5 + parent: 13329 + - uid: 23627 + components: + - type: Transform + pos: 103.5,-36.5 + parent: 13329 - uid: 23698 components: - type: Transform @@ -44006,6 +44563,11 @@ entities: - type: Transform pos: 46.5,12.5 parent: 13329 + - uid: 23886 + components: + - type: Transform + pos: 102.5,-36.5 + parent: 13329 - uid: 23964 components: - type: Transform @@ -45076,121 +45638,6 @@ entities: - type: Transform pos: 101.5,-36.5 parent: 13329 - - uid: 24644 - components: - - type: Transform - pos: 102.5,-36.5 - parent: 13329 - - uid: 24645 - components: - - type: Transform - pos: 103.5,-36.5 - parent: 13329 - - uid: 24646 - components: - - type: Transform - pos: 104.5,-36.5 - parent: 13329 - - uid: 24647 - components: - - type: Transform - pos: 105.5,-36.5 - parent: 13329 - - uid: 24648 - components: - - type: Transform - pos: 106.5,-36.5 - parent: 13329 - - uid: 24649 - components: - - type: Transform - pos: 106.5,-35.5 - parent: 13329 - - uid: 24650 - components: - - type: Transform - pos: 106.5,-34.5 - parent: 13329 - - uid: 24651 - components: - - type: Transform - pos: 105.5,-34.5 - parent: 13329 - - uid: 24652 - components: - - type: Transform - pos: 107.5,-34.5 - parent: 13329 - - uid: 24653 - components: - - type: Transform - pos: 106.5,-37.5 - parent: 13329 - - uid: 24654 - components: - - type: Transform - pos: 106.5,-38.5 - parent: 13329 - - uid: 24655 - components: - - type: Transform - pos: 105.5,-38.5 - parent: 13329 - - uid: 24656 - components: - - type: Transform - pos: 107.5,-38.5 - parent: 13329 - - uid: 24659 - components: - - type: Transform - pos: 102.5,-35.5 - parent: 13329 - - uid: 24660 - components: - - type: Transform - pos: 102.5,-34.5 - parent: 13329 - - uid: 24661 - components: - - type: Transform - pos: 102.5,-33.5 - parent: 13329 - - uid: 24662 - components: - - type: Transform - pos: 103.5,-33.5 - parent: 13329 - - uid: 24663 - components: - - type: Transform - pos: 104.5,-33.5 - parent: 13329 - - uid: 24664 - components: - - type: Transform - pos: 102.5,-37.5 - parent: 13329 - - uid: 24665 - components: - - type: Transform - pos: 102.5,-38.5 - parent: 13329 - - uid: 24666 - components: - - type: Transform - pos: 102.5,-39.5 - parent: 13329 - - uid: 24667 - components: - - type: Transform - pos: 103.5,-39.5 - parent: 13329 - - uid: 24668 - components: - - type: Transform - pos: 104.5,-39.5 - parent: 13329 - uid: 24669 components: - type: Transform @@ -90992,6 +91439,11 @@ entities: - type: Transform pos: 46.6966,20.050323 parent: 13329 + - uid: 26439 + components: + - type: Transform + pos: 105.39259,-33.28564 + parent: 13329 - proto: CheapRollerBed entities: - uid: 18570 @@ -91133,6 +91585,16 @@ entities: - type: Transform pos: 51.467434,14.178997 parent: 13329 +- proto: CigaretteFrezon + entities: + - uid: 26434 + components: + - type: MetaData + desc: Make the TEG cold, comrade... + name: The Taste of Russia + - type: Transform + pos: 105.27148,-33.399025 + parent: 13329 - proto: CigaretteSpent entities: - uid: 12139 @@ -91276,6 +91738,8 @@ entities: - type: Transform pos: 6.5,14.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: ClosetBombFilled entities: - uid: 10640 @@ -91294,18 +91758,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - proto: ClosetChefFilled entities: - uid: 1164 @@ -91319,18 +91773,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 4789 components: - type: Transform @@ -91342,18 +91786,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 10586 components: - type: Transform @@ -91372,18 +91806,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 4144 components: - type: Transform @@ -91395,18 +91819,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 4590 components: - type: Transform @@ -91418,18 +91832,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 4878 components: - type: Transform @@ -91441,18 +91845,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 4893 components: - type: Transform @@ -91464,18 +91858,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 6297 components: - type: Transform @@ -91487,18 +91871,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 6542 components: - type: Transform @@ -91510,18 +91884,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 6636 components: - type: Transform @@ -91533,18 +91897,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 6769 components: - type: Transform @@ -91556,18 +91910,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 10192 components: - type: Transform @@ -91579,18 +91923,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 10783 components: - type: Transform @@ -91602,18 +91936,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 12146 components: - type: Transform @@ -91625,18 +91949,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 13030 components: - type: Transform @@ -91648,18 +91962,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 13039 components: - type: Transform @@ -91671,18 +91975,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 13041 components: - type: Transform @@ -91694,18 +91988,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 13148 components: - type: Transform @@ -91717,18 +92001,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 13567 components: - type: Transform @@ -91740,18 +92014,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 13644 components: - type: Transform @@ -91763,18 +92027,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 15315 components: - type: Transform @@ -91786,18 +92040,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 18845 components: - type: Transform @@ -91809,18 +92053,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 25830 components: - type: Transform @@ -91832,18 +92066,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 26247 components: - type: Transform @@ -91855,18 +92079,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 26761 components: - type: Transform @@ -91878,18 +92092,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 26762 components: - type: Transform @@ -91901,18 +92105,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 29127 components: - type: Transform @@ -91924,18 +92118,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 29182 components: - type: Transform @@ -91952,18 +92136,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 29313 components: - type: Transform @@ -91975,18 +92149,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 29361 components: - type: Transform @@ -91998,18 +92162,8 @@ entities: immutable: False temperature: 293.14954 moles: - - 3.2184362 - - 12.107451 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.2184362 + Nitrogen: 12.107451 - uid: 29362 components: - type: Transform @@ -92021,18 +92175,8 @@ entities: immutable: False temperature: 293.14954 moles: - - 3.2184362 - - 12.107451 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.2184362 + Nitrogen: 12.107451 - uid: 29567 components: - type: Transform @@ -92044,18 +92188,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 30080 components: - type: Transform @@ -92067,18 +92201,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 30081 components: - type: Transform @@ -92090,18 +92214,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 31421 components: - type: Transform @@ -92113,18 +92227,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 31743 components: - type: Transform @@ -92136,18 +92240,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 31800 components: - type: Transform @@ -92159,18 +92253,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 32326 components: - type: Transform @@ -92182,18 +92266,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 32342 components: - type: Transform @@ -92230,18 +92304,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 32422 components: - type: Transform @@ -92253,18 +92317,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 32429 components: - type: Transform @@ -92276,18 +92330,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 32445 components: - type: Transform @@ -92299,18 +92343,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 32538 components: - type: Transform @@ -92322,18 +92356,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 32603 components: - type: Transform @@ -92345,18 +92369,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 32761 components: - type: Transform @@ -92368,18 +92382,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 32773 components: - type: Transform @@ -92391,18 +92395,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 33818 components: - type: Transform @@ -92414,18 +92408,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 33862 components: - type: Transform @@ -92437,18 +92421,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 33975 components: - type: Transform @@ -92460,18 +92434,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 34060 components: - type: Transform @@ -92483,18 +92447,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 35223 components: - type: Transform @@ -92506,18 +92460,8 @@ entities: immutable: False temperature: 293.14954 moles: - - 3.2184362 - - 12.107451 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.2184362 + Nitrogen: 12.107451 - proto: ClosetEmergencyN2FilledRandom entities: - uid: 13248 @@ -92568,18 +92512,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 4145 components: - type: Transform @@ -92591,18 +92525,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 4591 components: - type: Transform @@ -92614,18 +92538,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 4879 components: - type: Transform @@ -92637,18 +92551,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 6637 components: - type: Transform @@ -92660,18 +92564,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 10191 components: - type: Transform @@ -92683,18 +92577,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 10784 components: - type: Transform @@ -92706,18 +92590,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 12147 components: - type: Transform @@ -92729,18 +92603,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 13060 components: - type: Transform @@ -92752,18 +92616,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 13150 components: - type: Transform @@ -92775,18 +92629,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 13151 components: - type: Transform @@ -92798,18 +92642,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 13568 components: - type: Transform @@ -92821,18 +92655,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 15316 components: - type: Transform @@ -92844,18 +92668,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 15368 components: - type: Transform @@ -92867,18 +92681,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 18847 components: - type: Transform @@ -92890,18 +92694,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 19995 components: - type: Transform @@ -92913,18 +92707,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 25831 components: - type: Transform @@ -92936,18 +92720,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 26246 components: - type: Transform @@ -92959,18 +92733,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 26764 components: - type: Transform @@ -92982,18 +92746,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 29128 components: - type: Transform @@ -93005,18 +92759,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 29273 components: - type: Transform @@ -93028,18 +92772,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 29314 components: - type: Transform @@ -93051,18 +92785,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 29568 components: - type: Transform @@ -93074,18 +92798,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 30082 components: - type: Transform @@ -93097,18 +92811,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 31718 components: - type: Transform @@ -93120,18 +92824,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 31740 components: - type: Transform @@ -93143,18 +92837,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 32327 components: - type: Transform @@ -93166,18 +92850,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 32419 components: - type: Transform @@ -93189,18 +92863,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 32421 components: - type: Transform @@ -93212,18 +92876,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 32430 components: - type: Transform @@ -93235,18 +92889,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 32760 components: - type: Transform @@ -93258,18 +92902,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 33823 components: - type: Transform @@ -93281,18 +92915,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 33976 components: - type: Transform @@ -93304,18 +92928,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 35224 components: - type: Transform @@ -93327,18 +92941,8 @@ entities: immutable: False temperature: 293.14954 moles: - - 3.2184362 - - 12.107451 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.2184362 + Nitrogen: 12.107451 - proto: ClosetJanitorFilled entities: - uid: 1501 @@ -93352,18 +92956,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 10302 components: - type: Transform @@ -93382,18 +92976,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 34207 components: - type: Transform @@ -93405,18 +92989,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - proto: ClosetL3JanitorFilled entities: - uid: 1500 @@ -93430,18 +93004,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 32615 components: - type: Transform @@ -93453,18 +93017,8 @@ entities: immutable: False temperature: 293.14954 moles: - - 3.2184362 - - 12.107451 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.2184362 + Nitrogen: 12.107451 - proto: ClosetL3SecurityFilled entities: - uid: 4594 @@ -93478,18 +93032,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 10695 components: - type: Transform @@ -93506,18 +93050,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - proto: ClosetL3VirologyFilled entities: - uid: 19027 @@ -93531,18 +93065,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 19028 components: - type: Transform @@ -93554,18 +93078,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 19029 components: - type: Transform @@ -93577,18 +93091,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 19030 components: - type: Transform @@ -93600,18 +93104,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - proto: ClosetMaintenanceFilledRandom entities: - uid: 2611 @@ -93625,18 +93119,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 4873 components: - type: Transform @@ -93648,18 +93132,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 12183 components: - type: Transform @@ -93671,18 +93145,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 28160 components: - type: Transform @@ -93694,18 +93158,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 31662 components: - type: Transform @@ -93717,18 +93171,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 31669 components: - type: Transform @@ -93740,18 +93184,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 31717 components: - type: Transform @@ -93763,18 +93197,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 31737 components: - type: Transform @@ -93786,18 +93210,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 32138 components: - type: Transform @@ -93809,18 +93223,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 32417 components: - type: Transform @@ -93832,18 +93236,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 32434 components: - type: Transform @@ -93855,18 +93249,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 32507 components: - type: Transform @@ -93878,18 +93262,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 32714 components: - type: Transform @@ -93901,18 +93275,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 32734 components: - type: Transform @@ -93924,18 +93288,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 33535 components: - type: Transform @@ -93947,18 +93301,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 33683 components: - type: Transform @@ -93970,18 +93314,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 33864 components: - type: Transform @@ -93993,18 +93327,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 33954 components: - type: Transform @@ -94016,18 +93340,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 34222 components: - type: Transform @@ -94039,18 +93353,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 34546 components: - type: Transform @@ -94062,18 +93366,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 34716 components: - type: Transform @@ -94085,18 +93379,8 @@ entities: immutable: False temperature: 293.14954 moles: - - 3.2184362 - - 12.107451 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.2184362 + Nitrogen: 12.107451 - uid: 35202 components: - type: Transform @@ -94108,18 +93392,8 @@ entities: immutable: False temperature: 293.14954 moles: - - 3.2184362 - - 12.107451 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.2184362 + Nitrogen: 12.107451 - proto: ClosetRadiationSuitFilled entities: - uid: 15308 @@ -94138,18 +93412,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 19994 components: - type: Transform @@ -94161,18 +93425,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 23565 components: - type: Transform @@ -94189,18 +93443,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 23569 components: - type: Transform @@ -94212,18 +93456,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 23570 components: - type: Transform @@ -94235,18 +93469,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 26248 components: - type: Transform @@ -94258,18 +93482,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 26482 components: - type: Transform @@ -94281,18 +93495,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 26743 components: - type: Transform @@ -94304,18 +93508,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 26744 components: - type: Transform @@ -94327,18 +93521,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 26863 components: - type: Transform @@ -94350,18 +93534,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 32791 components: - type: Transform @@ -94373,18 +93547,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 34612 components: - type: Transform @@ -94396,18 +93560,8 @@ entities: immutable: False temperature: 293.14954 moles: - - 3.2184362 - - 12.107451 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.2184362 + Nitrogen: 12.107451 - uid: 34613 components: - type: Transform @@ -94419,18 +93573,8 @@ entities: immutable: False temperature: 293.14954 moles: - - 3.2184362 - - 12.107451 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.2184362 + Nitrogen: 12.107451 - proto: ClosetSteelBase entities: - uid: 10901 @@ -94444,18 +93588,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 10902 components: - type: Transform @@ -94467,18 +93601,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 19035 components: - type: Transform @@ -94490,18 +93614,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 31688 components: - type: Transform @@ -94513,18 +93627,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - type: ContainerContainer containers: entity_storage: !type:Container @@ -94547,18 +93651,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 33953 components: - type: Transform @@ -94570,18 +93664,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - proto: ClosetToolFilled entities: - uid: 2316 @@ -94595,18 +93679,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 12092 components: - type: Transform @@ -94618,18 +93692,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 13043 components: - type: Transform @@ -94641,18 +93705,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 26445 components: - type: Transform @@ -94664,18 +93718,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 26446 components: - type: Transform @@ -94687,18 +93731,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 26447 components: - type: Transform @@ -94710,18 +93744,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 26485 components: - type: Transform @@ -94733,18 +93757,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 31778 components: - type: Transform @@ -94756,18 +93770,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 31779 components: - type: Transform @@ -94779,18 +93783,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 32212 components: - type: Transform @@ -94802,18 +93796,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 32219 components: - type: Transform @@ -94825,18 +93809,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 32310 components: - type: Transform @@ -94848,18 +93822,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 32413 components: - type: Transform @@ -94871,18 +93835,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - proto: ClosetWallAtmospherics entities: - uid: 32204 @@ -94896,18 +93850,10 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 + - type: Fixtures + fixtures: {} - proto: ClosetWallOrange entities: - uid: 7244 @@ -94916,12 +93862,16 @@ entities: rot: -1.5707963267948966 rad pos: 52.5,12.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 7245 components: - type: Transform rot: -1.5707963267948966 rad pos: 52.5,15.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: ClothingBackpackClown entities: - uid: 34574 @@ -98469,18 +97419,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - proto: CrateCoffin entities: - uid: 6643 @@ -98516,18 +97456,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - proto: CrateEmergencyRadiation entities: - uid: 9643 @@ -98546,18 +97476,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - proto: CrateEmptySpawner entities: - uid: 6962 @@ -98678,18 +97598,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - proto: CrateEngineeringAMEShielding entities: - uid: 25989 @@ -98715,18 +97625,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 32260 components: - type: Transform @@ -98738,18 +97638,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 32728 components: - type: Transform @@ -98761,18 +97651,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 33558 components: - type: Transform @@ -98784,18 +97664,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - proto: CrateEngineeringCableHV entities: - uid: 32116 @@ -98809,18 +97679,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 34058 components: - type: Transform @@ -98832,18 +97692,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - proto: CrateEngineeringCableLV entities: - uid: 4808 @@ -98857,18 +97707,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - proto: CrateEngineeringCableMV entities: - uid: 32220 @@ -98882,18 +97722,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - proto: CrateEngineeringElectricalSupplies entities: - uid: 3662 @@ -98907,18 +97737,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 26561 components: - type: Transform @@ -98930,18 +97750,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 29393 components: - type: Transform @@ -98953,18 +97763,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 32792 components: - type: Transform @@ -98976,18 +97776,8 @@ entities: immutable: False temperature: 293.14948 moles: - - 3.0603204 - - 11.512634 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0603204 + Nitrogen: 11.512634 - proto: CrateEngineeringFoamGrenade entities: - uid: 35597 @@ -99008,18 +97798,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - proto: CrateFilledSpawner entities: - uid: 10785 @@ -99115,18 +97895,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 9379 components: - type: Transform @@ -99150,18 +97920,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - proto: CrateHydroponicsTools entities: - uid: 1353 @@ -99175,18 +97935,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 1444 components: - type: Transform @@ -99198,18 +97948,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - proto: CrateLockBoxEngineering entities: - uid: 36027 @@ -99268,18 +98008,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 13123 components: - type: Transform @@ -99291,18 +98021,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 26136 components: - type: Transform @@ -99314,18 +98034,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - proto: CrateMedicalSupplies entities: - uid: 34529 @@ -99339,18 +98049,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - proto: CrateMedicalSurgery entities: - uid: 18648 @@ -99371,18 +98071,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - proto: CrateNPCChicken entities: - uid: 23691 @@ -99410,18 +98100,8 @@ entities: immutable: False temperature: 293.14954 moles: - - 3.2184362 - - 12.107451 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.2184362 + Nitrogen: 12.107451 - uid: 30742 components: - type: Transform @@ -99433,18 +98113,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 1.9938449 - - 7.5006547 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 1.9938449 + Nitrogen: 7.5006547 - type: ContainerContainer containers: entity_storage: !type:Container @@ -99488,18 +98158,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 35872 components: - type: Transform @@ -99518,18 +98178,8 @@ entities: immutable: False temperature: 293.14673 moles: - - 1.7459903 - - 6.568249 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 1.7459903 + Nitrogen: 6.568249 - type: ContainerContainer containers: entity_storage: !type:Container @@ -99585,18 +98235,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - proto: CrewMonitoringServer entities: - uid: 27828 @@ -100558,36 +99198,50 @@ entities: rot: 1.5707963267948966 rad pos: 32.5,2.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 11850 components: - type: Transform pos: 14.5,52.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 13343 components: - type: Transform pos: 16.5,46.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 13344 components: - type: Transform pos: 28.5,52.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 13347 components: - type: Transform pos: 5.5,64.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 13462 components: - type: Transform pos: 14.5,60.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 13464 components: - type: Transform pos: 14.5,56.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: DeskBell entities: - uid: 208 @@ -110737,6 +109391,13 @@ entities: - type: Transform pos: -18.45263,-21.176937 parent: 13329 +- proto: DrinkBeerCan + entities: + - uid: 24650 + components: + - type: Transform + pos: 100.69995,-36.16255 + parent: 13329 - proto: DrinkBlueCuracaoGlass entities: - uid: 35226 @@ -110969,6 +109630,11 @@ entities: parent: 13329 - proto: DrinkSodaWaterCan entities: + - uid: 26436 + components: + - type: Transform + pos: 105.70898,-33.44069 + parent: 13329 - uid: 32309 components: - type: Transform @@ -111383,6 +110049,8 @@ entities: - type: Transform pos: 59.5,-31.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: ExtendedEmergencyOxygenTankFilled entities: - uid: 26454 @@ -111402,357 +110070,499 @@ entities: - type: Transform pos: -9.5,15.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 1302 components: - type: Transform pos: -15.5,8.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 1303 components: - type: Transform pos: -3.5,23.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 1304 components: - type: Transform pos: -7.5,26.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 1305 components: - type: Transform pos: -11.5,30.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 1306 components: - type: Transform pos: -12.5,31.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 1307 components: - type: Transform pos: -13.5,37.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 1308 components: - type: Transform pos: -15.5,43.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 1346 components: - type: Transform pos: -2.5,29.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 1347 components: - type: Transform pos: -7.5,43.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 1637 components: - type: Transform pos: 6.5,8.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 1794 components: - type: Transform pos: -11.5,34.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 1887 components: - type: Transform pos: 2.5,2.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 2035 components: - type: Transform pos: -7.5,3.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 4148 components: - type: Transform pos: -29.5,41.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 4592 components: - type: Transform pos: -23.5,47.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 4886 components: - type: Transform pos: -23.5,26.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 4887 components: - type: Transform pos: -35.5,37.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 4888 components: - type: Transform pos: -29.5,33.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 6350 components: - type: Transform pos: -14.5,69.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 6351 components: - type: Transform pos: -12.5,73.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 6352 components: - type: Transform pos: -18.5,61.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 10170 components: - type: Transform pos: 21.5,24.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 10967 components: - type: Transform rot: 1.5707963267948966 rad pos: 10.5,1.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 11678 components: - type: Transform pos: 17.5,-24.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 11879 components: - type: Transform pos: 7.5,-3.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 11880 components: - type: Transform pos: 17.5,-7.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 11881 components: - type: Transform pos: 4.5,-22.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 11882 components: - type: Transform pos: -3.5,-19.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 11883 components: - type: Transform pos: -4.5,-11.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 18469 components: - type: Transform pos: 17.5,39.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 18470 components: - type: Transform pos: 26.5,39.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 18471 components: - type: Transform pos: 9.5,40.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 24269 components: - type: Transform pos: 84.5,-17.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 24270 components: - type: Transform pos: 94.5,-18.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 24271 components: - type: Transform pos: 88.5,-7.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 24272 components: - type: Transform pos: 78.5,-1.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 24273 components: - type: Transform pos: 38.5,31.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 24274 components: - type: Transform pos: 33.5,36.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 28165 components: - type: Transform pos: 119.5,-17.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 29485 components: - type: Transform pos: 58.5,35.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 29486 components: - type: Transform pos: 57.5,19.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 29487 components: - type: Transform pos: 57.5,-2.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 29488 components: - type: Transform pos: 26.5,-4.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 29489 components: - type: Transform pos: 44.5,0.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 29490 components: - type: Transform pos: 26.5,-22.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 29491 components: - type: Transform pos: 44.5,-21.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 29492 components: - type: Transform pos: 57.5,-18.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 29493 components: - type: Transform pos: 58.5,-34.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 29494 components: - type: Transform pos: 40.5,-35.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 29495 components: - type: Transform pos: 37.5,-40.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 29496 components: - type: Transform pos: 26.5,-50.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 29497 components: - type: Transform pos: 52.5,-44.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 29498 components: - type: Transform pos: 70.5,-12.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 29499 components: - type: Transform pos: 66.5,-32.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 29500 components: - type: Transform pos: 82.5,-24.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 29501 components: - type: Transform pos: 75.5,1.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 29502 components: - type: Transform pos: 88.5,-1.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 29503 components: - type: Transform pos: 61.5,6.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 29504 components: - type: Transform pos: 95.5,16.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 29505 components: - type: Transform pos: 85.5,17.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 35726 components: - type: Transform pos: 100.5,45.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 35727 components: - type: Transform pos: 94.5,48.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 35728 components: - type: Transform pos: 98.5,42.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 35729 components: - type: Transform pos: 89.5,37.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 35730 components: - type: Transform pos: 53.5,38.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 35731 components: - type: Transform pos: 73.5,37.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 35732 components: - type: Transform pos: 57.5,7.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 35733 components: - type: Transform pos: 75.5,11.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 35734 components: - type: Transform pos: 95.5,18.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 35748 components: - type: Transform pos: 104.5,53.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: FaxMachineBase entities: - uid: 1628 @@ -112178,6 +110988,8 @@ entities: - 643 - 644 - 645 + - type: Fixtures + fixtures: {} - uid: 659 components: - type: Transform @@ -112192,12 +111004,16 @@ entities: - 657 - 378 - 424 + - type: Fixtures + fixtures: {} - uid: 660 components: - type: Transform rot: 3.141592653589793 rad pos: -20.5,13.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 661 components: - type: Transform @@ -112216,6 +111032,8 @@ entities: - 650 - 628 - 651 + - type: Fixtures + fixtures: {} - uid: 662 components: - type: Transform @@ -112227,6 +111045,8 @@ entities: - 629 - 20458 - 20459 + - type: Fixtures + fixtures: {} - uid: 663 components: - type: Transform @@ -112241,6 +111061,8 @@ entities: - 664 - 632 - 1358 + - type: Fixtures + fixtures: {} - uid: 2037 components: - type: Transform @@ -112261,6 +111083,8 @@ entities: - 2048 - 2049 - 2050 + - type: Fixtures + fixtures: {} - uid: 2203 components: - type: Transform @@ -112276,6 +111100,8 @@ entities: - 1760 - 2200 - 2204 + - type: Fixtures + fixtures: {} - uid: 4589 components: - type: Transform @@ -112290,6 +111116,8 @@ entities: - 1811 - 1812 - 1813 + - type: Fixtures + fixtures: {} - uid: 6227 components: - type: Transform @@ -112304,6 +111132,8 @@ entities: - 1809 - 1810 - 6225 + - type: Fixtures + fixtures: {} - uid: 6230 components: - type: Transform @@ -112318,6 +111148,8 @@ entities: - 4604 - 4605 - 4603 + - type: Fixtures + fixtures: {} - uid: 6276 components: - type: Transform @@ -112329,6 +111161,8 @@ entities: - 6278 - 6279 - 6291 + - type: Fixtures + fixtures: {} - uid: 6280 components: - type: Transform @@ -112342,6 +111176,8 @@ entities: - 6267 - 6268 - 6288 + - type: Fixtures + fixtures: {} - uid: 6281 components: - type: Transform @@ -112352,6 +111188,8 @@ entities: - 6265 - 6266 - 6289 + - type: Fixtures + fixtures: {} - uid: 6282 components: - type: Transform @@ -112363,6 +111201,8 @@ entities: - 6272 - 6271 - 6292 + - type: Fixtures + fixtures: {} - uid: 6283 components: - type: Transform @@ -112376,6 +111216,8 @@ entities: - 6267 - 6268 - 6288 + - type: Fixtures + fixtures: {} - uid: 6290 components: - type: Transform @@ -112393,6 +111235,8 @@ entities: - 6268 - 6272 - 6271 + - type: Fixtures + fixtures: {} - uid: 6906 components: - type: Transform @@ -112414,6 +111258,8 @@ entities: - 1806 - 1805 - 1807 + - type: Fixtures + fixtures: {} - uid: 6912 components: - type: Transform @@ -112438,6 +111284,8 @@ entities: - 1215 - 6823 - 6822 + - type: Fixtures + fixtures: {} - uid: 6916 components: - type: Transform @@ -112451,6 +111299,8 @@ entities: - 6820 - 6821 - 6917 + - type: Fixtures + fixtures: {} - uid: 7142 components: - type: Transform @@ -112471,6 +111321,8 @@ entities: - 7589 - 9345 - 36052 + - type: Fixtures + fixtures: {} - uid: 8396 components: - type: Transform @@ -112495,6 +111347,8 @@ entities: - 10117 - 10116 - 14589 + - type: Fixtures + fixtures: {} - uid: 8620 components: - type: Transform @@ -112510,6 +111364,8 @@ entities: - 8059 - 8060 - 8617 + - type: Fixtures + fixtures: {} - uid: 8621 components: - type: Transform @@ -112525,6 +111381,8 @@ entities: - 8053 - 8054 - 8638 + - type: Fixtures + fixtures: {} - uid: 8624 components: - type: Transform @@ -112540,6 +111398,8 @@ entities: - 8069 - 8068 - 8634 + - type: Fixtures + fixtures: {} - uid: 8626 components: - type: Transform @@ -112553,6 +111413,8 @@ entities: - 8067 - 8635 - 8636 + - type: Fixtures + fixtures: {} - uid: 8627 components: - type: Transform @@ -112566,6 +111428,8 @@ entities: - 8061 - 8066 - 8618 + - type: Fixtures + fixtures: {} - uid: 8631 components: - type: Transform @@ -112577,6 +111441,8 @@ entities: - 8452 - 8453 - 8069 + - type: Fixtures + fixtures: {} - uid: 8632 components: - type: Transform @@ -112594,6 +111460,8 @@ entities: - 8059 - 8060 - 8614 + - type: Fixtures + fixtures: {} - uid: 9459 components: - type: Transform @@ -112609,6 +111477,8 @@ entities: - 7558 - 35981 - 8477 + - type: Fixtures + fixtures: {} - uid: 11472 components: - type: Transform @@ -112624,6 +111494,8 @@ entities: - 10091 - 10092 - 11485 + - type: Fixtures + fixtures: {} - uid: 11474 components: - type: Transform @@ -112646,6 +111518,8 @@ entities: - 10088 - 10087 - 11484 + - type: Fixtures + fixtures: {} - uid: 11476 components: - type: Transform @@ -112663,6 +111537,8 @@ entities: - 10102 - 10103 - 11483 + - type: Fixtures + fixtures: {} - uid: 11478 components: - type: Transform @@ -112675,6 +111551,8 @@ entities: - 10094 - 10095 - 11486 + - type: Fixtures + fixtures: {} - uid: 11482 components: - type: Transform @@ -112691,6 +111569,8 @@ entities: - 10102 - 10103 - 11487 + - type: Fixtures + fixtures: {} - uid: 13027 components: - type: Transform @@ -112705,6 +111585,8 @@ entities: - 12769 - 12767 - 12768 + - type: Fixtures + fixtures: {} - uid: 14569 components: - type: Transform @@ -112723,6 +111605,8 @@ entities: - 14442 - 14441 - 14450 + - type: Fixtures + fixtures: {} - uid: 14570 components: - type: Transform @@ -112735,6 +111619,8 @@ entities: - 14434 - 14433 - 14449 + - type: Fixtures + fixtures: {} - uid: 14571 components: - type: Transform @@ -112745,6 +111631,8 @@ entities: devices: - 14604 - 14448 + - type: Fixtures + fixtures: {} - uid: 14572 components: - type: Transform @@ -112757,11 +111645,15 @@ entities: - 14437 - 14438 - 14451 + - type: Fixtures + fixtures: {} - uid: 14573 components: - type: Transform pos: 35.5,-18.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 14574 components: - type: Transform @@ -112776,6 +111668,8 @@ entities: - 14476 - 14477 - 14587 + - type: Fixtures + fixtures: {} - uid: 14575 components: - type: Transform @@ -112792,6 +111686,8 @@ entities: - 14445 - 14444 - 14602 + - type: Fixtures + fixtures: {} - uid: 14576 components: - type: Transform @@ -112805,6 +111701,8 @@ entities: - 14603 - 14441 - 14442 + - type: Fixtures + fixtures: {} - uid: 14580 components: - type: Transform @@ -112821,6 +111719,8 @@ entities: - 14479 - 14480 - 14586 + - type: Fixtures + fixtures: {} - uid: 14583 components: - type: Transform @@ -112840,6 +111740,8 @@ entities: - 2049 - 2050 - 14588 + - type: Fixtures + fixtures: {} - uid: 17758 components: - type: Transform @@ -112855,6 +111757,8 @@ entities: - 17560 - 17561 - 17755 + - type: Fixtures + fixtures: {} - uid: 17759 components: - type: Transform @@ -112869,6 +111773,8 @@ entities: - 17589 - 17561 - 17593 + - type: Fixtures + fixtures: {} - uid: 17761 components: - type: Transform @@ -112885,6 +111791,8 @@ entities: - 17567 - 17754 - 18744 + - type: Fixtures + fixtures: {} - uid: 17762 components: - type: Transform @@ -112903,6 +111811,8 @@ entities: - 17566 - 17567 - 18743 + - type: Fixtures + fixtures: {} - uid: 17765 components: - type: Transform @@ -112924,6 +111834,8 @@ entities: - 17575 - 17580 - 17591 + - type: Fixtures + fixtures: {} - uid: 17766 components: - type: Transform @@ -112935,6 +111847,8 @@ entities: - 17588 - 17586 - 17580 + - type: Fixtures + fixtures: {} - uid: 17769 components: - type: Transform @@ -112947,6 +111861,8 @@ entities: - 17586 - 17587 - 17784 + - type: Fixtures + fixtures: {} - uid: 17770 components: - type: Transform @@ -112959,6 +111875,8 @@ entities: - 17573 - 17574 - 17594 + - type: Fixtures + fixtures: {} - uid: 17777 components: - type: Transform @@ -112971,6 +111889,8 @@ entities: - 17611 - 17579 - 17778 + - type: Fixtures + fixtures: {} - uid: 17780 components: - type: Transform @@ -112987,6 +111907,8 @@ entities: - 17576 - 17577 - 17596 + - type: Fixtures + fixtures: {} - uid: 17786 components: - type: Transform @@ -112999,6 +111921,8 @@ entities: - 17590 - 17612 - 17756 + - type: Fixtures + fixtures: {} - uid: 17897 components: - type: Transform @@ -113012,6 +111936,8 @@ entities: - 17584 - 17585 - 17785 + - type: Fixtures + fixtures: {} - uid: 25909 components: - type: Transform @@ -113026,6 +111952,8 @@ entities: - 21374 - 21375 - 25502 + - type: Fixtures + fixtures: {} - uid: 25910 components: - type: Transform @@ -113041,6 +111969,8 @@ entities: - 21373 - 21374 - 25508 + - type: Fixtures + fixtures: {} - uid: 25913 components: - type: Transform @@ -113053,6 +111983,8 @@ entities: - 25009 - 21393 - 25948 + - type: Fixtures + fixtures: {} - uid: 25914 components: - type: Transform @@ -113069,6 +112001,8 @@ entities: - 25005 - 25004 - 25944 + - type: Fixtures + fixtures: {} - uid: 25916 components: - type: Transform @@ -113083,6 +112017,8 @@ entities: - 25005 - 25004 - 25943 + - type: Fixtures + fixtures: {} - uid: 25917 components: - type: Transform @@ -113093,6 +112029,8 @@ entities: - 25008 - 21382 - 25949 + - type: Fixtures + fixtures: {} - uid: 25920 components: - type: Transform @@ -113104,6 +112042,8 @@ entities: - 21382 - 21386 - 25942 + - type: Fixtures + fixtures: {} - uid: 25921 components: - type: Transform @@ -113114,6 +112054,8 @@ entities: - 21386 - 25953 - 25945 + - type: Fixtures + fixtures: {} - uid: 25924 components: - type: Transform @@ -113126,6 +112068,8 @@ entities: - 21380 - 21378 - 25939 + - type: Fixtures + fixtures: {} - uid: 25926 components: - type: Transform @@ -113145,6 +112089,8 @@ entities: - 25938 - 22720 - 22730 + - type: Fixtures + fixtures: {} - uid: 25928 components: - type: Transform @@ -113156,6 +112102,8 @@ entities: - 23459 - 23460 - 23461 + - type: Fixtures + fixtures: {} - uid: 25930 components: - type: Transform @@ -113167,6 +112115,8 @@ entities: - 21377 - 21385 - 25941 + - type: Fixtures + fixtures: {} - uid: 25932 components: - type: Transform @@ -113178,6 +112128,8 @@ entities: - 22741 - 22740 - 25946 + - type: Fixtures + fixtures: {} - uid: 25933 components: - type: Transform @@ -113190,6 +112142,8 @@ entities: - 21381 - 21380 - 21383 + - type: Fixtures + fixtures: {} - uid: 25936 components: - type: Transform @@ -113199,6 +112153,8 @@ entities: devices: - 25955 - 21384 + - type: Fixtures + fixtures: {} - uid: 25947 components: - type: Transform @@ -113211,6 +112167,8 @@ entities: - 21377 - 21376 - 25501 + - type: Fixtures + fixtures: {} - uid: 27682 components: - type: Transform @@ -113222,6 +112180,8 @@ entities: - 27680 - 21542 - 21541 + - type: Fixtures + fixtures: {} - uid: 27683 components: - type: Transform @@ -113232,6 +112192,8 @@ entities: - 21544 - 21543 - 27681 + - type: Fixtures + fixtures: {} - uid: 28232 components: - type: Transform @@ -113247,6 +112209,8 @@ entities: - 8146 - 8170 - 28231 + - type: Fixtures + fixtures: {} - uid: 28272 components: - type: Transform @@ -113264,6 +112228,8 @@ entities: - 21368 - 21367 - 21366 + - type: Fixtures + fixtures: {} - uid: 28336 components: - type: Transform @@ -113279,6 +112245,8 @@ entities: - 21406 - 21405 - 21404 + - type: Fixtures + fixtures: {} - uid: 28835 components: - type: Transform @@ -113292,6 +112260,8 @@ entities: - 21397 - 21398 - 28802 + - type: Fixtures + fixtures: {} - uid: 28836 components: - type: Transform @@ -113309,6 +112279,8 @@ entities: - 21402 - 21401 - 28801 + - type: Fixtures + fixtures: {} - uid: 28839 components: - type: Transform @@ -113322,6 +112294,8 @@ entities: - 28797 - 28796 - 28902 + - type: Fixtures + fixtures: {} - uid: 28840 components: - type: Transform @@ -113337,6 +112311,8 @@ entities: - 21405 - 21404 - 28803 + - type: Fixtures + fixtures: {} - uid: 28895 components: - type: Transform @@ -113354,6 +112330,8 @@ entities: - 21355 - 21356 - 28807 + - type: Fixtures + fixtures: {} - uid: 28896 components: - type: Transform @@ -113370,6 +112348,8 @@ entities: - 21358 - 21359 - 28806 + - type: Fixtures + fixtures: {} - uid: 28898 components: - type: Transform @@ -113384,6 +112364,8 @@ entities: - 21358 - 21359 - 28805 + - type: Fixtures + fixtures: {} - uid: 28900 components: - type: Transform @@ -113404,6 +112386,8 @@ entities: - 21367 - 21366 - 28804 + - type: Fixtures + fixtures: {} - uid: 31261 components: - type: Transform @@ -113416,6 +112400,8 @@ entities: - 31254 - 31257 - 31256 + - type: Fixtures + fixtures: {} - uid: 31263 components: - type: Transform @@ -113437,6 +112423,8 @@ entities: - 21412 - 21411 - 21410 + - type: Fixtures + fixtures: {} - proto: FireAxeCabinetFilled entities: - uid: 22994 @@ -113444,6 +112432,8 @@ entities: - type: Transform pos: 79.5,54.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 25199 components: - type: Transform @@ -113451,6 +112441,8 @@ entities: parent: 13329 - type: Lock locked: False + - type: Fixtures + fixtures: {} - proto: FireExtinguisher entities: - uid: 26361 @@ -117091,6 +116083,8 @@ entities: - type: Transform pos: 102.5,45.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: GalaxythistleSeeds entities: - uid: 1788 @@ -117112,18 +116106,6 @@ entities: - type: Transform pos: 90.476234,33.509247 parent: 13329 -- proto: GasFilter - entities: - - uid: 23855 - components: - - type: MetaData - name: Waste Filtered to Burn Chamber - - type: Transform - rot: 1.5707963267948966 rad - pos: 97.5,-30.5 - parent: 13329 - - type: AtmosPipeColor - color: '#22BA29FF' - proto: GasFilterFlipped entities: - uid: 15376 @@ -117230,6 +116212,14 @@ entities: rot: -1.5707963267948966 rad pos: 91.5,-26.5 parent: 13329 + - uid: 23936 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 109.5,-36.5 + parent: 13329 + - type: AtmosPipeColor + color: '#B3A234FF' - proto: GasPassiveGate entities: - uid: 23677 @@ -117323,12 +116313,27 @@ entities: rot: 3.141592653589793 rad pos: 78.5,-40.5 parent: 13329 + - uid: 23663 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 109.5,-39.5 + parent: 13329 + - type: AtmosPipeColor + color: '#333333FF' - uid: 23836 components: - type: Transform rot: -1.5707963267948966 rad pos: 102.5,-29.5 parent: 13329 + - uid: 23851 + components: + - type: Transform + pos: 111.5,-37.5 + parent: 13329 + - type: AtmosPipeColor + color: '#333333FF' - uid: 23856 components: - type: Transform @@ -117341,30 +116346,6 @@ entities: rot: -1.5707963267948966 rad pos: 91.5,-25.5 parent: 13329 - - uid: 23917 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 105.5,-36.5 - parent: 13329 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 23919 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 106.5,-36.5 - parent: 13329 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 23920 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 107.5,-36.5 - parent: 13329 - - type: AtmosPipeColor - color: '#FF1212FF' - uid: 25878 components: - type: Transform @@ -118859,12 +117840,14 @@ entities: parent: 13329 - type: AtmosPipeColor color: '#990000FF' - - uid: 20646 + - uid: 20666 components: - type: Transform rot: 3.141592653589793 rad - pos: 97.5,-33.5 + pos: 103.5,-42.5 parent: 13329 + - type: AtmosPipeColor + color: '#03FCD3FF' - uid: 20980 components: - type: Transform @@ -118880,21 +117863,19 @@ entities: parent: 13329 - type: AtmosPipeColor color: '#990000FF' - - uid: 23633 + - uid: 23631 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 109.5,-38.5 + pos: 97.5,-39.5 parent: 13329 - - type: AtmosPipeColor - color: '#03FCD3FF' - - uid: 23634 + - uid: 23640 components: - type: Transform - pos: 111.5,-38.5 + rot: 3.141592653589793 rad + pos: 97.5,-33.5 parent: 13329 - type: AtmosPipeColor - color: '#03FCD3FF' + color: '#B3A234FF' - uid: 23650 components: - type: Transform @@ -118927,30 +117908,14 @@ entities: parent: 13329 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 23696 + - uid: 23681 components: - type: Transform rot: -1.5707963267948966 rad - pos: 111.5,-40.5 + pos: 111.5,-39.5 parent: 13329 - type: AtmosPipeColor - color: '#03FCD3FF' - - uid: 23697 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 109.5,-40.5 - parent: 13329 - - type: AtmosPipeColor - color: '#03FCD3FF' - - uid: 23702 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 97.5,-34.5 - parent: 13329 - - type: AtmosPipeColor - color: '#FF1212FF' + color: '#333333FF' - uid: 23738 components: - type: Transform @@ -118998,113 +117963,36 @@ entities: parent: 13329 - type: AtmosPipeColor color: '#990000FF' - - uid: 23833 - components: - - type: Transform - pos: 101.5,-35.5 - parent: 13329 - - type: AtmosPipeColor - color: '#03FCD3FF' - uid: 23837 components: - type: Transform - rot: 3.141592653589793 rad - pos: 97.5,-38.5 + pos: 110.5,-35.5 parent: 13329 - type: AtmosPipeColor color: '#FF1212FF' - - uid: 23841 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 100.5,-35.5 - parent: 13329 - - type: AtmosPipeColor - color: '#03FCD3FF' - - uid: 23853 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 96.5,-30.5 - parent: 13329 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 23854 + - uid: 23862 components: - type: Transform rot: -1.5707963267948966 rad - pos: 98.5,-30.5 + pos: 110.5,-37.5 parent: 13329 - type: AtmosPipeColor color: '#FF1212FF' - - uid: 23889 + - uid: 23901 components: - type: Transform - pos: 98.5,-35.5 + pos: 97.5,-31.5 parent: 13329 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 23898 - components: - - type: Transform - pos: 110.5,-33.5 - parent: 13329 - - type: AtmosPipeColor - color: '#03FCD3FF' - - uid: 23907 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 100.5,-38.5 - parent: 13329 - - type: AtmosPipeColor - color: '#03FCD3FF' - - uid: 23910 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 98.5,-38.5 - parent: 13329 - - type: AtmosPipeColor - color: '#FF1212FF' + color: '#B3A234FF' - uid: 23930 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 102.5,-36.5 - parent: 13329 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 23931 components: - type: Transform rot: -1.5707963267948966 rad - pos: 109.5,-37.5 + pos: 105.5,-42.5 parent: 13329 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 23940 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 103.5,-37.5 - parent: 13329 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 23942 - components: - - type: Transform - pos: 109.5,-36.5 - parent: 13329 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 23948 - components: - - type: Transform - pos: 107.5,-35.5 - parent: 13329 - - type: AtmosPipeColor - color: '#FF1212FF' + color: '#03FCD3FF' - uid: 24029 components: - type: Transform @@ -119136,13 +118024,6 @@ entities: parent: 13329 - type: AtmosPipeColor color: '#990000FF' - - uid: 25092 - components: - - type: Transform - pos: 97.5,-39.5 - parent: 13329 - - type: AtmosPipeColor - color: '#0055CCFF' - uid: 25099 components: - type: Transform @@ -119880,13 +118761,6 @@ entities: parent: 13329 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 23632 - components: - - type: Transform - pos: 109.5,-39.5 - parent: 13329 - - type: AtmosPipeColor - color: '#03FCD3FF' - uid: 23759 components: - type: Transform @@ -119972,21 +118846,19 @@ entities: color: '#0055CCFF' - proto: GasPipeSensorTEGCold entities: - - uid: 22713 + - uid: 23885 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 102.5,-39.5 + pos: 98.5,-37.5 parent: 13329 - type: AtmosPipeColor color: '#03FCD3FF' - proto: GasPipeSensorTEGHot entities: - - uid: 23663 + - uid: 20639 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 101.5,-34.5 + pos: 100.5,-35.5 parent: 13329 - type: AtmosPipeColor color: '#FF1212FF' @@ -140302,7 +139174,15 @@ entities: pos: 97.5,-32.5 parent: 13329 - type: AtmosPipeColor - color: '#22BA29FF' + color: '#B3A234FF' + - uid: 20674 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 105.5,-40.5 + parent: 13329 + - type: AtmosPipeColor + color: '#03FCD3FF' - uid: 22625 components: - type: Transform @@ -140642,22 +139522,6 @@ entities: parent: 13329 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 22727 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 101.5,-37.5 - parent: 13329 - - type: AtmosPipeColor - color: '#03FCD3FF' - - uid: 22735 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 97.5,-37.5 - parent: 13329 - - type: AtmosPipeColor - color: '#FF1212FF' - uid: 23585 components: - type: Transform @@ -140708,44 +139572,14 @@ entities: rot: -1.5707963267948966 rad pos: 90.5,-43.5 parent: 13329 - - uid: 23625 + - uid: 23634 components: - type: Transform rot: -1.5707963267948966 rad - pos: 100.5,-33.5 - parent: 13329 - - uid: 23628 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 104.5,-35.5 + pos: 107.5,-35.5 parent: 13329 - type: AtmosPipeColor color: '#FF1212FF' - - uid: 23630 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 108.5,-39.5 - parent: 13329 - - type: AtmosPipeColor - color: '#03FCD3FF' - - uid: 23636 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 100.5,-34.5 - parent: 13329 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 23638 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 104.5,-33.5 - parent: 13329 - - type: AtmosPipeColor - color: '#03FCD3FF' - uid: 23643 components: - type: Transform @@ -140810,30 +139644,30 @@ entities: parent: 13329 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 23682 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 98.5,-34.5 - parent: 13329 - - type: AtmosPipeColor - color: '#FF1212FF' - uid: 23692 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 99.5,-34.5 + rot: -1.5707963267948966 rad + pos: 108.5,-36.5 parent: 13329 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#B3A234FF' - uid: 23694 components: - type: Transform rot: -1.5707963267948966 rad - pos: 110.5,-40.5 + pos: 107.5,-37.5 parent: 13329 - type: AtmosPipeColor - color: '#03FCD3FF' + color: '#FF1212FF' + - uid: 23696 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 106.5,-37.5 + parent: 13329 + - type: AtmosPipeColor + color: '#FF1212FF' - uid: 23699 components: - type: Transform @@ -141153,24 +139987,24 @@ entities: - uid: 23830 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 103.5,-39.5 + rot: -1.5707963267948966 rad + pos: 106.5,-35.5 parent: 13329 - type: AtmosPipeColor - color: '#03FCD3FF' + color: '#FF1212FF' - uid: 23831 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 106.5,-39.5 + rot: -1.5707963267948966 rad + pos: 107.5,-36.5 parent: 13329 - type: AtmosPipeColor - color: '#03FCD3FF' + color: '#B3A234FF' - uid: 23832 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 105.5,-39.5 + rot: 3.141592653589793 rad + pos: 103.5,-40.5 parent: 13329 - type: AtmosPipeColor color: '#03FCD3FF' @@ -141180,6 +140014,14 @@ entities: rot: -1.5707963267948966 rad pos: 101.5,-29.5 parent: 13329 + - uid: 23839 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 108.5,-35.5 + parent: 13329 + - type: AtmosPipeColor + color: '#FF1212FF' - uid: 23843 components: - type: Transform @@ -141228,6 +140070,13 @@ entities: parent: 13329 - type: AtmosPipeColor color: '#FF1212FF' + - uid: 23849 + components: + - type: Transform + pos: 111.5,-38.5 + parent: 13329 + - type: AtmosPipeColor + color: '#333333FF' - uid: 23850 components: - type: Transform @@ -141268,30 +140117,22 @@ entities: rot: 1.5707963267948966 rad pos: 90.5,-26.5 parent: 13329 - - uid: 23885 + - uid: 23889 components: - type: Transform rot: -1.5707963267948966 rad - pos: 106.5,-33.5 + pos: 108.5,-37.5 parent: 13329 - type: AtmosPipeColor - color: '#03FCD3FF' - - uid: 23886 + color: '#FF1212FF' + - uid: 23890 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 107.5,-33.5 + rot: 1.5707963267948966 rad + pos: 98.5,-29.5 parent: 13329 - type: AtmosPipeColor - color: '#03FCD3FF' - - uid: 23887 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 108.5,-33.5 - parent: 13329 - - type: AtmosPipeColor - color: '#03FCD3FF' + color: '#FF1212FF' - uid: 23891 components: - type: Transform @@ -141299,7 +140140,7 @@ entities: pos: 90.5,-31.5 parent: 13329 - type: AtmosPipeColor - color: '#22BA29FF' + color: '#B3A234FF' - uid: 23892 components: - type: Transform @@ -141307,7 +140148,7 @@ entities: pos: 91.5,-31.5 parent: 13329 - type: AtmosPipeColor - color: '#22BA29FF' + color: '#B3A234FF' - uid: 23893 components: - type: Transform @@ -141315,7 +140156,7 @@ entities: pos: 92.5,-31.5 parent: 13329 - type: AtmosPipeColor - color: '#22BA29FF' + color: '#B3A234FF' - uid: 23894 components: - type: Transform @@ -141323,7 +140164,7 @@ entities: pos: 93.5,-31.5 parent: 13329 - type: AtmosPipeColor - color: '#22BA29FF' + color: '#B3A234FF' - uid: 23895 components: - type: Transform @@ -141331,7 +140172,7 @@ entities: pos: 94.5,-31.5 parent: 13329 - type: AtmosPipeColor - color: '#22BA29FF' + color: '#B3A234FF' - uid: 23896 components: - type: Transform @@ -141339,7 +140180,7 @@ entities: pos: 95.5,-31.5 parent: 13329 - type: AtmosPipeColor - color: '#22BA29FF' + color: '#B3A234FF' - uid: 23897 components: - type: Transform @@ -141347,79 +140188,23 @@ entities: pos: 96.5,-31.5 parent: 13329 - type: AtmosPipeColor - color: '#22BA29FF' - - uid: 23905 + color: '#B3A234FF' + - uid: 23898 components: - type: Transform rot: 1.5707963267948966 rad - pos: 107.5,-39.5 + pos: 96.5,-29.5 parent: 13329 - type: AtmosPipeColor - color: '#03FCD3FF' - - uid: 23906 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 104.5,-39.5 - parent: 13329 - - type: AtmosPipeColor - color: '#03FCD3FF' - - uid: 23908 + color: '#FF1212FF' + - uid: 23910 components: - type: Transform rot: -1.5707963267948966 rad pos: 106.5,-36.5 parent: 13329 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 23909 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 105.5,-33.5 - parent: 13329 - - type: AtmosPipeColor - color: '#03FCD3FF' - - uid: 23911 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 109.5,-33.5 - parent: 13329 - - type: AtmosPipeColor - color: '#03FCD3FF' - - uid: 23913 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 110.5,-34.5 - parent: 13329 - - type: AtmosPipeColor - color: '#03FCD3FF' - - uid: 23914 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 110.5,-35.5 - parent: 13329 - - type: AtmosPipeColor - color: '#03FCD3FF' - - uid: 23915 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 110.5,-36.5 - parent: 13329 - - type: AtmosPipeColor - color: '#03FCD3FF' - - uid: 23916 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 110.5,-37.5 - parent: 13329 - - type: AtmosPipeColor - color: '#03FCD3FF' + color: '#B3A234FF' - uid: 23918 components: - type: Transform @@ -141500,82 +140285,6 @@ entities: parent: 13329 - type: AtmosPipeColor color: '#990000FF' - - uid: 23932 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 108.5,-36.5 - parent: 13329 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 23933 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 104.5,-36.5 - parent: 13329 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 23934 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 108.5,-37.5 - parent: 13329 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 23935 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 107.5,-37.5 - parent: 13329 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 23937 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 105.5,-37.5 - parent: 13329 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 23938 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 104.5,-37.5 - parent: 13329 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 23939 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 107.5,-36.5 - parent: 13329 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 23947 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 105.5,-36.5 - parent: 13329 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 23949 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 98.5,-33.5 - parent: 13329 - - uid: 23953 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 99.5,-33.5 - parent: 13329 - uid: 24024 components: - type: Transform @@ -150296,52 +149005,6 @@ entities: parent: 13329 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 23626 - components: - - type: Transform - pos: 106.5,-35.5 - parent: 13329 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 23627 - components: - - type: Transform - pos: 105.5,-35.5 - parent: 13329 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 23631 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 111.5,-39.5 - parent: 13329 - - type: AtmosPipeColor - color: '#03FCD3FF' - - uid: 23639 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 100.5,-37.5 - parent: 13329 - - type: AtmosPipeColor - color: '#03FCD3FF' - - uid: 23640 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 101.5,-38.5 - parent: 13329 - - type: AtmosPipeColor - color: '#03FCD3FF' - - uid: 23641 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 98.5,-37.5 - parent: 13329 - - type: AtmosPipeColor - color: '#FF1212FF' - uid: 23647 components: - type: Transform @@ -150389,22 +149052,6 @@ entities: parent: 13329 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 23681 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 97.5,-35.5 - parent: 13329 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 23701 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 110.5,-38.5 - parent: 13329 - - type: AtmosPipeColor - color: '#03FCD3FF' - uid: 23728 components: - type: Transform @@ -150461,51 +149108,6 @@ entities: parent: 13329 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 23819 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 101.5,-39.5 - parent: 13329 - - type: AtmosPipeColor - color: '#03FCD3FF' - - uid: 23839 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 102.5,-34.5 - parent: 13329 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 23849 - components: - - type: Transform - pos: 98.5,-29.5 - parent: 13329 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 23851 - components: - - type: Transform - pos: 96.5,-29.5 - parent: 13329 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 23883 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 97.5,-31.5 - parent: 13329 - - type: AtmosPipeColor - color: '#22BA29FF' - - uid: 23950 - components: - - type: Transform - pos: 103.5,-36.5 - parent: 13329 - - type: AtmosPipeColor - color: '#FF1212FF' - uid: 24002 components: - type: Transform @@ -150561,21 +149163,6 @@ entities: parent: 13329 - type: AtmosPipeColor color: '#990000FF' - - uid: 24253 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 102.5,-35.5 - parent: 13329 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 24254 - components: - - type: Transform - pos: 102.5,-33.5 - parent: 13329 - - type: AtmosPipeColor - color: '#FF1212FF' - uid: 24871 components: - type: Transform @@ -151326,18 +149913,6 @@ entities: rot: 3.141592653589793 rad pos: 57.5,-50.5 parent: 13329 - - uid: 23689 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 96.5,-37.5 - parent: 13329 - - uid: 23690 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 102.5,-37.5 - parent: 13329 - uid: 24005 components: - type: Transform @@ -151513,14 +150088,6 @@ entities: parent: 13329 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 23642 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 97.5,-37.5 - parent: 13329 - - type: AtmosPipeColor - color: '#FF1212FF' - uid: 23662 components: - type: Transform @@ -151557,6 +150124,14 @@ entities: rot: 3.141592653589793 rad pos: 80.5,-38.5 parent: 13329 + - uid: 23695 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 105.5,-36.5 + parent: 13329 + - type: AtmosPipeColor + color: '#B3A234FF' - uid: 23700 components: - type: MetaData @@ -151607,14 +150182,8 @@ entities: rot: 1.5707963267948966 rad pos: 89.5,-31.5 parent: 13329 - - uid: 23718 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 101.5,-37.5 - parent: 13329 - type: AtmosPipeColor - color: '#03FCD3FF' + color: '#B3A234FF' - uid: 23817 components: - type: Transform @@ -151663,14 +150232,6 @@ entities: parent: 13329 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 24257 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 101.5,-33.5 - parent: 13329 - - type: AtmosPipeColor - color: '#FF1212FF' - uid: 28136 components: - type: Transform @@ -151701,6 +150262,18 @@ entities: parent: 13329 - type: AtmosPipeColor color: '#0055CCFF' +- proto: GasPressureRegulator + entities: + - uid: 23841 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 110.5,-39.5 + parent: 13329 + - type: GasPressureRegulator + threshold: 95000 + - type: AtmosPipeColor + color: '#333333FF' - proto: GasThermoMachineFreezer entities: - uid: 1205 @@ -151740,14 +150313,6 @@ entities: - type: Transform pos: 77.5,-33.5 parent: 13329 - - uid: 23820 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 100.5,-39.5 - parent: 13329 - - type: AtmosPipeColor - color: '#03FCD3FF' - uid: 26548 components: - type: Transform @@ -151763,6 +150328,13 @@ entities: - type: Transform pos: 97.5,36.5 parent: 13329 +- proto: GasThermoMachineFreezerEnabled + entities: + - uid: 23855 + components: + - type: Transform + pos: 96.5,-34.5 + parent: 13329 - proto: GasThermoMachineHeater entities: - uid: 23660 @@ -151813,6 +150385,16 @@ entities: parent: 13329 - type: GasValve open: False + - uid: 23639 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 98.5,-33.5 + parent: 13329 + - type: GasValve + open: False + - type: AtmosPipeColor + color: '#B3A234FF' - uid: 23644 components: - type: MetaData @@ -151837,26 +150419,6 @@ entities: open: False - type: AtmosPipeColor color: '#FF1212FF' - - uid: 24255 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 103.5,-33.5 - parent: 13329 - - type: GasValve - open: False - - type: AtmosPipeColor - color: '#03FCD3FF' - - uid: 24256 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 103.5,-35.5 - parent: 13329 - - type: GasValve - open: False - - type: AtmosPipeColor - color: '#FF1212FF' - proto: GasVentPump entities: - uid: 424 @@ -155523,18 +154085,49 @@ entities: color: '#990000FF' - proto: GasVolumePump entities: - - uid: 23693 - components: - - type: Transform - pos: 97.5,-36.5 - parent: 13329 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 23842 + - uid: 20671 components: - type: Transform rot: 3.141592653589793 rad - pos: 101.5,-36.5 + pos: 98.5,-35.5 + parent: 13329 + - type: AtmosPipeColor + color: '#03FCD3FF' + - uid: 23701 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 103.5,-39.5 + parent: 13329 + - type: AtmosPipeColor + color: '#03FCD3FF' + - uid: 23833 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 105.5,-37.5 + parent: 13329 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 23863 + components: + - type: Transform + pos: 100.5,-37.5 + parent: 13329 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 23911 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 105.5,-35.5 + parent: 13329 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 26433 + components: + - type: Transform + pos: 105.5,-39.5 parent: 13329 - type: AtmosPipeColor color: '#03FCD3FF' @@ -159160,15 +157753,11 @@ entities: - type: Transform pos: 93.5,-28.5 parent: 13329 - - uid: 20645 + - uid: 20662 components: - type: Transform - pos: 104.5,-36.5 - parent: 13329 - - uid: 20671 - components: - - type: Transform - pos: 110.5,-32.5 + rot: -1.5707963267948966 rad + pos: 106.5,-37.5 parent: 13329 - uid: 20672 components: @@ -159180,6 +157769,12 @@ entities: - type: Transform pos: 110.5,-30.5 parent: 13329 + - uid: 20675 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 106.5,-36.5 + parent: 13329 - uid: 21244 components: - type: Transform @@ -159365,6 +157960,12 @@ entities: - type: Transform pos: 113.5,52.5 parent: 13329 + - uid: 22523 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 106.5,-35.5 + parent: 13329 - uid: 22529 components: - type: Transform @@ -160190,11 +158791,6 @@ entities: - type: Transform pos: 90.5,-33.5 parent: 13329 - - uid: 23695 - components: - - type: Transform - pos: 104.5,-37.5 - parent: 13329 - uid: 23813 components: - type: Transform @@ -160215,10 +158811,75 @@ entities: - type: Transform pos: 101.5,-29.5 parent: 13329 - - uid: 23863 + - uid: 23825 components: - type: Transform - pos: 104.5,-35.5 + pos: 107.5,-38.5 + parent: 13329 + - uid: 23842 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 111.5,-34.5 + parent: 13329 + - uid: 23905 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 111.5,-38.5 + parent: 13329 + - uid: 23932 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 112.5,-35.5 + parent: 13329 + - uid: 23933 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 112.5,-36.5 + parent: 13329 + - uid: 23935 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 109.5,-34.5 + parent: 13329 + - uid: 23939 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 108.5,-36.5 + parent: 13329 + - uid: 23940 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 112.5,-37.5 + parent: 13329 + - uid: 23942 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 109.5,-38.5 + parent: 13329 + - uid: 23947 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 110.5,-34.5 + parent: 13329 + - uid: 23948 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 108.5,-37.5 + parent: 13329 + - uid: 23950 + components: + - type: Transform + pos: 104.5,-40.5 parent: 13329 - uid: 23991 components: @@ -160240,6 +158901,89 @@ entities: - type: Transform pos: 117.5,-22.5 parent: 13329 + - uid: 24255 + components: + - type: Transform + pos: 103.5,-40.5 + parent: 13329 + - uid: 24257 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 108.5,-35.5 + parent: 13329 + - uid: 24653 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 116.5,-40.5 + parent: 13329 + - uid: 24654 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 115.5,-41.5 + parent: 13329 + - uid: 24655 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 114.5,-41.5 + parent: 13329 + - uid: 24656 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 112.5,-41.5 + parent: 13329 + - uid: 24659 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 110.5,-41.5 + parent: 13329 + - uid: 24661 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 114.5,-44.5 + parent: 13329 + - uid: 24662 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 111.5,-44.5 + parent: 13329 + - uid: 24663 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 112.5,-44.5 + parent: 13329 + - uid: 24664 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 116.5,-43.5 + parent: 13329 + - uid: 24665 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 116.5,-44.5 + parent: 13329 + - uid: 24667 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 118.5,-41.5 + parent: 13329 + - uid: 24668 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 119.5,-40.5 + parent: 13329 - uid: 24739 components: - type: Transform @@ -160268,7 +159012,8 @@ entities: - uid: 24744 components: - type: Transform - pos: 104.5,-39.5 + rot: -1.5707963267948966 rad + pos: 119.5,-44.5 parent: 13329 - uid: 24745 components: @@ -160278,47 +159023,13 @@ entities: - uid: 24746 components: - type: Transform - pos: 104.5,-33.5 - parent: 13329 - - uid: 24747 - components: - - type: Transform - pos: 108.5,-37.5 - parent: 13329 - - uid: 24748 - components: - - type: Transform - pos: 108.5,-35.5 + rot: -1.5707963267948966 rad + pos: 119.5,-42.5 parent: 13329 - uid: 24749 components: - type: Transform - pos: 107.5,-34.5 - parent: 13329 - - uid: 24750 - components: - - type: Transform - pos: 106.5,-34.5 - parent: 13329 - - uid: 24751 - components: - - type: Transform - pos: 105.5,-34.5 - parent: 13329 - - uid: 24752 - components: - - type: Transform - pos: 107.5,-38.5 - parent: 13329 - - uid: 24753 - components: - - type: Transform - pos: 106.5,-38.5 - parent: 13329 - - uid: 24754 - components: - - type: Transform - pos: 105.5,-38.5 + pos: 105.5,-40.5 parent: 13329 - uid: 25462 components: @@ -162386,6 +161097,26 @@ entities: - type: Transform pos: 42.5,61.5 parent: 13329 +- proto: GrilleSpawner + entities: + - uid: 24660 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 113.5,-41.5 + parent: 13329 + - uid: 24666 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 116.5,-41.5 + parent: 13329 + - uid: 24747 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 118.5,-44.5 + parent: 13329 - proto: GunSafeDisabler entities: - uid: 27875 @@ -162404,18 +161135,8 @@ entities: immutable: False temperature: 293.14673 moles: - - 1.7459903 - - 6.568249 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 1.7459903 + Nitrogen: 6.568249 - type: ContainerContainer containers: entity_storage: !type:Container @@ -162449,18 +161170,8 @@ entities: immutable: False temperature: 293.14673 moles: - - 1.7459903 - - 6.568249 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 1.7459903 + Nitrogen: 6.568249 - type: ContainerContainer containers: entity_storage: !type:Container @@ -162613,19 +161324,50 @@ entities: parent: 13329 - proto: HeatExchanger entities: - - uid: 23635 + - uid: 22522 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 110.5,-39.5 + rot: 3.141592653589793 rad + pos: 103.5,-41.5 parent: 13329 - type: AtmosPipeColor color: '#03FCD3FF' - - uid: 23936 + - uid: 23641 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 105.5,-41.5 + parent: 13329 + - type: AtmosPipeColor + color: '#03FCD3FF' + - uid: 23689 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 109.5,-37.5 + parent: 13329 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 23718 components: - type: Transform rot: -1.5707963267948966 rad - pos: 106.5,-37.5 + pos: 104.5,-42.5 + parent: 13329 + - type: AtmosPipeColor + color: '#03FCD3FF' + - uid: 23887 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 109.5,-35.5 + parent: 13329 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 24645 + components: + - type: Transform + pos: 110.5,-36.5 parent: 13329 - type: AtmosPipeColor color: '#FF1212FF' @@ -162978,8 +161720,13 @@ entities: - uid: 35909 components: - type: Transform - pos: 99.5,-35.5 + pos: 103.5,-33.5 parent: 13329 + - type: AccessReader + accessListsOriginal: + - - Command + - type: Pullable + prevFixedRotation: True - proto: HolopadEngineeringBreakroom entities: - uid: 35900 @@ -163766,6 +162513,8 @@ entities: - type: Transform pos: 124.5,50.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: IntercomCommand entities: - uid: 27873 @@ -163773,49 +162522,67 @@ entities: - type: Transform pos: 92.5,34.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 30725 components: - type: Transform pos: 83.5,52.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 30782 components: - type: Transform rot: 3.141592653589793 rad pos: 88.5,45.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 31525 components: - type: Transform pos: 62.5,58.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 31628 components: - type: Transform pos: 62.5,51.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 35604 components: - type: Transform pos: 114.5,51.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 35749 components: - type: Transform pos: 99.5,45.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 35750 components: - type: Transform rot: 3.141592653589793 rad pos: 99.5,45.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 35751 components: - type: Transform rot: 3.141592653589793 rad pos: 102.5,53.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: IntercomCommon entities: - uid: 1106 @@ -163823,67 +162590,91 @@ entities: - type: Transform pos: -12.5,11.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 1107 components: - type: Transform rot: 1.5707963267948966 rad pos: -21.5,18.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 1886 components: - type: Transform rot: 3.141592653589793 rad pos: -3.5,3.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 1888 components: - type: Transform pos: 2.5,-2.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 6218 components: - type: Transform rot: -1.5707963267948966 rad pos: -6.5,50.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 6219 components: - type: Transform rot: 1.5707963267948966 rad pos: -29.5,37.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 6220 components: - type: Transform rot: -1.5707963267948966 rad pos: -35.5,33.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 6761 components: - type: Transform pos: -12.5,67.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 6762 components: - type: Transform rot: -1.5707963267948966 rad pos: -6.5,71.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 6914 components: - type: Transform pos: 1.5,20.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 29441 components: - type: Transform pos: 63.5,32.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 29442 components: - type: Transform pos: 63.5,28.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: IntercomMedical entities: - uid: 18476 @@ -163891,16 +162682,22 @@ entities: - type: Transform pos: 13.5,42.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 18711 components: - type: Transform pos: 7.5,60.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 18712 components: - type: Transform pos: 10.5,46.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: IntercomScience entities: - uid: 15337 @@ -163908,17 +162705,23 @@ entities: - type: Transform pos: 47.5,-13.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 20048 components: - type: Transform rot: -1.5707963267948966 rad pos: 40.5,-31.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 20049 components: - type: Transform pos: 28.5,-54.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: IntercomSecurity entities: - uid: 4570 @@ -163927,11 +162730,15 @@ entities: rot: 3.141592653589793 rad pos: -24.5,36.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 10178 components: - type: Transform pos: 16.5,24.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: IntercomService entities: - uid: 1102 @@ -163939,17 +162746,23 @@ entities: - type: Transform pos: -4.5,25.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 1105 components: - type: Transform pos: -6.5,41.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 1153 components: - type: Transform rot: 3.141592653589793 rad pos: -7.5,30.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: IntercomSupply entities: - uid: 11807 @@ -163958,27 +162771,37 @@ entities: rot: -1.5707963267948966 rad pos: 21.5,-28.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 11808 components: - type: Transform pos: 2.5,-19.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 11809 components: - type: Transform pos: 16.5,-18.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 11810 components: - type: Transform rot: 1.5707963267948966 rad pos: 2.5,-12.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 20050 components: - type: Transform pos: 27.5,-54.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: JanitorialTrolley entities: - uid: 18924 @@ -164616,6 +163439,8 @@ entities: currentLabel: Open Armory - type: NameModifier baseName: lockable button + - type: Fixtures + fixtures: {} - uid: 9454 components: - type: MetaData @@ -164678,6 +163503,23 @@ entities: currentLabel: Close Armory - type: NameModifier baseName: lockable button + - type: Fixtures + fixtures: {} +- proto: LockableButtonAtmospherics + entities: + - uid: 24254 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 109.5,-40.5 + parent: 13329 + - type: DeviceLinkSource + linkedPorts: + 23642: + - - Pressed + - Toggle + - type: Fixtures + fixtures: {} - proto: LockableButtonCommand entities: - uid: 30750 @@ -164697,6 +163539,8 @@ entities: 29875: - - Pressed - Toggle + - type: Fixtures + fixtures: {} - proto: LockableButtonSecurity entities: - uid: 36030 @@ -164719,6 +163563,8 @@ entities: 9405: - - Pressed - Toggle + - type: Fixtures + fixtures: {} - proto: LockerAtmosphericsFilledHardsuit entities: - uid: 23864 @@ -164749,18 +163595,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 1194 components: - type: Transform @@ -164772,18 +163608,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 34341 components: - type: Transform @@ -164795,18 +163621,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - proto: LockerBotanistFilled entities: - uid: 1338 @@ -164820,18 +163636,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 1339 components: - type: Transform @@ -164843,18 +163649,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 1340 components: - type: Transform @@ -164866,18 +163662,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - proto: LockerCaptainFilledNoLaser entities: - uid: 26362 @@ -164898,18 +163684,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 18475 components: - type: Transform @@ -164921,18 +163697,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - proto: LockerChiefEngineerFilled entities: - uid: 26220 @@ -164946,18 +163712,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - proto: LockerChiefMedicalOfficerFilled entities: - uid: 18916 @@ -164971,18 +163727,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - proto: LockerDetectiveFilled entities: - uid: 4531 @@ -164996,18 +163742,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - proto: LockerElectricalSuppliesFilled entities: - uid: 4807 @@ -165021,18 +163757,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 10786 components: - type: Transform @@ -165044,18 +163770,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 12152 components: - type: Transform @@ -165067,18 +163783,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 13133 components: - type: Transform @@ -165090,18 +163796,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 26483 components: - type: Transform @@ -165113,18 +163809,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 31791 components: - type: Transform @@ -165136,18 +163822,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 33881 components: - type: Transform @@ -165159,18 +163835,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - proto: LockerEngineerFilled entities: - uid: 27104 @@ -165184,18 +163850,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - proto: LockerEngineerFilledHardsuit entities: - uid: 23867 @@ -165246,18 +163902,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 4600 components: - type: Transform @@ -165269,18 +163915,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 7253 components: - type: Transform @@ -165317,18 +163953,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 9516 components: - type: Transform @@ -165340,18 +163966,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 9517 components: - type: Transform @@ -165363,18 +163979,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 9518 components: - type: Transform @@ -165386,18 +163992,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 9519 components: - type: Transform @@ -165409,18 +164005,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 9520 components: - type: Transform @@ -165432,18 +164018,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 9521 components: - type: Transform @@ -165455,18 +164031,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 9522 components: - type: Transform @@ -165478,18 +164044,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 10123 components: - type: Transform @@ -165501,18 +164057,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 10124 components: - type: Transform @@ -165524,18 +164070,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 15348 components: - type: Transform @@ -165547,18 +164083,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 18669 components: - type: Transform @@ -165570,18 +164096,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 26615 components: - type: Transform @@ -165593,18 +164109,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - proto: LockerFreezer entities: - uid: 1209 @@ -165618,18 +164124,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 1210 components: - type: Transform @@ -165641,18 +164137,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 4790 components: - type: Transform @@ -165664,18 +164150,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - type: ContainerContainer containers: entity_storage: !type:Container @@ -165698,18 +164174,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - proto: LockerFreezerVaultFilled entities: - uid: 30188 @@ -165730,18 +164196,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - proto: LockerHeadOfSecurityFilled entities: - uid: 10498 @@ -165755,18 +164211,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - proto: LockerMedicalFilled entities: - uid: 18740 @@ -165780,18 +164226,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 18821 components: - type: Transform @@ -165803,18 +164239,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 18822 components: - type: Transform @@ -165826,18 +164252,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - proto: LockerMedicineFilled entities: - uid: 8431 @@ -165856,18 +164272,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 18658 components: - type: Transform @@ -165879,18 +164285,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 18809 components: - type: Transform @@ -165902,18 +164298,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 18857 components: - type: Transform @@ -165925,18 +164311,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 18858 components: - type: Transform @@ -165948,18 +164324,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 31649 components: - type: Transform @@ -165971,18 +164337,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - proto: LockerParamedicFilled entities: - uid: 13332 @@ -166064,18 +164420,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - proto: LockerResearchDirectorFilled entities: - uid: 15467 @@ -166089,18 +164435,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - proto: LockerSalvageSpecialistFilledHardsuit entities: - uid: 13468 @@ -166131,18 +164467,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 19250 components: - type: Transform @@ -166154,18 +164480,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 19251 components: - type: Transform @@ -166177,18 +164493,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 19252 components: - type: Transform @@ -166200,18 +164506,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 25832 components: - type: Transform @@ -166223,18 +164519,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - proto: LockerSecurityFilled entities: - uid: 2210 @@ -166248,18 +164534,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 8662 components: - type: Transform @@ -166286,18 +164562,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 9428 components: - type: Transform @@ -166309,18 +164575,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 9429 components: - type: Transform @@ -166332,18 +164588,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 9430 components: - type: Transform @@ -166355,18 +164601,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 9431 components: - type: Transform @@ -166378,18 +164614,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 9432 components: - type: Transform @@ -166401,18 +164627,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 9446 components: - type: Transform @@ -166429,18 +164645,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 11813 components: - type: Transform @@ -166452,18 +164658,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 19160 components: - type: Transform @@ -166475,18 +164671,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 34611 components: - type: Transform @@ -166498,18 +164684,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - proto: LockerWallMedicalFilled entities: - uid: 18856 @@ -166523,18 +164699,10 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 + - type: Fixtures + fixtures: {} - proto: LockerWardenFilled entities: - uid: 9370 @@ -166548,18 +164716,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - proto: LockerWeldingSuppliesFilled entities: - uid: 2317 @@ -166573,18 +164731,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 12153 components: - type: Transform @@ -166596,18 +164744,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 13134 components: - type: Transform @@ -166619,18 +164757,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 26484 components: - type: Transform @@ -166642,18 +164770,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 26559 components: - type: Transform @@ -166665,18 +164783,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - proto: MachineAnomalyGenerator entities: - uid: 13840 @@ -167622,51 +165730,71 @@ entities: - type: Transform pos: -13.5,11.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 1640 components: - type: Transform pos: 7.5,12.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 4714 components: - type: Transform pos: -31.5,26.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 4715 components: - type: Transform pos: -31.5,27.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 10457 components: - type: Transform pos: 52.5,27.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 19148 components: - type: Transform pos: 9.5,65.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 28917 components: - type: Transform pos: 63.5,14.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 28918 components: - type: Transform pos: 63.5,15.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 28919 components: - type: Transform pos: 69.5,18.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 30600 components: - type: Transform pos: 82.5,54.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: MonkeyCubeWrapped entities: - uid: 1300 @@ -167772,18 +165900,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 6624 components: - type: Transform @@ -167796,18 +165914,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 8901 components: - type: Transform @@ -167825,18 +165933,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 16938 components: - type: Transform @@ -167848,18 +165946,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 16939 components: - type: Transform @@ -167871,18 +165959,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 16940 components: - type: Transform @@ -167894,18 +165972,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 16941 components: - type: Transform @@ -167918,18 +165986,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 16942 components: - type: Transform @@ -167942,18 +166000,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 16943 components: - type: Transform @@ -167966,18 +166014,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 16944 components: - type: Transform @@ -167990,18 +166028,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 16945 components: - type: Transform @@ -168014,18 +166042,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 16946 components: - type: Transform @@ -168038,18 +166056,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 16947 components: - type: Transform @@ -168062,18 +166070,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 16948 components: - type: Transform @@ -168086,18 +166084,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 16949 components: - type: Transform @@ -168110,18 +166098,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 20040 components: - type: Transform @@ -168572,6 +166550,8 @@ entities: - type: Transform pos: -6.5,51.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: PaintingHelloWorld entities: - uid: 4912 @@ -168579,6 +166559,8 @@ entities: - type: Transform pos: -11.5,49.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: PaintingMonkey entities: - uid: 1103 @@ -168586,6 +166568,8 @@ entities: - type: Transform pos: -19.5,27.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: PaintingMoony entities: - uid: 4917 @@ -168593,6 +166577,8 @@ entities: - type: Transform pos: -6.5,49.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: PaintingNightHawks entities: - uid: 4918 @@ -168600,6 +166586,8 @@ entities: - type: Transform pos: -6.5,48.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: PaintingOlympia entities: - uid: 4919 @@ -168607,11 +166595,15 @@ entities: - type: Transform pos: -6.5,52.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 30773 components: - type: Transform pos: 86.5,48.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: PaintingPrayerHands entities: - uid: 4914 @@ -168619,6 +166611,8 @@ entities: - type: Transform pos: -11.5,51.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: PaintingSadClown entities: - uid: 16658 @@ -168626,6 +166620,8 @@ entities: - type: Transform pos: -14.5,11.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: PaintingSkeletonBoof entities: - uid: 35213 @@ -168633,6 +166629,8 @@ entities: - type: Transform pos: 27.5,-45.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: PaintingSkeletonCigarette entities: - uid: 35212 @@ -168640,6 +166638,8 @@ entities: - type: Transform pos: 108.5,27.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: PaintingTheKiss entities: - uid: 4913 @@ -168647,6 +166647,8 @@ entities: - type: Transform pos: -11.5,48.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: PaintingTheSonOfMan entities: - uid: 4915 @@ -168654,6 +166656,8 @@ entities: - type: Transform pos: -11.5,52.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: PaladinCircuitBoard entities: - uid: 35770 @@ -169330,11 +167334,31 @@ entities: - type: Transform pos: 59.5,-35.5 parent: 13329 + - type: AccessReader + accessListsOriginal: + - - Atmospherics + - - Engineering + - - Research + - uid: 22525 + components: + - type: Transform + pos: 96.5,-36.5 + parent: 13329 + - type: AccessReader + accessListsOriginal: + - - Atmospherics + - - Engineering + - - Research - uid: 23720 components: - type: Transform pos: 91.5,-15.5 parent: 13329 + - type: AccessReader + accessListsOriginal: + - - Atmospherics + - - Engineering + - - Research - uid: 23811 components: - type: Transform @@ -169348,6 +167372,8 @@ entities: rot: 1.5707963267948966 rad pos: 99.5,-15.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - proto: PlasmaWindoorSecureArmoryLocked entities: - uid: 26292 @@ -169356,6 +167382,8 @@ entities: rot: -1.5707963267948966 rad pos: 22.5,13.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - type: DeviceLinkSink invokeCounter: 1 - type: DeviceLinkSource @@ -169371,6 +167399,8 @@ entities: rot: 1.5707963267948966 rad pos: 22.5,13.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - type: DeviceLinkSink invokeCounter: 1 - type: DeviceLinkSource @@ -169445,7 +167475,14 @@ entities: - uid: 36012 components: - type: Transform - pos: 99.55299,-39.23832 + pos: 99.47241,-39.30239 + parent: 13329 +- proto: PlushieAtmosian + entities: + - uid: 23883 + components: + - type: Transform + pos: 111.467224,-36.527515 parent: 13329 - proto: PlushieBee entities: @@ -169454,6 +167491,13 @@ entities: - type: Transform pos: -18.528942,-20.489607 parent: 13329 +- proto: PlushieExperiment + entities: + - uid: 24752 + components: + - type: Transform + pos: 101.483894,-39.388832 + parent: 13329 - proto: PlushieLamp entities: - uid: 21256 @@ -169698,6 +167742,8 @@ entities: - type: Transform pos: 70.5,-17.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: PosterContrabandBeachStarYamamoto entities: - uid: 1635 @@ -169705,11 +167751,15 @@ entities: - type: Transform pos: 5.5,14.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 26276 components: - type: Transform pos: 68.5,17.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: PosterContrabandBorgFancyv2 entities: - uid: 23584 @@ -169717,6 +167767,8 @@ entities: - type: Transform pos: 31.5,-24.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: PosterContrabandClown entities: - uid: 34572 @@ -169724,6 +167776,8 @@ entities: - type: Transform pos: 59.5,-52.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: PosterContrabandDDayPromo entities: - uid: 35197 @@ -169731,6 +167785,8 @@ entities: - type: Transform pos: 66.5,-42.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: PosterContrabandDonutCorp entities: - uid: 29199 @@ -169738,6 +167794,8 @@ entities: - type: Transform pos: 87.5,17.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: PosterContrabandFunPolice entities: - uid: 10430 @@ -169745,6 +167803,8 @@ entities: - type: Transform pos: 29.5,4.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: PosterContrabandGreyTide entities: - uid: 31596 @@ -169752,6 +167812,8 @@ entities: - type: Transform pos: 7.5,21.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: PosterContrabandHackingGuide entities: - uid: 6966 @@ -169759,6 +167821,8 @@ entities: - type: Transform pos: 3.5,20.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: PosterContrabandHighEffectEngineering entities: - uid: 31597 @@ -169766,6 +167830,8 @@ entities: - type: Transform pos: 81.5,2.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: PosterContrabandKosmicheskayaStantsiya entities: - uid: 13612 @@ -169773,6 +167839,8 @@ entities: - type: Transform pos: -36.5,-45.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: PosterContrabandMissingGloves entities: - uid: 6967 @@ -169780,21 +167848,29 @@ entities: - type: Transform pos: 7.5,28.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 26573 components: - type: Transform pos: 75.5,-7.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 28059 components: - type: Transform pos: 119.5,-15.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 32232 components: - type: Transform pos: 45.5,-52.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: PosterContrabandNuclearDeviceInformational entities: - uid: 30772 @@ -169802,6 +167878,8 @@ entities: - type: Transform pos: 92.5,49.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: PosterContrabandRedRum entities: - uid: 11643 @@ -169809,6 +167887,8 @@ entities: - type: Transform pos: 16.5,-25.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: PosterContrabandRevolver entities: - uid: 31600 @@ -169816,6 +167896,8 @@ entities: - type: Transform pos: 18.5,16.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: PosterContrabandSmoke entities: - uid: 26574 @@ -169823,6 +167905,8 @@ entities: - type: Transform pos: 80.5,-15.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: PosterContrabandTheBigGasTruth entities: - uid: 35198 @@ -169830,6 +167914,8 @@ entities: - type: Transform pos: 101.5,-48.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: PosterContrabandTools entities: - uid: 6965 @@ -169837,11 +167923,15 @@ entities: - type: Transform pos: 7.5,24.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 26209 components: - type: Transform pos: 74.5,-17.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: PosterContrabandUnreadableAnnouncement entities: - uid: 35199 @@ -169849,11 +167939,15 @@ entities: - type: Transform pos: 99.5,-51.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 36008 components: - type: Transform pos: 29.5,38.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: PosterContrabandVoteWeh entities: - uid: 31602 @@ -169861,6 +167955,8 @@ entities: - type: Transform pos: 33.5,26.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: PosterLegitAnatomyPoster entities: - uid: 16657 @@ -169868,6 +167964,8 @@ entities: - type: Transform pos: 12.5,54.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: PosterLegitBlessThisSpess entities: - uid: 35334 @@ -169875,6 +167973,8 @@ entities: - type: Transform pos: 122.5,-0.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: PosterLegitCarpMount entities: - uid: 16656 @@ -169882,6 +167982,8 @@ entities: - type: Transform pos: 12.5,-28.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: PosterLegitCleanliness entities: - uid: 1545 @@ -169889,6 +167991,8 @@ entities: - type: Transform pos: 1.5,8.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: PosterLegitCohibaRobustoAd entities: - uid: 1187 @@ -169896,11 +168000,15 @@ entities: - type: Transform pos: -13.5,27.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 32206 components: - type: Transform pos: 26.5,-28.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: PosterLegitDickGumshue entities: - uid: 31698 @@ -169908,6 +168016,8 @@ entities: - type: Transform pos: -29.5,66.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: PosterLegitDoNotQuestion entities: - uid: 31592 @@ -169915,6 +168025,8 @@ entities: - type: Transform pos: 53.5,16.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: PosterLegitGetYourLEGS entities: - uid: 31593 @@ -169922,6 +168034,8 @@ entities: - type: Transform pos: 63.5,-6.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: PosterLegitHereForYourSafety entities: - uid: 31594 @@ -169929,6 +168043,8 @@ entities: - type: Transform pos: 18.5,0.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: PosterLegitHighClassMartini entities: - uid: 31595 @@ -169936,6 +168052,8 @@ entities: - type: Transform pos: -12.5,23.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: PosterLegitIan entities: - uid: 31598 @@ -169943,6 +168061,8 @@ entities: - type: Transform pos: 58.5,50.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: PosterLegitIonRifle entities: - uid: 31599 @@ -169950,6 +168070,8 @@ entities: - type: Transform pos: 16.5,16.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: PosterLegitLoveIan entities: - uid: 31591 @@ -169957,6 +168079,8 @@ entities: - type: Transform pos: 63.5,49.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: PosterLegitMime entities: - uid: 16659 @@ -169964,6 +168088,8 @@ entities: - type: Transform pos: -10.5,11.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: PosterLegitNanotrasenLogo entities: - uid: 1639 @@ -169971,92 +168097,128 @@ entities: - type: Transform pos: 2.5,14.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 1885 components: - type: Transform pos: -0.5,3.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 2580 components: - type: Transform rot: 3.141592653589793 rad pos: -15.5,-3.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 9421 components: - type: Transform pos: 33.5,8.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 11517 components: - type: Transform pos: 4.5,-28.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 11702 components: - type: Transform pos: 14.5,-18.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 14592 components: - type: Transform pos: 48.5,16.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 26098 components: - type: Transform pos: 44.5,-7.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 26099 components: - type: Transform pos: 53.5,-4.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 30077 components: - type: Transform pos: 95.5,45.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 30078 components: - type: Transform pos: 97.5,45.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 30726 components: - type: Transform pos: 75.5,41.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 30727 components: - type: Transform pos: 80.5,52.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 30728 components: - type: Transform pos: 84.5,43.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 31590 components: - type: Transform pos: 84.5,54.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 33576 components: - type: Transform pos: 48.5,41.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 33577 components: - type: Transform pos: 66.5,41.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 36072 components: - type: Transform pos: 111.5,51.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: PosterLegitNoERP entities: - uid: 18812 @@ -170064,6 +168226,8 @@ entities: - type: Transform pos: 21.5,64.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: PosterLegitObey entities: - uid: 4593 @@ -170071,11 +168235,15 @@ entities: - type: Transform pos: -37.5,51.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 14568 components: - type: Transform pos: 40.5,13.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: PosterLegitPeriodicTable entities: - uid: 20052 @@ -170083,11 +168251,15 @@ entities: - type: Transform pos: 28.5,38.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 20053 components: - type: Transform pos: 19.5,41.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: PosterLegitReportCrimes entities: - uid: 29514 @@ -170095,6 +168267,8 @@ entities: - type: Transform pos: 59.5,35.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: PosterLegitSafetyEyeProtection entities: - uid: 15319 @@ -170102,6 +168276,8 @@ entities: - type: Transform pos: 48.5,-20.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: PosterLegitSafetyInternals entities: - uid: 15338 @@ -170109,6 +168285,8 @@ entities: - type: Transform pos: 48.5,-24.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: PosterLegitSafetyMothEpi entities: - uid: 26509 @@ -170116,11 +168294,15 @@ entities: - type: Transform pos: 12.5,58.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 26510 components: - type: Transform pos: 7.5,35.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: PosterLegitSafetyMothHardhat entities: - uid: 21947 @@ -170128,11 +168310,15 @@ entities: - type: Transform pos: 75.5,-2.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 26512 components: - type: Transform pos: 80.5,-10.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: PosterLegitSafetyMothMeth entities: - uid: 26511 @@ -170140,6 +168326,8 @@ entities: - type: Transform pos: 26.5,36.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: PosterLegitSafetyMothPiping entities: - uid: 23583 @@ -170147,11 +168335,23 @@ entities: - type: Transform pos: 71.5,-23.5 parent: 13329 + - type: Fixtures + fixtures: {} + - uid: 24748 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 106.5,-34.5 + parent: 13329 + - type: Fixtures + fixtures: {} - uid: 26513 components: - type: Transform pos: 90.5,-23.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: PosterLegitSafetyReport entities: - uid: 14566 @@ -170159,11 +168359,15 @@ entities: - type: Transform pos: 40.5,22.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 29515 components: - type: Transform pos: 59.5,25.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: PosterLegitScience entities: - uid: 15524 @@ -170171,6 +168375,8 @@ entities: - type: Transform pos: 49.5,-18.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: PosterLegitSpaceCops entities: - uid: 10174 @@ -170178,6 +168384,8 @@ entities: - type: Transform pos: 22.5,21.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: PosterLegitWalk entities: - uid: 31603 @@ -170185,6 +168393,8 @@ entities: - type: Transform pos: 51.5,35.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: PosterLegitWorkForAFuture entities: - uid: 1641 @@ -170192,11 +168402,15 @@ entities: - type: Transform pos: 7.5,13.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 31553 components: - type: Transform pos: 65.5,43.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: PottedPlant0 entities: - uid: 13051 @@ -171071,6 +169285,12 @@ entities: - type: Transform pos: 115.5,6.5 parent: 13329 + - uid: 26443 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 100.5,-43.5 + parent: 13329 - uid: 35388 components: - type: Transform @@ -172950,18 +171170,30 @@ entities: parent: 13329 - type: ApcPowerReceiver powerLoad: 0 + - uid: 20659 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 111.5,-36.5 + parent: 13329 + - uid: 22524 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 105.5,-34.5 + parent: 13329 + - uid: 23628 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 105.5,-38.5 + parent: 13329 - uid: 23714 components: - type: Transform rot: 3.141592653589793 rad pos: 68.5,-38.5 parent: 13329 - - uid: 23941 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 105.5,-36.5 - parent: 13329 - uid: 25979 components: - type: Transform @@ -173268,6 +171500,24 @@ entities: parent: 13329 - type: ApcPowerReceiver powerLoad: 0 + - uid: 26440 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 100.5,-39.5 + parent: 13329 + - uid: 26441 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 107.5,-39.5 + parent: 13329 + - uid: 26442 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 103.5,-41.5 + parent: 13329 - uid: 26677 components: - type: Transform @@ -173313,14 +171563,6 @@ entities: parent: 13329 - type: ApcPowerReceiver powerLoad: 0 - - uid: 26774 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 99.5,-39.5 - parent: 13329 - - type: ApcPowerReceiver - powerLoad: 0 - uid: 28225 components: - type: Transform @@ -176596,6 +174838,11 @@ entities: - type: Transform pos: 99.5,54.5 parent: 13329 + - uid: 24648 + components: + - type: Transform + pos: 96.5,-35.5 + parent: 13329 - uid: 25713 components: - type: Transform @@ -179761,396 +178008,565 @@ entities: - type: Transform pos: -30.5,72.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 5634 components: - type: Transform pos: -30.5,73.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 5635 components: - type: Transform pos: -30.5,74.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 13916 components: - type: Transform pos: 59.5,-32.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 13917 components: - type: Transform pos: 59.5,-33.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 13918 components: - type: Transform pos: 63.5,-33.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 13919 components: - type: Transform pos: 59.5,-30.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 13920 components: - type: Transform pos: 59.5,-29.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 13922 components: - type: Transform pos: 66.5,-33.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 15774 components: - type: Transform pos: 96.5,-28.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 15775 components: - type: Transform pos: 98.5,-28.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20188 components: - type: Transform pos: 87.5,-12.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20189 components: - type: Transform pos: 87.5,-11.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20228 components: - type: Transform pos: 84.5,-4.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20229 components: - type: Transform pos: 79.5,-1.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20230 components: - type: Transform pos: 80.5,-1.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20231 components: - type: Transform pos: 81.5,-1.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20369 components: - type: Transform pos: 98.5,-18.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20370 components: - type: Transform pos: 99.5,-18.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20398 components: - type: Transform pos: 80.5,-39.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20399 components: - type: Transform pos: 71.5,-39.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20400 components: - type: Transform pos: 78.5,-39.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20403 components: - type: Transform pos: 73.5,-41.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20421 components: - type: Transform pos: 74.5,-39.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20422 components: - type: Transform pos: 76.5,-39.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20423 components: - type: Transform pos: 75.5,-39.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20424 components: - type: Transform pos: 79.5,-39.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20431 components: - type: Transform pos: 72.5,-39.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20432 components: - type: Transform pos: 70.5,-39.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20475 components: - type: Transform pos: 77.5,-41.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20503 components: - type: Transform pos: 92.5,-40.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20514 components: - type: Transform pos: 92.5,-36.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20518 components: - type: Transform pos: 90.5,-42.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20519 components: - type: Transform pos: 90.5,-38.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20526 components: - type: Transform pos: 92.5,-32.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20530 components: - type: Transform pos: 90.5,-34.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20558 components: - type: Transform pos: 90.5,-25.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20559 components: - type: Transform pos: 93.5,-28.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20561 components: - type: Transform pos: 91.5,-28.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20563 components: - type: Transform pos: 94.5,-25.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20565 components: - type: Transform pos: 94.5,-27.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20571 components: - type: Transform pos: 90.5,-27.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20573 components: - type: Transform pos: 90.5,-26.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20578 components: - type: Transform pos: 92.5,-28.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20630 components: - type: Transform pos: 98.5,-24.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20631 components: - type: Transform pos: 96.5,-24.5 parent: 13329 - - uid: 20644 - components: - - type: Transform - pos: 104.5,-37.5 - parent: 13329 - - uid: 20658 - components: - - type: Transform - pos: 105.5,-34.5 - parent: 13329 - - uid: 20660 - components: - - type: Transform - pos: 106.5,-34.5 - parent: 13329 - - uid: 20662 - components: - - type: Transform - pos: 107.5,-34.5 - parent: 13329 - - uid: 22522 - components: - - type: Transform - pos: 106.5,-38.5 - parent: 13329 - - uid: 22523 - components: - - type: Transform - pos: 107.5,-38.5 - parent: 13329 - - uid: 22524 - components: - - type: Transform - pos: 108.5,-37.5 - parent: 13329 - - uid: 22525 - components: - - type: Transform - pos: 105.5,-38.5 - parent: 13329 - - uid: 22526 - components: - - type: Transform - pos: 108.5,-35.5 - parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 22716 components: - type: Transform pos: 88.5,2.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 22721 components: - type: Transform pos: 88.5,-0.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 22806 components: - type: Transform pos: 92.5,-6.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 22809 components: - type: Transform pos: 92.5,-5.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 22810 components: - type: Transform pos: 92.5,-4.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 22831 components: - type: Transform pos: 95.5,-1.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 22832 components: - type: Transform pos: 93.5,-9.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 22835 components: - type: Transform pos: 95.5,-9.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 23398 components: - type: Transform pos: 93.5,-1.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 23602 components: - type: Transform pos: 90.5,-43.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 23603 components: - type: Transform pos: 90.5,-41.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 23604 components: - type: Transform pos: 90.5,-39.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 23605 components: - type: Transform pos: 90.5,-37.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 23606 components: - type: Transform pos: 90.5,-35.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 23607 components: - type: Transform pos: 90.5,-33.5 parent: 13329 - - uid: 23862 + - type: DeltaPressure + gridUid: 13329 + - uid: 23635 components: - type: Transform - pos: 104.5,-36.5 + rot: 3.141592653589793 rad + pos: 108.5,-36.5 parent: 13329 - - uid: 23890 + - type: DeltaPressure + gridUid: 13329 + - uid: 23636 components: - type: Transform - pos: 104.5,-35.5 + rot: 3.141592653589793 rad + pos: 112.5,-37.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 + - uid: 23638 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 109.5,-38.5 + parent: 13329 + - type: DeltaPressure + gridUid: 13329 + - uid: 23693 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 112.5,-36.5 + parent: 13329 + - type: DeltaPressure + gridUid: 13329 + - uid: 23702 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 108.5,-37.5 + parent: 13329 + - type: DeltaPressure + gridUid: 13329 + - uid: 23908 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 108.5,-35.5 + parent: 13329 + - type: DeltaPressure + gridUid: 13329 + - uid: 23909 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 111.5,-34.5 + parent: 13329 + - type: DeltaPressure + gridUid: 13329 + - uid: 23914 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 112.5,-35.5 + parent: 13329 + - type: DeltaPressure + gridUid: 13329 + - uid: 23920 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 110.5,-34.5 + parent: 13329 + - type: DeltaPressure + gridUid: 13329 + - uid: 24256 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 111.5,-38.5 + parent: 13329 + - type: DeltaPressure + gridUid: 13329 + - uid: 24646 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 109.5,-34.5 + parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 25460 components: - type: Transform pos: 84.5,-0.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 25461 components: - type: Transform pos: 84.5,1.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 25503 components: - type: Transform pos: 84.5,-6.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 25984 components: - type: Transform pos: 96.5,-0.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 26746 components: - type: Transform pos: 100.5,-18.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 29874 components: - type: Transform pos: 122.5,49.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 35306 components: - type: Transform pos: 99.5,-0.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - proto: ReinforcedWindow entities: - uid: 167 @@ -180158,3851 +178574,5426 @@ entities: - type: Transform pos: -12.5,34.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 314 components: - type: Transform pos: -8.5,16.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 315 components: - type: Transform pos: -4.5,16.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 316 components: - type: Transform pos: -11.5,23.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 317 components: - type: Transform pos: -15.5,13.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 318 components: - type: Transform pos: -2.5,36.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 319 components: - type: Transform pos: -2.5,39.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 320 components: - type: Transform pos: -8.5,43.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 321 components: - type: Transform pos: -11.5,43.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 896 components: - type: Transform pos: -2.5,31.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 1403 components: - type: Transform pos: 5.5,31.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 1404 components: - type: Transform pos: 2.5,31.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 1405 components: - type: Transform pos: 1.5,30.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 1406 components: - type: Transform pos: 1.5,27.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 1407 components: - type: Transform pos: 1.5,24.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 1408 components: - type: Transform pos: 1.5,21.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 1502 components: - type: Transform pos: -10.5,27.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2055 components: - type: Transform pos: 9.5,-14.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2056 components: - type: Transform pos: 6.5,-14.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2057 components: - type: Transform pos: 3.5,-14.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2089 components: - type: Transform pos: -11.5,-7.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2090 components: - type: Transform pos: -9.5,-7.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2126 components: - type: Transform pos: 22.5,-13.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2127 components: - type: Transform pos: 22.5,-14.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2128 components: - type: Transform pos: 22.5,-9.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2129 components: - type: Transform pos: 22.5,-11.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2248 components: - type: Transform pos: -17.5,-7.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2249 components: - type: Transform pos: -19.5,-7.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2250 components: - type: Transform pos: -20.5,-8.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2251 components: - type: Transform pos: -20.5,-9.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2252 components: - type: Transform pos: -20.5,-10.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2662 components: - type: Transform pos: 19.5,-16.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2663 components: - type: Transform pos: 19.5,-17.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2687 components: - type: Transform pos: 10.5,-11.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2688 components: - type: Transform pos: 10.5,-9.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2689 components: - type: Transform pos: 14.5,-11.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2690 components: - type: Transform pos: 14.5,-9.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2715 components: - type: Transform pos: -42.5,-26.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2716 components: - type: Transform pos: -42.5,-25.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2717 components: - type: Transform pos: -42.5,-24.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2718 components: - type: Transform pos: -31.5,-27.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2719 components: - type: Transform pos: -30.5,-27.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2720 components: - type: Transform pos: -32.5,-29.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2721 components: - type: Transform pos: -34.5,-29.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2722 components: - type: Transform pos: -29.5,-29.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2723 components: - type: Transform pos: -27.5,-29.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2724 components: - type: Transform pos: -24.5,-29.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2725 components: - type: Transform pos: -20.5,-29.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2726 components: - type: Transform pos: -23.5,-31.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2727 components: - type: Transform pos: -21.5,-31.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2728 components: - type: Transform pos: -17.5,-29.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2729 components: - type: Transform pos: -15.5,-29.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2778 components: - type: Transform pos: -5.5,-28.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2779 components: - type: Transform pos: -4.5,-28.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2780 components: - type: Transform pos: -3.5,-28.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2781 components: - type: Transform pos: -1.5,-28.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2782 components: - type: Transform pos: -0.5,-28.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2783 components: - type: Transform pos: 0.5,-28.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2804 components: - type: Transform pos: 4.5,-26.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2805 components: - type: Transform pos: 4.5,-24.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2806 components: - type: Transform pos: 2.5,-22.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2807 components: - type: Transform pos: 1.5,-22.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2808 components: - type: Transform pos: 0.5,-22.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2809 components: - type: Transform pos: -0.5,-22.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2843 components: - type: Transform pos: -29.5,-8.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2844 components: - type: Transform pos: -28.5,-7.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2845 components: - type: Transform pos: -27.5,-7.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2846 components: - type: Transform pos: -26.5,-7.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2847 components: - type: Transform pos: -25.5,-7.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2848 components: - type: Transform pos: -29.5,-10.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2849 components: - type: Transform pos: -31.5,-10.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2850 components: - type: Transform pos: -31.5,-8.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2851 components: - type: Transform pos: -31.5,-7.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2853 components: - type: Transform pos: -32.5,-9.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2856 components: - type: Transform pos: -44.5,-23.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2863 components: - type: Transform pos: -38.5,-21.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2864 components: - type: Transform pos: -35.5,-9.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2865 components: - type: Transform pos: -34.5,-9.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2866 components: - type: Transform pos: -33.5,-9.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2871 components: - type: Transform pos: -38.5,-22.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2872 components: - type: Transform pos: -39.5,-6.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2873 components: - type: Transform pos: -39.5,-5.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2874 components: - type: Transform pos: -39.5,-4.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2898 components: - type: Transform pos: -47.5,-2.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2899 components: - type: Transform pos: -46.5,-0.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2900 components: - type: Transform pos: -49.5,0.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2901 components: - type: Transform pos: -49.5,2.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2902 components: - type: Transform pos: -48.5,2.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2903 components: - type: Transform pos: -47.5,2.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2904 components: - type: Transform pos: -48.5,0.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2905 components: - type: Transform pos: -47.5,0.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2911 components: - type: Transform pos: -35.5,-21.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2912 components: - type: Transform pos: -34.5,-21.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2913 components: - type: Transform pos: -33.5,-21.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2918 components: - type: Transform pos: -36.5,-8.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2919 components: - type: Transform pos: -38.5,-10.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2934 components: - type: Transform pos: -31.5,-23.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2935 components: - type: Transform pos: -31.5,-22.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2936 components: - type: Transform pos: -29.5,-22.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2937 components: - type: Transform pos: -28.5,-23.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2938 components: - type: Transform pos: -27.5,-23.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2939 components: - type: Transform pos: -26.5,-23.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2940 components: - type: Transform pos: -25.5,-23.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2945 components: - type: Transform pos: -31.5,-20.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2946 components: - type: Transform pos: -29.5,-20.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2947 components: - type: Transform pos: -24.5,-19.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2948 components: - type: Transform pos: -24.5,-18.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2949 components: - type: Transform pos: -24.5,-17.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2950 components: - type: Transform pos: -24.5,-16.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2951 components: - type: Transform pos: -24.5,-14.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2952 components: - type: Transform pos: -24.5,-13.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2953 components: - type: Transform pos: -24.5,-12.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2954 components: - type: Transform pos: -24.5,-11.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2977 components: - type: Transform pos: -36.5,-22.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2978 components: - type: Transform pos: -36.5,-23.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 3024 components: - type: Transform pos: -38.5,-9.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 3025 components: - type: Transform pos: -38.5,-8.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 3655 components: - type: Transform pos: -39.5,12.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 3656 components: - type: Transform pos: -39.5,13.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 3751 components: - type: Transform pos: -36.5,-20.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 3753 components: - type: Transform pos: -36.5,-7.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 3762 components: - type: Transform pos: -41.5,43.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 3763 components: - type: Transform pos: -39.5,44.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 3764 components: - type: Transform pos: -38.5,43.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 3765 components: - type: Transform pos: -40.5,41.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 3766 components: - type: Transform pos: -41.5,41.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 3767 components: - type: Transform pos: -41.5,39.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 3768 components: - type: Transform pos: -39.5,39.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 3769 components: - type: Transform pos: -38.5,39.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 3770 components: - type: Transform pos: -38.5,38.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 3771 components: - type: Transform pos: -41.5,35.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 3772 components: - type: Transform pos: -39.5,35.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 3773 components: - type: Transform pos: -38.5,35.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 3774 components: - type: Transform pos: -38.5,36.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 3775 components: - type: Transform pos: -41.5,31.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 3776 components: - type: Transform pos: -39.5,31.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 3777 components: - type: Transform pos: -38.5,31.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 3779 components: - type: Transform pos: -38.5,33.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 3780 components: - type: Transform pos: -40.5,33.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 3781 components: - type: Transform pos: -41.5,33.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 3791 components: - type: Transform pos: -27.5,43.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 3792 components: - type: Transform pos: -28.5,43.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 3793 components: - type: Transform pos: -29.5,42.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 3794 components: - type: Transform pos: -28.5,41.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 3795 components: - type: Transform pos: -27.5,41.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 3796 components: - type: Transform pos: -30.5,41.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 3797 components: - type: Transform pos: -33.5,41.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 3798 components: - type: Transform pos: -34.5,42.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 3799 components: - type: Transform pos: -34.5,43.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 3800 components: - type: Transform pos: -34.5,44.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 3801 components: - type: Transform pos: -35.5,41.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 3802 components: - type: Transform pos: -37.5,41.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 3803 components: - type: Transform pos: -26.5,38.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 3804 components: - type: Transform pos: -26.5,39.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 3805 components: - type: Transform pos: -26.5,40.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 3809 components: - type: Transform pos: -38.5,27.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 3810 components: - type: Transform pos: -38.5,26.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 3905 components: - type: Transform pos: -37.5,46.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 3906 components: - type: Transform pos: -35.5,46.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 3907 components: - type: Transform pos: -38.5,47.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 3908 components: - type: Transform pos: -38.5,48.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 3909 components: - type: Transform pos: -38.5,49.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 3910 components: - type: Transform pos: -34.5,47.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 3911 components: - type: Transform pos: -34.5,49.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 4027 components: - type: Transform pos: -22.5,43.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 4035 components: - type: Transform pos: -21.5,43.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 5140 components: - type: Transform pos: -38.5,52.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 5141 components: - type: Transform pos: -38.5,54.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 5142 components: - type: Transform pos: -38.5,55.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 5143 components: - type: Transform pos: -38.5,56.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 5144 components: - type: Transform pos: -38.5,58.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 5171 components: - type: Transform pos: -41.5,62.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 5172 components: - type: Transform pos: -41.5,63.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 5219 components: - type: Transform pos: -17.5,77.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 5220 components: - type: Transform pos: -16.5,77.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 5221 components: - type: Transform pos: -15.5,77.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 5242 components: - type: Transform pos: -7.5,76.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 5243 components: - type: Transform pos: -8.5,76.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 5244 components: - type: Transform pos: -11.5,76.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 5245 components: - type: Transform pos: -10.5,76.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 5424 components: - type: Transform pos: -5.5,72.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 5425 components: - type: Transform pos: -3.5,72.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 5427 components: - type: Transform pos: -5.5,76.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 5435 components: - type: Transform pos: -5.5,67.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 5436 components: - type: Transform pos: -3.5,67.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 5456 components: - type: Transform pos: -6.5,69.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 5457 components: - type: Transform pos: -6.5,70.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 5988 components: - type: Transform pos: -33.5,50.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 5989 components: - type: Transform pos: -30.5,50.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 6763 components: - type: Transform pos: -3.5,76.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 7206 components: - type: Transform pos: 24.5,28.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 7207 components: - type: Transform pos: 24.5,31.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 7213 components: - type: Transform pos: 27.5,8.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 7214 components: - type: Transform pos: 29.5,8.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 7215 components: - type: Transform pos: 26.5,9.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 7216 components: - type: Transform pos: 26.5,10.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 7217 components: - type: Transform pos: 26.5,13.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 7218 components: - type: Transform pos: 26.5,14.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 7219 components: - type: Transform pos: 27.5,15.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 7220 components: - type: Transform pos: 32.5,11.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 7221 components: - type: Transform pos: 32.5,12.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 7240 components: - type: Transform pos: 39.5,8.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 7254 components: - type: Transform pos: 28.5,4.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 7258 components: - type: Transform pos: 24.5,0.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 7259 components: - type: Transform pos: 24.5,4.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 7276 components: - type: Transform pos: 34.5,8.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 7277 components: - type: Transform pos: 36.5,8.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 7299 components: - type: Transform pos: 28.5,0.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 7302 components: - type: Transform pos: 31.5,0.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 7333 components: - type: Transform pos: 24.5,15.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 7334 components: - type: Transform pos: 26.5,17.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 7335 components: - type: Transform pos: 26.5,19.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 7336 components: - type: Transform pos: 26.5,21.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 7337 components: - type: Transform pos: 26.5,22.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 7338 components: - type: Transform pos: 26.5,24.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 7339 components: - type: Transform pos: 26.5,26.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 7353 components: - type: Transform pos: 31.5,27.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 7378 components: - type: Transform pos: 34.5,17.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 7379 components: - type: Transform pos: 34.5,19.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 7417 components: - type: Transform pos: 30.5,0.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 7418 components: - type: Transform pos: 31.5,4.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 7519 components: - type: Transform pos: 52.5,6.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 7525 components: - type: Transform pos: 33.5,0.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 7533 components: - type: Transform pos: 27.5,4.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 7556 components: - type: Transform pos: 52.5,20.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 7557 components: - type: Transform pos: 52.5,21.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 7559 components: - type: Transform pos: 52.5,23.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 7560 components: - type: Transform pos: 52.5,24.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 8100 components: - type: Transform pos: 44.5,10.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 8130 components: - type: Transform pos: 27.5,0.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 8134 components: - type: Transform pos: 34.5,0.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 8141 components: - type: Transform pos: 37.5,6.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 8169 components: - type: Transform pos: 45.5,8.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 8387 components: - type: Transform pos: 27.5,31.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 8406 components: - type: Transform pos: 19.5,21.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 8407 components: - type: Transform pos: 19.5,22.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 8408 components: - type: Transform pos: 19.5,23.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 8681 components: - type: Transform pos: 46.5,8.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 8866 components: - type: Transform pos: 47.5,8.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 8958 components: - type: Transform pos: 46.5,11.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 8959 components: - type: Transform pos: 47.5,11.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 9246 components: - type: Transform pos: 22.5,17.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 9247 components: - type: Transform pos: 22.5,19.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 9360 components: - type: Transform pos: 33.5,4.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 9394 components: - type: Transform pos: 37.5,0.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 9477 components: - type: Transform pos: -10.5,-30.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 9675 components: - type: Transform pos: 16.5,-27.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 9679 components: - type: Transform pos: 13.5,-33.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 9687 components: - type: Transform pos: 20.5,-33.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 9691 components: - type: Transform pos: 15.5,-35.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 9692 components: - type: Transform pos: 15.5,-34.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 9693 components: - type: Transform pos: 18.5,-35.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 9694 components: - type: Transform pos: 18.5,-34.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 9695 components: - type: Transform pos: 17.5,-36.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 9696 components: - type: Transform pos: 8.5,-39.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 9697 components: - type: Transform pos: 7.5,-39.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 9699 components: - type: Transform pos: 3.5,-33.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 9700 components: - type: Transform pos: 2.5,-39.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 9702 components: - type: Transform pos: 9.5,-39.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 9706 components: - type: Transform pos: 6.5,-39.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 9709 components: - type: Transform pos: 11.5,-37.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 9710 components: - type: Transform pos: 2.5,-33.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 9711 components: - type: Transform pos: 3.5,-39.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 9712 components: - type: Transform pos: 11.5,-36.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 9713 components: - type: Transform pos: 11.5,-35.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 9722 components: - type: Transform pos: 3.5,-36.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 9723 components: - type: Transform pos: 1.5,-36.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 9724 components: - type: Transform pos: -8.5,-30.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 9725 components: - type: Transform pos: 22.5,-34.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 9726 components: - type: Transform pos: 22.5,-35.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 9727 components: - type: Transform pos: 22.5,-37.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 9728 components: - type: Transform pos: 22.5,-38.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 9740 components: - type: Transform pos: 11.5,-32.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 9741 components: - type: Transform pos: 11.5,-31.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 9742 components: - type: Transform pos: 11.5,-30.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 10216 components: - type: Transform pos: 46.5,-8.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 10217 components: - type: Transform pos: 49.5,-8.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 10218 components: - type: Transform pos: 48.5,-8.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 10219 components: - type: Transform pos: 51.5,-8.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 10220 components: - type: Transform pos: 51.5,-3.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 10221 components: - type: Transform pos: 49.5,-3.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 10222 components: - type: Transform pos: 48.5,-3.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 10223 components: - type: Transform pos: 46.5,-3.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 10358 components: - type: Transform pos: 36.5,0.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 10437 components: - type: Transform pos: 45.5,11.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 12192 components: - type: Transform pos: -37.5,-29.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 12193 components: - type: Transform pos: -41.5,-29.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 12203 components: - type: Transform pos: -42.5,-31.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 12206 components: - type: Transform pos: -42.5,-36.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 12207 components: - type: Transform pos: -42.5,-35.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 12212 components: - type: Transform pos: -42.5,-41.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 12214 components: - type: Transform pos: -37.5,-33.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 12215 components: - type: Transform pos: -37.5,-32.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 12216 components: - type: Transform pos: -37.5,-36.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 12248 components: - type: Transform pos: -37.5,-42.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 12249 components: - type: Transform pos: -37.5,-41.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 12250 components: - type: Transform pos: -37.5,-39.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 12251 components: - type: Transform pos: -32.5,-39.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 12252 components: - type: Transform pos: -32.5,-40.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 12253 components: - type: Transform pos: -32.5,-41.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 12255 components: - type: Transform pos: -39.5,-44.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 12265 components: - type: Transform pos: -34.5,-48.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 12266 components: - type: Transform pos: -33.5,-48.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 12267 components: - type: Transform pos: -30.5,-48.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 12268 components: - type: Transform pos: -31.5,-46.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 12269 components: - type: Transform pos: -37.5,-50.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 12270 components: - type: Transform pos: -37.5,-51.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 12271 components: - type: Transform pos: -37.5,-52.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 12273 components: - type: Transform pos: -37.5,-54.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 12274 components: - type: Transform pos: -37.5,-55.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 12275 components: - type: Transform pos: -37.5,-56.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 12280 components: - type: Transform pos: -33.5,-58.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 12284 components: - type: Transform pos: -34.5,-58.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 12287 components: - type: Transform pos: -30.5,-58.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 12292 components: - type: Transform pos: -31.5,-60.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 12335 components: - type: Transform pos: -35.5,-62.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 12336 components: - type: Transform pos: -34.5,-62.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 12337 components: - type: Transform pos: -34.5,-64.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 12338 components: - type: Transform pos: -35.5,-64.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 12345 components: - type: Transform pos: -38.5,-63.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 12346 components: - type: Transform pos: -31.5,-63.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 12411 components: - type: Transform pos: -46.5,-59.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 12412 components: - type: Transform pos: -44.5,-59.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 12413 components: - type: Transform pos: -44.5,-62.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 12414 components: - type: Transform pos: -46.5,-62.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 13082 components: - type: Transform pos: -31.5,-42.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 13083 components: - type: Transform pos: -29.5,-42.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 13149 components: - type: Transform pos: -32.5,-21.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 13256 components: - type: Transform pos: -38.5,-20.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 13257 components: - type: Transform pos: -38.5,-23.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 13258 components: - type: Transform pos: -36.5,-10.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 13272 components: - type: Transform pos: -38.5,-7.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 13274 components: - type: Transform pos: -41.5,-40.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 13275 components: - type: Transform pos: -43.5,-40.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 13614 components: - type: Transform pos: -23.5,-28.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 13615 components: - type: Transform pos: -21.5,-28.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 13705 components: - type: Transform pos: 40.5,-12.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 13706 components: - type: Transform pos: 44.5,-12.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 13707 components: - type: Transform pos: 35.5,-14.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 13712 components: - type: Transform pos: 52.5,-13.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 13713 components: - type: Transform pos: 54.5,-13.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 13714 components: - type: Transform pos: 55.5,-13.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 13718 components: - type: Transform pos: 49.5,-16.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 13729 components: - type: Transform pos: 43.5,-19.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 13730 components: - type: Transform pos: 44.5,-22.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 13731 components: - type: Transform pos: 41.5,-19.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 13732 components: - type: Transform pos: 41.5,-24.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 13748 components: - type: Transform pos: 51.5,-21.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 13769 components: - type: Transform pos: 37.5,-18.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 13773 components: - type: Transform pos: 33.5,-18.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 13777 components: - type: Transform pos: 31.5,-19.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 13778 components: - type: Transform pos: 31.5,-20.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 13812 components: - type: Transform pos: 44.5,-28.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 13813 components: - type: Transform pos: 51.5,-28.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 13814 components: - type: Transform pos: 40.5,-29.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 13815 components: - type: Transform pos: 40.5,-30.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 13819 components: - type: Transform pos: 42.5,-28.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 13820 components: - type: Transform pos: 43.5,-28.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 13832 components: - type: Transform pos: 33.5,-29.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 13833 components: - type: Transform pos: 33.5,-28.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 13837 components: - type: Transform pos: 46.5,-30.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 13839 components: - type: Transform pos: 46.5,-29.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 13847 components: - type: Transform pos: 54.5,-26.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 13848 components: - type: Transform pos: 54.5,-27.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 13859 components: - type: Transform pos: 55.5,-36.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 13860 components: - type: Transform pos: 50.5,-32.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 13921 components: - type: Transform pos: 59.5,-27.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 13923 components: - type: Transform pos: 49.5,-36.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 13924 components: - type: Transform pos: 47.5,-36.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 13967 components: - type: Transform pos: 36.5,-39.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 13968 components: - type: Transform pos: 36.5,-37.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 13992 components: - type: Transform pos: 40.5,-39.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 13993 components: - type: Transform pos: 42.5,-36.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 13995 components: - type: Transform pos: 40.5,-37.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 13996 components: - type: Transform pos: 44.5,-36.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 15565 components: - type: Transform pos: 37.5,-44.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 15566 components: - type: Transform pos: 39.5,-44.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 15576 components: - type: Transform pos: 22.5,-44.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 15577 components: - type: Transform pos: 22.5,-45.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 15581 components: - type: Transform pos: 21.5,-48.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 15586 components: - type: Transform pos: 22.5,-52.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 15589 components: - type: Transform pos: 23.5,-54.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 15590 components: - type: Transform pos: 25.5,-54.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 15591 components: - type: Transform pos: 22.5,-55.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 15592 components: - type: Transform pos: 22.5,-57.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 15605 components: - type: Transform pos: 24.5,-61.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 15606 components: - type: Transform pos: 24.5,-59.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 15607 components: - type: Transform pos: 28.5,-61.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 15608 components: - type: Transform pos: 28.5,-59.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 15613 components: - type: Transform pos: 30.5,-59.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 15623 components: - type: Transform pos: 30.5,-52.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 15624 components: - type: Transform pos: 29.5,-52.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 15648 components: - type: Transform pos: 47.5,-55.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 15686 components: - type: Transform pos: 83.5,-54.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 15688 components: - type: Transform pos: 83.5,-53.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 15689 components: - type: Transform pos: 71.5,-54.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 15690 components: - type: Transform pos: 71.5,-53.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 15712 components: - type: Transform pos: 56.5,-59.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 15713 components: - type: Transform pos: 57.5,-59.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 15714 components: - type: Transform pos: 58.5,-59.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 15750 components: - type: Transform pos: 101.5,-57.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 15751 components: - type: Transform pos: 103.5,-57.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 15757 components: - type: Transform pos: 100.5,-28.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 15758 components: - type: Transform pos: 105.5,-50.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 15759 components: - type: Transform pos: 105.5,-49.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 15779 components: - type: Transform pos: 103.5,-21.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 15780 components: - type: Transform pos: 104.5,-21.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 15781 components: - type: Transform pos: 105.5,-21.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 15782 components: - type: Transform pos: 106.5,-21.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 15791 components: - type: Transform pos: 108.5,-22.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 15812 components: - type: Transform pos: 117.5,30.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 15813 components: - type: Transform pos: 117.5,32.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 15842 components: - type: Transform pos: 117.5,13.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 15843 components: - type: Transform pos: 118.5,12.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 15844 components: - type: Transform pos: 118.5,10.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 15870 components: - type: Transform pos: 127.5,-1.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 15878 components: - type: Transform pos: 127.5,-8.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 15879 components: - type: Transform pos: 127.5,-7.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 15880 components: - type: Transform pos: 127.5,-6.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 15922 components: - type: Transform pos: 122.5,-20.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 15923 components: - type: Transform pos: 122.5,-19.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 15924 components: - type: Transform pos: 117.5,-22.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 15925 components: - type: Transform pos: 117.5,-23.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 15926 components: - type: Transform pos: 117.5,-26.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 15927 components: - type: Transform pos: 117.5,-25.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 15939 components: - type: Transform pos: 114.5,38.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 15940 components: - type: Transform pos: 114.5,39.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 15941 components: - type: Transform pos: 114.5,40.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 15942 components: - type: Transform pos: 110.5,38.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 15943 components: - type: Transform pos: 110.5,39.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 15944 components: - type: Transform pos: 110.5,40.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 15945 components: - type: Transform pos: 104.5,38.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 15946 components: - type: Transform pos: 104.5,39.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 15947 components: - type: Transform pos: 104.5,40.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 16046 components: - type: Transform pos: 96.5,57.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 16063 components: - type: Transform pos: 94.5,62.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 16064 components: - type: Transform pos: 93.5,63.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 16065 components: - type: Transform pos: 93.5,64.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 16066 components: - type: Transform pos: 94.5,65.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 16067 components: - type: Transform pos: 94.5,68.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 16068 components: - type: Transform pos: 94.5,69.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 16069 components: - type: Transform pos: 94.5,70.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 16070 components: - type: Transform pos: 92.5,71.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 16071 components: - type: Transform pos: 90.5,71.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 16084 components: - type: Transform pos: 90.5,74.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 16085 components: - type: Transform pos: 92.5,74.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 16087 components: - type: Transform pos: 89.5,69.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 16088 components: - type: Transform pos: 89.5,68.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 16089 components: - type: Transform pos: 89.5,67.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 16090 components: - type: Transform pos: 89.5,63.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 16091 components: - type: Transform pos: 89.5,62.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 16092 components: - type: Transform pos: 89.5,61.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 16100 components: - type: Transform pos: 88.5,57.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 16101 components: - type: Transform pos: 87.5,57.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 16102 components: - type: Transform pos: 86.5,57.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 16109 components: - type: Transform pos: 83.5,58.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 16110 components: - type: Transform pos: 82.5,58.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 16111 components: - type: Transform pos: 80.5,58.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 16112 components: - type: Transform pos: 79.5,58.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 16113 components: - type: Transform pos: 77.5,58.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 16114 components: - type: Transform pos: 76.5,58.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 16118 components: - type: Transform pos: 74.5,60.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 16119 components: - type: Transform pos: 74.5,61.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 16120 components: - type: Transform pos: 73.5,61.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 16121 components: - type: Transform pos: 71.5,61.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 16122 components: - type: Transform pos: 70.5,61.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 16123 components: - type: Transform pos: 69.5,61.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 16124 components: - type: Transform pos: 67.5,61.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 16130 components: - type: Transform pos: 63.5,61.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 16131 components: - type: Transform pos: 62.5,61.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 16132 components: - type: Transform pos: 61.5,61.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 16133 components: - type: Transform pos: 60.5,61.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 16139 components: - type: Transform pos: 57.5,63.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 16140 components: - type: Transform pos: 57.5,64.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 16260 components: - type: Transform pos: 61.5,41.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 16275 components: - type: Transform pos: 69.5,41.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 16276 components: - type: Transform pos: 68.5,41.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 16277 components: - type: Transform pos: 67.5,41.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 16281 components: - type: Transform pos: 59.5,43.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 16282 components: - type: Transform pos: 60.5,43.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 16283 components: - type: Transform pos: 64.5,43.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 16284 components: - type: Transform pos: 63.5,43.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 16285 components: - type: Transform pos: 62.5,43.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 16307 components: - type: Transform pos: 71.5,41.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 16308 components: - type: Transform pos: 71.5,44.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 16309 components: - type: Transform pos: 74.5,44.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 16310 components: - type: Transform pos: 74.5,41.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 16367 components: - type: Transform pos: 87.5,45.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 16368 components: - type: Transform pos: 86.5,45.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 16369 components: - type: Transform pos: 86.5,46.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 16370 components: - type: Transform pos: 91.5,45.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 16371 components: - type: Transform pos: 92.5,45.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 16372 components: - type: Transform pos: 92.5,46.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 16373 components: - type: Transform pos: 86.5,47.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 16375 components: - type: Transform pos: 92.5,47.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 16379 components: - type: Transform pos: 86.5,50.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 16380 components: - type: Transform pos: 86.5,51.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 16381 components: - type: Transform pos: 86.5,52.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 16382 components: - type: Transform pos: 87.5,52.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 16383 components: - type: Transform pos: 92.5,50.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 16384 components: - type: Transform pos: 92.5,51.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 16385 components: - type: Transform pos: 91.5,52.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 16386 components: - type: Transform pos: 92.5,52.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 16435 components: - type: Transform pos: 75.5,56.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 16452 components: - type: Transform pos: 66.5,54.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 16453 components: - type: Transform pos: 66.5,58.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 16454 components: - type: Transform pos: 94.5,56.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 16455 components: - type: Transform pos: 90.5,57.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 16456 components: - type: Transform pos: 92.5,57.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 16593 components: - type: Transform pos: 46.5,37.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 16595 components: - type: Transform pos: 47.5,35.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 16596 components: - type: Transform pos: 52.5,35.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 16597 components: - type: Transform pos: 53.5,37.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 16602 components: - type: Transform pos: 52.5,41.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 16603 components: - type: Transform pos: 49.5,41.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 16604 components: - type: Transform pos: 47.5,41.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 16621 components: - type: Transform pos: 53.5,43.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 16623 components: - type: Transform pos: 50.5,35.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 16624 components: - type: Transform pos: 49.5,35.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 16956 components: - type: Transform pos: 11.5,46.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 16978 components: - type: Transform pos: 18.5,35.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 16979 components: - type: Transform pos: 20.5,35.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 16980 components: - type: Transform pos: 22.5,35.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 16981 components: - type: Transform pos: 24.5,35.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 16982 components: - type: Transform pos: 25.5,42.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 16983 components: - type: Transform pos: 20.5,42.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 16984 components: - type: Transform pos: 16.5,36.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 16985 components: - type: Transform pos: 16.5,38.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 17056 components: - type: Transform pos: 25.5,53.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 17077 components: - type: Transform pos: 36.5,47.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 17078 components: - type: Transform pos: 32.5,47.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 17080 components: - type: Transform pos: 34.5,50.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 17081 components: - type: Transform pos: 34.5,49.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 17082 components: - type: Transform pos: 34.5,48.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 17085 components: - type: Transform pos: 33.5,51.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 17087 components: - type: Transform pos: 32.5,51.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 17127 components: - type: Transform pos: 12.5,46.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 17132 components: - type: Transform pos: 13.5,46.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 17133 components: - type: Transform pos: 20.5,48.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 17134 components: - type: Transform pos: 20.5,49.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 17135 components: - type: Transform pos: 20.5,50.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 17136 components: - type: Transform pos: 26.5,48.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 17137 components: - type: Transform pos: 26.5,51.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 17503 components: - type: Transform pos: 20.5,53.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 17504 components: - type: Transform pos: 20.5,55.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 17526 components: - type: Transform pos: 16.5,50.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 17531 components: - type: Transform pos: 30.5,44.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 17532 components: - type: Transform pos: 29.5,44.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 17533 components: - type: Transform pos: 28.5,44.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 17534 components: - type: Transform pos: 27.5,44.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 17535 components: - type: Transform pos: 8.5,43.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 17536 components: - type: Transform pos: 8.5,45.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 17537 components: - type: Transform pos: 0.5,47.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 17538 components: - type: Transform pos: -1.5,47.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 17539 components: - type: Transform pos: -2.5,48.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 17540 components: - type: Transform pos: -2.5,50.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 17542 components: - type: Transform pos: 8.5,50.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 17551 components: - type: Transform pos: 7.5,57.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 17552 components: - type: Transform pos: 8.5,57.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 17553 components: - type: Transform pos: 9.5,57.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 17554 components: - type: Transform pos: 10.5,57.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 17557 components: - type: Transform pos: -2.5,57.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 17558 components: - type: Transform pos: -2.5,58.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 17559 components: - type: Transform pos: 1.5,62.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 17659 components: - type: Transform pos: 20.5,57.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 17660 components: - type: Transform pos: 20.5,59.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 17661 components: - type: Transform pos: 20.5,60.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 17704 components: - type: Transform pos: 6.5,64.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 17705 components: - type: Transform pos: 8.5,64.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 17706 components: - type: Transform pos: 4.5,69.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 18330 components: - type: Transform pos: 18.5,65.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 18671 components: - type: Transform pos: 24.5,52.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 18672 components: - type: Transform pos: 23.5,52.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 18673 components: - type: Transform pos: 22.5,52.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 19052 components: - type: Transform pos: 33.5,53.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 19053 components: - type: Transform pos: 32.5,53.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 19054 components: - type: Transform pos: 35.5,51.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 19055 components: - type: Transform pos: 36.5,51.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 19056 components: - type: Transform pos: 37.5,52.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 19057 components: - type: Transform pos: 35.5,53.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 19058 components: - type: Transform pos: 36.5,53.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 19220 components: - type: Transform pos: 33.5,-51.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 19248 components: - type: Transform pos: 26.5,-47.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20128 components: - type: Transform pos: 59.5,-8.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20129 components: - type: Transform pos: 59.5,-6.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20130 components: - type: Transform pos: 61.5,-6.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20131 components: - type: Transform pos: 61.5,-8.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20132 components: - type: Transform pos: 61.5,0.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20133 components: - type: Transform pos: 59.5,0.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20167 components: - type: Transform pos: 67.5,-13.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20168 components: - type: Transform pos: 69.5,-13.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20169 components: - type: Transform pos: 70.5,-14.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20170 components: - type: Transform pos: 70.5,-16.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20171 components: - type: Transform pos: 69.5,-17.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20172 components: - type: Transform pos: 67.5,-17.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20173 components: - type: Transform pos: 70.5,-10.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20174 components: - type: Transform pos: 70.5,-8.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20175 components: - type: Transform pos: 74.5,-10.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20176 components: - type: Transform pos: 74.5,-9.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20177 components: - type: Transform pos: 74.5,-8.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20178 components: - type: Transform pos: 63.5,-13.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20179 components: - type: Transform pos: 75.5,-21.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20180 components: - type: Transform pos: 77.5,-21.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20181 components: - type: Transform pos: 75.5,-17.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20182 components: - type: Transform pos: 77.5,-17.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20183 components: - type: Transform pos: 79.5,-17.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20184 components: - type: Transform pos: 67.5,-22.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20185 components: - type: Transform pos: 69.5,-22.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20186 components: - type: Transform pos: 80.5,-14.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20187 components: - type: Transform pos: 80.5,-12.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20272 components: - type: Transform pos: 74.5,-3.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20273 components: - type: Transform pos: 70.5,-3.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20274 components: - type: Transform pos: 75.5,-5.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20275 components: - type: Transform pos: 75.5,-4.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20346 components: - type: Transform pos: 83.5,-22.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20347 components: - type: Transform pos: 84.5,-22.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20348 components: - type: Transform pos: 85.5,-22.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20349 components: - type: Transform pos: 87.5,-22.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20350 components: - type: Transform pos: 88.5,-22.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20351 components: - type: Transform pos: 89.5,-22.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20376 components: - type: Transform pos: 71.5,-24.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20377 components: - type: Transform pos: 71.5,-26.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20378 components: - type: Transform pos: 78.5,-26.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20379 components: - type: Transform pos: 77.5,-27.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20380 components: - type: Transform pos: 76.5,-27.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20381 components: - type: Transform pos: 74.5,-27.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20382 components: - type: Transform pos: 73.5,-27.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20560 components: - type: Transform pos: 101.5,-29.5 parent: 13329 - - uid: 20674 - components: - - type: Transform - pos: 104.5,-33.5 - parent: 13329 - - uid: 20675 - components: - - type: Transform - pos: 104.5,-39.5 - parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20691 components: - type: Transform pos: 102.5,-42.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20692 components: - type: Transform pos: 105.5,-47.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20693 components: - type: Transform pos: 105.5,-45.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20694 components: - type: Transform pos: 108.5,-47.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20695 components: - type: Transform pos: 108.5,-45.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20773 components: - type: Transform pos: 75.5,-32.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20774 components: - type: Transform pos: 74.5,-32.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20775 components: - type: Transform pos: 76.5,-32.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20776 components: - type: Transform pos: 77.5,-32.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20845 components: - type: Transform pos: 75.5,-53.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20846 components: - type: Transform pos: 75.5,-54.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20847 components: - type: Transform pos: 75.5,-55.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20848 components: - type: Transform pos: 76.5,-55.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20849 components: - type: Transform pos: 77.5,-55.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20850 components: - type: Transform pos: 78.5,-55.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20855 components: - type: Transform pos: 75.5,-51.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20856 components: - type: Transform pos: 75.5,-52.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20857 components: - type: Transform pos: 80.5,-50.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20858 components: - type: Transform pos: 74.5,-50.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20859 components: - type: Transform pos: 73.5,-50.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20860 components: - type: Transform pos: 73.5,-51.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20861 components: - type: Transform pos: 72.5,-51.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20862 components: - type: Transform pos: 72.5,-52.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20863 components: - type: Transform pos: 79.5,-55.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20864 components: - type: Transform pos: 79.5,-54.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20865 components: - type: Transform pos: 79.5,-53.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20866 components: - type: Transform pos: 79.5,-52.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20867 components: - type: Transform pos: 79.5,-51.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20868 components: - type: Transform pos: 81.5,-50.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20869 components: - type: Transform pos: 82.5,-52.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20870 components: - type: Transform pos: 81.5,-51.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20871 components: - type: Transform pos: 82.5,-51.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 21010 components: - type: Transform pos: 61.5,26.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 21011 components: - type: Transform pos: 61.5,27.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 21012 components: - type: Transform pos: 61.5,28.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 21013 components: - type: Transform pos: 61.5,29.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 21014 components: - type: Transform pos: 61.5,31.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 21015 components: - type: Transform pos: 61.5,32.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 21016 components: - type: Transform pos: 61.5,33.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 21017 components: - type: Transform pos: 61.5,34.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 21100 components: - type: Transform pos: 69.5,37.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 21101 components: - type: Transform pos: 71.5,37.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 21350 components: - type: Transform pos: 69.5,5.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 21351 components: - type: Transform pos: 68.5,5.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 21352 components: - type: Transform pos: 73.5,5.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 21353 components: - type: Transform pos: 72.5,5.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 21423 components: - type: Transform pos: 103.5,52.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 21424 components: - type: Transform pos: 103.5,51.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 21425 components: - type: Transform pos: 103.5,50.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 21426 components: - type: Transform pos: 103.5,46.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 21427 components: - type: Transform pos: 103.5,47.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 21428 components: - type: Transform pos: 103.5,48.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 21487 components: - type: Transform pos: 93.5,34.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 21488 components: - type: Transform pos: 98.5,34.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 21489 components: - type: Transform pos: 97.5,34.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 21490 components: - type: Transform pos: 96.5,34.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 21491 components: - type: Transform pos: 94.5,36.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 21492 components: - type: Transform pos: 86.5,31.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 21493 components: - type: Transform pos: 88.5,31.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 21494 components: - type: Transform pos: 89.5,29.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 21495 components: - type: Transform pos: 89.5,30.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 21496 components: - type: Transform pos: 90.5,31.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 21540 components: - type: Transform pos: 87.5,37.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 22578 components: - type: Transform pos: 58.5,67.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 22579 components: - type: Transform pos: 58.5,68.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 22597 components: - type: Transform pos: 51.5,69.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 22598 components: - type: Transform pos: 51.5,70.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 22599 components: - type: Transform pos: 51.5,71.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 22600 components: - type: Transform pos: 53.5,69.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 22601 components: - type: Transform pos: 53.5,70.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 22602 components: - type: Transform pos: 53.5,71.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 22606 components: - type: Transform pos: 46.5,66.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 22773 components: - type: Transform pos: 89.5,-13.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 22774 components: - type: Transform pos: 89.5,-17.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 22795 components: - type: Transform pos: 89.5,4.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 22796 components: - type: Transform pos: 91.5,4.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 22819 components: - type: Transform pos: 99.5,-7.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 22820 components: - type: Transform pos: 99.5,-6.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 22821 components: - type: Transform pos: 99.5,-5.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 22822 components: - type: Transform pos: 99.5,-4.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 22823 components: - type: Transform pos: 99.5,-3.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 22828 components: - type: Transform pos: 122.5,10.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 22961 components: - type: Transform pos: 117.5,-7.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 22980 components: - type: Transform pos: 106.5,-14.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 22981 components: - type: Transform pos: 107.5,-14.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 22982 components: - type: Transform pos: 108.5,-14.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 22983 components: - type: Transform pos: 109.5,-14.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 22984 components: - type: Transform pos: 110.5,-14.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 22985 components: - type: Transform pos: 110.5,3.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 22986 components: - type: Transform pos: 109.5,3.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 22987 components: - type: Transform pos: 108.5,3.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 22988 components: - type: Transform pos: 107.5,3.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 22989 components: - type: Transform pos: 106.5,3.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 22990 components: - type: Transform pos: 117.5,-6.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 22991 components: - type: Transform pos: 117.5,-5.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 22992 components: - type: Transform pos: 117.5,-4.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 22993 components: - type: Transform pos: 117.5,-3.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 23058 components: - type: Transform pos: 122.5,-7.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 23059 components: - type: Transform pos: 125.5,-0.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 23060 components: - type: Transform pos: 123.5,-0.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 23061 components: - type: Transform pos: 121.5,-2.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 23062 components: - type: Transform pos: 120.5,0.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 23063 components: - type: Transform pos: 120.5,2.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 23067 components: - type: Transform pos: 123.5,5.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 23068 components: - type: Transform pos: 123.5,7.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 23124 components: - type: Transform pos: 122.5,12.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 + - uid: 23906 + components: + - type: Transform + pos: 106.5,-35.5 + parent: 13329 + - type: DeltaPressure + gridUid: 13329 + - uid: 23907 + components: + - type: Transform + pos: 106.5,-36.5 + parent: 13329 + - type: DeltaPressure + gridUid: 13329 + - uid: 23913 + components: + - type: Transform + pos: 107.5,-38.5 + parent: 13329 + - type: DeltaPressure + gridUid: 13329 + - uid: 23941 + components: + - type: Transform + pos: 106.5,-37.5 + parent: 13329 + - type: DeltaPressure + gridUid: 13329 + - uid: 24753 + components: + - type: Transform + pos: 104.5,-40.5 + parent: 13329 + - type: DeltaPressure + gridUid: 13329 + - uid: 24754 + components: + - type: Transform + pos: 103.5,-40.5 + parent: 13329 + - type: DeltaPressure + gridUid: 13329 + - uid: 25092 + components: + - type: Transform + pos: 105.5,-40.5 + parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 26042 components: - type: Transform pos: 59.5,41.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 27811 components: - type: Transform pos: 80.5,32.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 27812 components: - type: Transform pos: 80.5,35.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 28019 components: - type: Transform pos: 64.5,61.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 28169 components: - type: Transform pos: 129.5,-4.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 28219 components: - type: Transform pos: 45.5,35.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 28220 components: - type: Transform pos: 44.5,35.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 28221 components: - type: Transform pos: 41.5,35.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 28222 components: - type: Transform pos: 43.5,35.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 28223 components: - type: Transform pos: 42.5,35.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 30153 components: - type: Transform pos: 109.5,42.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 30154 components: - type: Transform pos: 109.5,44.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 30244 components: - type: Transform pos: 86.5,41.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 31731 components: - type: Transform pos: 85.5,41.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 33241 components: - type: Transform pos: 38.5,67.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 33537 components: - type: Transform pos: 44.5,39.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 33538 components: - type: Transform pos: 45.5,39.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 33541 components: - type: Transform pos: 41.5,39.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 33543 components: - type: Transform pos: 43.5,39.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 33544 components: - type: Transform pos: 42.5,39.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 33549 components: - type: Transform pos: 40.5,37.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 33653 components: - type: Transform pos: 52.5,53.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 33663 components: - type: Transform pos: 47.5,48.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 33664 components: - type: Transform pos: 46.5,48.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 33665 components: - type: Transform pos: 45.5,48.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 33666 components: - type: Transform pos: 46.5,60.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 33668 components: - type: Transform pos: 45.5,60.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 33669 components: - type: Transform pos: 47.5,60.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 34733 components: - type: Transform pos: 128.5,-5.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 34734 components: - type: Transform pos: 128.5,-2.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 35640 components: - type: Transform pos: 92.5,41.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 35641 components: - type: Transform pos: 93.5,41.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 35642 components: - type: Transform pos: 90.5,42.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 35643 components: - type: Transform pos: 88.5,42.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - proto: RemoteSignaller entities: - uid: 6986 @@ -184188,151 +184179,211 @@ entities: - type: Transform pos: 28.5,35.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 26373 components: - type: Transform pos: 1.5,38.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 26374 components: - type: Transform pos: -16.5,47.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 26375 components: - type: Transform pos: -32.5,37.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 26376 components: - type: Transform pos: -32.5,33.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 26377 components: - type: Transform pos: -31.5,59.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 26378 components: - type: Transform pos: -6.5,57.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 26450 components: - type: Transform pos: 5.5,35.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 26451 components: - type: Transform pos: -2.5,8.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 26452 components: - type: Transform pos: -9.5,17.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 26453 components: - type: Transform pos: -3.5,1.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 26552 components: - type: Transform pos: -25.5,-3.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 26641 components: - type: Transform pos: -20.5,-22.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 26642 components: - type: Transform pos: 6.5,-8.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 26643 components: - type: Transform pos: 39.5,-3.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 26648 components: - type: Transform pos: 52.5,-8.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 26649 components: - type: Transform pos: 57.5,15.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 26668 components: - type: Transform pos: 60.5,41.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 26669 components: - type: Transform pos: 80.5,41.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 26742 components: - type: Transform pos: 80.5,11.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 35607 components: - type: Transform pos: 115.5,51.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 35608 components: - type: Transform pos: 117.5,51.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 35609 components: - type: Transform pos: 119.5,54.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 35610 components: - type: Transform pos: 126.5,54.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 35611 components: - type: Transform pos: 126.5,44.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 35612 components: - type: Transform pos: 119.5,44.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 35613 components: - type: Transform pos: 94.5,47.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 35614 components: - type: Transform pos: 94.5,51.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 35615 components: - type: Transform pos: 98.5,52.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 35616 components: - type: Transform pos: 105.5,53.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: Screwdriver entities: - uid: 11821 @@ -184597,15 +184648,15 @@ entities: - type: Transform pos: 70.512184,-23.453543 parent: 13329 - - uid: 23825 + - uid: 23953 components: - type: Transform - pos: 70.512184,-23.453543 + pos: 96.470955,-35.29695 parent: 13329 - - uid: 23901 + - uid: 24253 components: - type: Transform - pos: 70.512184,-23.453543 + pos: 96.658455,-35.474033 parent: 13329 - uid: 26131 components: @@ -184731,6 +184782,8 @@ entities: - type: Transform pos: 3.5,7.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - type: DeviceLinkSink invokeCounter: 1 - uid: 1493 @@ -184738,60 +184791,82 @@ entities: - type: Transform pos: 4.5,7.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 8154 components: - type: Transform pos: 46.5,8.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 8867 components: - type: Transform pos: 45.5,8.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 9595 components: - type: Transform rot: 1.5707963267948966 rad pos: 22.5,-17.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 9596 components: - type: Transform rot: 1.5707963267948966 rad pos: 22.5,-16.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 9774 components: - type: Transform pos: -1.5,-8.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 9775 components: - type: Transform pos: -0.5,-8.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 9776 components: - type: Transform pos: 0.5,-8.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 15304 components: - type: Transform rot: -1.5707963267948966 rad pos: 26.5,-20.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 15305 components: - type: Transform rot: -1.5707963267948966 rad pos: 26.5,-19.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 35989 components: - type: Transform pos: 47.5,8.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - proto: ShuttersNormalOpen entities: - uid: 921 @@ -184799,385 +184874,527 @@ entities: - type: Transform pos: -18.5,23.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 922 components: - type: Transform pos: -17.5,23.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 923 components: - type: Transform pos: -16.5,23.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 924 components: - type: Transform pos: -15.5,23.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 925 components: - type: Transform pos: -14.5,23.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 926 components: - type: Transform pos: -13.5,23.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 927 components: - type: Transform pos: -8.5,16.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 928 components: - type: Transform pos: -4.5,16.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 929 components: - type: Transform rot: 1.5707963267948966 rad pos: -3.5,18.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 930 components: - type: Transform rot: 1.5707963267948966 rad pos: -3.5,19.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 931 components: - type: Transform rot: 1.5707963267948966 rad pos: -3.5,20.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 932 components: - type: Transform rot: 1.5707963267948966 rad pos: -3.5,21.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 933 components: - type: Transform rot: 1.5707963267948966 rad pos: -3.5,22.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 934 components: - type: Transform rot: -1.5707963267948966 rad pos: -9.5,18.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 935 components: - type: Transform rot: -1.5707963267948966 rad pos: -9.5,19.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 936 components: - type: Transform rot: -1.5707963267948966 rad pos: -9.5,20.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 937 components: - type: Transform rot: -1.5707963267948966 rad pos: -9.5,21.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 1072 components: - type: Transform pos: -11.5,23.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 1311 components: - type: Transform pos: -2.5,34.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 1312 components: - type: Transform pos: -2.5,35.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 1313 components: - type: Transform pos: -2.5,36.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 1314 components: - type: Transform pos: -2.5,39.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 1315 components: - type: Transform pos: -8.5,43.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 1316 components: - type: Transform pos: -11.5,43.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 1432 components: - type: Transform pos: -12.5,25.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 4518 components: - type: Transform rot: -1.5707963267948966 rad pos: -26.5,38.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 4519 components: - type: Transform rot: -1.5707963267948966 rad pos: -26.5,39.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 4520 components: - type: Transform rot: -1.5707963267948966 rad pos: -26.5,40.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 4521 components: - type: Transform pos: -22.5,43.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 4522 components: - type: Transform pos: -21.5,43.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 4748 components: - type: Transform rot: -1.5707963267948966 rad pos: -25.5,30.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 4749 components: - type: Transform rot: -1.5707963267948966 rad pos: -25.5,31.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 4750 components: - type: Transform rot: -1.5707963267948966 rad pos: -25.5,32.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 7307 components: - type: Transform pos: 47.5,11.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 7309 components: - type: Transform rot: -1.5707963267948966 rad pos: 44.5,10.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 8073 components: - type: Transform pos: 34.5,0.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 8890 components: - type: Transform pos: 37.5,0.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 8945 components: - type: Transform pos: 28.5,0.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 8951 components: - type: Transform pos: 27.5,0.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 8952 components: - type: Transform pos: 30.5,0.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 8953 components: - type: Transform pos: 31.5,0.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 9150 components: - type: Transform pos: 36.5,0.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 9333 components: - type: Transform pos: 45.5,11.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 9336 components: - type: Transform pos: 33.5,0.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 9342 components: - type: Transform pos: 46.5,11.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 10658 components: - type: Transform rot: -1.5707963267948966 rad pos: 22.5,42.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 10659 components: - type: Transform rot: 1.5707963267948966 rad pos: 21.5,42.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 10661 components: - type: Transform pos: 16.5,37.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 10879 components: - type: Transform rot: -1.5707963267948966 rad pos: 7.5,-1.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 10880 components: - type: Transform rot: -1.5707963267948966 rad pos: 7.5,-0.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 10881 components: - type: Transform rot: -1.5707963267948966 rad pos: 7.5,0.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 10882 components: - type: Transform rot: -1.5707963267948966 rad pos: 7.5,2.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 10883 components: - type: Transform rot: -1.5707963267948966 rad pos: 7.5,3.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 10884 components: - type: Transform rot: -1.5707963267948966 rad pos: 7.5,4.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 18460 components: - type: Transform pos: 18.5,35.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 18461 components: - type: Transform pos: 20.5,35.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 18462 components: - type: Transform pos: 22.5,35.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 18463 components: - type: Transform pos: 24.5,35.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 18498 components: - type: Transform pos: 20.5,42.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 18502 components: - type: Transform pos: 25.5,42.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 18503 components: - type: Transform rot: -1.5707963267948966 rad pos: 16.5,36.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 18505 components: - type: Transform rot: -1.5707963267948966 rad pos: 16.5,38.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 18758 components: - type: Transform rot: -1.5707963267948966 rad pos: -2.5,57.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 18759 components: - type: Transform rot: -1.5707963267948966 rad pos: -2.5,58.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 18760 components: - type: Transform pos: -1.5,59.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 18761 components: - type: Transform pos: -0.5,59.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 18762 components: - type: Transform pos: 0.5,59.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 31550 components: - type: Transform pos: 65.5,41.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 31551 components: - type: Transform pos: 56.5,42.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 35590 components: - type: Transform rot: 3.141592653589793 rad pos: 123.5,50.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 35591 components: - type: Transform pos: 123.5,48.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - proto: ShuttersRadiationOpen entities: - uid: 25901 @@ -185185,137 +185402,187 @@ entities: - type: Transform pos: 94.5,-9.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 25902 components: - type: Transform pos: 94.5,-1.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 32379 components: - type: Transform rot: -1.5707963267948966 rad pos: 99.5,-3.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 32380 components: - type: Transform rot: -1.5707963267948966 rad pos: 99.5,-4.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 32381 components: - type: Transform rot: -1.5707963267948966 rad pos: 99.5,-5.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 32456 components: - type: Transform rot: -1.5707963267948966 rad pos: 99.5,-7.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 32702 components: - type: Transform rot: -1.5707963267948966 rad pos: 99.5,-7.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 34226 components: - type: Transform rot: -1.5707963267948966 rad pos: 99.5,-6.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 34676 components: - type: Transform rot: 1.5707963267948966 rad pos: 117.5,-7.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 34677 components: - type: Transform rot: 1.5707963267948966 rad pos: 117.5,-6.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 34678 components: - type: Transform rot: 1.5707963267948966 rad pos: 117.5,-5.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 34679 components: - type: Transform rot: 1.5707963267948966 rad pos: 117.5,-4.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 34680 components: - type: Transform rot: 1.5707963267948966 rad pos: 117.5,-3.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 34681 components: - type: Transform pos: 110.5,3.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 34682 components: - type: Transform pos: 109.5,3.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 34683 components: - type: Transform pos: 108.5,3.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 34684 components: - type: Transform pos: 107.5,3.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 34685 components: - type: Transform pos: 106.5,3.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 34686 components: - type: Transform pos: 110.5,-14.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 34687 components: - type: Transform pos: 109.5,-14.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 34688 components: - type: Transform pos: 108.5,-14.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 34689 components: - type: Transform pos: 107.5,-14.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 34690 components: - type: Transform pos: 106.5,-14.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 35310 components: - type: Transform pos: 96.5,-0.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 35311 components: - type: Transform pos: 99.5,-0.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - proto: ShuttleConsoleCircuitboard entities: - uid: 13064 @@ -185336,16 +185603,22 @@ entities: rot: -1.5707963267948966 rad pos: 98.5,51.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 35600 components: - type: Transform pos: 111.5,50.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 36084 components: - type: Transform pos: 117.5,48.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: SignAiUpload entities: - uid: 35599 @@ -185353,6 +185626,8 @@ entities: - type: Transform pos: 98.5,48.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: SignalButton entities: - uid: 938 @@ -185376,6 +185651,8 @@ entities: 937: - - Pressed - Toggle + - type: Fixtures + fixtures: {} - uid: 939 components: - type: MetaData @@ -185400,6 +185677,8 @@ entities: 929: - - Pressed - Toggle + - type: Fixtures + fixtures: {} - uid: 940 components: - type: MetaData @@ -185427,6 +185706,8 @@ entities: 926: - - Pressed - Toggle + - type: Fixtures + fixtures: {} - uid: 1073 components: - type: MetaData @@ -185445,6 +185726,8 @@ entities: 928: - - Pressed - Toggle + - type: Fixtures + fixtures: {} - uid: 1317 components: - type: MetaData @@ -185472,6 +185755,8 @@ entities: 1311: - - Pressed - Toggle + - type: Fixtures + fixtures: {} - uid: 1431 components: - type: MetaData @@ -185484,6 +185769,8 @@ entities: 1432: - - Pressed - Toggle + - type: Fixtures + fixtures: {} - uid: 4523 components: - type: Transform @@ -185506,6 +185793,8 @@ entities: 4522: - - Pressed - Toggle + - type: Fixtures + fixtures: {} - uid: 4751 components: - type: Transform @@ -185522,6 +185811,8 @@ entities: 4750: - - Pressed - Toggle + - type: Fixtures + fixtures: {} - uid: 9777 components: - type: Transform @@ -185538,6 +185829,8 @@ entities: 9776: - - Pressed - Toggle + - type: Fixtures + fixtures: {} - uid: 10877 components: - type: Transform @@ -185554,6 +185847,8 @@ entities: 10881: - - Pressed - Toggle + - type: Fixtures + fixtures: {} - uid: 10878 components: - type: Transform @@ -185570,6 +185865,8 @@ entities: 10882: - - Pressed - Toggle + - type: Fixtures + fixtures: {} - uid: 11543 components: - type: Transform @@ -185583,6 +185880,8 @@ entities: 11542: - - Pressed - Toggle + - type: Fixtures + fixtures: {} - uid: 14608 components: - type: Transform @@ -185600,6 +185899,8 @@ entities: 14605: - - Pressed - Toggle + - type: Fixtures + fixtures: {} - uid: 15306 components: - type: Transform @@ -185613,6 +185914,8 @@ entities: 15305: - - Pressed - Toggle + - type: Fixtures + fixtures: {} - uid: 15398 components: - type: Transform @@ -185629,6 +185932,8 @@ entities: 15303: - - Pressed - Toggle + - type: Fixtures + fixtures: {} - uid: 20585 components: - type: Transform @@ -185639,6 +185944,8 @@ entities: 20588: - - Pressed - Toggle + - type: Fixtures + fixtures: {} - uid: 20586 components: - type: Transform @@ -185655,6 +185962,8 @@ entities: 20428: - - Pressed - Toggle + - type: Fixtures + fixtures: {} - uid: 24020 components: - type: Transform @@ -185668,6 +185977,8 @@ entities: 24021: - - Pressed - Toggle + - type: Fixtures + fixtures: {} - uid: 25903 components: - type: Transform @@ -185678,6 +185989,8 @@ entities: 25901: - - Pressed - Toggle + - type: Fixtures + fixtures: {} - uid: 25904 components: - type: Transform @@ -185688,16 +186001,8 @@ entities: 25902: - - Pressed - Toggle - - uid: 26443 - components: - - type: Transform - pos: 104.5,-34.5 - parent: 13329 - - type: DeviceLinkSource - linkedPorts: - 26442: - - - Pressed - - Toggle + - type: Fixtures + fixtures: {} - uid: 31488 components: - type: Transform @@ -185717,6 +186022,8 @@ entities: 31487: - - Pressed - Toggle + - type: Fixtures + fixtures: {} - uid: 31552 components: - type: Transform @@ -185730,6 +186037,8 @@ entities: 31550: - - Pressed - Toggle + - type: Fixtures + fixtures: {} - uid: 32703 components: - type: Transform @@ -185755,6 +186064,8 @@ entities: 32379: - - Pressed - Toggle + - type: Fixtures + fixtures: {} - uid: 34227 components: - type: Transform @@ -185777,6 +186088,8 @@ entities: 32702: - - Pressed - Toggle + - type: Fixtures + fixtures: {} - uid: 34691 components: - type: MetaData @@ -185801,6 +186114,8 @@ entities: 34686: - - Pressed - Toggle + - type: Fixtures + fixtures: {} - uid: 34692 components: - type: MetaData @@ -185825,6 +186140,8 @@ entities: 34681: - - Pressed - Toggle + - type: Fixtures + fixtures: {} - uid: 34695 components: - type: MetaData @@ -185849,6 +186166,8 @@ entities: 34676: - - Pressed - Toggle + - type: Fixtures + fixtures: {} - uid: 35312 components: - type: MetaData @@ -185864,6 +186183,8 @@ entities: 35311: - - Pressed - Toggle + - type: Fixtures + fixtures: {} - proto: SignalButtonDirectional entities: - uid: 8077 @@ -185886,6 +186207,8 @@ entities: 8953: - - Pressed - Toggle + - type: Fixtures + fixtures: {} - uid: 8115 components: - type: Transform @@ -185906,6 +186229,8 @@ entities: 8890: - - Pressed - Toggle + - type: Fixtures + fixtures: {} - uid: 8123 components: - type: Transform @@ -185925,6 +186250,8 @@ entities: 7307: - - Pressed - Toggle + - type: Fixtures + fixtures: {} - uid: 8972 components: - type: Transform @@ -185941,6 +186268,8 @@ entities: 8867: - - Pressed - Toggle + - type: Fixtures + fixtures: {} - uid: 20551 components: - type: Transform @@ -185955,6 +186284,8 @@ entities: 18557: - - Pressed - Open + - type: Fixtures + fixtures: {} - uid: 24277 components: - type: Transform @@ -185965,6 +186296,8 @@ entities: 29009: - - Pressed - DoorBolt + - type: Fixtures + fixtures: {} - uid: 24281 components: - type: Transform @@ -185975,6 +186308,8 @@ entities: 29005: - - Pressed - DoorBolt + - type: Fixtures + fixtures: {} - uid: 24282 components: - type: Transform @@ -185985,6 +186320,8 @@ entities: 29008: - - Pressed - DoorBolt + - type: Fixtures + fixtures: {} - uid: 24283 components: - type: Transform @@ -185995,6 +186332,8 @@ entities: 29010: - - Pressed - DoorBolt + - type: Fixtures + fixtures: {} - uid: 24284 components: - type: Transform @@ -186005,6 +186344,8 @@ entities: 29007: - - Pressed - DoorBolt + - type: Fixtures + fixtures: {} - uid: 24285 components: - type: Transform @@ -186015,6 +186356,8 @@ entities: 29006: - - Pressed - DoorBolt + - type: Fixtures + fixtures: {} - uid: 26975 components: - type: Transform @@ -186026,6 +186369,8 @@ entities: 27054: - - Pressed - Toggle + - type: Fixtures + fixtures: {} - uid: 35603 components: - type: Transform @@ -186040,6 +186385,8 @@ entities: 35590: - - Pressed - Toggle + - type: Fixtures + fixtures: {} - proto: SignalSwitchDirectional entities: - uid: 6941 @@ -186080,6 +186427,8 @@ entities: currentLabel: Front Shutters - type: NameModifier baseName: Switch (Front Shutters) + - type: Fixtures + fixtures: {} - uid: 10662 components: - type: MetaData @@ -186151,6 +186500,8 @@ entities: currentLabel: Window Shutters - type: NameModifier baseName: Switch + - type: Fixtures + fixtures: {} - uid: 35390 components: - type: Transform @@ -186173,6 +186524,8 @@ entities: - Open - - Off - Close + - type: Fixtures + fixtures: {} - uid: 36009 components: - type: Transform @@ -186196,6 +186549,8 @@ entities: - Open - - Off - Close + - type: Fixtures + fixtures: {} - proto: SignAnomaly entities: - uid: 20083 @@ -186203,6 +186558,8 @@ entities: - type: Transform pos: 50.5,-34.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: SignAnomaly2 entities: - uid: 15560 @@ -186211,12 +186568,16 @@ entities: rot: -1.5707963267948966 rad pos: 46.5,-33.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 15563 components: - type: Transform rot: -1.5707963267948966 rad pos: 40.5,-36.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: SignArmory entities: - uid: 10573 @@ -186225,6 +186586,8 @@ entities: rot: 3.141592653589793 rad pos: 22.5,15.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: SignAtmos entities: - uid: 26468 @@ -186232,21 +186595,29 @@ entities: - type: Transform pos: 66.5,-16.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 26469 components: - type: Transform pos: 90.5,-21.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 26470 components: - type: Transform pos: 90.5,-19.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 26471 components: - type: Transform pos: 78.5,-21.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: SignBar entities: - uid: 1188 @@ -186254,16 +186625,22 @@ entities: - type: Transform pos: -2.5,16.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 34187 components: - type: Transform pos: 36.5,65.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 34188 components: - type: Transform pos: 50.5,61.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: SignBio entities: - uid: 19096 @@ -186271,6 +186648,8 @@ entities: - type: Transform pos: 31.5,42.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: SignBiohazardMed entities: - uid: 19097 @@ -186278,6 +186657,8 @@ entities: - type: Transform pos: 31.5,46.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: SignBridge entities: - uid: 31545 @@ -186285,6 +186666,8 @@ entities: - type: Transform pos: 75.5,42.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: SignCanisters entities: - uid: 14782 @@ -186292,6 +186675,8 @@ entities: - type: Transform pos: 58.5,-40.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: SignCargo entities: - uid: 2062 @@ -186299,21 +186684,29 @@ entities: - type: Transform pos: 3.5,-8.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 2063 components: - type: Transform pos: 9.5,-8.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 11515 components: - type: Transform pos: 2.5,-14.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 35286 components: - type: Transform pos: 10.5,-15.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: SignCargoDock entities: - uid: 11516 @@ -186321,6 +186714,8 @@ entities: - type: Transform pos: 4.5,-33.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: SignChapel entities: - uid: 6610 @@ -186328,6 +186723,8 @@ entities: - type: Transform pos: -10.5,57.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: SignChem entities: - uid: 18454 @@ -186335,11 +186732,15 @@ entities: - type: Transform pos: 16.5,39.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 18455 components: - type: Transform pos: 19.5,42.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: SignConference entities: - uid: 31544 @@ -186347,6 +186748,8 @@ entities: - type: Transform pos: 66.5,57.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: SignCryo entities: - uid: 35461 @@ -186355,6 +186758,8 @@ entities: rot: -1.5707963267948966 rad pos: 95.5,21.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: SignCryogenicsMed entities: - uid: 18588 @@ -186362,6 +186767,8 @@ entities: - type: Transform pos: 20.5,46.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: SignDangerMed entities: - uid: 19981 @@ -186370,6 +186777,8 @@ entities: rot: -1.5707963267948966 rad pos: 46.5,-35.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: SignDirectionalBar entities: - uid: 19111 @@ -186378,6 +186787,8 @@ entities: rot: -1.5707963267948966 rad pos: 1.4958932,13.951328 parent: 13329 + - type: Fixtures + fixtures: {} - proto: SignDirectionalBridge entities: - uid: 1656 @@ -186386,30 +186797,40 @@ entities: rot: 3.141592653589793 rad pos: 1.5324486,7.399826 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 1664 components: - type: Transform rot: 3.141592653589793 rad pos: 1.5008299,14.15414 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 19115 components: - type: Transform rot: 1.5707963267948966 rad pos: 1.5106125,31.217745 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 19136 components: - type: Transform rot: 3.141592653589793 rad pos: 52.50464,0.687273 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 35294 components: - type: Transform rot: 1.5707963267948966 rad pos: 53.498528,35.69145 parent: 13329 + - type: Fixtures + fixtures: {} - proto: SignDirectionalBrig entities: - uid: 10434 @@ -186418,12 +186839,16 @@ entities: rot: -1.5707963267948966 rad pos: 53.5,-3.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 10574 components: - type: Transform rot: 1.5707963267948966 rad pos: 26.5,8.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: SignDirectionalChapel entities: - uid: 19109 @@ -186432,6 +186857,8 @@ entities: rot: 3.141592653589793 rad pos: -2.499115,43.296005 parent: 13329 + - type: Fixtures + fixtures: {} - proto: SignDirectionalChemistry entities: - uid: 18586 @@ -186439,6 +186866,8 @@ entities: - type: Transform pos: 25.503977,46.27569 parent: 13329 + - type: Fixtures + fixtures: {} - proto: SignDirectionalCryo entities: - uid: 18585 @@ -186447,6 +186876,8 @@ entities: rot: 3.141592653589793 rad pos: 25.5,46.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: SignDirectionalDorms entities: - uid: 29371 @@ -186455,16 +186886,22 @@ entities: rot: 1.5707963267948966 rad pos: 57.5,13.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 29372 components: - type: Transform pos: 84.5,37.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 35297 components: - type: Transform pos: 57.492706,35.707073 parent: 13329 + - type: Fixtures + fixtures: {} - proto: SignDirectionalEng entities: - uid: 19123 @@ -186473,34 +186910,46 @@ entities: rot: 1.5707963267948966 rad pos: 22.512474,-3.3689547 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 19129 components: - type: Transform rot: 1.5707963267948966 rad pos: 40.499527,-3.3038204 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 19130 components: - type: Transform rot: 1.5707963267948966 rad pos: 53.5,-8.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 19135 components: - type: Transform pos: 52.504635,0.31227303 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 19138 components: - type: Transform rot: 1.5707963267948966 rad pos: 2.5193849,-2.6812243 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 35298 components: - type: Transform pos: 57.492706,35.31645 parent: 13329 + - type: Fixtures + fixtures: {} - proto: SignDirectionalEvac entities: - uid: 1655 @@ -186509,53 +186958,71 @@ entities: rot: 3.141592653589793 rad pos: 1.5271955,7.601759 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 1659 components: - type: Transform rot: 3.141592653589793 rad pos: 1.5105324,14.563708 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 4149 components: - type: Transform pos: -29.5,43.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 4150 components: - type: Transform rot: -1.5707963267948966 rad pos: -2.5,43.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 19112 components: - type: Transform rot: 3.141592653589793 rad pos: 1.5106124,31.796837 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 35290 components: - type: Transform rot: 3.141592653589793 rad pos: 6.5,-3.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 35291 components: - type: Transform rot: -1.5707963267948966 rad pos: 26.5,-3.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 35292 components: - type: Transform rot: 3.141592653589793 rad pos: 57.5,1.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 35293 components: - type: Transform rot: -1.5707963267948966 rad pos: 53.5,35.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: SignDirectionalFood entities: - uid: 19110 @@ -186563,17 +187030,23 @@ entities: - type: Transform pos: -2.499115,43.108505 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 19117 components: - type: Transform pos: 1.5074446,35.305725 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 26039 components: - type: Transform rot: -1.5707963267948966 rad pos: 44.5,-3.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: SignDirectionalGravity entities: - uid: 15769 @@ -186582,6 +187055,8 @@ entities: rot: 1.5707963267948966 rad pos: 102.5,-21.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: SignDirectionalHop entities: - uid: 36034 @@ -186590,6 +187065,8 @@ entities: rot: 3.141592653589793 rad pos: 53.499214,-3.3088872 parent: 13329 + - type: Fixtures + fixtures: {} - proto: SignDirectionalLibrary entities: - uid: 19107 @@ -186598,6 +187075,8 @@ entities: rot: 3.141592653589793 rad pos: -2.499115,43.68663 parent: 13329 + - type: Fixtures + fixtures: {} - proto: SignDirectionalMed entities: - uid: 1657 @@ -186606,42 +187085,56 @@ entities: rot: 3.141592653589793 rad pos: 1.5324486,7.196701 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 1658 components: - type: Transform rot: 3.141592653589793 rad pos: 1.5105324,14.766833 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 19113 components: - type: Transform rot: 1.5707963267948966 rad pos: 1.5106125,31.592745 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 19121 components: - type: Transform rot: 3.141592653589793 rad pos: -3.4807405,-2.8384223 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 19125 components: - type: Transform rot: -1.5707963267948966 rad pos: 22.512474,-3.7752047 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 19137 components: - type: Transform rot: 3.141592653589793 rad pos: 52.50464,0.874773 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 35295 components: - type: Transform rot: -1.5707963267948966 rad pos: 53.498528,35.31645 parent: 13329 + - type: Fixtures + fixtures: {} - proto: SignDirectionalSci entities: - uid: 19118 @@ -186649,46 +187142,62 @@ entities: - type: Transform pos: 1.5074447,35.69635 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 19120 components: - type: Transform rot: 1.5707963267948966 rad pos: -3.479002,-2.6489882 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 19124 components: - type: Transform rot: 1.5707963267948966 rad pos: 22.512474,-3.5720797 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 19126 components: - type: Transform pos: 40.5,-3.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 19127 components: - type: Transform rot: 1.5707963267948966 rad pos: 26.5,-14.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 19134 components: - type: Transform rot: -1.5707963267948966 rad pos: 52.5,0.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 19937 components: - type: Transform rot: 1.5707963267948966 rad pos: 25.5,-40.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 35299 components: - type: Transform pos: 57.492706,35.113323 parent: 13329 + - type: Fixtures + fixtures: {} - proto: SignDirectionalSec entities: - uid: 1654 @@ -186697,35 +187206,47 @@ entities: rot: 1.5707963267948966 rad pos: 1.5271955,7.8106413 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 2047 components: - type: Transform rot: 1.5707963267948966 rad pos: -3.479002,-2.2427382 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 19114 components: - type: Transform rot: 1.5707963267948966 rad pos: 1.5106125,31.405245 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 19122 components: - type: Transform rot: 3.141592653589793 rad pos: 22.512474,-3.1814547 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 35296 components: - type: Transform pos: 57.5,35.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 35301 components: - type: Transform rot: 1.5707963267948966 rad pos: 6.4969177,-3.3008394 parent: 13329 + - type: Fixtures + fixtures: {} - proto: SignDirectionalSupply entities: - uid: 1663 @@ -186733,39 +187254,53 @@ entities: - type: Transform pos: 1.5164549,14.357265 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 8437 components: - type: Transform rot: -1.5707963267948966 rad pos: 53.499214,-3.6887553 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 19116 components: - type: Transform pos: 1.5,35.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 19119 components: - type: Transform pos: -3.479002,-2.4458632 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 19128 components: - type: Transform rot: 3.141592653589793 rad pos: 26.496012,-14.27608 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 26040 components: - type: Transform rot: -1.5707963267948966 rad pos: 44.5,-8.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 35300 components: - type: Transform pos: 6.4953637,-3.6914644 parent: 13329 + - type: Fixtures + fixtures: {} - proto: SignDisposalSpace entities: - uid: 32423 @@ -186773,6 +187308,8 @@ entities: - type: Transform pos: 123.5,-9.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: SignDoors entities: - uid: 31546 @@ -186780,6 +187317,8 @@ entities: - type: Transform pos: 70.5,42.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: SignElectricalMed entities: - uid: 4728 @@ -186788,113 +187327,157 @@ entities: rot: 1.5707963267948966 rad pos: -26.5,24.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 4806 components: - type: Transform pos: -21.5,35.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 10766 components: - type: Transform pos: 4.5,17.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 10999 components: - type: Transform rot: -1.5707963267948966 rad pos: -29.5,63.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 12160 components: - type: Transform pos: -11.5,-13.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 23716 components: - type: Transform rot: -1.5707963267948966 rad pos: 96.5,-32.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 23899 components: - type: Transform pos: 98.5,-1.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 23900 components: - type: Transform pos: 98.5,-9.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 24228 components: - type: Transform pos: 38.5,-13.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 26576 components: - type: Transform pos: 77.5,-7.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 26666 components: - type: Transform pos: 65.5,0.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 26667 components: - type: Transform pos: 92.5,4.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 29392 components: - type: Transform pos: 73.5,21.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 30753 components: - type: Transform pos: 53.5,19.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 30754 components: - type: Transform pos: 52.5,30.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 30755 components: - type: Transform pos: 88.5,43.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 30757 components: - type: Transform pos: 90.5,52.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 30759 components: - type: Transform pos: 129.5,49.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 31780 components: - type: Transform pos: -43.5,2.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 32119 components: - type: Transform pos: -22.5,4.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 36080 components: - type: Transform pos: 103.5,47.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 36081 components: - type: Transform pos: 109.5,45.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: SignEngineering entities: - uid: 26575 @@ -186902,6 +187485,8 @@ entities: - type: Transform pos: 70.5,-11.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: SignEscapePods entities: - uid: 3744 @@ -186909,31 +187494,43 @@ entities: - type: Transform pos: -27.5,-27.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 3745 components: - type: Transform pos: -32.5,-27.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 6765 components: - type: Transform pos: -6.5,67.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 13278 components: - type: Transform pos: -41.5,-41.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 13279 components: - type: Transform pos: -41.5,-33.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 13286 components: - type: Transform pos: 89.5,58.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: SignEVA entities: - uid: 33575 @@ -186941,6 +187538,8 @@ entities: - type: Transform pos: 53.5,40.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: SignExamroom entities: - uid: 20067 @@ -186948,11 +187547,15 @@ entities: - type: Transform pos: 16.5,47.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 34483 components: - type: Transform pos: 64.5,-49.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: SignFire entities: - uid: 15562 @@ -186960,23 +187563,31 @@ entities: - type: Transform pos: 63.5,-31.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 23713 components: - type: Transform rot: -1.5707963267948966 rad pos: 95.5,-28.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 23840 components: - type: Transform rot: -1.5707963267948966 rad pos: 98.5,-32.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 28166 components: - type: Transform pos: 119.5,-18.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: SignGenpop entities: - uid: 7588 @@ -186984,12 +187595,16 @@ entities: - type: Transform pos: 42.5,0.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 10378 components: - type: Transform rot: 3.141592653589793 rad pos: 40.5,6.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: SignGravity entities: - uid: 26207 @@ -186997,6 +187612,8 @@ entities: - type: Transform pos: 110.5,-21.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: SignHead entities: - uid: 10577 @@ -187005,21 +187622,29 @@ entities: rot: 1.5707963267948966 rad pos: 34.5,20.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 18848 components: - type: Transform pos: 20.5,56.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 35378 components: - type: Transform pos: 75.5,46.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 35379 components: - type: Transform pos: 66.5,46.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: SignHydro1 entities: - uid: 20090 @@ -187027,16 +187652,22 @@ entities: - type: Transform pos: -2.5,37.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 20091 components: - type: Transform pos: -11.5,33.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 20092 components: - type: Transform pos: -12.5,43.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: SignInterrogation entities: - uid: 10159 @@ -187044,6 +187675,8 @@ entities: - type: Transform pos: 17.5,24.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: SignJanitor entities: - uid: 23564 @@ -187051,6 +187684,8 @@ entities: - type: Transform pos: 1.5,11.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: SignKiddiePlaque entities: - uid: 6307 @@ -187059,26 +187694,36 @@ entities: rot: 1.5707963267948966 rad pos: -23.5,51.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 6308 components: - type: Transform pos: -13.5,53.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 22403 components: - type: Transform pos: 100.5,53.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 26096 components: - type: Transform pos: 44.5,-4.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 26097 components: - type: Transform pos: 53.5,-7.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: SignKitchen entities: - uid: 20474 @@ -187087,6 +187732,8 @@ entities: rot: -1.5707963267948966 rad pos: -7.5,27.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: SignLaserMed entities: - uid: 26577 @@ -187094,6 +187741,8 @@ entities: - type: Transform pos: 96.5,-9.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: SignLibrary entities: - uid: 6347 @@ -187101,11 +187750,15 @@ entities: - type: Transform pos: -14.5,56.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 35206 components: - type: Transform pos: 103.5,24.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: SignMagneticsMed entities: - uid: 11644 @@ -187113,11 +187766,15 @@ entities: - type: Transform pos: 11.5,-28.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 11645 components: - type: Transform pos: 18.5,-33.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: SignMail entities: - uid: 11700 @@ -187125,11 +187782,15 @@ entities: - type: Transform pos: 22.5,-7.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 35285 components: - type: Transform pos: 14.5,-14.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: SignMaterials entities: - uid: 26692 @@ -187137,6 +187798,8 @@ entities: - type: Transform pos: 82.5,-21.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: SignMedical entities: - uid: 10600 @@ -187144,22 +187807,30 @@ entities: - type: Transform pos: -2.5,47.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 17628 components: - type: Transform pos: 16.5,35.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 17629 components: - type: Transform pos: 1.5,64.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 18767 components: - type: Transform rot: 3.141592653589793 rad pos: -2.5,59.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: SignMorgue entities: - uid: 18542 @@ -187167,11 +187838,15 @@ entities: - type: Transform pos: 4.5,35.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 18543 components: - type: Transform pos: 2.5,42.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: SignNews entities: - uid: 35871 @@ -187179,6 +187854,8 @@ entities: - type: Transform pos: -9.5,-2.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: SignNosmoking entities: - uid: 18472 @@ -187186,11 +187863,15 @@ entities: - type: Transform pos: 9.5,41.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 34568 components: - type: Transform pos: 67.5,-39.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: SignPlaque entities: - uid: 30763 @@ -187198,6 +187879,8 @@ entities: - type: Transform pos: 86.5,49.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: SignPrison entities: - uid: 7282 @@ -187205,11 +187888,15 @@ entities: - type: Transform pos: 52.5,22.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 10442 components: - type: Transform pos: 44.5,11.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: SignRadiationMed entities: - uid: 15564 @@ -187217,46 +187904,62 @@ entities: - type: Transform pos: 46.5,-32.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 26212 components: - type: Transform rot: 1.5707963267948966 rad pos: 123.5,-24.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 26213 components: - type: Transform rot: 1.5707963267948966 rad pos: 112.5,-21.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 26214 components: - type: Transform rot: 1.5707963267948966 rad pos: 88.5,-5.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 26215 components: - type: Transform rot: 1.5707963267948966 rad pos: 92.5,-1.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 26216 components: - type: Transform rot: 1.5707963267948966 rad pos: 105.5,-18.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 26578 components: - type: Transform pos: 84.5,-7.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 28180 components: - type: Transform pos: 122.5,-6.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: SignRedFive entities: - uid: 24290 @@ -187264,6 +187967,8 @@ entities: - type: Transform pos: 80.5,19.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: SignRedFour entities: - uid: 24289 @@ -187271,6 +187976,8 @@ entities: - type: Transform pos: 84.5,22.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: SignRedOne entities: - uid: 24286 @@ -187278,11 +187985,15 @@ entities: - type: Transform pos: 80.5,25.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 25538 components: - type: Transform pos: 7.5,-2.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: SignRedSix entities: - uid: 24344 @@ -187290,6 +188001,8 @@ entities: - type: Transform pos: 84.5,19.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: SignRedThree entities: - uid: 24288 @@ -187297,6 +188010,8 @@ entities: - type: Transform pos: 80.5,22.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: SignRedTwo entities: - uid: 14376 @@ -187304,11 +188019,15 @@ entities: - type: Transform pos: 7.5,5.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 24287 components: - type: Transform pos: 84.5,25.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: SignRND entities: - uid: 15261 @@ -187316,6 +188035,8 @@ entities: - type: Transform pos: 49.5,-14.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: SignRobo entities: - uid: 15260 @@ -187323,6 +188044,8 @@ entities: - type: Transform pos: 31.5,-18.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: SignScience entities: - uid: 15262 @@ -187330,22 +188053,30 @@ entities: - type: Transform pos: 45.5,-12.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 15263 components: - type: Transform pos: 39.5,-12.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 19938 components: - type: Transform rot: 1.5707963267948966 rad pos: 40.5,-40.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 20084 components: - type: Transform pos: 26.5,-48.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: SignSecurearea entities: - uid: 15808 @@ -187353,16 +188084,22 @@ entities: - type: Transform pos: 126.5,-36.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 21838 components: - type: Transform pos: 131.5,-26.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 22033 components: - type: Transform pos: 125.5,-21.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: SignSecureMed entities: - uid: 2862 @@ -187370,220 +188107,306 @@ entities: - type: Transform pos: -31.5,-9.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 2867 components: - type: Transform pos: -31.5,-21.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 3143 components: - type: Transform pos: -42.5,10.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 3750 components: - type: Transform pos: -36.5,-9.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 4147 components: - type: Transform pos: -34.5,41.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 5279 components: - type: Transform pos: -45.5,77.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 5280 components: - type: Transform pos: -30.5,77.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 5281 components: - type: Transform pos: -37.5,87.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 5282 components: - type: Transform pos: -33.5,78.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 5283 components: - type: Transform pos: -33.5,87.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 5285 components: - type: Transform pos: -45.5,68.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 8873 components: - type: Transform rot: -1.5707963267948966 rad pos: 40.5,2.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 10259 components: - type: Transform pos: 34.5,31.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 10429 components: - type: Transform rot: -1.5707963267948966 rad pos: 42.5,8.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 10489 components: - type: Transform pos: 53.5,25.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 10490 components: - type: Transform pos: 49.5,31.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 10491 components: - type: Transform pos: 44.5,31.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 10493 components: - type: Transform pos: 53.5,9.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 12434 components: - type: Transform pos: -51.5,-54.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 12435 components: - type: Transform pos: -51.5,-58.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 12436 components: - type: Transform pos: -46.5,-52.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 12577 components: - type: Transform pos: -24.5,-70.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 12643 components: - type: Transform pos: -22.5,-58.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 12644 components: - type: Transform pos: -22.5,-48.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 13273 components: - type: Transform pos: -36.5,-21.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 19131 components: - type: Transform rot: 1.5707963267948966 rad pos: 53.5,1.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 19132 components: - type: Transform rot: 1.5707963267948966 rad pos: 46.5,0.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 26769 components: - type: Transform pos: 102.5,-18.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 26770 components: - type: Transform pos: 117.5,-19.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 26771 components: - type: Transform pos: 95.5,-24.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 27932 components: - type: Transform pos: 62.5,0.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 27953 components: - type: Transform pos: 117.5,50.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 30751 components: - type: Transform pos: 109.5,57.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 30778 components: - type: Transform pos: 90.5,43.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 30779 components: - type: Transform pos: 88.5,52.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 33801 components: - type: Transform pos: 40.5,69.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 33802 components: - type: Transform pos: 22.5,76.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 33876 components: - type: Transform pos: 5.5,83.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 36075 components: - type: Transform pos: 103.5,51.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 36076 components: - type: Transform pos: 114.5,47.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 36077 components: - type: Transform pos: 122.5,43.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 36078 components: - type: Transform pos: 122.5,55.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 36079 components: - type: Transform pos: 98.5,44.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: SignSecureMedRed entities: - uid: 10580 @@ -187592,28 +188415,38 @@ entities: rot: 1.5707963267948966 rad pos: 44.5,8.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 10581 components: - type: Transform rot: 1.5707963267948966 rad pos: 20.5,8.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 10582 components: - type: Transform rot: 1.5707963267948966 rad pos: 22.5,27.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 36082 components: - type: Transform pos: 13.5,15.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 36083 components: - type: Transform pos: 15.5,8.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: SignSecureSmall entities: - uid: 15339 @@ -187621,11 +188454,15 @@ entities: - type: Transform pos: 46.5,-24.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 15340 components: - type: Transform pos: 46.5,-20.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: SignSecurity entities: - uid: 4516 @@ -187633,26 +188470,36 @@ entities: - type: Transform pos: -26.5,43.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 4517 components: - type: Transform pos: -20.5,43.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 10186 components: - type: Transform pos: 22.5,31.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 10187 components: - type: Transform pos: 26.5,0.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 10188 components: - type: Transform pos: 22.5,0.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: SignShipDock entities: - uid: 13601 @@ -187661,16 +188508,22 @@ entities: rot: -1.5707963267948966 rad pos: -37.5,-27.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 19947 components: - type: Transform pos: 22.5,-54.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 31417 components: - type: Transform pos: 93.5,57.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: SignShock entities: - uid: 26210 @@ -187679,27 +188532,37 @@ entities: rot: 1.5707963267948966 rad pos: 117.5,-21.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 26211 components: - type: Transform rot: 1.5707963267948966 rad pos: 117.5,-27.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 26672 components: - type: Transform pos: 84.5,2.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 27931 components: - type: Transform pos: 58.5,-6.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 34825 components: - type: Transform pos: 26.5,-21.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: SignSmoking entities: - uid: 1636 @@ -187707,31 +188570,43 @@ entities: - type: Transform pos: 6.5,9.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 18473 components: - type: Transform pos: 26.5,41.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 18608 components: - type: Transform pos: 16.5,51.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 18754 components: - type: Transform pos: 11.5,57.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 29614 components: - type: Transform pos: 75.5,36.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 32403 components: - type: Transform pos: 34.5,-6.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: SignSpace entities: - uid: 6221 @@ -187739,16 +188614,22 @@ entities: - type: Transform pos: -38.5,39.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 6222 components: - type: Transform pos: -38.5,35.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 11572 components: - type: Transform pos: 2.5,-36.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: SignSurgery entities: - uid: 18448 @@ -187756,11 +188637,15 @@ entities: - type: Transform pos: 9.5,52.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 18722 components: - type: Transform pos: 5.5,60.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: SignTelecomms entities: - uid: 27707 @@ -187768,11 +188653,15 @@ entities: - type: Transform pos: 84.5,33.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 27829 components: - type: Transform pos: 100.5,34.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: SignToolStorage entities: - uid: 6819 @@ -187781,6 +188670,8 @@ entities: rot: -1.5707963267948966 rad pos: 1.5,25.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: SignVault entities: - uid: 21436 @@ -187789,11 +188680,15 @@ entities: rot: 3.141592653589793 rad pos: 90.5,54.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 35639 components: - type: Transform pos: 90.5,41.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: SignVirology entities: - uid: 18456 @@ -187801,6 +188696,8 @@ entities: - type: Transform pos: 26.5,44.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: SingularityGenerator entities: - uid: 23410 @@ -191795,71 +192692,99 @@ entities: - type: Transform pos: 45.5,0.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 29183 components: - type: Transform pos: 13.5,-3.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 29184 components: - type: Transform pos: 40.5,-18.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 29294 components: - type: Transform pos: -37.5,-3.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 30734 components: - type: Transform pos: -14.5,-3.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 30735 components: - type: Transform pos: -39.5,-23.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 31306 components: - type: Transform pos: 29.5,35.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 31364 components: - type: Transform pos: -2.5,27.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 31365 components: - type: Transform pos: -13.5,47.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 31555 components: - type: Transform pos: 64.5,41.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 31568 components: - type: Transform pos: 100.5,41.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 31601 components: - type: Transform pos: 84.5,36.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 31631 components: - type: Transform pos: 51.5,-12.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 31632 components: - type: Transform pos: 26.5,-10.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: StatueVenusBlue entities: - uid: 4924 @@ -192103,12 +193028,24 @@ entities: rot: 1.5707963267948966 rad pos: 70.5,18.5 parent: 13329 + - uid: 24751 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 101.49124,-39.305496 + parent: 13329 - uid: 24756 components: - type: Transform rot: -1.5707963267948966 rad pos: 51.5,28.5 parent: 13329 + - uid: 26435 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 105.45398,-34.287945 + parent: 13329 - uid: 26506 components: - type: Transform @@ -192288,7 +193225,7 @@ entities: - uid: 36013 components: - type: Transform - rot: 3.141592653589793 rad + rot: 1.5707963267948966 rad pos: 99.49049,-39.26957 parent: 13329 - proto: StoolBar @@ -192997,18 +193934,8 @@ entities: immutable: False temperature: 293.14673 moles: - - 1.7459903 - - 6.568249 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 1.7459903 + Nitrogen: 6.568249 - proto: SuitStorageWarden entities: - uid: 9436 @@ -193411,6 +194338,17 @@ entities: - SurveillanceCameraEngineering nameSet: True id: Singulo Cage + - uid: 24649 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 101.5,-33.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: TEG - uid: 26354 components: - type: Transform @@ -193714,17 +194652,6 @@ entities: - SurveillanceCameraEngineering nameSet: True id: Atmos - - uid: 35451 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 101.5,-33.5 - parent: 13329 - - type: SurveillanceCamera - setupAvailableNetworks: - - SurveillanceCameraEngineering - nameSet: True - id: TEG - uid: 35452 components: - type: Transform @@ -198568,6 +199495,11 @@ entities: - type: Transform pos: 64.5,-13.5 parent: 13329 + - uid: 24750 + components: + - type: Transform + pos: 100.5,-39.5 + parent: 13329 - uid: 26007 components: - type: Transform @@ -198663,6 +199595,11 @@ entities: - type: Transform pos: 84.5,-10.5 parent: 13329 + - uid: 26437 + components: + - type: Transform + pos: 105.5,-33.5 + parent: 13329 - uid: 26481 components: - type: Transform @@ -200579,256 +201516,358 @@ entities: - type: Transform pos: -2.5,-26.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2811 components: - type: Transform pos: -2.5,-24.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 5017 components: - type: Transform pos: -19.5,61.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 5106 components: - type: Transform pos: -17.5,67.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 5107 components: - type: Transform pos: -15.5,67.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 6612 components: - type: Transform pos: -19.5,71.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 8163 components: - type: Transform pos: 48.5,15.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 8166 components: - type: Transform pos: 48.5,13.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 9244 components: - type: Transform pos: 37.5,23.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 9245 components: - type: Transform pos: 39.5,23.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 13794 components: - type: Transform pos: 31.5,-25.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 13834 components: - type: Transform pos: 36.5,-31.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 13835 components: - type: Transform pos: 36.5,-29.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 13953 components: - type: Transform pos: 51.5,-37.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 13998 components: - type: Transform pos: 36.5,-35.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 13999 components: - type: Transform pos: 36.5,-33.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 16935 components: - type: Transform pos: 5.5,42.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 16936 components: - type: Transform pos: 6.5,42.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 17545 components: - type: Transform pos: 8.5,60.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 17546 components: - type: Transform pos: 10.5,60.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 17547 components: - type: Transform pos: 16.5,53.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 17548 components: - type: Transform pos: 16.5,55.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 17549 components: - type: Transform pos: 16.5,57.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 17550 components: - type: Transform pos: 16.5,59.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20457 components: - type: Transform pos: -11.5,29.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 21216 components: - type: Transform pos: 63.5,19.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 21217 components: - type: Transform pos: 65.5,17.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 21218 components: - type: Transform pos: 67.5,17.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 25488 components: - type: Transform pos: 81.5,-22.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 25489 components: - type: Transform pos: 79.5,-22.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 28808 components: - type: Transform pos: 80.5,25.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 28809 components: - type: Transform pos: 84.5,25.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 28810 components: - type: Transform pos: 84.5,22.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 28811 components: - type: Transform pos: 80.5,22.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 28812 components: - type: Transform pos: 80.5,19.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 28813 components: - type: Transform pos: 84.5,19.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 31829 components: - type: Transform pos: -28.5,9.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 31830 components: - type: Transform pos: -27.5,9.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 31831 components: - type: Transform pos: -26.5,1.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 31842 components: - type: Transform pos: -26.5,0.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 31843 components: - type: Transform pos: -26.5,-0.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 31849 components: - type: Transform pos: -33.5,2.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 31851 components: - type: Transform pos: -33.5,4.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 32142 components: - type: Transform pos: -35.5,14.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 32146 components: - type: Transform pos: -27.5,14.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 32147 components: - type: Transform pos: -26.5,14.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 32150 components: - type: Transform pos: -31.5,14.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 32151 components: - type: Transform pos: -30.5,14.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 32460 components: - type: Transform pos: 103.5,11.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 32461 components: - type: Transform pos: 102.5,11.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 32462 components: - type: Transform pos: 101.5,11.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - proto: ToiletDirtyWater entities: - uid: 4720 @@ -202195,6 +203234,11 @@ entities: parent: 13329 - proto: VendingMachineSovietSoda entities: + - uid: 26438 + components: + - type: Transform + pos: 104.5,-33.5 + parent: 13329 - uid: 31768 components: - type: Transform @@ -202314,6 +203358,8 @@ entities: - type: Transform pos: 22.5,64.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: VendingMachineWinter entities: - uid: 17357 @@ -202380,39 +203426,53 @@ entities: rot: -1.5707963267948966 rad pos: -20.5,41.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 8878 components: - type: Transform pos: 46.5,10.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 30724 components: - type: Transform rot: 1.5707963267948966 rad pos: 76.5,50.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 31561 components: - type: Transform rot: 3.141592653589793 rad pos: 64.5,49.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 31589 components: - type: Transform pos: 78.5,58.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 35381 components: - type: Transform rot: 3.141592653589793 rad pos: 124.5,48.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 35617 components: - type: Transform pos: 105.5,45.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: WallmountTelevision entities: - uid: 13294 @@ -202420,26 +203480,36 @@ entities: - type: Transform pos: -18.5,47.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 13300 components: - type: Transform pos: -29.5,-3.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 29029 components: - type: Transform pos: 77.5,17.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 29506 components: - type: Transform pos: 20.5,0.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 29507 components: - type: Transform pos: 9.5,-3.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: WallmountTelevisionFrame entities: - uid: 13291 @@ -202447,16 +203517,22 @@ entities: - type: Transform pos: 65.5,-6.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 13292 components: - type: Transform pos: 59.5,13.5 parent: 13329 + - type: Fixtures + fixtures: {} - uid: 13293 components: - type: Transform pos: 38.5,35.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: WallReinforced entities: - uid: 265 @@ -214234,36 +215310,6 @@ entities: - type: Transform pos: 102.5,-40.5 parent: 13329 - - uid: 20637 - components: - - type: Transform - pos: 103.5,-40.5 - parent: 13329 - - uid: 20638 - components: - - type: Transform - pos: 104.5,-40.5 - parent: 13329 - - uid: 20639 - components: - - type: Transform - pos: 104.5,-38.5 - parent: 13329 - - uid: 20642 - components: - - type: Transform - pos: 104.5,-34.5 - parent: 13329 - - uid: 20659 - components: - - type: Transform - pos: 108.5,-38.5 - parent: 13329 - - uid: 20661 - components: - - type: Transform - pos: 108.5,-34.5 - parent: 13329 - uid: 20676 components: - type: Transform @@ -215664,11 +216710,92 @@ entities: - type: Transform pos: 115.5,-15.5 parent: 13329 + - uid: 23633 + components: + - type: Transform + pos: 107.5,-32.5 + parent: 13329 + - uid: 23682 + components: + - type: Transform + pos: 106.5,-32.5 + parent: 13329 + - uid: 23697 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 106.5,-33.5 + parent: 13329 - uid: 23812 components: - type: Transform pos: 101.5,-28.5 parent: 13329 + - uid: 23819 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 106.5,-38.5 + parent: 13329 + - uid: 23820 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 106.5,-34.5 + parent: 13329 + - uid: 23854 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 108.5,-40.5 + parent: 13329 + - uid: 23915 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 108.5,-38.5 + parent: 13329 + - uid: 23916 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 109.5,-32.5 + parent: 13329 + - uid: 23917 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 109.5,-40.5 + parent: 13329 + - uid: 23919 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 112.5,-34.5 + parent: 13329 + - uid: 23931 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 108.5,-34.5 + parent: 13329 + - uid: 23934 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 112.5,-38.5 + parent: 13329 + - uid: 23937 + components: + - type: Transform + pos: 105.5,-32.5 + parent: 13329 + - uid: 23949 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 106.5,-40.5 + parent: 13329 - uid: 24241 components: - type: Transform @@ -215694,6 +216821,18 @@ entities: - type: Transform pos: 99.5,-41.5 parent: 13329 + - uid: 24644 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 107.5,-40.5 + parent: 13329 + - uid: 24647 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 108.5,-32.5 + parent: 13329 - uid: 24981 components: - type: Transform @@ -224653,11 +225792,6 @@ entities: - type: Transform pos: 26.5,-45.5 parent: 13329 - - uid: 20666 - components: - - type: Transform - pos: 108.5,-32.5 - parent: 13329 - uid: 20667 components: - type: Transform @@ -224936,18 +226070,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 29339 components: - type: Transform @@ -224959,18 +226083,8 @@ entities: immutable: False temperature: 293.14948 moles: - - 3.0603204 - - 11.512634 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0603204 + Nitrogen: 11.512634 - uid: 32203 components: - type: Transform @@ -224982,18 +226096,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - proto: WardrobeBlueFilled entities: - uid: 29311 @@ -225007,18 +226111,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 29338 components: - type: Transform @@ -225030,18 +226124,8 @@ entities: immutable: False temperature: 293.14948 moles: - - 3.0603204 - - 11.512634 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0603204 + Nitrogen: 11.512634 - proto: WardrobeCargoFilled entities: - uid: 11620 @@ -225055,18 +226139,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - proto: WardrobeChapelFilled entities: - uid: 6609 @@ -225080,18 +226154,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - proto: WardrobeGreenFilled entities: - uid: 29250 @@ -225105,18 +226169,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - proto: WardrobeGreyFilled entities: - uid: 29253 @@ -225130,18 +226184,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - proto: WardrobeMedicalDoctorFilled entities: - uid: 18859 @@ -225162,18 +226206,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - proto: WardrobePinkFilled entities: - uid: 29252 @@ -225187,18 +226221,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 29312 components: - type: Transform @@ -225210,18 +226234,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - uid: 29340 components: - type: Transform @@ -225233,18 +226247,8 @@ entities: immutable: False temperature: 293.14948 moles: - - 3.0603204 - - 11.512634 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0603204 + Nitrogen: 11.512634 - proto: WardrobePrisonFilled entities: - uid: 10299 @@ -225287,18 +226291,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - proto: WardrobeWhiteFilled entities: - uid: 21253 @@ -225312,18 +226306,8 @@ entities: immutable: False temperature: 293.14954 moles: - - 3.2184362 - - 12.107451 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.2184362 + Nitrogen: 12.107451 - proto: WardrobeYellowFilled entities: - uid: 29251 @@ -225337,18 +226321,8 @@ entities: immutable: False temperature: 293.1495 moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.0981817 + Nitrogen: 11.655066 - proto: WarningAir entities: - uid: 23803 @@ -225356,6 +226330,8 @@ entities: - type: Transform pos: 77.5,-39.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: WarningCO2 entities: - uid: 23797 @@ -225363,6 +226339,8 @@ entities: - type: Transform pos: 90.5,-40.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: WarningN2 entities: - uid: 23795 @@ -225370,6 +226348,8 @@ entities: - type: Transform pos: 69.5,-39.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: WarningO2 entities: - uid: 23794 @@ -225377,6 +226357,8 @@ entities: - type: Transform pos: 73.5,-39.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: WarningPlasma entities: - uid: 23805 @@ -225384,6 +226366,8 @@ entities: - type: Transform pos: 90.5,-32.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: WarningWaste entities: - uid: 23804 @@ -225391,6 +226375,8 @@ entities: - type: Transform pos: 90.5,-36.5 parent: 13329 + - type: Fixtures + fixtures: {} - proto: WaterCooler entities: - uid: 4854 @@ -226317,12 +227303,16 @@ entities: - type: Transform pos: -6.5,15.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 7602 components: - type: Transform rot: -1.5707963267948966 rad pos: 49.5,-15.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - type: DeviceLinkSink invokeCounter: 1 - type: DeviceLinkSource @@ -226336,6 +227326,8 @@ entities: rot: -1.5707963267948966 rad pos: 49.5,-17.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - type: DeviceLinkSink invokeCounter: 1 - type: DeviceLinkSource @@ -226348,67 +227340,91 @@ entities: - type: Transform pos: 28.5,8.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 9386 components: - type: Transform rot: 3.141592653589793 rad pos: 28.5,15.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 10195 components: - type: Transform rot: -1.5707963267948966 rad pos: 12.5,-0.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 10196 components: - type: Transform rot: -1.5707963267948966 rad pos: 12.5,3.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 10459 components: - type: Transform pos: 48.5,28.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 18881 components: - type: Transform rot: -1.5707963267948966 rad pos: 11.5,65.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20009 components: - type: Transform rot: -1.5707963267948966 rad pos: 30.5,-39.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 26566 components: - type: Transform pos: 58.5,41.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 26567 components: - type: Transform pos: 62.5,41.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 29284 components: - type: Transform pos: 71.5,17.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 31549 components: - type: Transform pos: 58.5,43.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 31762 components: - type: Transform rot: -1.5707963267948966 rad pos: 16.5,37.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - type: DeviceLinkSink invokeCounter: 1 - type: DeviceLinkSource @@ -226422,6 +227438,8 @@ entities: rot: 3.141592653589793 rad pos: -10.5,-7.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - type: DeviceLinkSink invokeCounter: 1 - type: DeviceLinkSource @@ -226435,6 +227453,8 @@ entities: rot: 3.141592653589793 rad pos: 53.5,-13.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - type: DeviceLinkSink invokeCounter: 1 - type: DeviceLinkSource @@ -226450,12 +227470,16 @@ entities: rot: -1.5707963267948966 rad pos: -12.5,25.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 1221 components: - type: Transform rot: 1.5707963267948966 rad pos: -12.5,25.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - proto: WindoorCargoLocked entities: - uid: 2060 @@ -226464,27 +227488,37 @@ entities: rot: 3.141592653589793 rad pos: 7.5,-15.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 11490 components: - type: Transform rot: 3.141592653589793 rad pos: 5.5,-14.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 11491 components: - type: Transform pos: 4.5,-14.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 11510 components: - type: Transform pos: 13.5,-28.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 11851 components: - type: Transform pos: 20.5,-15.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - proto: WindoorHydroponicsLocked entities: - uid: 1309 @@ -226493,12 +227527,16 @@ entities: rot: -1.5707963267948966 rad pos: -2.5,34.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 1310 components: - type: Transform rot: -1.5707963267948966 rad pos: -2.5,35.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - proto: WindoorJanitorLocked entities: - uid: 9406 @@ -226506,11 +227544,15 @@ entities: - type: Transform pos: 3.5,8.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 15508 components: - type: Transform pos: 4.5,8.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - proto: WindoorKitchenHydroponicsLocked entities: - uid: 1224 @@ -226518,24 +227560,32 @@ entities: - type: Transform pos: -9.5,33.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 1225 components: - type: Transform rot: 3.141592653589793 rad pos: -9.5,33.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20450 components: - type: Transform rot: 3.141592653589793 rad pos: -9.5,27.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20452 components: - type: Transform rot: 3.141592653589793 rad pos: -8.5,27.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - proto: WindoorSecure entities: - uid: 56 @@ -226543,16 +227593,22 @@ entities: - type: Transform pos: -10.5,0.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 9650 components: - type: Transform pos: 36.5,3.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 10296 components: - type: Transform pos: 37.5,3.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - proto: WindoorSecureArmoryLocked entities: - uid: 9364 @@ -226561,22 +227617,30 @@ entities: rot: 3.141592653589793 rad pos: 28.5,8.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 9365 components: - type: Transform pos: 28.5,15.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 10677 components: - type: Transform pos: 17.5,15.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 10678 components: - type: Transform rot: 3.141592653589793 rad pos: 16.5,13.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - type: Airlock autoClose: False - uid: 10679 @@ -226585,6 +227649,8 @@ entities: rot: 3.141592653589793 rad pos: 17.5,13.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - type: Airlock autoClose: False - uid: 10680 @@ -226593,6 +227659,8 @@ entities: rot: 3.141592653589793 rad pos: 18.5,13.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - type: Airlock autoClose: False - uid: 10681 @@ -226601,6 +227669,8 @@ entities: rot: 3.141592653589793 rad pos: 19.5,13.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - type: Airlock autoClose: False - uid: 10683 @@ -226608,6 +227678,8 @@ entities: - type: Transform pos: 17.5,11.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - type: Airlock autoClose: False - uid: 10684 @@ -226615,6 +227687,8 @@ entities: - type: Transform pos: 16.5,11.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - type: Airlock autoClose: False - uid: 10685 @@ -226623,6 +227697,8 @@ entities: rot: -1.5707963267948966 rad pos: 16.5,12.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - type: Airlock autoClose: False - uid: 10686 @@ -226630,6 +227706,8 @@ entities: - type: Transform pos: 19.5,11.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - type: Airlock autoClose: False - uid: 10687 @@ -226637,6 +227715,8 @@ entities: - type: Transform pos: 18.5,11.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - type: Airlock autoClose: False - uid: 26338 @@ -226645,6 +227725,8 @@ entities: rot: 1.5707963267948966 rad pos: 19.5,12.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - type: Airlock autoClose: False - uid: 35969 @@ -226653,12 +227735,16 @@ entities: rot: 3.141592653589793 rad pos: 19.5,9.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 35970 components: - type: Transform rot: 3.141592653589793 rad pos: 20.5,9.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - proto: WindoorSecureAtmosphericsLocked entities: - uid: 14804 @@ -226667,6 +227753,8 @@ entities: rot: 3.141592653589793 rad pos: 64.5,-13.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - proto: WindoorSecureBrigLocked entities: - uid: 9455 @@ -226676,12 +227764,16 @@ entities: - type: Transform pos: 38.5,8.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 29451 components: - type: Transform rot: -1.5707963267948966 rad pos: 65.5,26.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - proto: WindoorSecureCargoLocked entities: - uid: 11831 @@ -226690,12 +227782,16 @@ entities: rot: 3.141592653589793 rad pos: 18.5,-9.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 11839 components: - type: Transform rot: 1.5707963267948966 rad pos: 22.5,-10.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - proto: WindoorSecureChapelLocked entities: - uid: 6646 @@ -226704,6 +227800,8 @@ entities: rot: 1.5707963267948966 rad pos: -12.5,69.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - proto: WindoorSecureChemistryLocked entities: - uid: 11718 @@ -226711,6 +227809,8 @@ entities: - type: Transform pos: 22.5,42.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - type: DeviceLinkSink invokeCounter: 1 - type: DeviceLinkSource @@ -226727,6 +227827,8 @@ entities: rot: 1.5707963267948966 rad pos: 16.5,37.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - type: DeviceLinkSink invokeCounter: 1 - type: DeviceLinkSource @@ -226739,6 +227841,8 @@ entities: - type: Transform pos: 21.5,42.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - type: DeviceLinkSink invokeCounter: 2 - type: DeviceLinkSource @@ -226756,72 +227860,98 @@ entities: - type: Transform pos: 123.5,48.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 30211 components: - type: Transform rot: 3.141592653589793 rad pos: 123.5,50.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 30248 components: - type: Transform rot: 3.141592653589793 rad pos: 108.5,46.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 30249 components: - type: Transform pos: 108.5,52.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 30694 components: - type: Transform rot: -1.5707963267948966 rad pos: 82.5,50.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 31273 components: - type: Transform pos: 72.5,57.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 31274 components: - type: Transform pos: 73.5,57.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 35714 components: - type: Transform rot: 3.141592653589793 rad pos: 109.5,46.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 35717 components: - type: Transform rot: 3.141592653589793 rad pos: 108.5,48.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 35718 components: - type: Transform pos: 107.5,52.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 35719 components: - type: Transform pos: 109.5,52.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 35720 components: - type: Transform rot: 3.141592653589793 rad pos: 107.5,46.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 35721 components: - type: Transform pos: 108.5,50.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - proto: WindoorSecureEngineeringLocked entities: - uid: 11007 @@ -226830,6 +227960,8 @@ entities: rot: 3.141592653589793 rad pos: 19.5,-20.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - proto: WindoorSecureHeadOfPersonnelLocked entities: - uid: 31548 @@ -226838,23 +227970,31 @@ entities: rot: 3.141592653589793 rad pos: 58.5,43.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 33561 components: - type: Transform rot: 3.141592653589793 rad pos: 51.5,42.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 33562 components: - type: Transform rot: 3.141592653589793 rad pos: 52.5,42.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 34644 components: - type: Transform pos: 60.5,49.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - proto: WindoorSecureMedicalLocked entities: - uid: 9337 @@ -226863,6 +228003,8 @@ entities: rot: 3.141592653589793 rad pos: 22.5,42.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - type: DeviceLinkSink invokeCounter: 2 - type: DeviceLinkSource @@ -226879,6 +228021,8 @@ entities: rot: 3.141592653589793 rad pos: 21.5,42.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - type: DeviceLinkSink invokeCounter: 2 - type: DeviceLinkSource @@ -226892,18 +228036,24 @@ entities: rot: 1.5707963267948966 rad pos: 4.5,66.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 18842 components: - type: Transform rot: 1.5707963267948966 rad pos: 4.5,67.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 18843 components: - type: Transform rot: 1.5707963267948966 rad pos: 4.5,68.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - proto: WindoorSecureScienceLocked entities: - uid: 13997 @@ -226912,17 +228062,23 @@ entities: rot: 3.141592653589793 rad pos: 43.5,-36.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 15257 components: - type: Transform pos: 38.5,-18.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 15258 components: - type: Transform rot: 1.5707963267948966 rad pos: 49.5,-15.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - type: DeviceLinkSink invokeCounter: 1 - type: DeviceLinkSource @@ -226936,6 +228092,8 @@ entities: rot: 1.5707963267948966 rad pos: 49.5,-17.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - type: DeviceLinkSink invokeCounter: 1 - type: DeviceLinkSource @@ -226949,11 +228107,15 @@ entities: rot: 3.141592653589793 rad pos: 50.5,-21.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 15325 components: - type: Transform pos: 53.5,-13.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - type: DeviceLinkSink invokeCounter: 1 - type: DeviceLinkSource @@ -226967,30 +228129,40 @@ entities: rot: 1.5707963267948966 rad pos: 53.5,-30.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 19991 components: - type: Transform rot: 1.5707963267948966 rad pos: 44.5,-39.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 19992 components: - type: Transform rot: 1.5707963267948966 rad pos: 44.5,-38.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 19993 components: - type: Transform rot: 1.5707963267948966 rad pos: 44.5,-37.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20047 components: - type: Transform rot: 3.141592653589793 rad pos: 37.5,-24.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - proto: WindoorSecureSecurityLocked entities: - uid: 2197 @@ -226999,28 +228171,38 @@ entities: rot: -1.5707963267948966 rad pos: -12.5,-9.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 4606 components: - type: Transform rot: 1.5707963267948966 rad pos: -34.5,48.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 9361 components: - type: Transform pos: 16.5,15.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 9423 components: - type: Transform rot: 1.5707963267948966 rad pos: 22.5,2.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 9651 components: - type: Transform pos: -10.5,-7.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - type: DeviceLinkSink invokeCounter: 1 - type: DeviceLinkSource @@ -227034,12 +228216,16 @@ entities: rot: -1.5707963267948966 rad pos: 26.5,29.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 18683 components: - type: Transform rot: 1.5707963267948966 rad pos: 25.5,54.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - proto: WindoorServiceLocked entities: - uid: 4762 @@ -227048,11 +228234,15 @@ entities: rot: 3.141592653589793 rad pos: -24.5,29.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 6356 components: - type: Transform pos: -22.5,56.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - proto: WindoorTheatreLocked entities: - uid: 907 @@ -227061,6 +228251,8 @@ entities: rot: 3.141592653589793 rad pos: -17.5,13.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - proto: Window entities: - uid: 60 @@ -227068,321 +228260,449 @@ entities: - type: Transform pos: -7.5,0.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 310 components: - type: Transform pos: -7.5,12.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 311 components: - type: Transform pos: -4.5,12.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 312 components: - type: Transform pos: -2.5,12.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 313 components: - type: Transform pos: -2.5,15.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 1631 components: - type: Transform pos: -2.5,3.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 1632 components: - type: Transform pos: -1.5,3.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 1633 components: - type: Transform pos: 0.5,3.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 1634 components: - type: Transform pos: 1.5,3.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 1829 components: - type: Transform pos: -19.5,-3.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 1830 components: - type: Transform pos: -16.5,-3.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2638 components: - type: Transform pos: 14.5,-16.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2639 components: - type: Transform pos: 14.5,-17.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 3100 components: - type: Transform pos: -18.5,-23.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 3101 components: - type: Transform pos: -20.5,-21.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 3972 components: - type: Transform pos: -24.5,47.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 3973 components: - type: Transform pos: -29.5,49.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 4976 components: - type: Transform pos: -29.5,56.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 4979 components: - type: Transform pos: -29.5,55.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 4980 components: - type: Transform pos: -29.5,54.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 5003 components: - type: Transform pos: -7.5,57.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 5004 components: - type: Transform pos: -8.5,57.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 5005 components: - type: Transform pos: -9.5,57.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 5007 components: - type: Transform pos: -15.5,57.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 5008 components: - type: Transform pos: -16.5,57.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 5009 components: - type: Transform pos: -17.5,57.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 5048 components: - type: Transform pos: -12.5,57.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 5070 components: - type: Transform pos: -6.5,59.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 5071 components: - type: Transform pos: -6.5,60.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 5072 components: - type: Transform pos: -6.5,62.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 5073 components: - type: Transform pos: -6.5,63.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 7096 components: - type: Transform pos: 19.5,-3.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 7097 components: - type: Transform pos: 20.5,-3.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 9563 components: - type: Transform pos: 21.5,-3.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 9771 components: - type: Transform pos: 10.5,-17.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 9772 components: - type: Transform pos: 7.5,-19.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 13793 components: - type: Transform pos: 39.5,-24.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 16345 components: - type: Transform pos: 79.5,42.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 17555 components: - type: Transform pos: 2.5,60.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 17556 components: - type: Transform pos: 4.5,60.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 18331 components: - type: Transform pos: 15.5,64.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 18332 components: - type: Transform pos: 13.5,64.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 18333 components: - type: Transform pos: 11.5,64.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 18334 components: - type: Transform pos: 16.5,68.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 18951 components: - type: Transform pos: 35.5,39.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 18952 components: - type: Transform pos: 34.5,39.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20114 components: - type: Transform pos: 57.5,-12.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 20115 components: - type: Transform pos: 62.5,-12.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 21097 components: - type: Transform pos: 57.5,29.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 21098 components: - type: Transform pos: 57.5,31.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 21099 components: - type: Transform pos: 57.5,36.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 21291 components: - type: Transform pos: 58.5,7.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 21292 components: - type: Transform pos: 57.5,11.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 21399 components: - type: Transform pos: 75.5,12.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 21400 components: - type: Transform pos: 75.5,16.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 23629 components: - type: Transform pos: -7.5,1.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 28818 components: - type: Transform pos: 88.5,12.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 28819 components: - type: Transform pos: 88.5,16.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 28820 components: - type: Transform pos: 90.5,17.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 28821 components: - type: Transform pos: 93.5,17.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 28905 components: - type: Transform pos: 73.5,18.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 28906 components: - type: Transform pos: 73.5,19.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 31704 components: - type: Transform pos: 9.5,21.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 31705 components: - type: Transform pos: 11.5,19.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - proto: WindowDirectional entities: - uid: 29369 @@ -227390,11 +228710,15 @@ entities: - type: Transform pos: 70.5,17.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 29370 components: - type: Transform pos: 72.5,17.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - proto: WindowFrostedDirectional entities: - uid: 1620 @@ -227402,22 +228726,30 @@ entities: - type: Transform pos: -8.5,0.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 1621 components: - type: Transform pos: -9.5,0.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 1625 components: - type: Transform pos: -11.5,0.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 18854 components: - type: Transform rot: 3.141592653589793 rad pos: -15.5,27.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - proto: WindowReinforcedDirectional entities: - uid: 304 @@ -227425,1600 +228757,2160 @@ entities: - type: Transform pos: -8.5,15.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 305 components: - type: Transform pos: -7.5,15.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 306 components: - type: Transform pos: -3.5,15.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 307 components: - type: Transform pos: -4.5,15.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 308 components: - type: Transform pos: -5.5,15.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 904 components: - type: Transform rot: 3.141592653589793 rad pos: -19.5,13.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 905 components: - type: Transform rot: 3.141592653589793 rad pos: -18.5,13.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 906 components: - type: Transform rot: 3.141592653589793 rad pos: -16.5,13.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 946 components: - type: Transform rot: 3.141592653589793 rad pos: -2.5,17.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 947 components: - type: Transform rot: 1.5707963267948966 rad pos: -2.5,17.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 1436 components: - type: Transform rot: -1.5707963267948966 rad pos: -13.5,33.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 1870 components: - type: Transform pos: -2.5,-2.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 1871 components: - type: Transform pos: 1.5,-2.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 1872 components: - type: Transform rot: 1.5707963267948966 rad pos: 2.5,0.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 1873 components: - type: Transform rot: -1.5707963267948966 rad pos: -3.5,0.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 1874 components: - type: Transform rot: -1.5707963267948966 rad pos: -3.5,-1.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 1875 components: - type: Transform rot: 1.5707963267948966 rad pos: 2.5,-1.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2677 components: - type: Transform rot: -1.5707963267948966 rad pos: 2.5,-7.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2678 components: - type: Transform rot: -1.5707963267948966 rad pos: 6.5,-7.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2679 components: - type: Transform rot: -1.5707963267948966 rad pos: 9.5,-7.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2680 components: - type: Transform rot: 3.141592653589793 rad pos: 9.5,-7.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2681 components: - type: Transform rot: 3.141592653589793 rad pos: 10.5,-7.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2682 components: - type: Transform rot: 3.141592653589793 rad pos: 2.5,-7.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2683 components: - type: Transform rot: 3.141592653589793 rad pos: 3.5,-7.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2684 components: - type: Transform rot: 3.141592653589793 rad pos: 6.5,-7.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2685 components: - type: Transform rot: 1.5707963267948966 rad pos: 6.5,-7.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 2686 components: - type: Transform rot: 1.5707963267948966 rad pos: 3.5,-7.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 4732 components: - type: Transform rot: 3.141592653589793 rad pos: -34.5,33.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 4733 components: - type: Transform rot: 3.141592653589793 rad pos: -33.5,33.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 4734 components: - type: Transform rot: 3.141592653589793 rad pos: -31.5,33.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 4735 components: - type: Transform rot: 3.141592653589793 rad pos: -30.5,33.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 4736 components: - type: Transform pos: -30.5,33.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 4737 components: - type: Transform pos: -31.5,33.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 4738 components: - type: Transform pos: -33.5,33.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 4739 components: - type: Transform pos: -34.5,33.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 4740 components: - type: Transform pos: -34.5,37.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 4741 components: - type: Transform pos: -33.5,37.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 4742 components: - type: Transform pos: -31.5,37.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 4743 components: - type: Transform pos: -30.5,37.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 4744 components: - type: Transform rot: 3.141592653589793 rad pos: -30.5,37.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 4745 components: - type: Transform rot: 3.141592653589793 rad pos: -31.5,37.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 4746 components: - type: Transform rot: 3.141592653589793 rad pos: -33.5,37.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 4747 components: - type: Transform rot: 3.141592653589793 rad pos: -34.5,37.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 4908 components: - type: Transform rot: 3.141592653589793 rad pos: -9.5,47.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 4909 components: - type: Transform rot: 3.141592653589793 rad pos: -8.5,47.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 4910 components: - type: Transform pos: -8.5,47.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 4911 components: - type: Transform pos: -9.5,47.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 6357 components: - type: Transform rot: -1.5707963267948966 rad pos: -21.5,56.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 6644 components: - type: Transform rot: 1.5707963267948966 rad pos: -12.5,70.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 6645 components: - type: Transform rot: 1.5707963267948966 rad pos: -12.5,68.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 6811 components: - type: Transform rot: -1.5707963267948966 rad pos: -10.5,56.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 6812 components: - type: Transform rot: 1.5707963267948966 rad pos: -7.5,56.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 7100 components: - type: Transform pos: 18.5,-0.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 7101 components: - type: Transform rot: -1.5707963267948966 rad pos: 18.5,-0.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 7102 components: - type: Transform rot: 1.5707963267948966 rad pos: 18.5,-0.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 7154 components: - type: Transform pos: 51.5,7.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 7278 components: - type: Transform rot: 1.5707963267948966 rad pos: 22.5,1.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 7279 components: - type: Transform rot: 1.5707963267948966 rad pos: 22.5,3.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 8081 components: - type: Transform pos: 39.5,3.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 8668 components: - type: Transform rot: -1.5707963267948966 rad pos: 17.5,12.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 8670 components: - type: Transform rot: 1.5707963267948966 rad pos: 17.5,11.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 8671 components: - type: Transform rot: -1.5707963267948966 rad pos: 18.5,11.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 8672 components: - type: Transform rot: -1.5707963267948966 rad pos: 17.5,13.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 8673 components: - type: Transform rot: -1.5707963267948966 rad pos: 18.5,13.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 8675 components: - type: Transform rot: 1.5707963267948966 rad pos: 19.5,11.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 8676 components: - type: Transform rot: -1.5707963267948966 rad pos: 16.5,11.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 8677 components: - type: Transform rot: -1.5707963267948966 rad pos: 16.5,13.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 8939 components: - type: Transform rot: -1.5707963267948966 rad pos: 16.5,15.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 9377 components: - type: Transform rot: 1.5707963267948966 rad pos: 16.5,15.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 9382 components: - type: Transform rot: 1.5707963267948966 rad pos: 19.5,13.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 9467 components: - type: Transform rot: 1.5707963267948966 rad pos: 49.5,7.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 9468 components: - type: Transform pos: 49.5,7.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 9469 components: - type: Transform rot: 3.141592653589793 rad pos: 50.5,2.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 9470 components: - type: Transform rot: 3.141592653589793 rad pos: 51.5,2.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 9474 components: - type: Transform rot: 1.5707963267948966 rad pos: 14.5,9.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 10154 components: - type: Transform rot: -1.5707963267948966 rad pos: 36.5,3.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 10243 components: - type: Transform rot: -1.5707963267948966 rad pos: 26.5,30.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 10295 components: - type: Transform rot: 1.5707963267948966 rad pos: 37.5,3.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 10411 components: - type: Transform rot: -1.5707963267948966 rad pos: 49.5,19.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 10412 components: - type: Transform rot: -1.5707963267948966 rad pos: 49.5,18.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 10413 components: - type: Transform rot: -1.5707963267948966 rad pos: 49.5,20.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 10414 components: - type: Transform rot: -1.5707963267948966 rad pos: 49.5,21.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 10619 components: - type: Transform rot: -1.5707963267948966 rad pos: 17.5,15.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 10620 components: - type: Transform rot: 1.5707963267948966 rad pos: 17.5,15.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 10635 components: - type: Transform rot: 1.5707963267948966 rad pos: 14.5,10.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 11489 components: - type: Transform rot: -1.5707963267948966 rad pos: 5.5,-14.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 11546 components: - type: Transform pos: 9.5,-37.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 11547 components: - type: Transform pos: 8.5,-37.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 11548 components: - type: Transform pos: 7.5,-37.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 11549 components: - type: Transform rot: -1.5707963267948966 rad pos: 6.5,-34.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 11776 components: - type: Transform rot: 3.141592653589793 rad pos: 3.5,-13.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 11832 components: - type: Transform rot: 1.5707963267948966 rad pos: 17.5,-8.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 11833 components: - type: Transform rot: 3.141592653589793 rad pos: 19.5,-9.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 11834 components: - type: Transform rot: 3.141592653589793 rad pos: 20.5,-9.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 11836 components: - type: Transform rot: 3.141592653589793 rad pos: 21.5,-9.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 11852 components: - type: Transform pos: 21.5,-15.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 11888 components: - type: Transform rot: 3.141592653589793 rad pos: 17.5,0.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 13404 components: - type: Transform rot: -1.5707963267948966 rad pos: 51.5,7.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 13818 components: - type: Transform rot: 1.5707963267948966 rad pos: 53.5,-31.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 15266 components: - type: Transform rot: -1.5707963267948966 rad pos: 43.5,-18.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 15267 components: - type: Transform rot: 3.141592653589793 rad pos: 43.5,-18.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 15268 components: - type: Transform rot: 1.5707963267948966 rad pos: 41.5,-18.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 15269 components: - type: Transform rot: 3.141592653589793 rad pos: 41.5,-18.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 15270 components: - type: Transform rot: 1.5707963267948966 rad pos: 51.5,-23.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 15271 components: - type: Transform rot: 1.5707963267948966 rad pos: 51.5,-24.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 15272 components: - type: Transform rot: 1.5707963267948966 rad pos: 51.5,-25.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 15273 components: - type: Transform rot: -1.5707963267948966 rad pos: 51.5,-25.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 15274 components: - type: Transform rot: -1.5707963267948966 rad pos: 51.5,-24.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 15275 components: - type: Transform rot: -1.5707963267948966 rad pos: 51.5,-23.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 15276 components: - type: Transform rot: 3.141592653589793 rad pos: 51.5,-23.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 15277 components: - type: Transform pos: 51.5,-25.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 15326 components: - type: Transform pos: 53.5,-31.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 15327 components: - type: Transform pos: 52.5,-31.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 15328 components: - type: Transform pos: 51.5,-31.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 15365 components: - type: Transform rot: 1.5707963267948966 rad pos: 53.5,-29.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 16261 components: - type: Transform pos: 57.5,41.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 16262 components: - type: Transform rot: -1.5707963267948966 rad pos: 57.5,41.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 16633 components: - type: Transform rot: -1.5707963267948966 rad pos: 51.5,42.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 16634 components: - type: Transform rot: -1.5707963267948966 rad pos: 52.5,42.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 18344 components: - type: Transform rot: 1.5707963267948966 rad pos: 19.5,36.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 18345 components: - type: Transform rot: 1.5707963267948966 rad pos: 19.5,38.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 18511 components: - type: Transform rot: 3.141592653589793 rad pos: 15.5,35.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 18512 components: - type: Transform rot: 3.141592653589793 rad pos: 11.5,35.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 18513 components: - type: Transform rot: 3.141592653589793 rad pos: 10.5,35.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 18514 components: - type: Transform rot: 3.141592653589793 rad pos: 10.5,42.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 18515 components: - type: Transform rot: 3.141592653589793 rad pos: 15.5,42.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 18516 components: - type: Transform rot: 3.141592653589793 rad pos: 16.5,42.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 18517 components: - type: Transform rot: 3.141592653589793 rad pos: 17.5,42.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 18518 components: - type: Transform pos: 17.5,42.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 18519 components: - type: Transform pos: 16.5,42.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 18520 components: - type: Transform pos: 15.5,42.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 18521 components: - type: Transform pos: 10.5,42.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 18522 components: - type: Transform pos: 11.5,35.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 18523 components: - type: Transform pos: 10.5,35.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 18524 components: - type: Transform pos: 15.5,35.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 18525 components: - type: Transform rot: -1.5707963267948966 rad pos: 15.5,35.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 18526 components: - type: Transform rot: -1.5707963267948966 rad pos: 15.5,42.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 18527 components: - type: Transform rot: 1.5707963267948966 rad pos: 11.5,35.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 18528 components: - type: Transform rot: 1.5707963267948966 rad pos: 10.5,42.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 18529 components: - type: Transform rot: 1.5707963267948966 rad pos: 17.5,42.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 18840 components: - type: Transform rot: 3.141592653589793 rad pos: 4.5,65.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 18841 components: - type: Transform rot: 1.5707963267948966 rad pos: 4.5,65.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 19221 components: - type: Transform pos: 29.5,-45.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 19222 components: - type: Transform pos: 30.5,-45.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 19223 components: - type: Transform pos: 31.5,-45.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 19224 components: - type: Transform pos: 32.5,-45.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 19225 components: - type: Transform pos: 29.5,-53.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 19226 components: - type: Transform pos: 30.5,-53.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 19243 components: - type: Transform rot: 3.141592653589793 rad pos: 32.5,-51.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 19406 components: - type: Transform rot: -1.5707963267948966 rad pos: 26.5,-44.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 19407 components: - type: Transform rot: 3.141592653589793 rad pos: 26.5,-44.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 19408 components: - type: Transform rot: 3.141592653589793 rad pos: 27.5,-44.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 21276 components: - type: Transform rot: 3.141592653589793 rad pos: 70.5,27.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 25534 components: - type: Transform rot: 1.5707963267948966 rad pos: 57.5,5.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 25535 components: - type: Transform rot: 1.5707963267948966 rad pos: 57.5,6.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 25536 components: - type: Transform rot: -1.5707963267948966 rad pos: 57.5,6.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 25537 components: - type: Transform rot: -1.5707963267948966 rad pos: 57.5,5.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 26070 components: - type: Transform rot: 3.141592653589793 rad pos: 45.5,-7.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 26071 components: - type: Transform rot: 3.141592653589793 rad pos: 46.5,-7.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 26072 components: - type: Transform rot: 3.141592653589793 rad pos: 51.5,-7.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 26073 components: - type: Transform rot: 3.141592653589793 rad pos: 52.5,-7.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 26074 components: - type: Transform pos: 52.5,-4.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 26075 components: - type: Transform pos: 51.5,-4.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 26076 components: - type: Transform pos: 46.5,-4.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 26077 components: - type: Transform pos: 45.5,-4.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 26078 components: - type: Transform rot: 1.5707963267948966 rad pos: 46.5,-4.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 26079 components: - type: Transform rot: -1.5707963267948966 rad pos: 51.5,-4.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 26080 components: - type: Transform rot: -1.5707963267948966 rad pos: 51.5,-7.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 26081 components: - type: Transform rot: 1.5707963267948966 rad pos: 46.5,-7.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 26139 components: - type: Transform rot: -1.5707963267948966 rad pos: 73.5,-33.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 26140 components: - type: Transform rot: -1.5707963267948966 rad pos: 73.5,-31.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 26233 components: - type: Transform rot: 3.141592653589793 rad pos: 57.5,41.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 26245 components: - type: Transform rot: 3.141592653589793 rad pos: 82.5,-14.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 26488 components: - type: Transform rot: -1.5707963267948966 rad pos: 78.5,-2.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 26489 components: - type: Transform rot: -1.5707963267948966 rad pos: 78.5,-0.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 26490 components: - type: Transform rot: 1.5707963267948966 rad pos: 82.5,-2.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 26491 components: - type: Transform rot: 1.5707963267948966 rad pos: 82.5,-0.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 26504 components: - type: Transform rot: 3.141592653589793 rad pos: 58.5,41.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 26514 components: - type: Transform rot: 3.141592653589793 rad pos: 62.5,41.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 26515 components: - type: Transform rot: 3.141592653589793 rad pos: 63.5,41.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 26564 components: - type: Transform rot: 1.5707963267948966 rad pos: 63.5,41.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 26565 components: - type: Transform pos: 63.5,41.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 29336 components: - type: Transform rot: -1.5707963267948966 rad pos: 74.5,6.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 29337 components: - type: Transform rot: 1.5707963267948966 rad pos: 67.5,6.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 29404 components: - type: Transform pos: 65.5,35.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 29405 components: - type: Transform pos: 64.5,35.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 29406 components: - type: Transform pos: 63.5,35.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 29407 components: - type: Transform pos: 62.5,35.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 29419 components: - type: Transform rot: 1.5707963267948966 rad pos: 63.5,34.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 29420 components: - type: Transform rot: 1.5707963267948966 rad pos: 63.5,32.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 29421 components: - type: Transform pos: 63.5,32.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 29422 components: - type: Transform pos: 62.5,32.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 29423 components: - type: Transform rot: 3.141592653589793 rad pos: 62.5,28.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 29424 components: - type: Transform rot: 3.141592653589793 rad pos: 63.5,28.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 29425 components: - type: Transform rot: 1.5707963267948966 rad pos: 63.5,28.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 29427 components: - type: Transform rot: 3.141592653589793 rad pos: 65.5,27.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 29428 components: - type: Transform rot: -1.5707963267948966 rad pos: 65.5,27.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 29468 components: - type: Transform rot: 3.141592653589793 rad pos: 66.5,27.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 29513 components: - type: Transform rot: 1.5707963267948966 rad pos: 63.5,26.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 30215 components: - type: Transform rot: -1.5707963267948966 rad pos: 107.5,46.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 30216 components: - type: Transform rot: 1.5707963267948966 rad pos: 109.5,46.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 30217 components: - type: Transform rot: 1.5707963267948966 rad pos: 109.5,52.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 30218 components: - type: Transform rot: -1.5707963267948966 rad pos: 107.5,52.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 30224 components: - type: Transform pos: 108.5,48.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 30225 components: - type: Transform rot: 3.141592653589793 rad pos: 108.5,50.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 30558 components: - type: Transform rot: -1.5707963267948966 rad pos: 109.5,48.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 30559 components: - type: Transform rot: 1.5707963267948966 rad pos: 107.5,50.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 30692 components: - type: Transform rot: -1.5707963267948966 rad pos: 82.5,49.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 30693 components: - type: Transform rot: -1.5707963267948966 rad pos: 82.5,51.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 30731 components: - type: Transform rot: -1.5707963267948966 rad pos: 109.5,50.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 31080 components: - type: Transform rot: 3.141592653589793 rad pos: 67.5,55.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 31081 components: - type: Transform rot: 3.141592653589793 rad pos: 68.5,55.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 31082 components: - type: Transform rot: 3.141592653589793 rad pos: 69.5,55.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 31083 components: - type: Transform rot: 3.141592653589793 rad pos: 70.5,55.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 31084 components: - type: Transform rot: 3.141592653589793 rad pos: 71.5,55.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 31085 components: - type: Transform rot: 3.141592653589793 rad pos: 71.5,52.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 31086 components: - type: Transform rot: 3.141592653589793 rad pos: 70.5,52.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 31087 components: - type: Transform rot: 3.141592653589793 rad pos: 69.5,52.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 31088 components: - type: Transform rot: 3.141592653589793 rad pos: 68.5,52.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 31089 components: - type: Transform rot: 3.141592653589793 rad pos: 67.5,52.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 31090 components: - type: Transform rot: 3.141592653589793 rad pos: 67.5,49.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 31091 components: - type: Transform rot: 3.141592653589793 rad pos: 68.5,49.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 31092 components: - type: Transform rot: 3.141592653589793 rad pos: 69.5,49.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 31093 components: - type: Transform rot: 3.141592653589793 rad pos: 70.5,49.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 31094 components: - type: Transform rot: 3.141592653589793 rad pos: 71.5,49.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 31095 components: - type: Transform pos: 71.5,49.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 31096 components: - type: Transform pos: 70.5,49.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 31097 components: - type: Transform pos: 69.5,49.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 31098 components: - type: Transform pos: 68.5,49.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 31099 components: - type: Transform pos: 67.5,49.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 31100 components: - type: Transform pos: 67.5,52.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 31101 components: - type: Transform pos: 68.5,52.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 31102 components: - type: Transform pos: 69.5,52.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 31103 components: - type: Transform pos: 70.5,52.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 31104 components: - type: Transform pos: 71.5,52.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 31105 components: - type: Transform pos: 68.5,55.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 31106 components: - type: Transform pos: 67.5,55.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 31107 components: - type: Transform pos: 69.5,55.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 31108 components: - type: Transform pos: 70.5,55.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 31109 components: - type: Transform pos: 71.5,55.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 31110 components: - type: Transform rot: 1.5707963267948966 rad pos: 71.5,55.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 31111 components: - type: Transform rot: 1.5707963267948966 rad pos: 71.5,52.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 31112 components: - type: Transform rot: 1.5707963267948966 rad pos: 71.5,49.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 31113 components: - type: Transform pos: 67.5,57.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 31114 components: - type: Transform pos: 68.5,57.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 31115 components: - type: Transform pos: 69.5,57.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 31116 components: - type: Transform pos: 70.5,57.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 31117 components: - type: Transform pos: 71.5,57.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 31118 components: - type: Transform rot: -1.5707963267948966 rad pos: 74.5,57.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 31119 components: - type: Transform rot: -1.5707963267948966 rad pos: 78.5,57.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 31120 components: - type: Transform rot: 1.5707963267948966 rad pos: 81.5,57.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 31121 components: - type: Transform rot: -1.5707963267948966 rad pos: 84.5,57.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 31122 components: - type: Transform rot: 1.5707963267948966 rad pos: 71.5,51.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 31123 components: - type: Transform rot: 1.5707963267948966 rad pos: 71.5,54.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 31124 components: - type: Transform rot: 1.5707963267948966 rad pos: 71.5,48.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 31125 components: - type: Transform rot: 3.141592653589793 rad pos: 71.5,46.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 31126 components: - type: Transform rot: 3.141592653589793 rad pos: 70.5,46.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 31127 components: - type: Transform rot: 3.141592653589793 rad pos: 69.5,46.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 31128 components: - type: Transform rot: 3.141592653589793 rad pos: 68.5,46.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 31129 components: - type: Transform rot: 3.141592653589793 rad pos: 67.5,46.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 31496 components: - type: Transform pos: 59.5,49.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 31497 components: - type: Transform pos: 61.5,49.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 32550 components: - type: Transform rot: -1.5707963267948966 rad pos: 108.5,16.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 32551 components: - type: Transform rot: -1.5707963267948966 rad pos: 108.5,14.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 32751 components: - type: Transform rot: -1.5707963267948966 rad pos: 108.5,36.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 32752 components: - type: Transform rot: 1.5707963267948966 rad pos: 104.5,36.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 33965 components: - type: Transform rot: -1.5707963267948966 rad pos: 39.5,56.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 33966 components: - type: Transform rot: 1.5707963267948966 rad pos: 35.5,56.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 35338 components: - type: Transform rot: 1.5707963267948966 rad pos: 18.5,12.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 35941 components: - type: Transform pos: 17.5,13.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 35942 components: - type: Transform pos: 18.5,13.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 35943 components: - type: Transform pos: 19.5,13.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 35944 components: - type: Transform pos: 16.5,13.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 35945 components: - type: Transform rot: 3.141592653589793 rad pos: 16.5,11.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 35946 components: - type: Transform rot: 3.141592653589793 rad pos: 17.5,11.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 35947 components: - type: Transform rot: 3.141592653589793 rad pos: 18.5,11.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 35948 components: - type: Transform rot: 3.141592653589793 rad pos: 19.5,11.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 35967 components: - type: Transform rot: -1.5707963267948966 rad pos: 19.5,9.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 35968 components: - type: Transform rot: 1.5707963267948966 rad pos: 20.5,9.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - uid: 36069 components: - type: Transform rot: 1.5707963267948966 rad pos: 107.5,48.5 parent: 13329 + - type: DeltaPressure + gridUid: 13329 - proto: Wirecutter entities: - uid: 32412 diff --git a/Resources/Maps/marathon.yml b/Resources/Maps/marathon.yml index fb11cf4f70..42df78c970 100644 --- a/Resources/Maps/marathon.yml +++ b/Resources/Maps/marathon.yml @@ -1,11 +1,11 @@ meta: format: 7 category: Map - engineVersion: 266.0.0 + engineVersion: 267.2.0 forkId: "" forkVersion: "" - time: 08/29/2025 15:07:57 - entityCount: 23830 + time: 10/04/2025 14:51:31 + entityCount: 23828 maps: - 5350 grids: @@ -7592,108 +7592,31 @@ entities: - volume: 2500 temperature: 293.15 moles: - - 21.824879 - - 82.10312 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 21.824879 + Nitrogen: 82.10312 - volume: 2500 temperature: 235 moles: - - 27.225372 - - 102.419266 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 27.225372 + Nitrogen: 102.419266 - volume: 2500 immutable: True - moles: - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + moles: {} + - volume: 2500 + temperature: 293.15 + moles: {} - volume: 2500 temperature: 293.15 moles: - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Plasma: 6666.982 - volume: 2500 temperature: 293.15 moles: - - 0 - - 0 - - 0 - - 6666.982 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Nitrogen: 6666.982 - volume: 2500 temperature: 293.15 moles: - - 0 - - 6666.982 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - volume: 2500 - temperature: 293.15 - moles: - - 6666.982 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 6666.982 chunkSize: 4 - type: BecomesStation id: Marathon @@ -11880,7 +11803,7 @@ entities: pos: 34.5,45.5 parent: 30 - type: Door - secondsUntilStateChange: -25488.797 + secondsUntilStateChange: -25686.977 state: Opening - type: DeviceLinkSource lastSignals: @@ -54307,18 +54230,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - uid: 21712 components: - type: Transform @@ -54330,18 +54243,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - proto: ClosetChef entities: - uid: 19558 @@ -54355,18 +54258,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - proto: ClosetChefFilled entities: - uid: 2228 @@ -54380,18 +54273,8 @@ entities: immutable: False temperature: 293.14673 moles: - - 1.7459903 - - 6.568249 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 1.7459903 + Nitrogen: 6.568249 - type: ContainerContainer containers: entity_storage: !type:Container @@ -54439,18 +54322,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - uid: 1276 components: - type: Transform @@ -54462,18 +54335,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - uid: 1346 components: - type: Transform @@ -54485,18 +54348,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - uid: 1347 components: - type: Transform @@ -54508,18 +54361,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - uid: 5662 components: - type: Transform @@ -54531,18 +54374,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - uid: 5727 components: - type: Transform @@ -54554,18 +54387,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - uid: 6032 components: - type: Transform @@ -54582,18 +54405,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - uid: 7271 components: - type: Transform @@ -54615,18 +54428,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - uid: 12817 components: - type: Transform @@ -54648,18 +54451,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - uid: 15827 components: - type: Transform @@ -54671,18 +54464,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - uid: 15970 components: - type: Transform @@ -54694,18 +54477,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - uid: 16114 components: - type: Transform @@ -54717,18 +54490,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - uid: 16171 components: - type: Transform @@ -54740,18 +54503,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - uid: 16814 components: - type: Transform @@ -54763,18 +54516,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - uid: 17340 components: - type: Transform @@ -54786,18 +54529,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - uid: 17490 components: - type: Transform @@ -54809,18 +54542,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - uid: 18176 components: - type: Transform @@ -54832,18 +54555,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - uid: 19242 components: - type: Transform @@ -54865,18 +54578,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - uid: 21046 components: - type: Transform @@ -54888,18 +54591,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - uid: 21089 components: - type: Transform @@ -54911,18 +54604,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - uid: 22508 components: - type: Transform @@ -54934,18 +54617,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - uid: 23219 components: - type: Transform @@ -54971,18 +54644,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - uid: 1348 components: - type: Transform @@ -54994,18 +54657,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - uid: 6366 components: - type: Transform @@ -55017,18 +54670,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - uid: 8336 components: - type: Transform @@ -55040,18 +54683,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - uid: 9067 components: - type: Transform @@ -55068,18 +54701,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - uid: 9243 components: - type: Transform @@ -55091,18 +54714,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - uid: 10562 components: - type: Transform @@ -55129,18 +54742,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - uid: 13340 components: - type: Transform @@ -55152,18 +54755,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - uid: 14329 components: - type: Transform @@ -55180,18 +54773,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - uid: 16815 components: - type: Transform @@ -55203,18 +54786,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - uid: 18856 components: - type: Transform @@ -55231,18 +54804,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - proto: ClosetJanitorFilled entities: - uid: 539 @@ -55256,18 +54819,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - proto: ClosetL3JanitorFilled entities: - uid: 538 @@ -55281,18 +54834,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - proto: ClosetL3ScienceFilled entities: - uid: 13356 @@ -55306,18 +54849,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - proto: ClosetL3SecurityFilled entities: - uid: 2041 @@ -55336,18 +54869,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - proto: ClosetLegalFilled entities: - uid: 16938 @@ -55361,18 +54884,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - uid: 21523 components: - type: Transform @@ -55384,18 +54897,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - proto: ClosetMaintenanceFilledRandom entities: - uid: 729 @@ -55409,18 +54912,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - uid: 7008 components: - type: Transform @@ -55437,18 +54930,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - uid: 10161 components: - type: Transform @@ -55465,18 +54948,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - uid: 16820 components: - type: Transform @@ -55488,18 +54961,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - uid: 16928 components: - type: Transform @@ -55511,18 +54974,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - uid: 20494 components: - type: Transform @@ -55534,18 +54987,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - uid: 23216 components: - type: Transform @@ -55584,18 +55027,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - uid: 13346 components: - type: Transform @@ -55607,18 +55040,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - uid: 14333 components: - type: Transform @@ -55637,18 +55060,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - type: ContainerContainer containers: entity_storage: !type:Container @@ -55671,18 +55084,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - proto: ClosetToolFilled entities: - uid: 13446 @@ -55696,18 +55099,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - uid: 15157 components: - type: Transform @@ -55719,18 +55112,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - proto: ClothingBackpack entities: - uid: 16077 @@ -56744,13 +56127,6 @@ entities: - type: Transform pos: -17.507723,23.466288 parent: 30 -- proto: ClothingUniformJumpskirtColorBlack - entities: - - uid: 6455 - components: - - type: Transform - pos: 21.564045,44.633358 - parent: 30 - proto: ClothingUniformJumpskirtDetective entities: - uid: 15123 @@ -56779,13 +56155,6 @@ entities: - type: Transform pos: 38.459328,30.474371 parent: 30 -- proto: ClothingUniformJumpsuitColorBlack - entities: - - uid: 6454 - components: - - type: Transform - pos: 21.51717,44.539608 - parent: 30 - proto: ClothingUniformJumpsuitCossack entities: - uid: 13662 @@ -58032,18 +57401,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - proto: CrateCoffin entities: - uid: 20530 @@ -58122,18 +57481,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - uid: 7840 components: - type: Transform @@ -58160,18 +57509,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - uid: 22442 components: - type: Transform @@ -58183,18 +57522,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - proto: CrateEngineeringCableHV entities: - uid: 10211 @@ -58215,18 +57544,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - proto: CrateFilledSpawner entities: - uid: 3505 @@ -58309,18 +57628,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - proto: CrateLockBoxEngineering entities: - uid: 21679 @@ -58426,18 +57735,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - uid: 16170 components: - type: Transform @@ -58449,18 +57748,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - proto: CrateStoneGrave entities: - uid: 20625 @@ -58554,18 +57843,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - proto: CrewMonitoringServer entities: - uid: 7439 @@ -105184,11 +104463,15 @@ entities: - type: Transform pos: -10.5,-18.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 10024 components: - type: Transform pos: -7.5,-18.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - proto: InflatableWallStack entities: - uid: 9248 @@ -107359,18 +106642,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - uid: 9080 components: - type: Transform @@ -107382,18 +106655,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - uid: 9081 components: - type: Transform @@ -107405,18 +106668,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - proto: LockerBoozeFilled entities: - uid: 453 @@ -107430,18 +106683,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - uid: 13719 components: - type: Transform @@ -107453,18 +106696,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - uid: 20650 components: - type: Transform @@ -107483,18 +106716,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - uid: 420 components: - type: Transform @@ -107506,18 +106729,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - uid: 421 components: - type: Transform @@ -107529,18 +106742,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - proto: LockerCaptainFilledNoLaser entities: - uid: 12238 @@ -107561,18 +106764,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - proto: LockerChiefEngineerFilled entities: - uid: 11058 @@ -107600,18 +106793,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - proto: LockerElectricalSuppliesFilled entities: - uid: 11061 @@ -107630,18 +106813,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - proto: LockerEngineer entities: - uid: 19420 @@ -107706,18 +106879,8 @@ entities: immutable: False temperature: 234.99968 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - uid: 477 components: - type: Transform @@ -107729,18 +106892,8 @@ entities: immutable: False temperature: 234.99968 moles: - - 2.0214376 - - 7.6044564 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 2.0214376 + Nitrogen: 7.6044564 - type: ContainerContainer containers: entity_storage: !type:Container @@ -107765,18 +106918,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - type: ContainerContainer containers: entity_storage: !type:Container @@ -107803,18 +106946,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - type: ContainerContainer containers: entity_storage: !type:Container @@ -107842,18 +106975,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - uid: 19537 components: - type: Transform @@ -107865,18 +106988,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - uid: 19669 components: - type: Transform @@ -107888,18 +107001,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - proto: LockerFreezerVaultFilled entities: - uid: 5608 @@ -107920,18 +107023,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - proto: LockerHeadOfSecurityFilled entities: - uid: 2126 @@ -107945,18 +107038,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - proto: LockerMedicalFilled entities: - uid: 4805 @@ -108087,18 +107170,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 2.0214376 - - 7.6044564 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 2.0214376 + Nitrogen: 7.6044564 - type: ContainerContainer containers: entity_storage: !type:Container @@ -108123,18 +107196,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - proto: LockerSalvageSpecialistFilledHardsuit entities: - uid: 7253 @@ -108165,18 +107228,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - uid: 21702 components: - type: Transform @@ -108188,18 +107241,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - uid: 21703 components: - type: Transform @@ -108211,18 +107254,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - proto: LockerSecurity entities: - uid: 6567 @@ -108236,18 +107269,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - uid: 6752 components: - type: Transform @@ -108259,18 +107282,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - uid: 11245 components: - type: Transform @@ -108282,18 +107295,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - proto: LockerSecurityFilled entities: - uid: 1072 @@ -108307,18 +107310,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - uid: 1854 components: - type: Transform @@ -108340,18 +107333,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - uid: 2080 components: - type: Transform @@ -108363,18 +107346,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - uid: 2081 components: - type: Transform @@ -108386,18 +107359,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - uid: 2082 components: - type: Transform @@ -108409,18 +107372,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - uid: 22430 components: - type: Transform @@ -108451,18 +107404,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - uid: 9725 components: - type: Transform @@ -108484,18 +107427,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - proto: MachineAnomalyGenerator entities: - uid: 22436 @@ -109115,18 +108048,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - uid: 6906 components: - type: Transform @@ -109139,18 +108062,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - uid: 6907 components: - type: Transform @@ -109163,18 +108076,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - uid: 6913 components: - type: Transform @@ -109187,18 +108090,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.3955739 - - 12.773826 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.3955739 + Nitrogen: 12.773826 - uid: 6914 components: - type: Transform @@ -109211,18 +108104,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.3955739 - - 12.773826 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.3955739 + Nitrogen: 12.773826 - uid: 6915 components: - type: Transform @@ -109235,18 +108118,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.3955739 - - 12.773826 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.3955739 + Nitrogen: 12.773826 - uid: 6916 components: - type: Transform @@ -109259,18 +108132,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.3955739 - - 12.773826 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.3955739 + Nitrogen: 12.773826 - uid: 8832 components: - type: Transform @@ -109289,18 +108152,8 @@ entities: immutable: False temperature: 293.14954 moles: - - 3.1239278 - - 11.75192 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.1239278 + Nitrogen: 11.75192 - uid: 21242 components: - type: Transform @@ -109313,18 +108166,8 @@ entities: immutable: False temperature: 293.14954 moles: - - 3.1239278 - - 11.75192 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.1239278 + Nitrogen: 11.75192 - uid: 21244 components: - type: Transform @@ -109337,18 +108180,8 @@ entities: immutable: False temperature: 293.14954 moles: - - 3.1239278 - - 11.75192 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.1239278 + Nitrogen: 11.75192 - uid: 21245 components: - type: Transform @@ -109361,18 +108194,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - proto: Multitool entities: - uid: 545 @@ -110499,46 +109322,62 @@ entities: rot: 3.141592653589793 rad pos: -40.5,53.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 2091 components: - type: Transform pos: -40.5,54.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 2532 components: - type: Transform pos: -39.5,54.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 2592 components: - type: Transform rot: 1.5707963267948966 rad pos: -39.5,54.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 4595 components: - type: Transform rot: 1.5707963267948966 rad pos: -39.5,53.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 4600 components: - type: Transform rot: 3.141592653589793 rad pos: -39.5,53.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 4781 components: - type: Transform rot: -1.5707963267948966 rad pos: -40.5,54.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 21013 components: - type: Transform rot: -1.5707963267948966 rad pos: -40.5,53.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - proto: PlasmaTank entities: - uid: 23385 @@ -110558,23 +109397,31 @@ entities: - type: Transform pos: -39.5,53.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1986 components: - type: Transform pos: -40.5,53.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 2407 components: - type: Transform rot: 3.141592653589793 rad pos: -39.5,54.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 4788 components: - type: Transform rot: 3.141592653589793 rad pos: -40.5,54.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - proto: PlasticFlapsAirtightClear entities: - uid: 11228 @@ -117167,6 +116014,13 @@ entities: - type: Transform pos: -43.5,-1.5 parent: 30 +- proto: RandomVendingClothing + entities: + - uid: 6454 + components: + - type: Transform + pos: 20.5,44.5 + parent: 30 - proto: RandomVendingDrinks entities: - uid: 746 @@ -117312,176 +116166,246 @@ entities: - type: Transform pos: 2.5,-57.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 4454 components: - type: Transform pos: 0.5,-58.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 5792 components: - type: Transform pos: 1.5,-57.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 8682 components: - type: Transform pos: 24.5,-34.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 8683 components: - type: Transform pos: 24.5,-32.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 8684 components: - type: Transform pos: 24.5,-30.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 8685 components: - type: Transform pos: 24.5,-28.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 8686 components: - type: Transform pos: 24.5,-26.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 8687 components: - type: Transform pos: 24.5,-24.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 8688 components: - type: Transform pos: 24.5,-22.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 12898 components: - type: Transform pos: 38.5,11.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 12900 components: - type: Transform pos: 37.5,11.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 12901 components: - type: Transform pos: 35.5,11.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 12920 components: - type: Transform pos: 36.5,11.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 12928 components: - type: Transform pos: 38.5,14.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 12931 components: - type: Transform pos: 35.5,14.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 15073 components: - type: Transform pos: 12.5,-38.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 15180 components: - type: Transform pos: 12.5,-42.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 15188 components: - type: Transform pos: 10.5,-40.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 15190 components: - type: Transform pos: 13.5,-38.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 16404 components: - type: Transform pos: -40.5,50.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17012 components: - type: Transform pos: -60.5,56.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17013 components: - type: Transform pos: -61.5,57.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17014 components: - type: Transform pos: -60.5,58.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17015 components: - type: Transform pos: -59.5,57.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 18190 components: - type: Transform pos: -39.5,50.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 20467 components: - type: Transform pos: 11.5,-38.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 20538 components: - type: Transform pos: 3.5,-57.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 20539 components: - type: Transform pos: 1.5,-61.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 20569 components: - type: Transform pos: 4.5,-58.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 20591 components: - type: Transform pos: 3.5,-61.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 20613 components: - type: Transform pos: 2.5,-61.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 20644 components: - type: Transform pos: 0.5,-60.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 20651 components: - type: Transform pos: 0.5,-59.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 20652 components: - type: Transform pos: 4.5,-60.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - proto: ReinforcedWindow entities: - uid: 66 @@ -117489,3566 +116413,4992 @@ entities: - type: Transform pos: -17.5,4.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 67 components: - type: Transform pos: -16.5,4.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 68 components: - type: Transform pos: -15.5,4.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 69 components: - type: Transform pos: -13.5,4.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 70 components: - type: Transform pos: -14.5,4.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 71 components: - type: Transform pos: -11.5,5.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 72 components: - type: Transform pos: -19.5,8.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 73 components: - type: Transform pos: -21.5,8.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 152 components: - type: Transform pos: 44.5,50.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 301 components: - type: Transform pos: 0.5,24.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 302 components: - type: Transform pos: -1.5,24.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 303 components: - type: Transform pos: -3.5,24.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 304 components: - type: Transform pos: 3.5,24.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 305 components: - type: Transform pos: 5.5,24.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 319 components: - type: Transform pos: -22.5,5.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 327 components: - type: Transform pos: -22.5,7.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 379 components: - type: Transform pos: -56.5,5.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 445 components: - type: Transform pos: 44.5,49.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 479 components: - type: Transform pos: -64.5,12.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 843 components: - type: Transform pos: -46.5,-1.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 872 components: - type: Transform pos: -54.5,5.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 876 components: - type: Transform pos: -60.5,8.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 897 components: - type: Transform pos: -60.5,7.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 902 components: - type: Transform pos: -48.5,4.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 903 components: - type: Transform pos: -46.5,-5.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 911 components: - type: Transform pos: -58.5,9.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 912 components: - type: Transform pos: -58.5,10.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 913 components: - type: Transform pos: -46.5,-2.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 920 components: - type: Transform pos: -46.5,3.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 930 components: - type: Transform pos: -46.5,-4.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 932 components: - type: Transform pos: -59.5,9.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 949 components: - type: Transform pos: -46.5,2.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 952 components: - type: Transform pos: -46.5,-6.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 965 components: - type: Transform pos: -46.5,1.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1051 components: - type: Transform pos: -41.5,12.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1053 components: - type: Transform pos: -37.5,11.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1054 components: - type: Transform pos: -39.5,8.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1058 components: - type: Transform pos: -39.5,12.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1060 components: - type: Transform pos: -37.5,9.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1061 components: - type: Transform pos: -41.5,8.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1078 components: - type: Transform pos: -56.5,-7.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1080 components: - type: Transform pos: -50.5,-7.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1082 components: - type: Transform pos: -57.5,-10.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1111 components: - type: Transform pos: -58.5,16.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1112 components: - type: Transform pos: -58.5,17.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1113 components: - type: Transform pos: -58.5,18.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1114 components: - type: Transform pos: -58.5,19.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1116 components: - type: Transform pos: -59.5,20.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1117 components: - type: Transform pos: -60.5,20.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1118 components: - type: Transform pos: -61.5,20.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1119 components: - type: Transform pos: -62.5,20.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1120 components: - type: Transform pos: -59.5,16.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1121 components: - type: Transform pos: -61.5,16.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1122 components: - type: Transform pos: -62.5,16.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1123 components: - type: Transform pos: -58.5,12.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1124 components: - type: Transform pos: -59.5,12.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1125 components: - type: Transform pos: -60.5,12.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1126 components: - type: Transform pos: -61.5,12.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1127 components: - type: Transform pos: -62.5,12.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1128 components: - type: Transform pos: -58.5,14.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1129 components: - type: Transform pos: -59.5,14.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1130 components: - type: Transform pos: -61.5,14.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1131 components: - type: Transform pos: -62.5,14.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1132 components: - type: Transform pos: -58.5,24.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1133 components: - type: Transform pos: -59.5,24.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1134 components: - type: Transform pos: -61.5,24.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1135 components: - type: Transform pos: -62.5,24.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1136 components: - type: Transform pos: -62.5,22.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1137 components: - type: Transform pos: -61.5,22.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1138 components: - type: Transform pos: -59.5,22.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1139 components: - type: Transform pos: -58.5,22.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1145 components: - type: Transform pos: -64.5,14.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1148 components: - type: Transform pos: -64.5,22.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1206 components: - type: Transform pos: -58.5,20.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1291 components: - type: Transform pos: -60.5,5.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1305 components: - type: Transform pos: -54.5,-7.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1322 components: - type: Transform pos: -63.5,20.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1326 components: - type: Transform pos: -47.5,-13.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1327 components: - type: Transform pos: -47.5,-15.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1329 components: - type: Transform pos: -47.5,-11.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1374 components: - type: Transform pos: -40.5,32.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1375 components: - type: Transform pos: -40.5,31.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1377 components: - type: Transform pos: -40.5,30.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1430 components: - type: Transform pos: -42.5,34.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1489 components: - type: Transform pos: -52.5,34.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1491 components: - type: Transform pos: -50.5,34.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1492 components: - type: Transform pos: -48.5,34.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1549 components: - type: Transform pos: -57.5,34.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1550 components: - type: Transform pos: -56.5,34.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1551 components: - type: Transform pos: -55.5,34.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1553 components: - type: Transform pos: -59.5,28.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1554 components: - type: Transform pos: -60.5,28.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1555 components: - type: Transform pos: -61.5,28.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1559 components: - type: Transform pos: 12.5,36.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1565 components: - type: Transform pos: 11.5,37.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1667 components: - type: Transform pos: -40.5,38.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1668 components: - type: Transform pos: -43.5,38.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1669 components: - type: Transform pos: -42.5,38.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1670 components: - type: Transform pos: -44.5,38.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1671 components: - type: Transform pos: -39.5,38.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1672 components: - type: Transform pos: -38.5,38.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1693 components: - type: Transform pos: -35.5,38.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1694 components: - type: Transform pos: -35.5,41.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1729 components: - type: Transform pos: -29.5,42.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1730 components: - type: Transform pos: -29.5,44.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1758 components: - type: Transform pos: -46.5,-0.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1772 components: - type: Transform pos: 3.5,38.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1776 components: - type: Transform pos: -31.5,45.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1777 components: - type: Transform pos: -33.5,45.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1790 components: - type: Transform pos: -27.5,48.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1791 components: - type: Transform pos: -27.5,52.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1808 components: - type: Transform pos: -20.5,48.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1809 components: - type: Transform pos: -20.5,50.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1810 components: - type: Transform pos: -20.5,49.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1814 components: - type: Transform pos: -20.5,52.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1815 components: - type: Transform pos: -20.5,51.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1834 components: - type: Transform pos: -38.5,45.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1835 components: - type: Transform pos: -36.5,46.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1836 components: - type: Transform pos: -36.5,48.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1837 components: - type: Transform pos: -40.5,45.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1838 components: - type: Transform pos: -41.5,45.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1840 components: - type: Transform pos: -43.5,45.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1841 components: - type: Transform pos: -44.5,45.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1842 components: - type: Transform pos: -45.5,46.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1843 components: - type: Transform pos: -45.5,48.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1879 components: - type: Transform pos: -34.5,55.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1922 components: - type: Transform pos: -26.5,59.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1925 components: - type: Transform pos: -26.5,58.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1928 components: - type: Transform pos: -63.5,24.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1931 components: - type: Transform pos: -63.5,16.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1941 components: - type: Transform pos: 6.5,37.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1954 components: - type: Transform pos: 6.5,36.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1964 components: - type: Transform pos: 35.5,36.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1967 components: - type: Transform pos: 36.5,36.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 2044 components: - type: Transform pos: -28.5,61.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 2045 components: - type: Transform pos: -29.5,61.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 2046 components: - type: Transform pos: -30.5,61.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 2049 components: - type: Transform pos: -34.5,61.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 2050 components: - type: Transform pos: -33.5,61.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 2051 components: - type: Transform pos: -32.5,61.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 2066 components: - type: Transform pos: -36.5,58.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 2201 components: - type: Transform pos: -49.5,47.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 2267 components: - type: Transform pos: -47.5,70.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 2269 components: - type: Transform pos: -45.5,70.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 2314 components: - type: Transform pos: -55.5,-10.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 2344 components: - type: Transform pos: -45.5,42.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 2588 components: - type: Transform pos: -26.5,57.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 2724 components: - type: Transform pos: -45.5,44.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 3168 components: - type: Transform pos: -63.5,12.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 3186 components: - type: Transform pos: -48.5,-10.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 3199 components: - type: Transform pos: -47.5,4.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 3513 components: - type: Transform pos: -50.5,4.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 3514 components: - type: Transform pos: -49.5,4.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 4406 components: - type: Transform pos: -6.5,-49.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 4410 components: - type: Transform pos: -34.5,-24.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 4491 components: - type: Transform pos: -49.5,70.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 4695 components: - type: Transform pos: -47.5,45.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 4824 components: - type: Transform pos: 41.5,22.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 4847 components: - type: Transform pos: -11.5,28.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 4848 components: - type: Transform pos: -10.5,28.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 4849 components: - type: Transform pos: -9.5,28.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 4850 components: - type: Transform pos: -8.5,28.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 4851 components: - type: Transform pos: -7.5,28.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 5071 components: - type: Transform pos: -18.5,45.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 5072 components: - type: Transform pos: -19.5,45.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 5073 components: - type: Transform pos: -20.5,45.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 5080 components: - type: Transform pos: -21.5,45.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 5248 components: - type: Transform pos: 2.5,-21.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 5250 components: - type: Transform pos: -56.5,-10.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 5277 components: - type: Transform pos: -6.5,30.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 5283 components: - type: Transform pos: -6.5,37.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 5295 components: - type: Transform pos: -11.5,37.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 5303 components: - type: Transform pos: -7.5,37.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 5304 components: - type: Transform pos: -12.5,37.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 5307 components: - type: Transform pos: -8.5,38.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 5308 components: - type: Transform pos: -11.5,38.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 5310 components: - type: Transform pos: -10.5,38.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 5312 components: - type: Transform pos: -7.5,38.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 5326 components: - type: Transform pos: -12.5,30.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 5372 components: - type: Transform pos: 3.5,30.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 5373 components: - type: Transform pos: 0.5,30.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 5375 components: - type: Transform pos: 0.5,28.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 5376 components: - type: Transform pos: 1.5,28.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 5377 components: - type: Transform pos: 2.5,28.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 5378 components: - type: Transform pos: 3.5,28.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 5395 components: - type: Transform pos: 0.5,38.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 5423 components: - type: Transform pos: 12.5,29.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 5424 components: - type: Transform pos: 12.5,30.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 5425 components: - type: Transform pos: 12.5,33.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 5426 components: - type: Transform pos: 12.5,34.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 5430 components: - type: Transform pos: -57.5,-7.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 5433 components: - type: Transform pos: -49.5,-7.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 5434 components: - type: Transform pos: -55.5,-7.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 5436 components: - type: Transform pos: -61.5,-9.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 5437 components: - type: Transform pos: -61.5,-8.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 5438 components: - type: Transform pos: 13.5,39.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 5439 components: - type: Transform pos: 3.5,39.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 5440 components: - type: Transform pos: 12.5,37.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 5442 components: - type: Transform pos: 5.5,37.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 5466 components: - type: Transform pos: 11.5,46.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 5476 components: - type: Transform pos: 9.5,46.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 5488 components: - type: Transform pos: 7.5,37.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 5491 components: - type: Transform pos: -54.5,-10.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 5758 components: - type: Transform pos: -15.5,43.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 5759 components: - type: Transform pos: -14.5,44.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 5760 components: - type: Transform pos: -13.5,46.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 5761 components: - type: Transform pos: -13.5,47.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 5762 components: - type: Transform pos: -12.5,47.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 5763 components: - type: Transform pos: -10.5,47.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 5764 components: - type: Transform pos: -9.5,47.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 5765 components: - type: Transform pos: -8.5,47.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 5766 components: - type: Transform pos: -6.5,47.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 5767 components: - type: Transform pos: -5.5,47.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 5768 components: - type: Transform pos: -5.5,46.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 5769 components: - type: Transform pos: -4.5,44.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 5770 components: - type: Transform pos: -3.5,43.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 5853 components: - type: Transform pos: -36.5,60.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 6290 components: - type: Transform pos: 13.5,28.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 6291 components: - type: Transform pos: 14.5,28.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 6306 components: - type: Transform pos: 15.5,33.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 6307 components: - type: Transform pos: 15.5,34.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 6308 components: - type: Transform pos: 15.5,36.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 6309 components: - type: Transform pos: 15.5,37.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 6310 components: - type: Transform pos: 15.5,39.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 6311 components: - type: Transform pos: 15.5,40.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 6360 components: - type: Transform pos: 24.5,43.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 6363 components: - type: Transform pos: 26.5,43.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 6523 components: - type: Transform pos: 17.5,24.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 6525 components: - type: Transform pos: 19.5,24.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 6553 components: - type: Transform pos: 11.5,21.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 6554 components: - type: Transform pos: 11.5,22.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 6555 components: - type: Transform pos: 12.5,19.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 6556 components: - type: Transform pos: 14.5,19.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 6557 components: - type: Transform pos: 15.5,20.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 6558 components: - type: Transform pos: 15.5,22.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 6577 components: - type: Transform pos: 11.5,18.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 6578 components: - type: Transform pos: 11.5,14.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 6627 components: - type: Transform pos: -32.5,-24.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 6641 components: - type: Transform pos: -10.5,-6.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 6643 components: - type: Transform pos: -9.5,-5.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 6644 components: - type: Transform pos: -5.5,-5.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 6645 components: - type: Transform pos: -7.5,-5.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 6741 components: - type: Transform pos: -17.5,-3.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 6742 components: - type: Transform pos: -19.5,-3.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 6743 components: - type: Transform pos: -15.5,-2.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 6744 components: - type: Transform pos: -15.5,-1.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 6745 components: - type: Transform pos: -15.5,-0.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 6774 components: - type: Transform pos: -14.5,-7.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 6775 components: - type: Transform pos: -15.5,-7.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 6776 components: - type: Transform pos: -13.5,-6.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 6809 components: - type: Transform pos: -16.5,-11.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 6810 components: - type: Transform pos: -26.5,-11.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 6887 components: - type: Transform pos: -28.5,0.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 6972 components: - type: Transform pos: -12.5,-17.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 6981 components: - type: Transform pos: -33.5,-27.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 6987 components: - type: Transform pos: -32.5,-27.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 7018 components: - type: Transform pos: -14.5,-17.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 7210 components: - type: Transform pos: -34.5,-27.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 7240 components: - type: Transform pos: -14.5,-3.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 7380 components: - type: Transform pos: -31.5,-18.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 7381 components: - type: Transform pos: -31.5,-16.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 7420 components: - type: Transform pos: -22.5,-13.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 7421 components: - type: Transform pos: -20.5,-13.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 7450 components: - type: Transform pos: -63.5,42.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 7529 components: - type: Transform pos: -30.5,-14.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 7537 components: - type: Transform pos: -28.5,-14.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 7822 components: - type: Transform pos: -30.5,-8.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 7828 components: - type: Transform pos: -33.5,-24.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 7889 components: - type: Transform pos: -14.5,-13.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 7912 components: - type: Transform pos: 15.5,12.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 7996 components: - type: Transform pos: -12.5,-13.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 8044 components: - type: Transform pos: -24.5,-19.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 8048 components: - type: Transform pos: -26.5,-19.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 8062 components: - type: Transform pos: -25.5,-19.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 8064 components: - type: Transform pos: -28.5,-8.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 8193 components: - type: Transform pos: 38.5,16.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 8273 components: - type: Transform pos: -48.5,-7.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 8314 components: - type: Transform pos: -65.5,42.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 8377 components: - type: Transform pos: -0.5,-24.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 8378 components: - type: Transform pos: 4.5,-23.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 8381 components: - type: Transform pos: -0.5,-23.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 8382 components: - type: Transform pos: 4.5,-24.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 8385 components: - type: Transform pos: 4.5,-25.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 8390 components: - type: Transform pos: 0.5,-21.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 8391 components: - type: Transform pos: -0.5,-22.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 8395 components: - type: Transform pos: -0.5,-25.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 8398 components: - type: Transform pos: 3.5,-26.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 8401 components: - type: Transform pos: 2.5,-26.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 8409 components: - type: Transform pos: 15.5,-16.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 8410 components: - type: Transform pos: 15.5,-14.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 8411 components: - type: Transform pos: 16.5,-12.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 8420 components: - type: Transform pos: 17.5,-16.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 8421 components: - type: Transform pos: 17.5,-14.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 8436 components: - type: Transform pos: 5.5,-22.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 8437 components: - type: Transform pos: 7.5,-22.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 8457 components: - type: Transform pos: 15.5,-0.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 8462 components: - type: Transform pos: 18.5,-7.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 8463 components: - type: Transform pos: 18.5,-5.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 8488 components: - type: Transform pos: 22.5,1.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 8491 components: - type: Transform pos: 19.5,-0.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 8492 components: - type: Transform pos: 21.5,-0.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 8516 components: - type: Transform pos: 5.5,-30.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 8517 components: - type: Transform pos: 7.5,-30.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 8545 components: - type: Transform pos: 18.5,-37.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 8546 components: - type: Transform pos: 22.5,-36.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 8548 components: - type: Transform pos: 20.5,-37.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 8549 components: - type: Transform pos: 22.5,-37.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 8550 components: - type: Transform pos: 21.5,-37.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 8551 components: - type: Transform pos: 22.5,-35.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 8552 components: - type: Transform pos: 22.5,-34.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 8553 components: - type: Transform pos: 22.5,-33.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 8554 components: - type: Transform pos: 22.5,-32.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 8555 components: - type: Transform pos: 22.5,-31.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 8556 components: - type: Transform pos: 22.5,-30.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 8557 components: - type: Transform pos: 22.5,-29.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 8558 components: - type: Transform pos: 22.5,-28.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 8559 components: - type: Transform pos: 22.5,-27.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 8560 components: - type: Transform pos: 22.5,-26.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 8561 components: - type: Transform pos: 22.5,-25.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 8562 components: - type: Transform pos: 22.5,-24.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 8563 components: - type: Transform pos: 22.5,-23.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 8564 components: - type: Transform pos: 22.5,-22.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 8565 components: - type: Transform pos: 22.5,-21.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 8567 components: - type: Transform pos: 8.5,-36.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 8601 components: - type: Transform pos: 5.5,-37.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 8605 components: - type: Transform pos: 1.5,-26.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 8829 components: - type: Transform pos: -63.5,22.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 8838 components: - type: Transform pos: -27.5,-21.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 8933 components: - type: Transform pos: 15.5,-35.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 8980 components: - type: Transform pos: 14.5,-35.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 8982 components: - type: Transform pos: 7.5,-37.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 8996 components: - type: Transform pos: 17.5,-37.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 9004 components: - type: Transform pos: -3.5,-55.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 9005 components: - type: Transform pos: -4.5,-55.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 9012 components: - type: Transform pos: 6.5,-37.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 9042 components: - type: Transform pos: -55.5,5.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 9043 components: - type: Transform pos: -50.5,-10.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 9092 components: - type: Transform pos: 23.5,-14.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 9104 components: - type: Transform pos: 5.5,-49.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 9120 components: - type: Transform pos: -64.5,42.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 9156 components: - type: Transform pos: -1.5,-31.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 9158 components: - type: Transform pos: -3.5,-31.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 9234 components: - type: Transform pos: 1.5,-55.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 9277 components: - type: Transform pos: -1.5,-36.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 9279 components: - type: Transform pos: -3.5,-36.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 9280 components: - type: Transform pos: -0.5,-34.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 9281 components: - type: Transform pos: -0.5,-32.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 9289 components: - type: Transform pos: 3.5,-55.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 9316 components: - type: Transform pos: 13.5,-35.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 9320 components: - type: Transform pos: 16.5,-36.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 9321 components: - type: Transform pos: -6.5,-37.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 9322 components: - type: Transform pos: -8.5,-37.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 9361 components: - type: Transform pos: -49.5,-10.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 9495 components: - type: Transform pos: -16.5,-45.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 9513 components: - type: Transform pos: 5.5,-51.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 9577 components: - type: Transform pos: -6.5,-51.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 9597 components: - type: Transform pos: -37.5,-36.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 9598 components: - type: Transform pos: -38.5,-36.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 9664 components: - type: Transform pos: 4.5,37.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 9681 components: - type: Transform pos: -0.5,-55.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 9691 components: - type: Transform pos: 5.5,-50.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 9702 components: - type: Transform pos: -18.5,-45.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 9706 components: - type: Transform pos: 13.5,37.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 9718 components: - type: Transform pos: 13.5,38.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 9723 components: - type: Transform pos: -63.5,14.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 9801 components: - type: Transform pos: -57.5,5.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 9815 components: - type: Transform pos: -1.5,-42.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 9820 components: - type: Transform pos: 2.5,-42.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 9848 components: - type: Transform pos: -27.5,-17.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 9857 components: - type: Transform pos: -32.5,-5.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 9858 components: - type: Transform pos: -32.5,-7.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 9966 components: - type: Transform pos: -2.5,-55.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 10044 components: - type: Transform pos: 2.5,-55.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 10053 components: - type: Transform pos: -15.5,-57.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 10054 components: - type: Transform pos: -17.5,-57.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 10058 components: - type: Transform pos: -16.5,-57.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 10059 components: - type: Transform pos: -19.5,-57.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 10088 components: - type: Transform pos: -14.5,-57.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 10089 components: - type: Transform pos: 0.5,-26.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 10094 components: - type: Transform pos: -18.5,-57.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 10098 components: - type: Transform pos: 4.5,-40.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 10099 components: - type: Transform pos: 4.5,-38.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 10124 components: - type: Transform pos: -14.5,-31.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 10139 components: - type: Transform pos: -20.5,-57.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 10150 components: - type: Transform pos: -49.5,49.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 10152 components: - type: Transform pos: -14.5,-39.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 10185 components: - type: Transform pos: -14.5,-28.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 10395 components: - type: Transform pos: 23.5,-16.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 10558 components: - type: Transform pos: 10.5,-35.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 10559 components: - type: Transform pos: 12.5,-35.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 10623 components: - type: Transform pos: -14.5,-29.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 10654 components: - type: Transform pos: -35.5,-25.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 10656 components: - type: Transform pos: 16.5,-19.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 10743 components: - type: Transform pos: 3.5,-21.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 11073 components: - type: Transform pos: -9.5,-45.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 11076 components: - type: Transform pos: -16.5,-49.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 11091 components: - type: Transform pos: -9.5,-43.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 11106 components: - type: Transform pos: -12.5,-32.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 11125 components: - type: Transform pos: -18.5,-49.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 11139 components: - type: Transform pos: -7.5,-42.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 11140 components: - type: Transform pos: -5.5,-42.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 11164 components: - type: Transform pos: 16.5,-17.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 11270 components: - type: Transform pos: -11.5,-32.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 11288 components: - type: Transform pos: -6.5,-50.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 11308 components: - type: Transform pos: -14.5,-44.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 11438 components: - type: Transform pos: -64.5,16.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 11448 components: - type: Transform pos: -53.5,37.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 11450 components: - type: Transform pos: -53.5,35.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 11602 components: - type: Transform pos: 24.5,-0.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 11603 components: - type: Transform pos: 25.5,-0.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 11604 components: - type: Transform pos: 26.5,-0.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 11653 components: - type: Transform pos: -39.5,-34.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 11657 components: - type: Transform pos: 26.5,-12.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 11671 components: - type: Transform pos: 30.5,-12.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 11679 components: - type: Transform pos: 33.5,-15.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 11692 components: - type: Transform pos: 25.5,-8.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 11700 components: - type: Transform pos: 18.5,-2.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 11760 components: - type: Transform pos: 1.5,-21.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 11782 components: - type: Transform pos: 33.5,-12.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 11867 components: - type: Transform pos: 36.5,-4.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 12019 components: - type: Transform pos: 37.5,-4.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 12030 components: - type: Transform pos: 38.5,-4.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 12104 components: - type: Transform pos: 28.5,-12.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 12656 components: - type: Transform pos: 15.5,10.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 12695 components: - type: Transform pos: 30.5,15.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 12711 components: - type: Transform pos: 33.5,13.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 12712 components: - type: Transform pos: 31.5,13.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 12729 components: - type: Transform pos: -64.5,24.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 12730 components: - type: Transform pos: -64.5,20.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 12803 components: - type: Transform pos: -39.5,-32.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 12804 components: - type: Transform pos: -39.5,-33.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 12807 components: - type: Transform pos: 27.5,17.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 12837 components: - type: Transform pos: -64.5,-66.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 12857 components: - type: Transform pos: 47.5,27.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 12975 components: - type: Transform pos: 30.5,14.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 13361 components: - type: Transform pos: 29.5,17.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 13379 components: - type: Transform pos: 24.5,15.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 13420 components: - type: Transform pos: 11.5,62.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 13421 components: - type: Transform pos: 10.5,53.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 13422 components: - type: Transform pos: 10.5,59.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 13451 components: - type: Transform pos: 22.5,52.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 13452 components: - type: Transform pos: 22.5,54.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 13454 components: - type: Transform pos: 21.5,47.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 13455 components: - type: Transform pos: 21.5,48.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 13456 components: - type: Transform pos: 21.5,49.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 13474 components: - type: Transform pos: 10.5,57.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 13475 components: - type: Transform pos: 10.5,61.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 13479 components: - type: Transform pos: 28.5,52.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 13481 components: - type: Transform pos: 20.5,60.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 13482 components: - type: Transform pos: 28.5,54.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 13483 components: - type: Transform pos: 30.5,54.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 13484 components: - type: Transform pos: 29.5,50.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 13485 components: - type: Transform pos: 29.5,48.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 13486 components: - type: Transform pos: 29.5,49.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 13488 components: - type: Transform pos: 31.5,48.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 13489 components: - type: Transform pos: 31.5,49.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 13490 components: - type: Transform pos: 31.5,50.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 13510 components: - type: Transform pos: 36.5,46.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 13511 components: - type: Transform pos: 35.5,46.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 13512 components: - type: Transform pos: 39.5,46.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 13513 components: - type: Transform pos: 38.5,46.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 13541 components: - type: Transform pos: 48.5,43.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 13550 components: - type: Transform pos: 47.5,38.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 13551 components: - type: Transform pos: 47.5,37.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 13552 components: - type: Transform pos: 47.5,36.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 13553 components: - type: Transform pos: 47.5,35.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 13554 components: - type: Transform pos: 44.5,39.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 13555 components: - type: Transform pos: 44.5,37.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 13581 components: - type: Transform pos: 34.5,37.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 13582 components: - type: Transform pos: 34.5,39.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 13612 components: - type: Transform pos: 45.5,11.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 13615 components: - type: Transform pos: 51.5,25.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 13616 components: - type: Transform pos: 52.5,25.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 13619 components: - type: Transform pos: 54.5,23.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 13622 components: - type: Transform pos: 54.5,21.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 13652 components: - type: Transform pos: 36.5,24.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 13653 components: - type: Transform pos: 36.5,22.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 13654 components: - type: Transform pos: 36.5,23.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 13661 components: - type: Transform pos: 41.5,23.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 13664 components: - type: Transform pos: 14.5,63.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 13669 components: - type: Transform pos: 41.5,24.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 13712 components: - type: Transform pos: 20.5,59.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 13713 components: - type: Transform pos: 10.5,55.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 13984 components: - type: Transform pos: -6.5,-42.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 14338 components: - type: Transform pos: 28.5,12.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 14339 components: - type: Transform pos: 26.5,12.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 14354 components: - type: Transform pos: 27.5,12.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 14515 components: - type: Transform pos: 49.5,24.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 14723 components: - type: Transform pos: 17.5,63.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 14729 components: - type: Transform pos: 40.5,49.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 14735 components: - type: Transform pos: 15.5,63.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 14798 components: - type: Transform pos: 16.5,63.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 14849 components: - type: Transform pos: 30.5,40.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 14915 components: - type: Transform pos: -22.5,-45.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 15160 components: - type: Transform pos: 40.5,50.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 15241 components: - type: Transform pos: 43.5,50.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 15243 components: - type: Transform pos: 40.5,47.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 15245 components: - type: Transform pos: 41.5,50.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 15328 components: - type: Transform pos: 52.5,29.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 15329 components: - type: Transform pos: 52.5,31.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 15330 components: - type: Transform pos: 54.5,29.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 15331 components: - type: Transform pos: 54.5,31.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 15332 components: - type: Transform pos: 53.5,29.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 15333 components: - type: Transform pos: 53.5,31.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 15759 components: - type: Transform pos: 45.5,5.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 15820 components: - type: Transform pos: 45.5,8.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 16095 components: - type: Transform pos: 24.5,-12.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 16123 components: - type: Transform pos: 23.5,-8.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 16252 components: - type: Transform pos: -68.5,42.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 16254 components: - type: Transform pos: -67.5,42.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 16256 components: - type: Transform pos: -66.5,42.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 16257 components: - type: Transform pos: -66.5,44.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 16258 components: - type: Transform pos: -68.5,44.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 16736 components: - type: Transform pos: -58.5,36.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 16789 components: - type: Transform pos: -56.5,48.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 16803 components: - type: Transform pos: -62.5,-66.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17039 components: - type: Transform pos: -58.5,48.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17040 components: - type: Transform pos: -56.5,47.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17057 components: - type: Transform pos: -58.5,47.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17075 components: - type: Transform pos: 11.5,-35.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17076 components: - type: Transform pos: 9.5,-35.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17098 components: - type: Transform pos: -57.5,53.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17102 components: - type: Transform pos: -55.5,53.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17120 components: - type: Transform pos: -47.5,-17.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17122 components: - type: Transform pos: -47.5,-19.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17125 components: - type: Transform pos: -49.5,-21.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17128 components: - type: Transform pos: -56.5,-20.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17129 components: - type: Transform pos: -57.5,-20.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17130 components: - type: Transform pos: -58.5,-20.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17131 components: - type: Transform pos: -60.5,-19.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17132 components: - type: Transform pos: -61.5,-19.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17133 components: - type: Transform pos: -62.5,-19.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17134 components: - type: Transform pos: -64.5,-20.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17135 components: - type: Transform pos: -64.5,-18.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17136 components: - type: Transform pos: -62.5,-20.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17137 components: - type: Transform pos: -62.5,-18.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17144 components: - type: Transform pos: -48.5,-21.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17160 components: - type: Transform pos: -65.5,-24.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17161 components: - type: Transform pos: -66.5,-24.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17162 components: - type: Transform pos: -66.5,-25.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17163 components: - type: Transform pos: -67.5,-25.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17164 components: - type: Transform pos: -67.5,-26.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17165 components: - type: Transform pos: -67.5,-27.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17166 components: - type: Transform pos: -67.5,-28.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17167 components: - type: Transform pos: -67.5,-29.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17168 components: - type: Transform pos: -68.5,-29.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17169 components: - type: Transform pos: -68.5,-30.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17170 components: - type: Transform pos: -69.5,-30.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17171 components: - type: Transform pos: -69.5,-31.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17172 components: - type: Transform pos: -69.5,-32.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17173 components: - type: Transform pos: -70.5,-32.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17174 components: - type: Transform pos: -70.5,-33.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17175 components: - type: Transform pos: -71.5,-33.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17176 components: - type: Transform pos: -71.5,-34.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17177 components: - type: Transform pos: -73.5,-35.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17178 components: - type: Transform pos: -73.5,-34.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17179 components: - type: Transform pos: -72.5,-34.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17180 components: - type: Transform pos: -74.5,-34.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17181 components: - type: Transform pos: -75.5,-34.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17182 components: - type: Transform pos: -48.5,-48.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17183 components: - type: Transform pos: -48.5,-47.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17184 components: - type: Transform pos: -48.5,-46.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17185 components: - type: Transform pos: -48.5,-45.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17186 components: - type: Transform pos: -48.5,-44.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17187 components: - type: Transform pos: -48.5,-43.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17188 components: - type: Transform pos: -48.5,-42.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17189 components: - type: Transform pos: -48.5,-41.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17190 components: - type: Transform pos: -48.5,-40.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17191 components: - type: Transform pos: -49.5,-40.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17192 components: - type: Transform pos: -50.5,-40.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17193 components: - type: Transform pos: -52.5,-40.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17194 components: - type: Transform pos: -50.5,-38.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17195 components: - type: Transform pos: -51.5,-38.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17196 components: - type: Transform pos: -51.5,-37.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17197 components: - type: Transform pos: -51.5,-36.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17198 components: - type: Transform pos: -51.5,-35.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17199 components: - type: Transform pos: -52.5,-35.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17200 components: - type: Transform pos: -52.5,-34.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17201 components: - type: Transform pos: -52.5,-33.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17202 components: - type: Transform pos: -53.5,-33.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17203 components: - type: Transform pos: -53.5,-32.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17204 components: - type: Transform pos: -54.5,-32.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17205 components: - type: Transform pos: -54.5,-31.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17206 components: - type: Transform pos: -54.5,-30.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17207 components: - type: Transform pos: -55.5,-30.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17208 components: - type: Transform pos: -55.5,-29.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17209 components: - type: Transform pos: -56.5,-29.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17210 components: - type: Transform pos: -56.5,-28.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17211 components: - type: Transform pos: -56.5,-27.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17212 components: - type: Transform pos: -56.5,-26.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17213 components: - type: Transform pos: -50.5,-21.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17214 components: - type: Transform pos: -51.5,-21.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17215 components: - type: Transform pos: -52.5,-21.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17216 components: - type: Transform pos: -53.5,-21.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17217 components: - type: Transform pos: -54.5,-21.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17218 components: - type: Transform pos: -54.5,-25.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17219 components: - type: Transform pos: -53.5,-25.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17220 components: - type: Transform pos: -52.5,-25.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17221 components: - type: Transform pos: -51.5,-25.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17222 components: - type: Transform pos: -50.5,-25.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17223 components: - type: Transform pos: -49.5,-25.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17224 components: - type: Transform pos: -48.5,-25.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17344 components: - type: Transform pos: -48.5,-49.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17354 components: - type: Transform pos: -52.5,-45.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17375 components: - type: Transform pos: -70.5,-46.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17376 components: - type: Transform pos: -71.5,-46.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17377 components: - type: Transform pos: -72.5,-46.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17378 components: - type: Transform pos: -73.5,-46.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17379 components: - type: Transform pos: -73.5,-44.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17380 components: - type: Transform pos: -71.5,-44.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17381 components: - type: Transform pos: -70.5,-44.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17382 components: - type: Transform pos: -72.5,-44.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17574 components: - type: Transform pos: -83.5,-42.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17575 components: - type: Transform pos: -85.5,-45.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17576 components: - type: Transform pos: -83.5,-48.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17577 components: - type: Transform pos: -79.5,-37.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17593 components: - type: Transform pos: -3.5,-44.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 18006 components: - type: Transform pos: -35.5,-38.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 18007 components: - type: Transform pos: -36.5,-38.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 18013 components: - type: Transform pos: -37.5,-38.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 18014 components: - type: Transform pos: -35.5,-40.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 18015 components: - type: Transform pos: -37.5,-40.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 18017 components: - type: Transform pos: -36.5,-40.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 18068 components: - type: Transform pos: -36.5,-36.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 18137 components: - type: Transform pos: -82.5,-61.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 18138 components: - type: Transform pos: -83.5,-61.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 18139 components: - type: Transform pos: -84.5,-61.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 18140 components: - type: Transform pos: -85.5,-61.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 18141 components: - type: Transform pos: -85.5,-59.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 18142 components: - type: Transform pos: -76.5,-67.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 18143 components: - type: Transform pos: -76.5,-66.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 18144 components: - type: Transform pos: -77.5,-66.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 18145 components: - type: Transform pos: -78.5,-66.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 18146 components: - type: Transform pos: -78.5,-65.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 18147 components: - type: Transform pos: -73.5,-67.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 18148 components: - type: Transform pos: -73.5,-66.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 18149 components: - type: Transform pos: -72.5,-66.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 18150 components: - type: Transform pos: -71.5,-66.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 18151 components: - type: Transform pos: -71.5,-65.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 18152 components: - type: Transform pos: -75.5,-67.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 18153 components: - type: Transform pos: -74.5,-67.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 18343 components: - type: Transform pos: -52.5,-38.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 18372 components: - type: Transform pos: -63.5,-66.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 18763 components: - type: Transform pos: -85.5,-46.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 18764 components: - type: Transform pos: -85.5,-44.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 19066 components: - type: Transform pos: -51.5,-40.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 19373 components: - type: Transform pos: -24.5,-45.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 19632 components: - type: Transform pos: -23.5,-34.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 19633 components: - type: Transform pos: -22.5,-34.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 19634 components: - type: Transform pos: -26.5,-34.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 19635 components: - type: Transform pos: -25.5,-34.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 19877 components: - type: Transform pos: 4.5,69.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 19878 components: - type: Transform pos: 4.5,70.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 19879 components: - type: Transform pos: 4.5,71.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 19903 components: - type: Transform pos: -5.5,69.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 19904 components: - type: Transform pos: -5.5,70.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 19905 components: - type: Transform pos: -5.5,71.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 19906 components: - type: Transform pos: -4.5,62.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 19907 components: - type: Transform pos: 3.5,62.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 19932 components: - type: Transform pos: -1.5,69.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 19933 components: - type: Transform pos: -1.5,70.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 19934 components: - type: Transform pos: -1.5,71.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 19935 components: - type: Transform pos: 0.5,69.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 19936 components: - type: Transform pos: 0.5,70.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 19937 components: - type: Transform pos: 0.5,71.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 19972 components: - type: Transform pos: -2.5,76.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 19973 components: - type: Transform pos: -1.5,76.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 19974 components: - type: Transform pos: 0.5,76.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 19975 components: - type: Transform pos: 1.5,76.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 20098 components: - type: Transform pos: -35.5,-26.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 20276 components: - type: Transform pos: -31.5,-26.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 20376 components: - type: Transform pos: -37.5,61.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 20443 components: - type: Transform pos: -45.5,-28.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 20712 components: - type: Transform pos: 0.5,37.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 20971 components: - type: Transform pos: 7.5,22.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 20976 components: - type: Transform pos: 7.5,21.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 21052 components: - type: Transform pos: -33.5,-45.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 21055 components: - type: Transform pos: -38.5,-47.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 21056 components: - type: Transform pos: -38.5,-48.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 21057 components: - type: Transform pos: -37.5,-48.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 21058 components: - type: Transform pos: -36.5,-48.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 21059 components: - type: Transform pos: -35.5,-48.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 21063 components: - type: Transform pos: -37.5,-44.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 21064 components: - type: Transform pos: -36.5,-44.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 21065 components: - type: Transform pos: -35.5,-44.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 21068 components: - type: Transform pos: -33.5,-47.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 21075 components: - type: Transform pos: -31.5,-48.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 21120 components: - type: Transform pos: -58.5,53.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 21121 components: - type: Transform pos: -59.5,53.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 21122 components: - type: Transform pos: -59.5,52.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 21123 components: - type: Transform pos: -59.5,51.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 21209 components: - type: Transform pos: -31.5,-25.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 21509 components: - type: Transform pos: 37.5,36.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 21510 components: - type: Transform pos: 38.5,36.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 21512 components: - type: Transform pos: 40.5,36.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 21513 components: - type: Transform pos: 41.5,36.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 21514 components: - type: Transform pos: 42.5,36.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 21515 components: - type: Transform pos: 43.5,36.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 21591 components: - type: Transform pos: -43.5,-28.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 21593 components: - type: Transform pos: -41.5,-28.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 22136 components: - type: Transform pos: 32.5,40.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 22366 components: - type: Transform pos: 18.5,-40.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 22367 components: - type: Transform pos: 19.5,-40.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 22368 components: - type: Transform pos: 20.5,-40.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 22369 components: - type: Transform pos: 20.5,-38.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 22370 components: - type: Transform pos: 18.5,-38.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 22878 components: - type: Transform pos: -6.5,-48.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 22886 components: - type: Transform pos: -4.5,-46.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 22887 components: - type: Transform pos: -5.5,-46.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 22976 components: - type: Transform pos: -6.5,-46.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 22977 components: - type: Transform pos: -7.5,-46.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 22978 components: - type: Transform pos: -8.5,-46.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 23198 components: - type: Transform pos: 44.5,47.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - proto: ResearchAndDevelopmentServer entities: - uid: 12746 @@ -121691,61 +122041,85 @@ entities: - type: Transform pos: -33.5,8.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 543 components: - type: Transform pos: -33.5,7.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 13728 components: - type: Transform pos: 23.5,52.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 13729 components: - type: Transform pos: 24.5,52.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 13730 components: - type: Transform pos: 25.5,52.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 13731 components: - type: Transform pos: 26.5,52.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 13732 components: - type: Transform pos: 27.5,52.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 13733 components: - type: Transform pos: 27.5,54.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 13734 components: - type: Transform pos: 26.5,54.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 13735 components: - type: Transform pos: 25.5,54.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 13736 components: - type: Transform pos: 24.5,54.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 13737 components: - type: Transform pos: 23.5,54.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - proto: ShuttersNormalOpen entities: - uid: 390 @@ -121754,365 +122128,503 @@ entities: rot: 1.5707963267948966 rad pos: -10.5,11.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 391 components: - type: Transform rot: 1.5707963267948966 rad pos: -10.5,9.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 392 components: - type: Transform rot: 1.5707963267948966 rad pos: -10.5,10.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 393 components: - type: Transform rot: 1.5707963267948966 rad pos: -10.5,7.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 394 components: - type: Transform rot: 1.5707963267948966 rad pos: -10.5,8.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 395 components: - type: Transform rot: 1.5707963267948966 rad pos: -10.5,6.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 899 components: - type: Transform pos: 29.5,17.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 3176 components: - type: Transform pos: -42.5,38.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 3177 components: - type: Transform pos: -40.5,38.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 3184 components: - type: Transform pos: -44.5,38.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 3185 components: - type: Transform pos: -43.5,38.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 4438 components: - type: Transform pos: 27.5,17.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 5698 components: - type: Transform pos: -39.5,38.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 5700 components: - type: Transform pos: -38.5,38.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 5738 components: - type: Transform pos: -14.5,36.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 5741 components: - type: Transform pos: -15.5,36.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 6785 components: - type: Transform pos: -8.5,-5.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 6797 components: - type: Transform pos: -9.5,-5.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 6871 components: - type: Transform pos: -23.5,-17.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 6882 components: - type: Transform pos: -28.5,0.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 7164 components: - type: Transform pos: -27.5,-21.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 7829 components: - type: Transform pos: -23.5,-21.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 7876 components: - type: Transform pos: -27.5,-17.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 7971 components: - type: Transform pos: -7.5,-5.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 7972 components: - type: Transform pos: -5.5,-5.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 7991 components: - type: Transform pos: -6.5,-5.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 7992 components: - type: Transform pos: -10.5,-6.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 9238 components: - type: Transform pos: -4.5,12.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 9239 components: - type: Transform pos: -3.5,12.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 11002 components: - type: Transform rot: 1.5707963267948966 rad pos: -40.5,32.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 11006 components: - type: Transform pos: -42.5,34.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 11010 components: - type: Transform rot: 1.5707963267948966 rad pos: -40.5,31.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 11716 components: - type: Transform pos: 26.5,-0.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 11822 components: - type: Transform pos: 24.5,-0.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 11823 components: - type: Transform pos: 25.5,-0.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 12625 components: - type: Transform pos: -5.5,12.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 12810 components: - type: Transform pos: 24.5,15.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 14340 components: - type: Transform pos: 27.5,12.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 14352 components: - type: Transform pos: 28.5,12.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 14355 components: - type: Transform pos: 26.5,12.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 14530 components: - type: Transform rot: -1.5707963267948966 rad pos: 15.5,39.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 14844 components: - type: Transform rot: -1.5707963267948966 rad pos: 15.5,34.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 15075 components: - type: Transform rot: -1.5707963267948966 rad pos: 15.5,40.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 15213 components: - type: Transform rot: -1.5707963267948966 rad pos: 15.5,36.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 15986 components: - type: Transform rot: -1.5707963267948966 rad pos: 15.5,33.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 15987 components: - type: Transform rot: -1.5707963267948966 rad pos: 15.5,37.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 19418 components: - type: Transform pos: 4.5,5.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 19419 components: - type: Transform pos: 5.5,5.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 19795 components: - type: Transform rot: 1.5707963267948966 rad pos: 7.5,8.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 20051 components: - type: Transform pos: -1.5,5.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 20052 components: - type: Transform pos: 1.5,5.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 20053 components: - type: Transform pos: 0.5,5.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 20054 components: - type: Transform rot: 1.5707963267948966 rad pos: 7.5,7.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 20061 components: - type: Transform pos: -9.5,5.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 20062 components: - type: Transform pos: -3.5,5.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 20063 components: - type: Transform pos: -5.5,5.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 20064 components: - type: Transform pos: -2.5,5.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 20065 components: - type: Transform rot: -1.5707963267948966 rad pos: 16.5,16.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 20066 components: - type: Transform rot: -1.5707963267948966 rad pos: 16.5,14.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 20394 components: - type: Transform pos: -3.5,36.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 20395 components: - type: Transform pos: -4.5,36.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 20445 components: - type: Transform pos: -2.5,12.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 20447 components: - type: Transform pos: 0.5,12.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 20448 components: - type: Transform pos: -0.5,12.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 20449 components: - type: Transform pos: -1.5,12.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 21333 components: - type: Transform rot: 1.5707963267948966 rad pos: -40.5,30.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 21722 components: - type: Transform pos: -0.5,28.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 21758 components: - type: Transform rot: -1.5707963267948966 rad pos: 16.5,15.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 22424 components: - type: Transform pos: 4.5,28.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - proto: ShuttersRadiationOpen entities: - uid: 9408 @@ -122120,56 +122632,78 @@ entities: - type: Transform pos: -16.5,-49.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 9410 components: - type: Transform pos: -18.5,-45.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 9411 components: - type: Transform pos: -16.5,-45.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 9415 components: - type: Transform pos: -18.5,-49.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 23813 components: - type: Transform pos: -20.5,-57.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 23814 components: - type: Transform pos: -19.5,-57.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 23815 components: - type: Transform pos: -18.5,-57.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 23816 components: - type: Transform pos: -17.5,-57.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 23817 components: - type: Transform pos: -16.5,-57.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 23818 components: - type: Transform pos: -15.5,-57.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 23819 components: - type: Transform pos: -14.5,-57.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - proto: SignAi entities: - uid: 20306 @@ -130380,11 +130914,6 @@ entities: - type: Transform pos: 11.5,34.5 parent: 30 - - uid: 6453 - components: - - type: Transform - pos: 21.5,44.5 - parent: 30 - uid: 6568 components: - type: Transform @@ -132715,96 +133244,134 @@ entities: - type: Transform pos: -30.5,24.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 290 components: - type: Transform pos: -32.5,24.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 291 components: - type: Transform pos: -33.5,23.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 292 components: - type: Transform pos: -33.5,21.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 7235 components: - type: Transform pos: -19.5,-14.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 7590 components: - type: Transform pos: -15.5,-16.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 7597 components: - type: Transform pos: -19.5,-16.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 7877 components: - type: Transform pos: -15.5,-14.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17391 components: - type: Transform pos: -67.5,-41.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 18697 components: - type: Transform pos: -47.5,-24.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 18698 components: - type: Transform pos: -55.5,-22.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 18699 components: - type: Transform pos: -55.5,-24.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 18700 components: - type: Transform pos: -47.5,-22.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 19566 components: - type: Transform pos: 9.5,-12.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 19567 components: - type: Transform pos: 8.5,-12.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 21470 components: - type: Transform pos: 7.5,-12.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 21471 components: - type: Transform pos: 10.5,-15.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 21472 components: - type: Transform pos: 10.5,-14.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 22704 components: - type: Transform pos: -10.5,15.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - proto: ToiletDirtyWater entities: - uid: 754 @@ -133869,6 +134436,13 @@ entities: - type: Transform pos: -28.5,13.5 parent: 30 +- proto: VendingMachinePride + entities: + - uid: 6453 + components: + - type: Transform + pos: 21.5,44.5 + parent: 30 - proto: VendingMachineRoboDrobe entities: - uid: 12778 @@ -134028,13 +134602,6 @@ entities: - type: Transform pos: -14.5,-22.5 parent: 30 -- proto: VendingMachineWinter - entities: - - uid: 10040 - components: - - type: Transform - pos: 20.5,44.5 - parent: 30 - proto: VendingMachineYouTool entities: - uid: 1606 @@ -148515,18 +149082,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - proto: WardrobeCargoFilled entities: - uid: 6362 @@ -148540,18 +149097,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - uid: 22106 components: - type: Transform @@ -148563,18 +149110,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - proto: WardrobeChapel entities: - uid: 17952 @@ -148588,18 +149125,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - uid: 17953 components: - type: Transform @@ -148611,18 +149138,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - proto: WardrobeChapelFilled entities: - uid: 17622 @@ -148636,18 +149153,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - proto: WardrobeEngineeringFilled entities: - uid: 7112 @@ -148673,18 +149180,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - type: ContainerContainer containers: entity_storage: !type:Container @@ -148726,18 +149223,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - proto: WardrobePrisonFilled entities: - uid: 2734 @@ -148763,18 +149250,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - proto: WardrobeYellowFilled entities: - uid: 16043 @@ -148788,18 +149265,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 3.4430928 + Nitrogen: 12.952587 - proto: WarningCO2 entities: - uid: 8666 @@ -149300,58 +149767,78 @@ entities: - type: Transform pos: -20.5,8.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1918 components: - type: Transform rot: 3.141592653589793 rad pos: -50.5,61.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 2598 components: - type: Transform rot: 3.141592653589793 rad pos: -40.5,41.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 4813 components: - type: Transform rot: 3.141592653589793 rad pos: -42.5,41.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 5066 components: - type: Transform rot: -1.5707963267948966 rad pos: -19.5,34.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 5410 components: - type: Transform pos: 4.5,30.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 11038 components: - type: Transform pos: 4.5,-4.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 20484 components: - type: Transform rot: 1.5707963267948966 rad pos: -35.5,-35.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 20959 components: - type: Transform rot: 3.141592653589793 rad pos: 18.5,24.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 22199 components: - type: Transform rot: -1.5707963267948966 rad pos: -74.5,-55.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - proto: WindoorCargoLocked entities: - uid: 402 @@ -149360,12 +149847,16 @@ entities: rot: -1.5707963267948966 rad pos: 19.5,-3.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 21788 components: - type: Transform rot: 3.141592653589793 rad pos: 31.5,-8.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - proto: WindoorHydroponicsLocked entities: - uid: 322 @@ -149374,6 +149865,8 @@ entities: rot: 3.141592653589793 rad pos: -20.5,8.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - proto: WindoorKitchenHydroponicsLocked entities: - uid: 20701 @@ -149382,6 +149875,8 @@ entities: rot: 1.5707963267948966 rad pos: -18.5,10.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - proto: WindoorSecure entities: - uid: 15983 @@ -149390,12 +149885,16 @@ entities: rot: 3.141592653589793 rad pos: 52.5,20.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 15984 components: - type: Transform rot: 3.141592653589793 rad pos: 51.5,20.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - proto: WindoorSecureArmoryLocked entities: - uid: 1753 @@ -149403,27 +149902,37 @@ entities: - type: Transform pos: -40.5,56.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 2006 components: - type: Transform pos: -38.5,56.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 2216 components: - type: Transform pos: -39.5,56.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 3180 components: - type: Transform pos: -41.5,56.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 4450 components: - type: Transform rot: 3.141592653589793 rad pos: -42.5,45.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - proto: WindoorSecureAtmosphericsLocked entities: - uid: 8394 @@ -149432,18 +149941,24 @@ entities: rot: -1.5707963267948966 rad pos: 4.5,-27.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 11232 components: - type: Transform rot: 1.5707963267948966 rad pos: 3.5,-29.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 12003 components: - type: Transform rot: -1.5707963267948966 rad pos: 4.5,-28.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - proto: WindoorSecureBrigLocked entities: - uid: 2013 @@ -149451,6 +149966,8 @@ entities: - type: Transform pos: -42.5,45.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - proto: WindoorSecureCargoLocked entities: - uid: 8464 @@ -149459,18 +149976,24 @@ entities: rot: 1.5707963267948966 rad pos: 18.5,-1.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 8471 components: - type: Transform rot: 3.141592653589793 rad pos: 16.5,-0.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 8472 components: - type: Transform rot: 3.141592653589793 rad pos: 17.5,-0.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - proto: WindoorSecureChemistryLocked entities: - uid: 6674 @@ -149478,23 +150001,31 @@ entities: - type: Transform pos: -6.5,-5.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 6677 components: - type: Transform pos: -8.5,-5.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 9054 components: - type: Transform rot: 1.5707963267948966 rad pos: -10.5,-9.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 9672 components: - type: Transform rot: 1.5707963267948966 rad pos: -10.5,-8.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - proto: WindoorSecureCommandLocked entities: - uid: 20088 @@ -149503,48 +150034,64 @@ entities: rot: 3.141592653589793 rad pos: 10.5,42.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 20649 components: - type: Transform rot: 3.141592653589793 rad pos: -13.5,16.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 21680 components: - type: Transform rot: 1.5707963267948966 rad pos: -3.5,62.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 21681 components: - type: Transform rot: 1.5707963267948966 rad pos: -3.5,63.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 21682 components: - type: Transform rot: 1.5707963267948966 rad pos: -3.5,64.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 21750 components: - type: Transform rot: 3.141592653589793 rad pos: 4.5,20.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 22223 components: - type: Transform rot: -1.5707963267948966 rad pos: 1.5,75.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 22232 components: - type: Transform rot: 1.5707963267948966 rad pos: -2.5,75.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - proto: WindoorSecureEngineeringLocked entities: - uid: 21294 @@ -149552,6 +150099,8 @@ entities: - type: Transform pos: -24.5,42.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - proto: WindoorSecureHeadOfPersonnelLocked entities: - uid: 5409 @@ -149560,6 +150109,8 @@ entities: rot: 3.141592653589793 rad pos: 4.5,30.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - proto: WindoorSecureMedicalLocked entities: - uid: 7093 @@ -149568,12 +150119,16 @@ entities: rot: -1.5707963267948966 rad pos: -13.5,-5.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 8047 components: - type: Transform rot: -1.5707963267948966 rad pos: -13.5,-4.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - proto: WindoorSecureScienceLocked entities: - uid: 6488 @@ -149581,39 +150136,53 @@ entities: - type: Transform pos: 18.5,24.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 20067 components: - type: Transform rot: -1.5707963267948966 rad pos: 16.5,16.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 20069 components: - type: Transform rot: -1.5707963267948966 rad pos: 16.5,14.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 21708 components: - type: Transform pos: 31.5,18.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 21711 components: - type: Transform pos: 33.5,18.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 21759 components: - type: Transform rot: -1.5707963267948966 rad pos: 16.5,15.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 22235 components: - type: Transform pos: 32.5,18.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - proto: WindoorSecureSecurityLocked entities: - uid: 1052 @@ -149621,42 +150190,56 @@ entities: - type: Transform pos: -40.5,12.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1059 components: - type: Transform rot: 3.141592653589793 rad pos: -40.5,8.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1746 components: - type: Transform rot: 1.5707963267948966 rad pos: -33.5,40.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1747 components: - type: Transform rot: 1.5707963267948966 rad pos: -33.5,39.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1748 components: - type: Transform rot: 3.141592653589793 rad pos: -32.5,38.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1749 components: - type: Transform rot: 3.141592653589793 rad pos: -31.5,38.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1750 components: - type: Transform rot: 3.141592653589793 rad pos: -30.5,38.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - proto: WindoorSecureServiceLocked entities: - uid: 11458 @@ -149665,6 +150248,8 @@ entities: rot: 1.5707963267948966 rad pos: -65.5,-62.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - proto: Window entities: - uid: 5 @@ -149672,411 +150257,575 @@ entities: - type: Transform pos: -0.5,-1.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 6 components: - type: Transform pos: -0.5,-4.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 7 components: - type: Transform pos: -4.5,-4.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 8 components: - type: Transform pos: -4.5,-1.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 57 components: - type: Transform pos: 1.5,-0.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 58 components: - type: Transform pos: 0.5,-0.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 59 components: - type: Transform pos: -5.5,-0.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 60 components: - type: Transform pos: -6.5,-0.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 61 components: - type: Transform pos: -7.5,0.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 62 components: - type: Transform pos: -11.5,0.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 63 components: - type: Transform pos: -5.5,5.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 65 components: - type: Transform pos: -9.5,5.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 80 components: - type: Transform pos: 2.5,0.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 81 components: - type: Transform pos: 6.5,0.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 84 components: - type: Transform pos: 0.5,5.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 85 components: - type: Transform pos: 1.5,5.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 293 components: - type: Transform pos: -28.5,24.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 294 components: - type: Transform pos: -27.5,24.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 296 components: - type: Transform pos: -7.5,24.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 297 components: - type: Transform pos: -8.5,24.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 298 components: - type: Transform pos: -9.5,24.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 299 components: - type: Transform pos: -10.5,24.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 300 components: - type: Transform pos: -11.5,24.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1000 components: - type: Transform pos: -43.5,0.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1001 components: - type: Transform pos: -43.5,3.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1002 components: - type: Transform pos: -37.5,0.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1003 components: - type: Transform pos: -37.5,3.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1004 components: - type: Transform pos: -39.5,4.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1005 components: - type: Transform pos: -41.5,4.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1267 components: - type: Transform pos: -54.5,22.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1271 components: - type: Transform pos: -52.5,22.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1272 components: - type: Transform pos: -52.5,14.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1273 components: - type: Transform pos: -54.5,14.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1354 components: - type: Transform pos: -32.5,28.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1365 components: - type: Transform pos: -38.5,34.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1367 components: - type: Transform pos: -37.5,32.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1368 components: - type: Transform pos: -37.5,31.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1369 components: - type: Transform pos: -37.5,30.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1595 components: - type: Transform pos: -30.5,28.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1596 components: - type: Transform pos: -26.5,28.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1597 components: - type: Transform pos: -24.5,28.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 2239 components: - type: Transform pos: -50.5,57.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 2348 components: - type: Transform pos: -50.5,51.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 2366 components: - type: Transform pos: -50.5,55.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 4576 components: - type: Transform pos: -50.5,53.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 5017 components: - type: Transform pos: -23.5,36.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 6542 components: - type: Transform pos: 28.5,34.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 6543 components: - type: Transform pos: 28.5,35.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 6544 components: - type: Transform pos: 28.5,39.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 6545 components: - type: Transform pos: 28.5,38.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 6625 components: - type: Transform pos: 8.5,0.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 6628 components: - type: Transform pos: -13.5,0.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 8329 components: - type: Transform pos: 10.5,-1.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 8334 components: - type: Transform pos: 10.5,-6.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 9837 components: - type: Transform pos: -39.5,34.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 13579 components: - type: Transform pos: 44.5,35.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17716 components: - type: Transform pos: -69.5,-52.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17721 components: - type: Transform pos: -65.5,-58.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17722 components: - type: Transform pos: -64.5,-58.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17727 components: - type: Transform pos: -66.5,-57.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17733 components: - type: Transform pos: -69.5,-56.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17735 components: - type: Transform pos: -66.5,-56.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17739 components: - type: Transform pos: -66.5,-52.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17758 components: - type: Transform pos: -66.5,-51.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17759 components: - type: Transform pos: -65.5,-50.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17760 components: - type: Transform pos: -64.5,-50.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17761 components: - type: Transform pos: -62.5,-50.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17762 components: - type: Transform pos: -61.5,-50.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17763 components: - type: Transform pos: -59.5,-50.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17764 components: - type: Transform pos: -58.5,-50.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17765 components: - type: Transform pos: -57.5,-51.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17766 components: - type: Transform pos: -57.5,-52.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17767 components: - type: Transform pos: -57.5,-56.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17768 components: - type: Transform pos: -57.5,-57.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17769 components: - type: Transform pos: -58.5,-58.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17770 components: - type: Transform pos: -59.5,-58.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17771 components: - type: Transform pos: -61.5,-58.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17772 components: - type: Transform pos: -62.5,-58.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 20964 components: - type: Transform pos: 44.5,33.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 21473 components: - type: Transform pos: 9.5,-17.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 21474 components: - type: Transform pos: 7.5,-17.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 21511 components: - type: Transform pos: 34.5,34.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - proto: WindowDirectional entities: - uid: 7523 @@ -150085,68 +150834,92 @@ entities: rot: -1.5707963267948966 rad pos: 6.5,-6.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 7524 components: - type: Transform pos: 3.5,-4.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 8307 components: - type: Transform pos: 5.5,-4.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 10093 components: - type: Transform rot: -1.5707963267948966 rad pos: 6.5,-7.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 11346 components: - type: Transform rot: -1.5707963267948966 rad pos: 6.5,-11.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 11411 components: - type: Transform rot: 1.5707963267948966 rad pos: 2.5,-8.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 11413 components: - type: Transform pos: 2.5,-8.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 13610 components: - type: Transform rot: 3.141592653589793 rad pos: 44.5,11.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 13633 components: - type: Transform pos: 44.5,15.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 22190 components: - type: Transform rot: -1.5707963267948966 rad pos: 34.5,30.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 22191 components: - type: Transform rot: 1.5707963267948966 rad pos: 33.5,30.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 22200 components: - type: Transform rot: 3.141592653589793 rad pos: -74.5,-55.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - proto: WindowFrostedDirectional entities: - uid: 207 @@ -150155,30 +150928,40 @@ entities: rot: -1.5707963267948966 rad pos: -5.5,23.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 4609 components: - type: Transform rot: -1.5707963267948966 rad pos: -49.5,61.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 4610 components: - type: Transform rot: -1.5707963267948966 rad pos: -49.5,60.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 4611 components: - type: Transform rot: -1.5707963267948966 rad pos: -49.5,59.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 4671 components: - type: Transform rot: -1.5707963267948966 rad pos: -49.5,58.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - proto: WindowReinforcedDirectional entities: - uid: 74 @@ -150186,396 +150969,532 @@ entities: - type: Transform pos: -26.5,4.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 75 components: - type: Transform pos: -28.5,4.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 76 components: - type: Transform pos: -27.5,4.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 519 components: - type: Transform pos: -54.5,17.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1226 components: - type: Transform rot: 1.5707963267948966 rad pos: -52.5,19.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1227 components: - type: Transform rot: 1.5707963267948966 rad pos: -52.5,18.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1229 components: - type: Transform rot: 1.5707963267948966 rad pos: -52.5,17.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1230 components: - type: Transform rot: -1.5707963267948966 rad pos: -54.5,19.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1231 components: - type: Transform rot: -1.5707963267948966 rad pos: -54.5,18.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1232 components: - type: Transform rot: -1.5707963267948966 rad pos: -54.5,17.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1234 components: - type: Transform pos: -53.5,17.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1235 components: - type: Transform pos: -52.5,17.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1236 components: - type: Transform rot: 3.141592653589793 rad pos: -54.5,19.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1237 components: - type: Transform rot: 3.141592653589793 rad pos: -53.5,19.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1274 components: - type: Transform rot: 3.141592653589793 rad pos: -52.5,19.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1911 components: - type: Transform rot: -1.5707963267948966 rad pos: -38.5,58.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1953 components: - type: Transform rot: 1.5707963267948966 rad pos: -38.5,56.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1977 components: - type: Transform rot: 3.141592653589793 rad pos: 43.5,40.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 1987 components: - type: Transform rot: -1.5707963267948966 rad pos: -41.5,56.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 2063 components: - type: Transform rot: -1.5707963267948966 rad pos: -38.5,60.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 2271 components: - type: Transform rot: 3.141592653589793 rad pos: -38.5,41.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 2672 components: - type: Transform rot: 3.141592653589793 rad pos: -41.5,41.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 2679 components: - type: Transform rot: 3.141592653589793 rad pos: -44.5,39.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 3525 components: - type: Transform rot: 3.141592653589793 rad pos: -44.5,41.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 4526 components: - type: Transform rot: 3.141592653589793 rad pos: -43.5,41.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 4612 components: - type: Transform rot: 3.141592653589793 rad pos: -50.5,67.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 4675 components: - type: Transform rot: 3.141592653589793 rad pos: -45.5,67.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 4688 components: - type: Transform rot: 3.141592653589793 rad pos: -49.5,67.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 4700 components: - type: Transform rot: 3.141592653589793 rad pos: -44.5,67.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 4814 components: - type: Transform rot: 3.141592653589793 rad pos: -39.5,41.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 5641 components: - type: Transform rot: -1.5707963267948966 rad pos: -17.5,43.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 5644 components: - type: Transform rot: -1.5707963267948966 rad pos: -17.5,42.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 5827 components: - type: Transform pos: -8.5,41.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 5828 components: - type: Transform pos: -9.5,41.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 5829 components: - type: Transform pos: -10.5,41.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 5834 components: - type: Transform rot: -1.5707963267948966 rad pos: -10.5,41.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 5835 components: - type: Transform rot: 3.141592653589793 rad pos: -10.5,41.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 5836 components: - type: Transform rot: 3.141592653589793 rad pos: -9.5,41.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 5837 components: - type: Transform rot: 3.141592653589793 rad pos: -8.5,41.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 5838 components: - type: Transform rot: 1.5707963267948966 rad pos: -8.5,41.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 7352 components: - type: Transform rot: 1.5707963267948966 rad pos: -19.5,-21.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 7476 components: - type: Transform rot: 1.5707963267948966 rad pos: -19.5,-22.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 7483 components: - type: Transform rot: -1.5707963267948966 rad pos: -19.5,-19.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 7558 components: - type: Transform rot: -1.5707963267948966 rad pos: -19.5,-21.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 7823 components: - type: Transform rot: 1.5707963267948966 rad pos: -19.5,-18.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 7980 components: - type: Transform rot: -1.5707963267948966 rad pos: -19.5,-18.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 7981 components: - type: Transform rot: 1.5707963267948966 rad pos: -19.5,-19.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 7982 components: - type: Transform rot: 3.141592653589793 rad pos: -19.5,-21.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 7990 components: - type: Transform rot: -1.5707963267948966 rad pos: -19.5,-22.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 7994 components: - type: Transform pos: -19.5,-19.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 8614 components: - type: Transform pos: -25.5,4.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 8615 components: - type: Transform pos: -24.5,4.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 9960 components: - type: Transform pos: -23.5,4.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 12728 components: - type: Transform rot: 3.141592653589793 rad pos: 20.5,19.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 12774 components: - type: Transform rot: -1.5707963267948966 rad pos: 24.5,9.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 12780 components: - type: Transform rot: -1.5707963267948966 rad pos: 24.5,11.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 12788 components: - type: Transform rot: 1.5707963267948966 rad pos: 20.5,18.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 12792 components: - type: Transform rot: 3.141592653589793 rad pos: 17.5,19.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 12795 components: - type: Transform rot: -1.5707963267948966 rad pos: 24.5,10.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 12881 components: - type: Transform rot: 1.5707963267948966 rad pos: 20.5,19.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 13577 components: - type: Transform rot: 1.5707963267948966 rad pos: 42.5,41.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 14356 components: - type: Transform rot: 3.141592653589793 rad pos: 52.5,23.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 15152 components: - type: Transform rot: -1.5707963267948966 rad pos: 14.5,8.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 15153 components: - type: Transform rot: 1.5707963267948966 rad pos: 16.5,8.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 15981 components: - type: Transform rot: 3.141592653589793 rad pos: 50.5,20.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 15982 components: - type: Transform rot: 3.141592653589793 rad pos: 53.5,20.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 16892 components: - type: Transform rot: 3.141592653589793 rad pos: -44.5,24.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 17675 components: - type: Transform rot: 1.5707963267948966 rad pos: -78.5,-38.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 18300 components: - type: Transform @@ -150674,341 +151593,459 @@ entities: - type: Transform pos: -69.5,-29.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 18312 components: - type: Transform rot: 1.5707963267948966 rad pos: -69.5,-29.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 18313 components: - type: Transform pos: -68.5,-28.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 18314 components: - type: Transform rot: 1.5707963267948966 rad pos: -68.5,-28.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 18315 components: - type: Transform rot: 1.5707963267948966 rad pos: -68.5,-27.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 18316 components: - type: Transform rot: 1.5707963267948966 rad pos: -68.5,-26.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 18317 components: - type: Transform rot: 1.5707963267948966 rad pos: -68.5,-25.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 18318 components: - type: Transform pos: -67.5,-24.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 18319 components: - type: Transform rot: 1.5707963267948966 rad pos: -67.5,-24.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 18320 components: - type: Transform pos: -66.5,-23.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 18321 components: - type: Transform pos: -65.5,-23.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 18322 components: - type: Transform rot: -1.5707963267948966 rad pos: -55.5,-26.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 18323 components: - type: Transform rot: -1.5707963267948966 rad pos: -55.5,-27.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 18324 components: - type: Transform rot: -1.5707963267948966 rad pos: -55.5,-28.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 18325 components: - type: Transform pos: -55.5,-28.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 18326 components: - type: Transform rot: -1.5707963267948966 rad pos: -54.5,-29.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 18327 components: - type: Transform pos: -54.5,-29.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 18328 components: - type: Transform pos: -53.5,-31.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 18329 components: - type: Transform rot: -1.5707963267948966 rad pos: -53.5,-31.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 18330 components: - type: Transform rot: -1.5707963267948966 rad pos: -53.5,-30.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 18331 components: - type: Transform rot: -1.5707963267948966 rad pos: -52.5,-32.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 18332 components: - type: Transform rot: -1.5707963267948966 rad pos: -51.5,-34.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 18333 components: - type: Transform rot: -1.5707963267948966 rad pos: -51.5,-33.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 18334 components: - type: Transform rot: -1.5707963267948966 rad pos: -50.5,-37.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 18335 components: - type: Transform rot: -1.5707963267948966 rad pos: -50.5,-36.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 18336 components: - type: Transform rot: -1.5707963267948966 rad pos: -50.5,-35.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 18337 components: - type: Transform pos: -51.5,-34.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 18338 components: - type: Transform pos: -52.5,-32.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 18339 components: - type: Transform pos: -50.5,-37.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 18341 components: - type: Transform rot: -1.5707963267948966 rad pos: -49.5,-38.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 18344 components: - type: Transform rot: -1.5707963267948966 rad pos: -47.5,-40.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 18345 components: - type: Transform rot: -1.5707963267948966 rad pos: -47.5,-49.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 18346 components: - type: Transform rot: -1.5707963267948966 rad pos: -47.5,-48.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 18347 components: - type: Transform rot: -1.5707963267948966 rad pos: -47.5,-47.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 18348 components: - type: Transform rot: -1.5707963267948966 rad pos: -47.5,-46.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 18349 components: - type: Transform rot: -1.5707963267948966 rad pos: -47.5,-45.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 18350 components: - type: Transform rot: -1.5707963267948966 rad pos: -47.5,-44.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 18351 components: - type: Transform rot: -1.5707963267948966 rad pos: -47.5,-43.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 18352 components: - type: Transform rot: -1.5707963267948966 rad pos: -47.5,-42.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 18353 components: - type: Transform rot: -1.5707963267948966 rad pos: -47.5,-41.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 20093 components: - type: Transform pos: 1.5,75.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 20138 components: - type: Transform rot: 3.141592653589793 rad pos: 9.5,42.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 20272 components: - type: Transform rot: 3.141592653589793 rad pos: 11.5,42.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 20278 components: - type: Transform rot: -1.5707963267948966 rad pos: 4.5,20.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 20477 components: - type: Transform rot: 3.141592653589793 rad pos: -38.5,-32.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 20478 components: - type: Transform rot: 3.141592653589793 rad pos: -37.5,-32.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 20479 components: - type: Transform rot: 3.141592653589793 rad pos: -36.5,-32.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 20480 components: - type: Transform rot: 3.141592653589793 rad pos: -35.5,-32.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 20481 components: - type: Transform rot: 1.5707963267948966 rad pos: -35.5,-32.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 20482 components: - type: Transform rot: 1.5707963267948966 rad pos: -35.5,-33.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 20483 components: - type: Transform rot: 1.5707963267948966 rad pos: -35.5,-34.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 20615 components: - type: Transform rot: -1.5707963267948966 rad pos: -23.5,41.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 20748 components: - type: Transform rot: -1.5707963267948966 rad pos: -17.5,44.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 20750 components: - type: Transform rot: 1.5707963267948966 rad pos: -18.5,44.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 21239 components: - type: Transform pos: -2.5,75.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 21745 components: - type: Transform rot: 1.5707963267948966 rad pos: 4.5,20.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 21746 components: - type: Transform pos: 4.5,20.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 22458 components: - type: Transform rot: 1.5707963267948966 rad pos: -18.5,43.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - uid: 22459 components: - type: Transform rot: 1.5707963267948966 rad pos: -18.5,42.5 parent: 30 + - type: DeltaPressure + gridUid: 30 - proto: Wirecutter entities: - uid: 21096 diff --git a/Resources/Prototypes/Catalog/Bounties/bounties.yml b/Resources/Prototypes/Catalog/Bounties/bounties.yml index 28adfb16ac..60fa5147b8 100644 --- a/Resources/Prototypes/Catalog/Bounties/bounties.yml +++ b/Resources/Prototypes/Catalog/Bounties/bounties.yml @@ -202,14 +202,16 @@ - type: cargoBounty id: BountyKnife - reward: 6000 + reward: 2000 description: bounty-description-knife entries: - name: bounty-item-knife amount: 5 whitelist: components: - - Sharp + - Sharp + tags: + - UtilityKnife # required because retracted utility knives are not Sharp - type: cargoBounty id: BountyLemon diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml b/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml index 7a8deb3151..9e109e6c02 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml @@ -58,6 +58,16 @@ category: cargoproduct-category-name-fun group: market +- type: cargoProduct + id: FunInstrumentsRandom + icon: + sprite: Objects/Fun/Instruments/h_synthesizer.rsi + state: supersynth + product: CrateFunInstrumentsRandom + cost: 2500 + category: cargoproduct-category-name-fun + group: market + - type: cargoProduct id: FunArtSupplies icon: diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/heads.yml b/Resources/Prototypes/Catalog/Fills/Boxes/heads.yml new file mode 100644 index 0000000000..122aecd27b --- /dev/null +++ b/Resources/Prototypes/Catalog/Fills/Boxes/heads.yml @@ -0,0 +1,143 @@ +- type: entity + name: circuit tote [QM] + parent: ToteBase + id: BoxQMCircuitboards + description: A Tote filled with QM's Circuit boards. + components: + - type: StorageFill + contents: + - id: CargoBountyComputerCircuitboard + - id: CargoRequestComputerCircuitboard + - id: CargoSaleComputerCircuitboard + - id: CargoShuttleConsoleCircuitboard + - id: SalvageMagnetMachineCircuitboard + - id: SalvageJobBoardComputerCircuitboard + - id: MailTeleporterMachineCircuitboard + +- type: entity + name: stamp box [QM] + parent: BoxCardboard + id: BoxQMStamps + description: A box filled with QM's Stamps. Stamped of course. + components: + - type: Item + size: Small + shape: + - 0,0,1,1 + - type: StorageFill + contents: + - id: RubberStampApproved + - id: RubberStampDenied + - id: RubberStampQm + - type: Storage + grid: + - 0,0,1,1 + whitelist: + components: + - Stamp + - type: Sprite + layers: + - state: box + - state: stamp + +- type: entity + name: circuit tote [HoP] + parent: ToteBase + id: BoxHoPCircuitboards + description: A Tote filled with HoP's Circuit boards. + components: + - type: StorageFill + contents: + - id: IDComputerCircuitboard + - id: FundingAllocationComputerCircuitboard + - id: CargoRequestServiceComputerCircuitboard + +- type: entity + name: stamp box [HoP] + parent: BoxCardboard + id: BoxHoPStamps + description: A box filled with HoP's Stamps. Stamped of course. + components: + - type: Item + size: Small + shape: + - 0,0,1,1 + - type: StorageFill + contents: + - id: RubberStampApproved + - id: RubberStampDenied + - id: RubberStampHop + - type: Storage + grid: + - 0,0,1,1 + whitelist: + components: + - Stamp + - type: Sprite + layers: + - state: box + - state: stamp + +- type: entity + name: circuit tote [CE] + parent: ToteBase + id: BoxCECircuitboards + description: A Tote filled with CE's Circuit boards. + components: + - type: StorageFill + contents: + - id: CargoRequestEngineeringComputerCircuitboard + - id: AlertsComputerCircuitboard + - id: AtmosMonitoringComputerCircuitboard + - id: PowerComputerCircuitboard + - id: SolarControlComputerCircuitboard + +- type: entity + name: circuit tote [Captain] + parent: ToteBase + id: BoxCaptainCircuitboards + description: A Tote filled with Captain's Circuit boards. + components: + - type: StorageFill + contents: + - id: CommsComputerCircuitboard + - id: StationRecordsComputerCircuitboard + +- type: entity + name: circuit tote [CMO] + parent: ToteBase + id: BoxCMOCircuitboards + description: A Tote filled with CMO's Circuit boards. + components: + - type: StorageFill + contents: + - id: MedicalTechFabCircuitboard + - id: CargoRequestMedicalComputerCircuitboard + +- type: entity + name: circuit tote [RD] + parent: ToteBase + id: BoxRDCircuitboards + description: A Tote filled with RD's Circuit boards. + components: + - type: StorageFill + contents: + - id: CircuitImprinterMachineCircuitboard + - id: ProtolatheMachineCircuitboard + - id: ResearchComputerCircuitboard + - id: CargoRequestScienceComputerCircuitboard + - id: RoboticsConsoleCircuitboard + - id: AnalysisComputerCircuitboard #Because sometimes round start artis just fucking explode on the pad. + - id: ArtifactAnalyzerMachineCircuitboard + - id: StationAiFixerCircuitboard + +- type: entity + name: circuit tote [HoS] + parent: ToteBase + id: BoxHoSCircuitboards + description: A Tote filled with HoS's Circuit boards. + components: + - type: StorageFill + contents: + - id: SecurityTechFabCircuitboard + - id: CargoRequestSecurityComputerCircuitboard diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/security.yml b/Resources/Prototypes/Catalog/Fills/Boxes/security.yml index 818810d0cc..2f9decab7d 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/security.yml +++ b/Resources/Prototypes/Catalog/Fills/Boxes/security.yml @@ -135,3 +135,24 @@ layers: - state: box_security - state: forensic + +- type: entity + parent: BoxCardboard + id: BoxDetonator + name: detonator box + description: A box of explosive detonators and triggers. + components: + - type: Item + shape: + - 0,0,1,1 + - type: StorageFill + contents: + - id: EmptyDetonator + amount: 3 + - id: TimerTrigger + amount: 2 + - id: VoiceTrigger + - type: Sprite + layers: + - state: box_security + - state: trigger diff --git a/Resources/Prototypes/Catalog/Fills/Crates/cargo.yml b/Resources/Prototypes/Catalog/Fills/Crates/cargo.yml index a01ba7c3ff..ad65b43684 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/cargo.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/cargo.yml @@ -313,6 +313,9 @@ - id: PlushieMoth prob: 0.01 orGroup: Plushies + - id: PlushieVulp + prob: 0.01 + orGroup: Plushies - id: PlushieArachind prob: 0.01 orGroup: Plushies diff --git a/Resources/Prototypes/Catalog/Fills/Crates/engineering.yml b/Resources/Prototypes/Catalog/Fills/Crates/engineering.yml index 7acb9cf8b1..51e6440a34 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/engineering.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/engineering.yml @@ -235,13 +235,13 @@ - type: entity id: CrateTechBoardRandom - parent: CrateEngineering + parent: ToteBase name: surplus boards description: Surplus boards from somewhere. components: - type: EntityTableContainerFill containers: - entity_storage: !type:NestedSelector + storagebase: !type:NestedSelector tableId: RandomTechBoardTable rolls: !type:RangeNumberSelector range: 6, 8 diff --git a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml index 9aa5092c7b..893d62b310 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml @@ -42,6 +42,7 @@ - id: PlushieMoth - id: PlushieArachind - id: PlushiePenguin + - id: PlushieVulp - type: entityTable id: AllPottedPlantsTable @@ -245,6 +246,30 @@ - id: MusicalLungInstrument - id: ReverseCymbalsInstrument +- type: entity + id: CrateFunInstrumentsRandom + parent: CrateGenericSteel + name: random instrument collection + description: A box containing several randomly curated instruments, hand picked by Centcomm's top musicians! + components: + - type: EntityTableContainerFill + containers: + entity_storage: !type:AllSelector + children: + - !type:NestedSelector + tableId: VarietyInstrumentTable # 200 speso max + - !type:NestedSelector + tableId: BrassInstrumentTable # 300 speso max + - !type:NestedSelector + tableId: StringInstrumentTable # 300 speso max + - !type:NestedSelector + tableId: WoodwindInstrumentTable # 200 speso max + - !type:NestedSelector + tableId: KeyedPercussionInstrumentTable # 300 speso max + - !type:NestedSelector + tableId: SpecialInstrumentTable # x2 200 speso max + rolls: 2 + - type: entity id: CrateFunArtSupplies parent: CrateGenericSteel diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index 78d668da7d..1972e168f5 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -4,22 +4,14 @@ children: - id: BoxEncryptionKeyCargo - id: BoxFolderQmClipboard - - id: CargoBountyComputerCircuitboard - - id: CargoRequestComputerCircuitboard - - id: CargoSaleComputerCircuitboard - - id: CargoShuttleConsoleCircuitboard - - id: SalvageMagnetMachineCircuitboard - - id: SalvageJobBoardComputerCircuitboard + - id: BoxQMCircuitboards + - id: BoxQMStamps - id: CigPackGreen prob: 0.50 - id: ClothingHeadsetAltCargo - id: DoorRemoteCargo - - id: RubberStampApproved - - id: RubberStampDenied - - id: RubberStampQm - id: AstroNavCartridge - id: ClothingHandsKnuckleDustersQM - - id: MailTeleporterMachineCircuitboard - id: PrinterDocFlatpack # Corvax-Printer - type: entity @@ -43,7 +35,7 @@ - id: ClothingBeltSheathFilled - id: ClothingHeadsetAltCommand - id: ClothingOuterArmorCaptainCarapace - - id: CommsComputerCircuitboard + - id: BoxCaptainCircuitboards - id: DoorRemoteCustom - id: MedalCase - id: NukeDisk @@ -127,6 +119,8 @@ - id: BoxEncryptionKeyPassenger - id: BoxEncryptionKeyService - id: BoxHeadset + - id: BoxHoPCircuitboards + - id: BoxHoPStamps - id: BoxID - id: BoxPDA - id: CigarGoldCase @@ -139,12 +133,6 @@ - id: ClothingNeckGoldmedal - id: DoorRemoteService - id: HoPIDCard - - id: IDComputerCircuitboard - - id: FundingAllocationComputerCircuitboard - - id: CargoRequestServiceComputerCircuitboard - - id: RubberStampApproved - - id: RubberStampDenied - - id: RubberStampHop - id: WeaponDisabler - id: ClothingEyesHudCommand - id: ClothingOuterCoatHOP # Corvax-Resprite @@ -174,7 +162,7 @@ - id: ClothingHandsGlovesColorYellow - id: ClothingHeadsetAltEngineering - id: DoorRemoteEngineering - - id: CargoRequestEngineeringComputerCircuitboard + - id: BoxCECircuitboards - id: RCD - id: RCDAmmo - id: RubberStampCE @@ -233,8 +221,7 @@ - id: DoorRemoteMedical - id: HandheldCrewMonitor - id: Hypospray - - id: MedicalTechFabCircuitboard - - id: CargoRequestMedicalComputerCircuitboard + - id: BoxCMOCircuitboards - id: MedkitFilled - id: RubberStampCMO - id: MedTekCartridge @@ -281,15 +268,11 @@ children: - id: Intellicard - id: BoxEncryptionKeyScience - - id: CircuitImprinterMachineCircuitboard + - id: BoxRDCircuitboards - id: ClothingBeltUtilityFilled - id: ClothingHeadsetAltScience - id: DoorRemoteResearch - id: HandTeleporter - - id: ProtolatheMachineCircuitboard - - id: ResearchComputerCircuitboard - - id: CargoRequestScienceComputerCircuitboard - - id: StationAiFixerCircuitboard - id: RubberStampRd # Hardsuit table, used for suit storage as well @@ -346,9 +329,9 @@ - id: DoorRemoteSecurity - id: HoloprojectorSecurity - id: RubberStampHos - - id: SecurityTechFabCircuitboard - - id: CargoRequestSecurityComputerCircuitboard + - id: BoxHoSCircuitboards - id: WeaponDisabler + - id: WeaponTaser - id: WantedListCartridge - id: DrinkHosFlask # Corvax-Start diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml index 14a98dd9ba..5ae5553622 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml @@ -28,6 +28,7 @@ children: - id: FlashlightSeclite - id: WeaponDisabler + - id: WeaponTaser - id: ClothingBeltSecurityFilled - id: Flash - id: ClothingEyesGlassesSecurity @@ -74,6 +75,7 @@ - id: FlashlightSeclite prob: 0.8 - id: WeaponDisabler + - id: WeaponTaser - id: ClothingUniformJumpsuitSecGrey prob: 0.3 - id: ClothingHeadHelmetBasic @@ -109,6 +111,7 @@ table: !type:AllSelector children: - id: ClothingEyesGlassesSecurity + - id: WeaponTaser - id: WeaponDisabler - id: TrackingImplanter amount: 2 diff --git a/Resources/Prototypes/Datasets/arcade_villain.yml b/Resources/Prototypes/Datasets/arcade_villain.yml new file mode 100644 index 0000000000..5e4a517f1f --- /dev/null +++ b/Resources/Prototypes/Datasets/arcade_villain.yml @@ -0,0 +1,17 @@ +- type: localizedDataset + id: SpaceVillainVerbsFight + values: + prefix: arcade-villain-verbs-fight- + count: 10 + +- type: localizedDataset + id: SpaceVillainNamesEnemyFirst + values: + prefix: arcade-villain-names-enemy-first- + count: 11 + +- type: localizedDataset + id: SpaceVillainNamesEnemyLast + values: + prefix: arcade-villain-names-enemy-last- + count: 15 diff --git a/Resources/Prototypes/DeviceLinking/source_ports.yml b/Resources/Prototypes/DeviceLinking/source_ports.yml index 302679c4d9..5eb059b191 100644 --- a/Resources/Prototypes/DeviceLinking/source_ports.yml +++ b/Resources/Prototypes/DeviceLinking/source_ports.yml @@ -20,6 +20,7 @@ id: Status name: signal-port-name-status-transmitter description: signal-port-description-status-transmitter + defaultLinks: [ Toggle ] - type: sourcePort id: Left diff --git a/Resources/Prototypes/Entities/Clothing/Back/smuggler_tables.yml b/Resources/Prototypes/Entities/Clothing/Back/smuggler_tables.yml index d03e629014..5ab753ef3d 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/smuggler_tables.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/smuggler_tables.yml @@ -241,14 +241,14 @@ id: RandomSatchelTable3 table: !type:AllSelector children: + - !type:NestedSelector + tableId: RandomSatchelBurgerTable #2x medium - !type:NestedSelector tableId: RandomSatchelPresentsOrToysTable #3x small - !type:NestedSelector tableId: RandomSatchelCashTable #1x small - !type:NestedSelector tableId: RandomSatchelWeaponTable #5x small - - !type:NestedSelector - tableId: RandomSatchelBurgerTable #5x small - !type:NestedSelector tableId: RandomSatchelGenericTableSmall #1x small - !type:NestedSelector @@ -309,24 +309,18 @@ amount: !type:RangeNumberSelector range: 1, 5 -- type: entityTable #5x small +- type: entityTable #2x medium id: RandomSatchelBurgerTable table: !type:GroupSelector + rolls: !type:RangeNumberSelector + range: 1, 2 children: - id: SpaceCash100 weight: 10 - id: FoodBurgerAppendix - amount: !type:RangeNumberSelector - range: 1, 5 - id: FoodBurgerEmpowered - amount: !type:RangeNumberSelector - range: 1, 5 - id: FoodBurgerClown - amount: !type:RangeNumberSelector - range: 1, 5 - id: FoodBurgerGhost - amount: !type:RangeNumberSelector - range: 1, 5 - type: entityTable #1x small id: RandomSatchelGenericTableSmall diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml index 06c38cc694..5273fa1453 100644 --- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml @@ -35,6 +35,7 @@ - GPS - WeldingMask - RemoteSignaller + - UtilityKnife components: - StationMap - SprayPainter @@ -120,6 +121,7 @@ - HolofanProjector - Multitool - AppraisalTool + - UtilityKnife components: - StationMap - SprayPainter diff --git a/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml b/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml index cd68149edc..d90e02b16e 100644 --- a/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml +++ b/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml @@ -7,7 +7,7 @@ state: icon - type: Clothing slots: [gloves] - - type: Food + - type: Edible requiresSpecialDigestion: true - type: Item size: Small diff --git a/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml b/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml index 5d512cb3c7..53772f6215 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml @@ -11,7 +11,7 @@ - type: Item size: Small storedRotation: -90 - - type: Food + - type: Edible requiresSpecialDigestion: true - type: SolutionContainerManager solutions: diff --git a/Resources/Prototypes/Entities/Clothing/Masks/base_clothingmask.yml b/Resources/Prototypes/Entities/Clothing/Masks/base_clothingmask.yml index a112e4f0de..6ab6da4c0f 100644 --- a/Resources/Prototypes/Entities/Clothing/Masks/base_clothingmask.yml +++ b/Resources/Prototypes/Entities/Clothing/Masks/base_clothingmask.yml @@ -44,7 +44,7 @@ - type: PhysicalComposition # 50% of the amount of cloth you'd obtain upon butchering materialComposition: Cloth: 50 - - type: Food + - type: Edible requiresSpecialDigestion: true - type: SolutionContainerManager solutions: diff --git a/Resources/Prototypes/Entities/Clothing/Multiple/towel.yml b/Resources/Prototypes/Entities/Clothing/Multiple/towel.yml index 0ee8df4524..f5f2053fea 100644 --- a/Resources/Prototypes/Entities/Clothing/Multiple/towel.yml +++ b/Resources/Prototypes/Entities/Clothing/Multiple/towel.yml @@ -9,18 +9,16 @@ sprite: Clothing/Multiple/towel.rsi - type: Clothing sprite: Clothing/Multiple/towel.rsi - slots: + slots: - BELT - INNERCLOTHING - HEAD femaleMask: UniformTop - equipSound: - unequipSound: + equipSound: + unequipSound: - type: Spillable solution: absorbed spillWhenThrown: false - - type: DrainableSolution - solution: absorbed - type: Absorbent pickupAmount: 15 - type: SolutionContainerManager @@ -163,7 +161,7 @@ color: "#0089EF" - type: Fiber fiberColor: fibers-blue - + - type: entity id: TowelColorDarkBlue name: dark blue towel @@ -766,4 +764,3 @@ color: "#535353" - type: Fiber fiberColor: fibers-black - \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Clothing/Neck/base_clothingneck.yml b/Resources/Prototypes/Entities/Clothing/Neck/base_clothingneck.yml index 949575eaf5..2e1b0dea73 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/base_clothingneck.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/base_clothingneck.yml @@ -19,7 +19,7 @@ - type: PhysicalComposition # 50% of the amount of cloth you'd obtain upon butchering materialComposition: Cloth: 100 - - type: Food + - type: Edible requiresSpecialDigestion: true - type: SolutionContainerManager solutions: diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml index e73eca00bf..5c0f1ed277 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml @@ -131,7 +131,7 @@ modifiers: coefficients: Slash: 0.95 - - type: Food + - type: Edible requiresSpecialDigestion: true - type: SolutionContainerManager solutions: diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml index d5612210c6..7bf6ed1f0a 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml @@ -71,12 +71,19 @@ parent: ClothingOuterEVASuitBase id: ClothingOuterHardsuitEVAPrisoner name: prisoner EVA suit - description: A lightweight space suit for prisoners to protect them from the vacuum of space during emergencies. + description: An emergency EVA suit meant for prisoners. It's horribly slow and lacking in temperature protection, but enough to buy you time from the harsh vacuum of space. components: - type: Sprite sprite: Clothing/OuterClothing/Suits/eva_prisoner.rsi - type: Clothing sprite: Clothing/OuterClothing/Suits/eva_prisoner.rsi + - type: ClothingSpeedModifier + walkModifier: 0.7 + sprintModifier: 0.7 + - type: HeldSpeedModifier + - type: TemperatureProtection + heatingCoefficient: 0.75 + coolingCoefficient: 0.5 - type: Tag tags: - SuitEVA diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml index 4227e52518..86df3c6ec1 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml @@ -21,7 +21,7 @@ priceMultiplier: 0 - type: ZombificationResistance zombificationResistanceCoefficient: 0.55 - - type: Food + - type: Edible requiresSpecialDigestion: true - type: SolutionContainerManager solutions: diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml b/Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml index 646adda105..cd945af5e3 100644 --- a/Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml +++ b/Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml @@ -10,7 +10,7 @@ state: icon - type: Item size: Normal - - type: Food + - type: Edible requiresSpecialDigestion: true - type: SolutionContainerManager solutions: @@ -51,11 +51,11 @@ slots: item: name: clothing-boots-sidearm + priority: 4 whitelist: tags: - Knife - Sidearm - priority: 4 - type: entity abstract: true diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml b/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml index 4b93091ec5..db8e3bb603 100644 --- a/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml +++ b/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml @@ -68,6 +68,12 @@ - type: Construction graph: ClothingShoeSlippersLizard node: shoes + - type: Edible + useSound: + path: /Audio/Items/Toys/weh.ogg # Copied from lizard plush sound + params: + volume: -5 + transferAmount: 10 - type: Extractable juiceSolution: reagents: diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml index cd8ef614e5..0abbfebc2a 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml @@ -17,7 +17,7 @@ - type: PhysicalComposition # 50% of the amount of cloth you'd obtain upon butchering materialComposition: Cloth: 150 - - type: Food + - type: Edible requiresSpecialDigestion: true - type: SolutionContainerManager solutions: @@ -74,4 +74,4 @@ unfoldVerbText: unfold-verb-clothing-jacket foldVerbText: fold-verb-clothing-jacket - type: FoldableClothing - foldedEquippedPrefix: folded \ No newline at end of file + foldedEquippedPrefix: folded diff --git a/Resources/Prototypes/Entities/Effects/emp_effects.yml b/Resources/Prototypes/Entities/Effects/emp_effects.yml index d1096b85f5..6919f776f2 100644 --- a/Resources/Prototypes/Entities/Effects/emp_effects.yml +++ b/Resources/Prototypes/Entities/Effects/emp_effects.yml @@ -8,17 +8,14 @@ drawdepth: Effects noRot: true layers: - - shader: unshaded - map: ["enum.EffectLayers.Unshaded"] - sprite: Effects/emp.rsi - state: emp_pulse + - shader: unshaded + map: ["enum.EffectLayers.Unshaded"] + sprite: Effects/emp.rsi + state: emp_pulse - type: EffectVisuals - type: Tag tags: - - HideContextMenu - - type: EmitSoundOnSpawn - sound: - path: /Audio/Effects/Lightning/lightningbolt.ogg + - HideContextMenu - type: AnimationPlayer - type: entity @@ -31,12 +28,12 @@ drawdepth: Effects noRot: true layers: - - shader: unshaded - map: ["enum.EffectLayers.Unshaded"] - sprite: Effects/emp.rsi - state: emp_disable + - shader: unshaded + map: ["enum.EffectLayers.Unshaded"] + sprite: Effects/emp.rsi + state: emp_disable - type: EffectVisuals - type: Tag tags: - - HideContextMenu + - HideContextMenu - type: AnimationPlayer diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml index 9f952db002..1263e47b6c 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml @@ -104,7 +104,7 @@ rolls: !type:RangeNumberSelector range: 1, 2 - !type:NestedSelector - tableId: RandomInstrumentTable + tableId: SalvageInstrumentTable - type: entityTable id: SalvageTreasureUncommon diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/instruments.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/instruments.yml index 0d38015c40..93e7e58e88 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/instruments.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/instruments.yml @@ -38,6 +38,111 @@ - id: MusicBoxInstrument - id: ViolaInstrument +- type: entityTable + id: VarietyInstrumentTable + table: !type:GroupSelector + children: + - id: SynthesizerInstrument + - id: AcousticGuitarInstrument + - id: TrumpetInstrument + - id: AccordionInstrument + - id: HarmonicaInstrument + - id: RecorderInstrument + - id: GlockenspielInstrument + +- type: entityTable + id: BrassInstrumentTable + table: !type:GroupSelector + children: + - id: TrumpetInstrument + - id: TromboneInstrument + - id: FrenchHornInstrument + - id: EuphoniumInstrument + - id: TubaInstrument + +- type: entityTable + id: StringInstrumentTable + table: !type:GroupSelector + children: + - id: AcousticGuitarInstrument + - id: ElectricGuitarInstrument + - id: BassGuitarInstrument + - id: RockGuitarInstrument + - id: BanjoInstrument + - id: ViolinInstrument + - id: CelloInstrument + - id: ViolaInstrument + - id: HarpInstrument + +- type: entityTable + id: WoodwindInstrumentTable + table: !type:GroupSelector + children: + - id: RecorderInstrument + - id: BagpipeInstrument + - id: ClarinetInstrument + - id: FluteInstrument + - id: HarmonicaInstrument + - id: SaxophoneInstrument + - id: OcarinaInstrument + - id: PanFluteInstrument + +- type: entityTable + id: KeyedPercussionInstrumentTable + table: !type:GroupSelector + children: + - id: SynthesizerInstrument + - id: AccordionInstrument + - id: KalimbaInstrument + - id: WoodblockInstrument + - id: GlockenspielInstrument + - id: VibraphoneInstrument + +- type: entityTable + id: SpecialInstrumentTable + table: !type:GroupSelector + children: + - !type:GroupSelector + weight: 1 + children: + - id: BikeHornInstrument + - id: MusicBoxInstrument + - id: SeashellInstrument + - id: XylophoneInstrument + - id: GunpetInstrument + - id: MicrophoneInstrument + - id: HelicopterInstrument + - id: BirdToyInstrument + - id: MusicalLungInstrument + - id: ReverseCymbalsInstrument + - !type:GroupSelector + weight: 0.1 + children: + - id: DawInstrumentMachineCircuitboard + - !type:GroupSelector + weight: 0.05 + children: + - id: SuperSynthesizerInstrument + +- type: entityTable + id: SalvageInstrumentTable + table: !type:GroupSelector + children: + - !type:NestedSelector + tableId: VarietyInstrumentTable + - !type:NestedSelector + tableId: BrassInstrumentTable + - !type:NestedSelector + tableId: StringInstrumentTable + - !type:NestedSelector + tableId: KeyedPercussionInstrumentTable + - !type:NestedSelector + tableId: WoodwindInstrumentTable + - !type:NestedSelector + tableId: SpecialInstrumentTable + - id: SuperSynthesizerInstrument + weight: 0.3 + - type: entity id: RandomInstruments name: random instruments spawner diff --git a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml index 4879c866d7..38d25d6abc 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml @@ -1,4 +1,4 @@ -# Be careful with these as they get removed on shutdown too! +# Be careful with these as they get removed on shutdown too! - type: entity id: AiHeld description: Components added / removed from an entity that gets inserted into an AI core. @@ -170,7 +170,7 @@ # Empty AI core - type: entity id: PlayerStationAiEmpty - name: AI Core + name: AI core description: The latest in Artificial Intelligences. parent: - BaseStructure @@ -331,7 +331,7 @@ - type: entity parent: BaseStructure id: PlayerStationAiAssembly - name: AI Core Assembly + name: AI core assembly description: An unfinished computer core for housing an artifical intelligence. components: - type: Anchorable diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml index 64309dd5cb..eb8d6bedf5 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml @@ -1675,7 +1675,7 @@ - type: SolutionContainerManager solutions: food: - maxVol: 24 + maxVol: 14 reagents: - ReagentId: Bicaridine Quantity: 5 @@ -1683,8 +1683,6 @@ Quantity: 5 - ReagentId: Nutriment Quantity: 2 - - ReagentId: Desoxyephedrine - Quantity: 10 - ReagentId: Vitamin Quantity: 2 - type: Sprite @@ -1720,7 +1718,7 @@ - type: SolutionContainerManager solutions: food: - maxVol: 20 + maxVol: 10 reagents: - ReagentId: Omnizine Quantity: 3 @@ -1728,8 +1726,6 @@ Quantity: 5 - ReagentId: Nutriment Quantity: 2 - - ReagentId: Desoxyephedrine - Quantity: 10 - type: Sprite sprite: Objects/Specific/Hydroponics/ambrosia_deus.rsi - type: Item @@ -1799,10 +1795,12 @@ - type: SolutionContainerManager solutions: food: - maxVol: 15 + maxVol: 25 reagents: - ReagentId: Razorium Quantity: 15 + - ReagentId: Desoxyephedrine + Quantity: 10 - type: Sprite sprite: Objects/Specific/Hydroponics/glasstle.rsi - type: Produce diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml index e047108bc8..b705fb8a9a 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml @@ -1,4 +1,4 @@ -- type: entity +- type: entity parent: BaseItem id: BaseComputerCircuitboard name: computer board @@ -566,7 +566,7 @@ - type: entity parent: BaseComputerCircuitboard id: StationAiFixerCircuitboard - name: AI restoration console + name: AI restoration console board description: A computer printed circuit board for an AI restoration console console. components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/misc.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/misc.yml index a38aafa649..44bad730fa 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/misc.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/misc.yml @@ -12,5 +12,3 @@ - type: Tag tags: - StationMapElectronics - - type: StaticPrice - price: 30 diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/base_electronics.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/base_electronics.yml index 7d2daaec0d..56d96b99d4 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/base_electronics.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/base_electronics.yml @@ -10,8 +10,6 @@ - type: Sprite sprite: Objects/Misc/module.rsi state: generic - - type: StaticPrice - price: 100 - type: PhysicalComposition materialComposition: Glass: 200 diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/disposal.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/disposal.yml index 4e57705417..4638b44d48 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/disposal.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/disposal.yml @@ -10,5 +10,3 @@ - type: Tag tags: - MailingUnitElectronics - - type: StaticPrice - price: 55 diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/door.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/door.yml index 5ca355ec71..05ab58071c 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/door.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/door.yml @@ -11,8 +11,6 @@ tags: - DoorElectronics - type: DoorElectronics - - type: StaticPrice - price: 55 - type: AccessReader - type: ActivatableUI key: enum.DoorElectronicsConfigurationUiKey.Key diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/misc.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/misc.yml index 62a4ee7294..5b713bcbe9 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/misc.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/misc.yml @@ -11,5 +11,3 @@ tags: - FreezerElectronics - type: DoorElectronics - - type: StaticPrice - price: 55 diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/triggers.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/triggers.yml index c6943a63e3..af5538fd34 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/triggers.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/triggers.yml @@ -17,7 +17,7 @@ sprite: Objects/Devices/timer.rsi state: timer - type: Item - size: Small + size: Tiny - type: StaticPrice price: 40 - type: PayloadTrigger @@ -79,6 +79,8 @@ name: voice trigger description: Adds a machine link that is triggered by vocal keywords. components: + - type: Item + size: Tiny - type: Sprite sprite: Objects/Devices/voice.rsi state: voice diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml index ade592ec9c..2461328f1d 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml @@ -64,7 +64,8 @@ - type: UnpoweredFlashlight - type: PointLight enabled: false - radius: 1.5 + radius: 1.7 + falloff: 3 softness: 5 autoRot: true - type: Ringer diff --git a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instrument_keyed.yml b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instrument_keyed.yml index 02eaf3cc7d..46af54f86f 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instrument_keyed.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instrument_keyed.yml @@ -32,13 +32,20 @@ - type: Instrument allowPercussion: true allowProgramChange: true - respectMidiLimits: false - type: Sprite sprite: Objects/Fun/Instruments/h_synthesizer.rsi state: supersynth - type: Item heldPrefix: super +- type: entity + parent: SuperSynthesizerInstrument + id: SuperSynthesizerNoLimitInstrument + suffix: NoLimits + components: + - type: Instrument + respectMidiLimits: false + - type: entity parent: BaseKeyedInstrument id: AccordionInstrument diff --git a/Resources/Prototypes/Entities/Objects/Fun/plushies.yml b/Resources/Prototypes/Entities/Objects/Fun/plushies.yml index fa028c038a..48670291e6 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/plushies.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/plushies.yml @@ -33,7 +33,7 @@ Cloth: 100 - type: StaticPrice price: 5 - - type: Food + - type: Edible requiresSpecialDigestion: true useSound: *BasePlushieSound delay: 2 @@ -110,6 +110,7 @@ - ForceableFollow - PlushieGhost - Payload + - ClothMade - type: entity parent: PlushieGhost @@ -178,28 +179,20 @@ sprite: Objects/Fun/Plushies/hampter.rsi state: icon - type: EmitSoundOnUse - sound: + sound: &PlushieHampterSound path: /Audio/Items/Toys/mousesqueek.ogg - type: EmitSoundOnLand - sound: - path: /Audio/Items/Toys/mousesqueek.ogg + sound: *PlushieHampterSound - type: EmitSoundOnActivate - sound: - path: /Audio/Items/Toys/mousesqueek.ogg + sound: *PlushieHampterSound - type: EmitSoundOnTrigger - sound: - path: /Audio/Items/Toys/mousesqueek.ogg + sound: *PlushieHampterSound - type: EmitSoundOnCollide - sound: - path: /Audio/Items/Toys/mousesqueek.ogg - - type: Food - requiresSpecialDigestion: true - useSound: - path: /Audio/Items/Toys/mousesqueek.ogg + sound: *PlushieHampterSound + - type: Edible + useSound: *PlushieHampterSound - type: MeleeWeapon - wideAnimationRotation: 180 - soundHit: - path: /Audio/Items/Toys/mousesqueek.ogg + soundHit: *PlushieHampterSound - type: Clothing quickEquip: false sprite: Objects/Fun/Plushies/hampter.rsi @@ -310,28 +303,20 @@ sprite: Objects/Fun/Plushies/arachnid.rsi state: icon - type: EmitSoundOnUse - sound: + sound: &PlushieArachnidSound path: /Audio/Voice/Arachnid/arachnid_laugh.ogg - type: EmitSoundOnLand - sound: - path: /Audio/Voice/Arachnid/arachnid_laugh.ogg + sound: *PlushieArachnidSound - type: EmitSoundOnActivate - sound: - path: /Audio/Voice/Arachnid/arachnid_laugh.ogg + sound: *PlushieArachnidSound - type: EmitSoundOnTrigger - sound: - path: /Audio/Voice/Arachnid/arachnid_laugh.ogg + sound: *PlushieArachnidSound - type: EmitSoundOnCollide - sound: - path: /Audio/Voice/Arachnid/arachnid_laugh.ogg - - type: Food - requiresSpecialDigestion: true - useSound: - path: /Audio/Voice/Arachnid/arachnid_laugh.ogg + sound: *PlushieArachnidSound + - type: Edible + useSound: *PlushieArachnidSound - type: MeleeWeapon - wideAnimationRotation: 180 - soundHit: - path: /Audio/Voice/Arachnid/arachnid_laugh.ogg + soundHit: *PlushieArachnidSound - type: Clothing quickEquip: false sprite: Objects/Fun/Plushies/arachnid.rsi @@ -365,11 +350,10 @@ sound: *PlushieLizardSound - type: EmitSoundOnCollide sound: *PlushieLizardSound - - type: Food - requiresSpecialDigestion: true + - type: Edible useSound: *PlushieLizardSound + transferAmount: 10 - type: MeleeWeapon - wideAnimationRotation: 180 soundHit: *PlushieLizardSound - type: Extractable juiceSolution: @@ -405,7 +389,7 @@ parent: BasePlushie id: PlushieExperiment #Arf! name: experiment plushie - description: A plushie of a canid of sorts, it yearns to be detonated on a landmine. + description: A plushie of a canid of sorts. It yearns to be detonated on a landmine. components: - type: Sprite sprite: Objects/Fun/Plushies/expi.rsi @@ -432,11 +416,9 @@ sound: *PlushieExperimentSound - type: EmitSoundOnCollide sound: *PlushieExperimentSound - - type: Food - requiresSpecialDigestion: true + - type: Edible useSound: *PlushieExperimentSound - type: MeleeWeapon - wideAnimationRotation: 180 soundHit: *PlushieExperimentSound - type: Clothing clothingVisuals: @@ -516,11 +498,9 @@ sound: *PlushieSpaceLizardSound - type: EmitSoundOnCollide sound: *PlushieSpaceLizardSound - - type: Food - requiresSpecialDigestion: true + - type: Edible useSound: *PlushieSpaceLizardSound - type: MeleeWeapon - wideAnimationRotation: 180 soundHit: *PlushieSpaceLizardSound - type: Clothing sprite: Objects/Fun/Plushies/lizard.rsi @@ -554,13 +534,13 @@ sound: *PlushieLizardInversedSound - type: EmitSoundOnActivate sound: *PlushieLizardInversedSound + - type: EmitSoundOnCollide + sound: *PlushieLizardInversedSound - type: EmitSoundOnTrigger sound: *PlushieLizardInversedSound - - type: Food - requiresSpecialDigestion: true + - type: Edible useSound: *PlushieLizardInversedSound - type: MeleeWeapon - wideAnimationRotation: 180 soundHit: *PlushieLizardInversedSound - type: Extractable juiceSolution: @@ -614,24 +594,20 @@ - type: EmitSoundOnCollide sound: *PlushieDionaSound - type: MeleeWeapon - wideAnimationRotation: 180 soundHit: *PlushieDionaSound - - type: Food - requiresSpecialDigestion: true + - type: Edible useSound: *PlushieDionaSound - type: SolutionContainerManager solutions: - plushie: - maxVol: 1 food: - maxVol: 10 + maxVol: 11 reagents: - ReagentId: Fiber Quantity: 10 - type: RefillableSolution - solution: plushie + solution: food - type: SolutionContainerVisuals - solutionName: plushie + solutionName: food maxFillLevels: 1 fillBaseName: plushie_diona changeColor: false @@ -683,26 +659,23 @@ - type: Sprite sprite: Objects/Fun/Plushies/shark.rsi state: blue - - type: EmitSoundOnLand - sound: - path: /Audio/Items/Toys/rawr.ogg - - type: EmitSoundOnTrigger - sound: - path: /Audio/Items/Toys/rawr.ogg - type: EmitSoundOnUse - sound: + sound: &PlushieSharkSound path: /Audio/Items/Toys/rawr.ogg + - type: EmitSoundOnLand + sound: *PlushieSharkSound + - type: EmitSoundOnTrigger + sound: *PlushieSharkSound - type: EmitSoundOnActivate - sound: - path: /Audio/Items/Toys/rawr.ogg + sound: *PlushieSharkSound - type: EmitSoundOnCollide - sound: - path: /Audio/Items/Toys/rawr.ogg + sound: *PlushieSharkSound - type: MeleeWeapon wideAnimationRotation: 90 - soundHit: - path: /Audio/Items/Toys/rawr.ogg + soundHit: *PlushieSharkSound animation: WeaponArcBite + - type: Edible + useSound: *PlushieSharkSound - type: Item heldPrefix: blue storedRotation: -90 @@ -813,28 +786,21 @@ heldPrefix: carpplush storedRotation: -90 - type: EmitSoundOnUse - sound: + sound: &PlushieCarpSound path: /Audio/Effects/bite.ogg - type: EmitSoundOnLand - sound: - path: /Audio/Effects/bite.ogg + sound: *PlushieCarpSound - type: EmitSoundOnActivate - sound: - path: /Audio/Effects/bite.ogg + sound: *PlushieCarpSound - type: EmitSoundOnTrigger - sound: - path: /Audio/Effects/bite.ogg + sound: *PlushieCarpSound - type: EmitSoundOnCollide - sound: - path: /Audio/Effects/bite.ogg - - type: Food - requiresSpecialDigestion: true - useSound: - path: /Audio/Effects/bite.ogg + sound: *PlushieCarpSound + - type: Edible + useSound: *PlushieCarpSound - type: MeleeWeapon wideAnimationRotation: 90 - soundHit: - path: /Audio/Effects/bite.ogg + soundHit: *PlushieCarpSound angle: 0 animation: WeaponArcBite # Rrrr! - type: FoodSequenceElement @@ -924,21 +890,20 @@ sprite: Objects/Fun/Plushies/slime.rsi state: icon - type: EmitSoundOnUse - sound: + sound: &PlushieSlimeSound path: /Audio/Voice/Slime/slime_squish.ogg - type: EmitSoundOnLand - sound: - path: /Audio/Voice/Slime/slime_squish.ogg + sound: *PlushieSlimeSound - type: EmitSoundOnActivate - sound: - path: /Audio/Voice/Slime/slime_squish.ogg + sound: *PlushieSlimeSound + - type: EmitSoundOnCollide + sound: *PlushieSlimeSound - type: EmitSoundOnTrigger - sound: - path: /Audio/Voice/Slime/slime_squish.ogg + sound: *PlushieSlimeSound - type: MeleeWeapon - wideAnimationRotation: 180 - soundHit: - path: /Audio/Voice/Slime/slime_squish.ogg + soundHit: *PlushieSlimeSound + - type: Edible + useSound: *PlushieSlimeSound - type: Clothing quickEquip: false sprite: Objects/Fun/Plushies/slime.rsi @@ -960,28 +925,21 @@ - type: Item heldPrefix: plushiesnake - type: EmitSoundOnUse - sound: + sound: &PlushieSnakeSound path: /Audio/Items/Toys/rattle.ogg - type: EmitSoundOnLand - sound: - path: /Audio/Items/Toys/rattle.ogg + sound: *PlushieSnakeSound - type: EmitSoundOnActivate - sound: - path: /Audio/Items/Toys/rattle.ogg + sound: *PlushieSnakeSound - type: EmitSoundOnTrigger - sound: - path: /Audio/Items/Toys/rattle.ogg + sound: *PlushieSnakeSound - type: EmitSoundOnCollide - sound: - path: /Audio/Items/Toys/rattle.ogg - - type: Food - requiresSpecialDigestion: true - useSound: - path: /Audio/Items/Toys/rattle.ogg + sound: *PlushieSnakeSound + - type: Edible + useSound: *PlushieSnakeSound - type: MeleeWeapon wideAnimationRotation: 90 - soundHit: - path: /Audio/Items/Toys/rattle.ogg + soundHit: *PlushieSnakeSound - type: Clothing sprite: Objects/Fun/Plushies/snake.rsi quickEquip: false @@ -1003,28 +961,21 @@ sprite: Objects/Fun/toy_mouse.rsi state: icon - type: EmitSoundOnUse - sound: + sound: &PlushieMouseSound path: /Audio/Items/Toys/mousesqueek.ogg - type: EmitSoundOnLand - sound: - path: /Audio/Items/Toys/mousesqueek.ogg + sound: *PlushieMouseSound - type: EmitSoundOnActivate - sound: - path: /Audio/Items/Toys/mousesqueek.ogg + sound: *PlushieMouseSound - type: EmitSoundOnTrigger - sound: - path: /Audio/Items/Toys/mousesqueek.ogg + sound: *PlushieMouseSound - type: EmitSoundOnCollide - sound: - path: /Audio/Items/Toys/mousesqueek.ogg - - type: Food - requiresSpecialDigestion: true - useSound: - path: /Audio/Items/Toys/mousesqueek.ogg + sound: *PlushieMouseSound + - type: Edible + useSound: *PlushieMouseSound - type: MeleeWeapon wideAnimationRotation: -90 - soundHit: - path: /Audio/Items/Toys/mousesqueek.ogg + soundHit: *PlushieMouseSound - type: Clothing quickEquip: false sprite: Objects/Fun/toy_mouse.rsi @@ -1056,11 +1007,9 @@ sound: *PlushieVoxSound - type: EmitSoundOnCollide sound: *PlushieVoxSound - - type: Food - requiresSpecialDigestion: true + - type: Edible useSound: *PlushieVoxSound - type: MeleeWeapon - wideAnimationRotation: 180 soundHit: *PlushieVoxSound - type: Clothing quickEquip: false @@ -1121,11 +1070,9 @@ sound: *PlushieXenoSound - type: EmitSoundOnCollide sound: *PlushieXenoSound - - type: Food - requiresSpecialDigestion: true + - type: Edible useSound: *PlushieXenoSound - type: MeleeWeapon - wideAnimationRotation: 180 soundHit: *PlushieXenoSound - type: Clothing quickEquip: false @@ -1168,7 +1115,7 @@ sprite: Objects/Fun/Plushies/human.rsi state: icon - type: EmitSoundOnUse - sound: &PlushieHuman + sound: &PlushieHuman1 path: /Audio/Voice/Human/malescream_1.ogg params: volume: -8 @@ -1183,21 +1130,14 @@ params: volume: -8 - type: EmitSoundOnCollide - sound: + sound: &PlushieHuman4 path: /Audio/Voice/Human/malescream_4.ogg params: volume: -8 - - type: Food - requiresSpecialDigestion: true - useSound: - path: /Audio/Voice/Human/malescream_1.ogg - params: - volume: -8 + - type: Edible + useSound: *PlushieHuman1 - type: MeleeWeapon - soundHit: - path: /Audio/Voice/Human/malescream_4.ogg - params: - volume: -8 + soundHit: *PlushieHuman4 - type: EmitSoundOnTrigger sound: path: /Audio/Voice/Human/malescream_5.ogg @@ -1222,27 +1162,20 @@ sprite: Objects/Fun/Plushies/moth.rsi state: icon - type: EmitSoundOnUse - sound: + sound: &PlushieMothSound path: /Audio/Voice/Moth/moth_chitter.ogg - type: EmitSoundOnLand - sound: - path: /Audio/Voice/Moth/moth_chitter.ogg + sound: *PlushieMothSound - type: EmitSoundOnActivate - sound: - path: /Audio/Voice/Moth/moth_chitter.ogg + sound: *PlushieMothSound - type: EmitSoundOnTrigger - sound: - path: /Audio/Voice/Moth/moth_chitter.ogg + sound: *PlushieMothSound - type: EmitSoundOnCollide - sound: - path: /Audio/Voice/Moth/moth_chitter.ogg + sound: *PlushieMothSound - type: MeleeWeapon - soundHit: - path: /Audio/Voice/Moth/moth_chitter.ogg - - type: Food - requiresSpecialDigestion: true - useSound: - path: /Audio/Voice/Moth/moth_chitter.ogg + soundHit: *PlushieMothSound + - type: Edible + useSound: *PlushieMothSound - type: Clothing quickEquip: false sprite: Objects/Fun/Plushies/moth.rsi @@ -1251,3 +1184,44 @@ - type: FoodSequenceElement entries: CottonBurger: MothPlushie + +- type: entity + parent: BasePlushie + id: PlushieVulp + name: vulpkanin plushie + description: An adorable stuffed toy that resembles a vulpkanin. Yip! Yap! + components: + - type: Sprite + sprite: Objects/Fun/Plushies/vulp.rsi + state: icon + - type: EmitSoundOnUse + sound: &PlushieVulpSound + path: /Audio/Voice/Vulpkanin/howl.ogg + params: + volume: -5 + - type: EmitSoundOnLand + sound: *PlushieVulpSound + - type: EmitSoundOnActivate + sound: *PlushieVulpSound + - type: EmitSoundOnTrigger + sound: *PlushieVulpSound + - type: Edible + requiresSpecialDigestion: true + useSound: + path: /Audio/Voice/Vulpkanin/vulp_scream4.ogg + params: + volume: -5 + - type: MeleeWeapon + soundHit: *PlushieVulpSound + - type: Clothing + quickEquip: false + sprite: Objects/Fun/Plushies/vulp.rsi + slots: + - HEAD + clothingVisuals: + head: + - state: equipped-HELMET + offset: "0, 0.0625" + - type: FoodSequenceElement + entries: + CottonBurger: PlushieVulp diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml index 0c8ef383c5..a62ef84132 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml @@ -11,10 +11,8 @@ blacklist: components: - SecretStash # Prevents being able to insert plushies inside each other (infinite plush)! - - NukeDisk # Could confuse the Nukies if they don't know that plushies have a stash. tags: - QuantumSpinInverter # It will cause issues with the grinder... - - FakeNukeDisk # So you can't tell if the nuke disk is real or fake depending on if it can be inserted or not. - type: ToolOpenable openToolQualityNeeded: Slicing closeToolQualityNeeded: Slicing # Should probably be stitching or something if that gets added diff --git a/Resources/Prototypes/Entities/Objects/Fun/whistles.yml b/Resources/Prototypes/Entities/Objects/Fun/whistles.yml index 1ab6567e65..6e7fd3d0c1 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/whistles.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/whistles.yml @@ -3,7 +3,7 @@ parent: BaseItem id: BaseWhistle name: whistle - description: Someone forgot to turn off kettle? + description: Someone forgot to turn off a kettle? components: - type: Item sprite: Objects/Fun/whistles.rsi @@ -32,7 +32,7 @@ - type: entity parent: BaseWhistle id: SecurityWhistle - description: Sound of it make you feel fear. + description: The sound of it brings fear. components: - type: Sprite state: sec diff --git a/Resources/Prototypes/Entities/Objects/Materials/scrap.yml b/Resources/Prototypes/Entities/Objects/Materials/scrap.yml index 7e8efe5770..82d2d115d8 100644 --- a/Resources/Prototypes/Entities/Objects/Materials/scrap.yml +++ b/Resources/Prototypes/Entities/Objects/Materials/scrap.yml @@ -491,7 +491,7 @@ parent: BaseScrapLarge id: ScrapGeneratorUraniumLeaking name: leaking S.U.P.E.R.P.A.C.M.A.N. generator - description: A S.U.P.E.R.P.A.C.M.A.N. generator that appears to have had some kind of catastrophic failure. Its leaking uranium. + description: A S.U.P.E.R.P.A.C.M.A.N. generator that appears to have had some kind of catastrophic failure. It's leaking uranium. components: - type: Sprite sprite: Objects/Materials/Scrap/generator.rsi diff --git a/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml b/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml index ddc17240f1..cc6939ee65 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml @@ -19,7 +19,7 @@ slots: - neck - type: StaticPrice - price: 100 + price: 12 - type: Tag tags: - Bedsheet diff --git a/Resources/Prototypes/Entities/Objects/Misc/box.yml b/Resources/Prototypes/Entities/Objects/Misc/box.yml index edb1a81239..73d72e4fb0 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/box.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/box.yml @@ -21,9 +21,45 @@ graph: BoxCardboard node: boxcardboard containers: - - entity_storage + - storagebase - type: PhysicalComposition materialComposition: Cardboard: 100 - type: StaticPrice price: 10 + +- type: entity + name: circuit tote + id: ToteBase + parent: BoxBase + description: A large tote for carrying circuit boards. + components: + - type: Sprite + layers: + - state: tote-0 + map: ["enum.StorageFillLayers.Fill"] + - state: circuit + - type: Appearance + - type: StorageFillVisualizer + maxFillLevels: 3 + fillBaseName: tote + - type: Storage + maxItemSize: Small + grid: + - 0,0,5,2 + whitelist: + components: + - MachineBoard + - Circuitboard + - type: Construction + graph: ToteBase + node: totebase + - type: PhysicalComposition + materialComposition: + Cardboard: 75 + Cloth: 25 + - type: StaticPrice + price: 15 + - type: Tag + tags: + - ToteBase diff --git a/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml b/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml index 0d8a7d49d6..dd2c73e005 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml @@ -205,6 +205,8 @@ solutions: cube: maxVol: 1 # needs room for water + - type: Edible + solution: cube - type: Fixtures # BaseItem from PlushieCarp overrides fixtures, making carp not react to extinguishers fixtures: fix1: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/cord.yml b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/cord.yml new file mode 100644 index 0000000000..4b91c444b7 --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/cord.yml @@ -0,0 +1,115 @@ +# Explosive cable below +- type: entity + parent: [ CableStack, BaseSecurityContraband ] + id: CableDetStack + name: explosive cord + suffix: Full + description: Explosive cord for removing whatever is in your way. + components: + - type: Stack + stackType: CableDet + baseLayer: base + layerStates: + - coilex-10 + - coilex-20 + - coilex-30 + - type: Sprite + state: coilex-30 + layers: + - state: coilex-30 + map: ["base"] + - type: Item + heldPrefix: coilex + - type: CablePlacer + cablePrototypeID: CableDet + blockingWireType: ExCable + blacklist: + tags: + - ExCable + overTile: true + - type: Appearance + - type: Extractable + grindableSolutionName: excable + - type: SolutionContainerManager + solutions: + mvcable: + reagents: + - ReagentId: Thermite + Quantity: 3 + - ReagentId: Charcoal + Quantity: 2 + - type: Damageable + damageContainer: StructuralInorganic + - type: Destructible # should have the same general explosive behavior as in cables.yml & detonator.yml + thresholds: + - trigger: + !type:DamageTypeTrigger + damageType: Structural # as close as we can get to only letting explosives trigger it. + damage: 120 + behaviors: + - !type:DoActsBehavior + acts: ["Destruction"] + - !type:ExplodeBehavior + - trigger: + !type:DamageTrigger # the idea here is to prevent you from just beating it until it explodes. + damage: 50 + behaviors: + - !type:DoActsBehavior + acts: ["Destruction"] + - type: Explosive + explosionType: DemolitionCharge + totalIntensity: 60 + intensitySlope: 5 + maxIntensity: 30 + canCreateVacuum: false + - type: Tag + tags: + - Payload + # - type: Sticky #While cool, this doesn't actually work because the structure prevents the explosion from the cable reaching the stickied wire. + # stickDelay: 5 + # unstickDelay: 5 + # whitelist: + # components: + # - Airlock + # tags: + # - Window + # - Wall + # - type: StickyVisualizer + +- type: entity + parent: CableDetStack + id: CableDetStack10 + suffix: 10 + components: + - type: Sprite + state: coilex-10 + - type: Stack + count: 10 + - type: Explosive # TODO: some how make stacking logic handle the explosion scaling. Maybe also something for lingering stacks. + explosionType: DemolitionCharge + totalIntensity: 30 + intensitySlope: 5 + maxIntensity: 15 + canCreateVacuum: false + - type: Tag + tags: + - Payload + +- type: entity + parent: CableDetStack + id: CableDetStack1 + suffix: 1 + components: + - type: Sprite + state: coilex-10 + - type: Stack + count: 1 + - type: Explosive + explosionType: DemolitionCharge + totalIntensity: 10 + intensitySlope: 5 + maxIntensity: 5 + canCreateVacuum: false + - type: Tag + tags: + - Payload diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/detonator.yml b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/detonator.yml new file mode 100644 index 0000000000..d92cf1f77b --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/detonator.yml @@ -0,0 +1,77 @@ +- type: entity + parent: [ BaseItem, BaseSecurityContraband ] + id: EmptyDetonator + name: detonator cap + description: A detonator cap. Requires a trigger and wire. + components: + - type: Sprite + sprite: Objects/Weapons/Bombs/detonator.rsi + layers: + - state: empty + map: [ "enum.ConstructionVisuals.Layer" ] + - type: Item + size: Small + - type: PayloadCase + - type: Construction + graph: DetonatorGraph + node: emptyDetonator + - type: Damageable + damageContainer: StructuralInorganic + - type: Destructible + thresholds: + - trigger: + !type:DamageTypeTrigger + damageType: Structural # as close as we can get to only letting explosives trigger it. + damage: 120 + behaviors: + - !type:TriggerBehavior + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger # the idea here is to prevent you from just beating it until it explodes. + damage: 50 + behaviors: + - !type:DoActsBehavior + acts: ["Destruction"] + - type: Appearance + - type: GenericVisualizer + visuals: + enum.ConstructionVisuals.Key: + enum.ConstructionVisuals.Layer: + emptyDetonator: { state: empty } + detonatorWithTrigger: { state: addtrigger } + wiredDetonator: { state: complete } + enum.Trigger.TriggerVisuals.VisualState: + enum.ConstructionVisuals.Layer: + Primed: { state: primed } + Unprimed: { state: complete } + - type: StaticPrice + price: 25 + +- type: entity + parent: EmptyDetonator + id: WiredDetonator + name: detonator cap + description: A detonator cap. + categories: [ HideSpawnMenu ] + components: + - type: Explosive # this is the cord, but its a little smaller because I dont want these to be grenades. They need to not really break walls themselves, but do enough to set off the cable. ~125 structural. + explosionType: DemolitionCharge + totalIntensity: 2.5 + intensitySlope: 100 + maxIntensity: 2.5 + canCreateVacuum: false + - type: ExplodeOnTrigger + - type: Sticky + stickDelay: 2 + unstickDelay: 2 + stickPopupStart: comp-sticky-start-stick-bomb + stickPopupSuccess: comp-sticky-success-stick-bomb + unstickPopupStart: comp-sticky-start-unstick-bomb + unstickPopupSuccess: comp-sticky-success-unstick-bomb + whitelist: + tags: + - ExCable + blacklist: # can't stick it to other items + components: + - Item diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index 821f63856e..30967200d7 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -611,6 +611,7 @@ slots: - Belt - type: Gun + fireRate: 0.5 soundGunshot: path: /Audio/Weapons/Guns/Gunshots/taser.ogg - type: ProjectileBatteryAmmoProvider @@ -621,6 +622,7 @@ steps: 5 zeroVisible: true - type: Appearance + - type: PacifismAllowedGun - type: entity name: elite taser diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml index fcbffc6be6..de9cea7e52 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml @@ -64,7 +64,7 @@ parent: [ BaseWeaponLauncher, BaseGunWieldable, BaseMajorContraband ] id: WeaponLauncherHydra name: hydra - description: PLOOP... FSSSSSS + description: PLOOP... FSSSSSS... components: - type: Sprite sprite: Objects/Weapons/Guns/Launchers/hydra_launcher.rsi diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index d847e9d8d8..6c39e112bd 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -217,7 +217,7 @@ - type: Projectile damage: types: - Shock: 1 + Shock: 0 soundHit: path: "/Audio/Weapons/Guns/Hits/taser_hit.ogg" forceSound: true @@ -225,7 +225,8 @@ lifetime: 0.170 # Very short range - type: StunOnCollide stunAmount: 0 - knockdownAmount: 2.5 # Enough to subdue and follow up with a stun batong + knockdownAmount: 2.5 # Enough to subdue and follow up with a stun baton + drop: false #Ranged KD and item drop are too strong in one package slowdownAmount: 2.5 walkSpeedModifier: 0.5 sprintSpeedModifier: 0.5 @@ -253,6 +254,7 @@ lifetime: 1.0 # Not so short range - type: StunOnCollide stunAmount: 5 + drop: true # this is the evil taser knockdownAmount: 10 slowdownAmount: 10 walkSpeedModifier: 0.5 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml index aadf15153e..bd20659696 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml @@ -336,3 +336,67 @@ - ItemMask restitution: 0.3 friction: 0.2 + +- type: entity + name: utility knife + parent: BaseItem + id: UtilityKnife + description: A knife with a retractable, tiny blade. Useful as a box cutter and letter opener, among other things. + components: + - type: Appearance + - type: ComponentToggler + components: + - type: Execution + doAfterDuration: 4.0 + - type: Sharp + - type: Utensil + types: + - Knife + - type: Tool + qualities: + - Slicing + useSound: + path: /Audio/Items/Culinary/chop.ogg + - type: Item + size: Tiny + sprite: Objects/Weapons/Melee/utility_knife.rsi + - type: ItemToggle + soundActivate: + path: /Audio/Weapons/utilityknifeopen.ogg + soundDeactivate: + path: /Audio/Weapons/utilityknifeclose.ogg + - type: ItemToggleMeleeWeapon + activatedSoundOnHit: + path: /Audio/Weapons/bladeslice.ogg + activatedDamage: + types: + Slash: 4 + - type: MeleeWeapon + wideAnimationRotation: -135 + attackRate: 1 + damage: + types: + Blunt: 1 + - type: PhysicalComposition + materialComposition: + Steel: 50 + - type: Sprite + sprite: Objects/Weapons/Melee/utility_knife.rsi + layers: + - state: utility_knife_handle + - state: utility_knife_blade + visible: false + map: [ "blade" ] + - type: Tag + tags: + - Knife + - UtilityKnife + - type: ToggleableVisuals + spriteLayer: blade + inhandVisuals: + left: + - state: inhand-left-blade + right: + - state: inhand-right-blade + - type: UseDelay + delay: 0.2 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml index 79a5ec8159..a2c7cddcb1 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml @@ -188,6 +188,8 @@ totalIntensity: 400 intensitySlope: 30 maxIntensity: 125 + deleteAfterExplosion: false + repeatable: true canCreateVacuum: true - type: TimerTrigger delay: 4.5 diff --git a/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml b/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml index 510b76b41e..26db89ed32 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml @@ -55,7 +55,7 @@ thresholds: - trigger: !type:DamageTrigger - damage: 200 + damage: 300 behaviors: - !type:DoActsBehavior acts: ["Destruction"] @@ -69,6 +69,8 @@ components: - type: NavMapDoor +### Metal doors ### + - type: entity id: MetalDoor name: metal door @@ -77,6 +79,183 @@ - type: Construction graph: DoorGraph node: metalDoor + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 200 + behaviors: + - !type:DoActsBehavior + acts: ["Destruction"] + - trigger: + !type:DamageTrigger + damage: 150 + behaviors: + - !type:DoActsBehavior + acts: ["Destruction"] + - !type:PlaySoundBehavior + sound: + collection: MetalBreak + - !type:SpawnEntitiesBehavior + spawn: + SheetSteel1: + min: 3 + max: 5 + +- type: entity + id: PlasmaDoor + name: plasma door + parent: BaseMaterialDoorNavMap + description: A door, where will it lead? + components: + - type: Sprite + sprite: Structures/Doors/MineralDoors/plasma_door.rsi + layers: + - state: closed + map: ["enum.DoorVisualLayers.Base"] + - type: Construction + graph: DoorGraph + node: plasmaDoor + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 200 + behaviors: + - !type:DoActsBehavior + acts: ["Destruction"] + - trigger: + !type:DamageTrigger + damage: 150 + behaviors: + - !type:DoActsBehavior + acts: ["Destruction"] + - !type:PlaySoundBehavior + sound: + collection: MetalBreak + - !type:SpawnEntitiesBehavior + spawn: + SheetPlasma1: + min: 3 + max: 5 + +- type: entity + id: GoldDoor + name: gold door + parent: BaseMaterialDoorNavMap + description: A door, where will it lead? + components: + - type: Sprite + sprite: Structures/Doors/MineralDoors/gold_door.rsi + layers: + - state: closed + map: ["enum.DoorVisualLayers.Base"] + - type: Construction + graph: DoorGraph + node: goldDoor + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 200 + behaviors: + - !type:DoActsBehavior + acts: ["Destruction"] + - trigger: + !type:DamageTrigger + damage: 150 + behaviors: + - !type:DoActsBehavior + acts: ["Destruction"] + - !type:PlaySoundBehavior + sound: + collection: MetalBreak + - !type:SpawnEntitiesBehavior + spawn: + IngotGold1: + min: 3 + max: 5 + +- type: entity + id: SilverDoor + name: silver door + parent: BaseMaterialDoorNavMap + description: A door, where will it lead? + components: + - type: Sprite + sprite: Structures/Doors/MineralDoors/silver_door.rsi + layers: + - state: closed + map: ["enum.DoorVisualLayers.Base"] + - type: Construction + graph: DoorGraph + node: silverDoor + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 200 + behaviors: + - !type:DoActsBehavior + acts: ["Destruction"] + - trigger: + !type:DamageTrigger + damage: 150 + behaviors: + - !type:DoActsBehavior + acts: ["Destruction"] + - !type:PlaySoundBehavior + sound: + collection: MetalBreak + - !type:SpawnEntitiesBehavior + spawn: + IngotSilver1: + min: 3 + max: 5 + +- type: entity + id: BananiumDoor + name: bananium door + parent: BaseMaterialDoorNavMap + description: A door, where will it lead? + components: + - type: Sprite + sprite: Structures/Doors/MineralDoors/bananium_door.rsi + layers: + - state: closed + map: ["enum.DoorVisualLayers.Base"] + - type: Door + openSound: + path: /Audio/Items/bikehorn.ogg + closeSound: + path: /Audio/Items/bikehorn.ogg + - type: Construction + graph: DoorGraph + node: bananiumDoor + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 200 + behaviors: + - !type:DoActsBehavior + acts: ["Destruction"] + - trigger: + !type:DamageTrigger + damage: 150 + behaviors: + - !type:DoActsBehavior + acts: ["Destruction"] + - !type:PlaySoundBehavior + sound: + collection: MetalBreak + - !type:SpawnEntitiesBehavior + spawn: + MaterialBananium1: + min: 1 + max: 2 + +### Other doors ### - type: entity id: WoodDoor @@ -90,6 +269,9 @@ path: /Audio/Effects/door_open.ogg closeSound: path: /Audio/Effects/door_close.ogg + - type: Construction + graph: DoorGraph + node: woodDoor - type: Damageable damageContainer: StructuralInorganic damageModifierSet: Wood @@ -97,97 +279,69 @@ thresholds: - trigger: !type:DamageTrigger - damage: 100 + damage: 150 behaviors: - !type:DoActsBehavior acts: ["Destruction"] - - type: Construction - graph: DoorGraph - node: woodDoor + - trigger: + !type:DamageTrigger + damage: 75 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: WoodDestroy + - !type:DoActsBehavior + acts: ["Destruction"] + - !type:SpawnEntitiesBehavior + spawn: + MaterialWoodPlank1: + min: 3 + max: 5 - type: entity id: PaperDoor name: paper door parent: BaseMaterialDoorNavMap + description: A door, where will it lead? components: - type: Sprite sprite: Structures/Doors/MineralDoors/paper_door.rsi + layers: + - state: closed + map: ["enum.DoorVisualLayers.Base"] + - type: Door + openSound: + path: /Audio/Effects/paperdoor_openclose.ogg + closeSound: + path: /Audio/Effects/paperdoor_openclose.ogg + - type: Construction + graph: DoorGraph + node: paperDoor + - type: Damageable + damageContainer: StructuralInorganic + damageModifierSet: Wood - type: Destructible thresholds: + - trigger: + !type:DamageTrigger + damage: 150 + behaviors: + - !type:DoActsBehavior + acts: ["Destruction"] - trigger: !type:DamageTrigger damage: 50 behaviors: + - !type:PlaySoundBehavior + sound: + path: /Audio/Effects/poster_broken.ogg - !type:DoActsBehavior acts: ["Destruction"] - - type: Construction - graph: DoorGraph - node: paperDoor - - type: Door - openSound: - path: /Audio/Effects/paperdoor_openclose.ogg - closeSound: - path: /Audio/Effects/paperdoor_openclose.ogg - -- type: entity - id: PlasmaDoor - name: plasma door - parent: BaseMaterialDoorNavMap - components: - - type: Sprite - sprite: Structures/Doors/MineralDoors/plasma_door.rsi - - type: Damageable - damageContainer: StructuralInorganic - damageModifierSet: StructuralMetallicStrong - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 300 - behaviors: - - !type:DoActsBehavior - acts: ["Destruction"] - - type: Construction - graph: DoorGraph - node: plasmaDoor - -- type: entity - id: GoldDoor - name: gold door - parent: BaseMaterialDoorNavMap - components: - - type: Sprite - sprite: Structures/Doors/MineralDoors/gold_door.rsi - - type: Construction - graph: DoorGraph - node: goldDoor - -- type: entity - id: SilverDoor - name: silver door - parent: BaseMaterialDoorNavMap - components: - - type: Sprite - sprite: Structures/Doors/MineralDoors/silver_door.rsi - - type: Construction - graph: DoorGraph - node: silverDoor - -- type: entity - id: BananiumDoor - name: bananium door - parent: BaseMaterialDoorNavMap - components: - - type: Sprite - sprite: Structures/Doors/MineralDoors/bananium_door.rsi - - type: Construction - graph: DoorGraph - node: bananiumDoor - - type: Door - openSound: - path: /Audio/Items/bikehorn.ogg - closeSound: - path: /Audio/Items/bikehorn.ogg + - !type:SpawnEntitiesBehavior + spawn: + SheetPaper1: + min: 3 + max: 5 - type: entity id: WebDoor @@ -197,9 +351,19 @@ components: - type: Sprite sprite: Structures/Doors/web_door.rsi + layers: + - state: closed + map: ["enum.DoorVisualLayers.Base"] + - type: Door + closeSound: + path: /Audio/Effects/rustle1.ogg + openSound: + path: /Audio/Effects/rustle2.ogg - type: Construction graph: WebStructures node: door + - type: Damageable + damageModifierSet: Web - type: Destructible thresholds: - trigger: # Excess damage, don't spawn entities @@ -211,6 +375,12 @@ collection: WoodDestroy - !type:DoActsBehavior acts: ["Destruction"] + - trigger: + !type:DamageTrigger + damage: 150 + behaviors: + - !type:DoActsBehavior + acts: ["Destruction"] - trigger: !type:DamageTrigger damage: 50 @@ -222,16 +392,9 @@ collection: WoodDestroy - !type:SpawnEntitiesBehavior spawn: - MaterialWebSilk: - min: 3 - max: 5 - - type: Damageable - damageModifierSet: Web - - type: Door - closeSound: - path: /Audio/Effects/rustle1.ogg - openSound: - path: /Audio/Effects/rustle2.ogg + MaterialWebSilk1: + min: 1 + max: 2 - type: entity id: CardDoor @@ -242,9 +405,12 @@ sprite: Structures/Doors/MineralDoors/card_door.rsi - type: Door openSound: - path: /Audio/Effects/card_drag.ogg + path: /Audio/Effects/card_drag.ogg closeSound: path: /Audio/Effects/card_drag.ogg + - type: Construction + graph: DoorGraph + node: cardDoor - type: MeleeSound soundGroups: Brute: @@ -265,13 +431,13 @@ !type:DamageTrigger damage: 30 behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - !type:PlaySoundBehavior + sound: + collection: WoodDestroy - !type:SpawnEntitiesBehavior spawn: MaterialCardboard: - min: 2 - max: 4 - - !type:DoActsBehavior - acts: [ "Destruction" ] - - type: Construction - graph: DoorGraph - node: cardDoor + min: 3 + max: 5 diff --git a/Resources/Prototypes/Entities/Structures/Furniture/rollerbeds.yml b/Resources/Prototypes/Entities/Structures/Furniture/rollerbeds.yml index 875a501153..135783a452 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/rollerbeds.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/rollerbeds.yml @@ -69,13 +69,15 @@ buckledLayer: True: {visible: true} False: {visible: false} + unfoldedLayer: + True: { visible: false } + False: { visible: true } enum.FoldedVisuals.State: # Copypasta from BaseFoldable b/c collections don't merge when overriding component prototypes. foldedLayer: True: {visible: true} False: {visible: false} unfoldedLayer: True: {visible: false} - False: {visible: true} - type: StaticPrice price: 120 diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml index 27990fb04a..3b151c5ea5 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml @@ -114,6 +114,7 @@ - PlushieSnake - PlushieArachind - PlushieMoth + - PlushieVulp - PlushieHampter - PlushiePenguin - PlushieHuman diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index fb7fd0b8b2..ec1d9231a2 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -124,6 +124,7 @@ - AtmosStatic - CablesStatic - PaperworkStatic + - TowelsStatic - CargoStatic - MaterialsStatic - BasicChemistryStatic @@ -510,6 +511,7 @@ idleState: icon runningState: building staticPacks: + - TowelsStatic - ClothingCivilian - ClothingCargo - ClothingCommand diff --git a/Resources/Prototypes/Entities/Structures/Machines/microwave.yml b/Resources/Prototypes/Entities/Structures/Machines/microwave.yml index 2a19bdc326..072fadbc7e 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/microwave.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/microwave.yml @@ -62,6 +62,7 @@ sprite: Structures/Machines/microwave.rsi drawdepth: SmallObjects snapCardinals: true + offset: "0.0,0.2" layers: - state: mw0 map: ["enum.MicrowaveVisualizerLayers.Base"] @@ -112,6 +113,38 @@ guides: - Chef - FoodRecipes + - type: Item + sprite: Structures/Machines/microwave.rsi + size: Ginormous + - type: MultiHandedItem + - type: MeleeWeapon + attackRate: 0.5 + soundHit: + collection: MetalBreak + damage: + types: + Blunt: 25 + - type: DamageOtherOnHit + damage: + types: + Blunt: 10 + - type: DamageOnHit + damage: + types: + Blunt: 10 + - type: DamageOnLand + damage: + types: + Blunt: 50 + - type: EmitSoundOnLand + sound: + collection: MetalBreak + params: + variation: 0.25 + - type: HeldSpeedModifier + walkModifier: 0.7 + sprintModifier: 0.7 + - type: DamageExaminable - type: entity id: SyndicateMicrowave @@ -135,3 +168,24 @@ providedRecipes: - RecipeBaguetteSword - RecipeThrowingCroissant + - type: Item + sprite: Structures/Machines/microwave_syndie.rsi + size: Ginormous + - type: MeleeWeapon + attackRate: 0.75 + damage: + types: + Blunt: 30 + Shock: 5 + - type: DamageOtherOnHit + damage: + types: + Blunt: 15 + - type: DamageOnHit + damage: + types: + Blunt: 5 + - type: DamageOnLand + damage: + types: + Blunt: 25 diff --git a/Resources/Prototypes/Entities/Structures/Power/cables.yml b/Resources/Prototypes/Entities/Structures/Power/cables.yml index 2a4f1c7f1c..4722b6e0b7 100644 --- a/Resources/Prototypes/Entities/Structures/Power/cables.yml +++ b/Resources/Prototypes/Entities/Structures/Power/cables.yml @@ -1,6 +1,6 @@ - type: entity abstract: true - id: CableBase + id: CablePhysBase placement: mode: SnapgridCenter components: @@ -13,11 +13,21 @@ - type: Transform anchored: true noRot: true - # TODO: Remove both of these, same with CollideOnAnchor + # TODO: Remove both of these, same with CollideOnAnchor - type: Physics bodyType: Static canCollide: false - type: Fixtures + - type: CollideOnAnchor + - type: Appearance + +- type: entity + abstract: true + parent: CablePhysBase + id: CableBase + components: + - type: Visibility + layer: 1 - type: Sprite drawdepth: ThinWire visible: false @@ -33,8 +43,6 @@ - !type:DoActsBehavior acts: ["Destruction"] - type: SubFloorHide - - type: CollideOnAnchor - - type: Appearance - type: Electrified onHandInteract: false onInteractUsing: false # wire-cutting handled separately. @@ -215,3 +223,72 @@ components: - type: Cable cuttingQuality: null + +# Explosive cable below +- type: entity + id: CableDet + parent: [ CablePhysBase, BaseSecurityContraband ] + name: explosive cord + description: Spaghetti for people who hate walls. + components: + - type: Cable + cableDroppedOnCutPrototype: CableDetStack1 + cableType: ExCable + - type: Sprite +# color: white # maybe change this later and move the stripes to the CableVisualizerComp layer instead + sprite: Structures/Power/Cables/ex_cable.rsi + state: excable_0 + - type: Icon + sprite: Structures/Power/Cables/ex_cable.rsi + state: excable_4 + - type: Damageable + damageContainer: StructuralInorganic + - type: Destructible + thresholds: + - trigger: + !type:DamageTypeTrigger + damageType: Structural #this is as close as we can get to only letting explosives set it off. + damage: 120 + behaviors: + - !type:DoActsBehavior + acts: ["Destruction"] + - !type:ExplodeBehavior + - trigger: + !type:DamageTrigger #A fallback that deletes it but doesnt explode in case something somehow gets here without exploding violently enough. + damage: 50 + behaviors: + - !type:DoActsBehavior + acts: ["Destruction"] + - trigger: + !type:DamageTrigger + damage: 35 + behaviors: + - !type:SpawnEntitiesBehavior + spawn: + CableDetStack1: + min: 1 + max: 1 + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: CableVis + node: cordage + - type: NodeContainer + nodes: + cordage: + !type:CableNode + nodeGroupID: ExCable + - type: CableVisualizer + statePrefix: excable_ + - type: Explosive + explosionType: DemolitionCharge + totalIntensity: 10 + intensitySlope: 5 + maxIntensity: 5 + canCreateVacuum: false + - type: ExplodeOnTrigger + - type: Construction + graph: DetCable + node: detonationCable + - type: Tag + tags: + - ExCable diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/base_structurelockers.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/base_structurelockers.yml index a30ae00e96..27d29fb3d0 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/base_structurelockers.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/base_structurelockers.yml @@ -69,7 +69,23 @@ thresholds: - trigger: !type:DamageTrigger - damage: 75 + damage: 300 behaviors: - !type:DoActsBehavior acts: ["Destruction"] + - trigger: + !type:DamageTrigger + damage: 150 + behaviors: + - !type:DoActsBehavior + acts: ["Destruction"] + - !type:PlaySoundBehavior + sound: + collection: MetalBreak + params: + volume: -6 + - !type:SpawnEntitiesBehavior + spawn: + SheetSteel1: + min: 1 + max: 2 diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml index ba1ecfd749..181321d280 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml @@ -71,13 +71,13 @@ thresholds: - trigger: !type:DamageTrigger - damage: 300 + damage: 100 behaviors: - !type:DoActsBehavior acts: [ "Destruction" ] - trigger: !type:DamageTrigger - damage: 150 + damage: 50 behaviors: - !type:DoActsBehavior acts: ["Destruction"] @@ -167,13 +167,13 @@ thresholds: - trigger: !type:DamageTrigger - damage: 300 + damage: 100 behaviors: - !type:DoActsBehavior acts: [ "Destruction" ] - trigger: !type:DamageTrigger - damage: 150 + damage: 50 behaviors: - !type:DoActsBehavior acts: ["Destruction"] diff --git a/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml index a08ba4aacd..55a0c72e7c 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml @@ -489,6 +489,8 @@ - CrateMask #this is so they can go under plastic flaps layer: - MachineLayer + - type: Paintable + group: null - type: entity id: CrateLockBoxEngineering diff --git a/Resources/Prototypes/Hydroponics/seeds.yml b/Resources/Prototypes/Hydroponics/seeds.yml index 37e8a1beb3..9a2b4eafae 100644 --- a/Resources/Prototypes/Hydroponics/seeds.yml +++ b/Resources/Prototypes/Hydroponics/seeds.yml @@ -1294,10 +1294,6 @@ Min: 1 Max: 5 PotencyDivisor: 20 - Desoxyephedrine: - Min: 1 - Max: 10 - PotencyDivisor: 10 Vitamin: Min: 1 Max: 2 @@ -1332,10 +1328,6 @@ Min: 1 Max: 5 PotencyDivisor: 20 - Desoxyephedrine: - Min: 1 - Max: 10 - PotencyDivisor: 10 - type: seed id: galaxythistle @@ -1382,6 +1374,10 @@ Min: 1 Max: 25 PotencyDivisor: 4 + Desoxyephedrine: # meff!! + Min: 1 + Max: 10 + PotencyDivisor: 10 - type: seed id: flyAmanita diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml index 28344b4e22..4d2c45ad17 100644 --- a/Resources/Prototypes/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/Loadouts/role_loadouts.yml @@ -202,6 +202,7 @@ - type: roleLoadout id: JobMusician + canCustomizeName: true groups: - Inventory # Corvax-Loadouts - GroupTankHarness diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml index 137e5796e7..8db5e92fdf 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml @@ -34,7 +34,6 @@ min: 10 type: Add time: 5 - refresh: false - !type:PopupMessage type: Local messages: diff --git a/Resources/Prototypes/Reagents/cleaning.yml b/Resources/Prototypes/Reagents/cleaning.yml index d03fff1941..2ebd213fec 100644 --- a/Resources/Prototypes/Reagents/cleaning.yml +++ b/Resources/Prototypes/Reagents/cleaning.yml @@ -114,7 +114,6 @@ effectProto: StatusEffectSeeingRainbow time: 5 type: Add - refresh: false Drink: effects: - !type:GenericStatusEffect diff --git a/Resources/Prototypes/Reagents/gases.yml b/Resources/Prototypes/Reagents/gases.yml index b3a533d747..3d65931f19 100644 --- a/Resources/Prototypes/Reagents/gases.yml +++ b/Resources/Prototypes/Reagents/gases.yml @@ -372,7 +372,7 @@ shouldHave: false effectProto: StatusEffectForcedSleeping time: 3 - type: Add + type: Update - !type:HealthChange conditions: - !type:ReagentThreshold @@ -412,7 +412,6 @@ effectProto: StatusEffectSeeingRainbow type: Add time: 15 - refresh: false - !type:Drunk boozePower: 15 - !type:PopupMessage @@ -452,7 +451,6 @@ effectProto: StatusEffectSeeingRainbow type: Add time: 500 - refresh: false - !type:Drunk boozePower: 500 conditions: diff --git a/Resources/Prototypes/Reagents/medicine.yml b/Resources/Prototypes/Reagents/medicine.yml index bfbb8242fd..71ae11dad9 100644 --- a/Resources/Prototypes/Reagents/medicine.yml +++ b/Resources/Prototypes/Reagents/medicine.yml @@ -89,7 +89,6 @@ effectProto: StatusEffectDrowsiness time: 1.5 type: Add - refresh: false - !type:HealthChange damage: types: @@ -364,12 +363,11 @@ min: 1 reagent: Histamine amount: 4 - - !type:GenericStatusEffect - key: Stun + - !type:ModifyStatusEffect + effectProto: StatusEffectStunned time: 0.75 type: Remove - - !type:GenericStatusEffect - key: KnockedDown + - !type:ModifyKnockdown time: 0.75 type: Remove - !type:GenericStatusEffect @@ -744,12 +742,11 @@ damage: types: Poison: 2 - - !type:GenericStatusEffect - key: Stun + - !type:ModifyStatusEffect + effectProto: StatusEffectStunned time: 3.0 type: Remove - - !type:GenericStatusEffect - key: KnockedDown + - !type:ModifyKnockdown time: 3.0 type: Remove - !type:ModifyStatusEffect @@ -1354,7 +1351,6 @@ min: 30 type: Add time: 8 - refresh: false - !type:GenericStatusEffect key: Jitter time: 2.0 @@ -1416,7 +1412,6 @@ effectProto: StatusEffectDrowsiness time: 4 type: Add - refresh: false - !type:GenericStatusEffect key: Jitter time: 4.0 diff --git a/Resources/Prototypes/Reagents/narcotics.yml b/Resources/Prototypes/Reagents/narcotics.yml index 7f84790561..a1b1033a4b 100644 --- a/Resources/Prototypes/Reagents/narcotics.yml +++ b/Resources/Prototypes/Reagents/narcotics.yml @@ -33,12 +33,11 @@ key: Stutter component: StutteringAccent - !type:Jitter - - !type:GenericStatusEffect - key: Stun + - !type:ModifyStatusEffect + effectProto: StatusEffectStunned time: 3 type: Remove - - !type:GenericStatusEffect - key: KnockedDown + - !type:ModifyKnockdown time: 3 type: Remove - !type:ModifyStatusEffect @@ -82,12 +81,11 @@ Poison: 2 # this is added to the base damage of the meth. Asphyxiation: 2 - !type:Jitter - - !type:GenericStatusEffect - key: Stun + - !type:ModifyStatusEffect + effectProto: StatusEffectStunned time: 1 type: Remove - - !type:GenericStatusEffect - key: KnockedDown + - !type:ModifyKnockdown time: 1 type: Remove - !type:ModifyStatusEffect @@ -142,12 +140,11 @@ min: 1 reagent: ChloralHydrate amount: -10 - - !type:GenericStatusEffect - key: Stun + - !type:ModifyStatusEffect + effectProto: StatusEffectStunned time: 3 type: Remove - - !type:GenericStatusEffect - key: KnockedDown + - !type:ModifyKnockdown time: 3 type: Remove - !type:GenericStatusEffect @@ -205,7 +202,6 @@ effectProto: StatusEffectSeeingRainbow time: 16 type: Add - refresh: false - type: reagent id: Nicotine @@ -243,7 +239,6 @@ effectProto: StatusEffectSeeingRainbow time: 10 type: Add - refresh: false - !type:ChemVomit # Vomiting is a symptom of brain damage probability: 0.05 - !type:Drunk # Headaches and slurring are major symptoms of brain damage, this is close enough @@ -264,7 +259,6 @@ effectProto: StatusEffectSeeingRainbow type: Add time: 5 - refresh: false - type: reagent id: Bananadine @@ -281,7 +275,6 @@ effectProto: StatusEffectSeeingRainbow type: Add time: 5 - refresh: false # Probably replace this one with sleeping chem when putting someone in a comatose state is easier - type: reagent @@ -304,6 +297,7 @@ min: 8 effectProto: StatusEffectForcedSleeping time: 3 + delay: 6 type: Add - type: reagent @@ -324,7 +318,6 @@ component: Muted type: Add time: 10 - refresh: false - type: reagent id: NorepinephricAcid @@ -476,4 +469,3 @@ effectProto: StatusEffectSeeingRainbow type: Add time: 5 - refresh: false diff --git a/Resources/Prototypes/Reagents/toxins.yml b/Resources/Prototypes/Reagents/toxins.yml index e94d13a891..33a94c0792 100644 --- a/Resources/Prototypes/Reagents/toxins.yml +++ b/Resources/Prototypes/Reagents/toxins.yml @@ -74,7 +74,6 @@ effectProto: StatusEffectDrowsiness time: 4 type: Add - refresh: false - !type:HealthChange conditions: - !type:ReagentThreshold @@ -359,7 +358,6 @@ effectProto: StatusEffectSeeingRainbow type: Add time: 10 - refresh: false # TODO: PROPER hallucinations - type: reagent diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/cordage.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/cordage.yml new file mode 100644 index 0000000000..aa26a1f581 --- /dev/null +++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/cordage.yml @@ -0,0 +1,27 @@ +- type: constructionGraph + id: DetCable + start: start + graph: + - node: start + edges: + - to: detonationCable + completed: + - !type:SnapToGrid + southRotation: true + steps: + - material: Bananium + amount: 1 + doAfter: 0 + + - node: detonationCable + entity: CableDet + edges: + - to: start + completed: + - !type:SpawnPrototype + prototype: CableDetStack1 + amount: 1 + - !type:DeleteEntity {} + steps: + - tool: Cutting + doAfter: 0.5 diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/doors.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/doors.yml index 2c8260269f..d675a0f7f8 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/doors.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/doors.yml @@ -11,57 +11,57 @@ - !type:SnapToGrid { } steps: - material: Steel - amount: 20 - doAfter: 15 + amount: 10 + doAfter: 8 - to: woodDoor completed: - !type:SnapToGrid { } steps: - material: WoodPlank - amount: 20 - doAfter: 15 + amount: 10 + doAfter: 8 - to: plasmaDoor completed: - !type:SnapToGrid { } steps: - material: Plasma - amount: 20 - doAfter: 15 + amount: 10 + doAfter: 8 - to: goldDoor completed: - !type:SnapToGrid { } steps: - material: Gold - amount: 20 - doAfter: 15 + amount: 10 + doAfter: 8 - to: silverDoor completed: - !type:SnapToGrid { } steps: - material: Silver - amount: 20 - doAfter: 15 + amount: 10 + doAfter: 8 - to: bananiumDoor completed: - !type:SnapToGrid { } steps: - material: Bananium amount: 5 - doAfter: 15 + doAfter: 8 - to: paperDoor completed: - !type:SnapToGrid { } steps: - material: Paper - amount: 20 - doAfter: 15 + amount: 10 + doAfter: 8 - to: cardDoor completed: - !type:SnapToGrid { } steps: - material: Cardboard - amount: 5 - doAfter: 6 + amount: 10 + doAfter: 8 - node: metalDoor entity: MetalDoor edges: @@ -69,10 +69,10 @@ completed: - !type:SpawnPrototype prototype: SheetSteel1 - amount: 20 + amount: 10 steps: - tool: Anchoring - doAfter: 15 + doAfter: 8 - node: woodDoor entity: WoodDoor edges: @@ -80,10 +80,10 @@ completed: - !type:SpawnPrototype prototype: MaterialWoodPlank1 - amount: 20 + amount: 10 steps: - tool: Anchoring - doAfter: 15 + doAfter: 8 - node: plasmaDoor entity: PlasmaDoor edges: @@ -91,10 +91,10 @@ completed: - !type:SpawnPrototype prototype: SheetPlasma - amount: 20 + amount: 10 steps: - tool: Anchoring - doAfter: 15 + doAfter: 8 - node: goldDoor entity: GoldDoor edges: @@ -102,10 +102,10 @@ completed: - !type:SpawnPrototype prototype: IngotGold1 - amount: 20 + amount: 10 steps: - tool: Anchoring - doAfter: 15 + doAfter: 8 - node: silverDoor entity: SilverDoor edges: @@ -113,10 +113,10 @@ completed: - !type:SpawnPrototype prototype: IngotSilver1 - amount: 20 + amount: 10 steps: - tool: Anchoring - doAfter: 15 + doAfter: 8 - node: paperDoor entity: PaperDoor edges: @@ -124,10 +124,10 @@ completed: - !type:SpawnPrototype prototype: SheetPaper1 - amount: 20 + amount: 10 steps: - tool: Anchoring - doAfter: 15 + doAfter: 8 - node: cardDoor entity: CardDoor edges: @@ -137,7 +137,7 @@ sound: /Audio/Items/Toys/ToyFall2.ogg - !type:SpawnPrototype prototype: MaterialCardboard1 - amount: 5 + amount: 8 - !type:DeleteEntity {} steps: - tool: Slicing @@ -152,4 +152,4 @@ amount: 5 steps: - tool: Anchoring - doAfter: 15 + doAfter: 8 diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/grille_clockwork.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/grille_clockwork.yml index d51fed4fa6..e4d389a951 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/grille_clockwork.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/grille_clockwork.yml @@ -6,6 +6,9 @@ edges: - to: clockGrille completed: + - !type:AdminLog + message: "Construction" + impact: High - !type:SnapToGrid southRotation: true steps: diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/grille_diagonal.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/grille_diagonal.yml index 6c32b96801..5b4a3733ce 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/grille_diagonal.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/grille_diagonal.yml @@ -5,12 +5,20 @@ - node: start edges: - to: grilleDiagonal + completed: + - !type:AdminLog + message: "Construction" + impact: High steps: - material: MetalRod amount: 2 doAfter: 1 - to: clockworkGrilleDiagonal + completed: + - !type:AdminLog + message: "Construction" + impact: High steps: - material: MetalRod amount: 2 diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/weapons/explosive_detonator.yml b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/explosive_detonator.yml new file mode 100644 index 0000000000..ddd5e29efe --- /dev/null +++ b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/explosive_detonator.yml @@ -0,0 +1,59 @@ +- type: constructionGraph + id: DetonatorGraph + start: start + graph: + - node: start + edges: + - to: emptyDetonator + steps: + - material: Bananium + amount: 1 + doAfter: 1 + + - node: emptyDetonator + entity: EmptyDetonator + actions: + - !type:AppearanceChange + edges: + - to: detonatorWithTrigger + steps: + - component: PayloadTrigger + store: payloadTrigger + name: construction-graph-component-payload-trigger + doAfter: 0.5 + + - node: detonatorWithTrigger + entity: EmptyDetonator + actions: + - !type:AppearanceChange + - !type:PlaySound + sound: /Audio/Machines/button.ogg + edges: + - to: emptyDetonator + steps: + - tool: Prying + doAfter: 0.5 + completed: + - !type:EmptyContainer + container: payloadTrigger + - to: wiredDetonator + steps: + - material: CableDet + doAfter: 0.5 + + - node: wiredDetonator + entity: WiredDetonator + actions: + - !type:AppearanceChange + - !type:PlaySound + sound: /Audio/Machines/button.ogg + - !type:AdminLog + message: "A detonator cap was crafted" + edges: + - to: detonatorWithTrigger + steps: + - tool: Cutting + doAfter: 0.5 + completed: + - !type:SpawnPrototype + prototype: CableDetStack1 diff --git a/Resources/Prototypes/Recipes/Cooking/food_sequence_element.yml b/Resources/Prototypes/Recipes/Cooking/food_sequence_element.yml index 343df2b7d6..ef3134bd7b 100644 --- a/Resources/Prototypes/Recipes/Cooking/food_sequence_element.yml +++ b/Resources/Prototypes/Recipes/Cooking/food_sequence_element.yml @@ -1547,6 +1547,16 @@ - sprite: Objects/Fun/Plushies/moth.rsi state: icon +#Vulp Plushie + +- type: foodSequenceElement + id: PlushieVulp + scale: 0.8, 0.8 + name: food-sequence-cotton-burger-content-plushie-vulp + sprites: + - sprite: Objects/Fun/Plushies/vulp.rsi + state: icon + #Ian Toy - type: foodSequenceElement diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/storage/cardboardbox.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/storage/cardboardbox.yml index 527f6b5247..9cabb7e441 100644 --- a/Resources/Prototypes/Recipes/Crafting/Graphs/storage/cardboardbox.yml +++ b/Resources/Prototypes/Recipes/Crafting/Graphs/storage/cardboardbox.yml @@ -2,14 +2,28 @@ id: BoxCardboard start: start graph: - - node: start - edges: - - to: boxcardboard - steps: - - material: Cardboard - amount: 1 - doAfter: 4 + - node: start + edges: + - to: boxcardboard + steps: + - material: Cardboard + amount: 1 + doAfter: 4 + - node: boxcardboard + entity: BoxCardboard - - - node: boxcardboard - entity: BoxCardboard \ No newline at end of file +- type: constructionGraph + id: ToteBase + start: start + graph: + - node: start + edges: + - to: totebase + steps: + - material: Cardboard + amount: 1 + - material: Cloth + amount: 1 + doAfter: 4 + - node: totebase + entity: ToteBase diff --git a/Resources/Prototypes/Recipes/Crafting/crates.yml b/Resources/Prototypes/Recipes/Crafting/crates.yml index ebd0261b3a..0ba076b36b 100644 --- a/Resources/Prototypes/Recipes/Crafting/crates.yml +++ b/Resources/Prototypes/Recipes/Crafting/crates.yml @@ -57,6 +57,15 @@ category: construction-category-storage objectType: Item +- type: construction + id: ToteBase + name: construction-recipe-box-tote + graph: ToteBase + startNode: start + targetNode: totebase + category: construction-category-storage + objectType: Item + - type: construction id: FoodBoxPizza graph: FoodBoxPizza diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/cargo.yml b/Resources/Prototypes/Recipes/Lathes/Packs/cargo.yml index dc4245e447..01a6409cb5 100644 --- a/Resources/Prototypes/Recipes/Lathes/Packs/cargo.yml +++ b/Resources/Prototypes/Recipes/Lathes/Packs/cargo.yml @@ -5,6 +5,7 @@ recipes: - AppraisalTool - Pickaxe + - UtilityKnife - type: latheRecipePack id: CargoBoardsStatic diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/security.yml b/Resources/Prototypes/Recipes/Lathes/Packs/security.yml index f3e8891b25..0dc5fe3d90 100644 --- a/Resources/Prototypes/Recipes/Lathes/Packs/security.yml +++ b/Resources/Prototypes/Recipes/Lathes/Packs/security.yml @@ -90,6 +90,8 @@ - ScienceExplosives # sec gets everything for modular grenade making that sci does id: SecurityExplosives recipes: + - CableDetStack1 + - EmptyDetonator - ExplosivePayload - GrenadeBlast - GrenadeEMP diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/shared.yml b/Resources/Prototypes/Recipes/Lathes/Packs/shared.yml index 34a5fcbe6e..f0147d9ca5 100644 --- a/Resources/Prototypes/Recipes/Lathes/Packs/shared.yml +++ b/Resources/Prototypes/Recipes/Lathes/Packs/shared.yml @@ -44,6 +44,11 @@ - BoxFolderClipboardEmpty - BoxFolderPlasticClipboardEmpty +- type: latheRecipePack + id: TowelsStatic # This is used for both the autolathe and the uniform printer, so "unique" towels that only HoP can print shouldn't be included! + recipes: + - TowelColorWhite + ## Dynamic # Things you'd expect sci salv and engi to make use of diff --git a/Resources/Prototypes/Recipes/Lathes/cargo.yml b/Resources/Prototypes/Recipes/Lathes/cargo.yml index 0679132ec0..8c0f1e07f2 100644 --- a/Resources/Prototypes/Recipes/Lathes/cargo.yml +++ b/Resources/Prototypes/Recipes/Lathes/cargo.yml @@ -12,3 +12,10 @@ completetime: 4 materials: Steel: 500 + +- type: latheRecipe + id: UtilityKnife + result: UtilityKnife + completetime: 2 + materials: + Steel: 100 diff --git a/Resources/Prototypes/Recipes/Lathes/devices.yml b/Resources/Prototypes/Recipes/Lathes/devices.yml index 62a6122342..b703aa1240 100644 --- a/Resources/Prototypes/Recipes/Lathes/devices.yml +++ b/Resources/Prototypes/Recipes/Lathes/devices.yml @@ -216,3 +216,23 @@ Steel: 500 Glass: 400 Gold: 100 + +- type: latheRecipe + id: CableDetStack1 + result: CableDetStack1 + categories: + - Weapons + completetime: 2 + materials: + Plastic: 50 + Plasma: 25 + Gold: 20 + +- type: latheRecipe + id: EmptyDetonator + result: EmptyDetonator + categories: + - Weapons + completetime: 3 + materials: + Steel: 100 diff --git a/Resources/Prototypes/Recipes/Lathes/misc.yml b/Resources/Prototypes/Recipes/Lathes/misc.yml index 206a8856e3..46e632e995 100644 --- a/Resources/Prototypes/Recipes/Lathes/misc.yml +++ b/Resources/Prototypes/Recipes/Lathes/misc.yml @@ -231,3 +231,10 @@ materials: Plastic: 100 Steel: 25 + +- type: latheRecipe + id: TowelColorWhite + result: TowelColorWhite + completetime: 2 + materials: + Cloth: 300 diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml index bb12a2c25f..846eef1452 100644 --- a/Resources/Prototypes/Research/arsenal.yml +++ b/Resources/Prototypes/Research/arsenal.yml @@ -116,6 +116,8 @@ - FlashPayload - ExplosivePayload - ChemicalPayload + - CableDetStack1 + - EmptyDetonator - type: technology id: SpecialMeans diff --git a/Resources/Prototypes/Stacks/power_stacks.yml b/Resources/Prototypes/Stacks/power_stacks.yml index 305c85943d..40782d382c 100644 --- a/Resources/Prototypes/Stacks/power_stacks.yml +++ b/Resources/Prototypes/Stacks/power_stacks.yml @@ -18,3 +18,13 @@ icon: { sprite: "/Textures/Objects/Tools/cable-coils.rsi", state: coilhv-30 } spawn: CableHVStack1 maxCount: 30 + +# Explosive cable below + +- type: stack + id: CableDet + name: stack-explosive-cord + icon: { sprite: "/Textures/Objects/Tools/cable-coils.rsi", state: coilex-30 } + spawn: CableDetStack1 + maxCount: 30 + diff --git a/Resources/Prototypes/Voice/speech_emote_sounds.yml b/Resources/Prototypes/Voice/speech_emote_sounds.yml index c21091051c..1ca35c3eb2 100644 --- a/Resources/Prototypes/Voice/speech_emote_sounds.yml +++ b/Resources/Prototypes/Voice/speech_emote_sounds.yml @@ -226,15 +226,25 @@ path: /Audio/Voice/Vox/shriek1.ogg Laugh: path: /Audio/Voice/Vox/vox_laugh.ogg + Cough: + path: /Audio/Voice/Vox/vox_cough.ogg + Sigh: + path: /Audio/Voice/Vox/vox_sigh.ogg Honk: collection: BikeHorn + Crying: + path: /Audio/Voice/Vox/vox_cry.ogg Weh: collection: Weh Hew: collection: Hew + Gasp: + path: /Audio/Effects/Gasp/vox_gasp.ogg + DefaultDeathgasp: + path: /Audio/Effects/Gasp/vox_DeathGasp.ogg params: variation: 0.125 - # We need vox sounds for the other emotes + # TODO: We need vox sounds for the other emotes - type: emoteSounds id: UnisexDiona @@ -486,6 +496,10 @@ collection: VulpkaninWhines Howl: collection: VulpkaninHowls + Gasp: + collection: MaleGasp + DefaultDeathgasp: + collection: MaleDeathGasp - type: emoteSounds id: FemaleVulpkanin @@ -514,6 +528,10 @@ collection: VulpkaninWhines Howl: collection: VulpkaninHowls + Gasp: + collection: FemaleGasp + DefaultDeathgasp: + collection: FemaleDeathGasp # body emotes - type: emoteSounds diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index b97d409d4a..e24aba9b1f 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -1,208 +1,215 @@ # PUT YOUR TAGS IN ALPHABETICAL ORDER +# ALSO DOCUMENT WHAT THE HELL THEY DO + +## A ## - type: Tag - id: AccessBreakerImmune + id: AccessBreakerImmune # This tag marks an entity as immune to emagging. - type: Tag - id: AirAlarm + id: AirAlarm # Used by AtmosAlarmableComponent for syncing devices - type: Tag - id: AirAlarmElectronics + id: AirAlarmElectronics # ConstructionGraph: AirAlarm - type: Tag - id: Airlock + id: Airlock # Used in ConstructionGraph "Airlock" to navigate between regular, glass, and highsec airlocks - type: Tag - id: AirSensor + id: AirSensor # Used by AtmosAlarmableComponent for syncing devices - type: Tag id: AllowBiomeLoading # Entities with this tag will load terrain, even if a ghost. - type: Tag - id: AllowGhostShownByEvent + id: AllowGhostShownByEvent # Used by GhostSystem to show ghosts (usually at round end) - type: Tag - id: Ambrosia + id: Ambrosia # ConstructionGraph: flowerwreath - type: Tag - id: AnomalyHost + id: AnomalyHost # Targeting whitelist: BaseAnomalyInjector - type: Tag - id: AppraisalTool + id: AppraisalTool # Storage whitelist: ClothingBeltUtility - type: Tag - id: Apron + id: Apron # ConstructionGraph: scraparmor - type: Tag - id: Arrow + id: Arrow # Storage whitelist: ClothingBeltQuiver - type: Tag - id: ArtifactFragment + id: ArtifactFragment # Storage whitelist: OreBag, CargoBounty: BountyArtifactFragment, ConstructionGraph: Artifact - type: Tag - id: ATVKeys + id: ATVKeys # Unused + +## B ## - type: Tag - id: Backpack + id: Backpack # ConstructionGraph: ClothingBagPet - type: Tag - id: Balloon + id: Balloon # Used by BalloonPopperComponent/System to viciously maim helpless balloons - type: Tag - id: Banana + id: Banana # CargoBounty: BountyBanana - type: Tag - id: BananaPeel + id: BananaPeel # SpecialDigestible by OrganAnimalRuminantStomach, and several BananaClown ConstructionGraphs - type: Tag - id: Bandana + id: Bandana # CargoBounty: BountyBandana - type: Tag - id: BaseballBat + id: BaseballBat # CargoBounty: BountyBaseballBat - type: Tag - id: BBQsauce + id: BBQsauce # Storage whitelist: ClothingBeltChef and FoodCartHot, ItemMapper: ClothingBeltChef and FoodCartHot - type: Tag - id: Bedsheet + id: Bedsheet # CargoBounty: BountyBedsheet - type: Tag - id: Bee + id: Bee # Mode switch whitelisting for BuzzochloricBees (only damages non-bees) - type: Tag - id: Beer + id: Beer # CargoBounty: BountyBeer - type: Tag - id: BikeHorn + id: BikeHorn # ConstructionGraph: HonkBot, BananiumHorn - type: Tag - id: Bloodpack + id: Bloodpack # Storage whitelist: ClothingBeltMedical - type: Tag - id: BlueprintAutolathe + id: BlueprintAutolathe # Whitelist on BlueprintReceiverComponent on the autolate for linking this entity's BlueprintComponent - type: Tag - id: BodyBag + id: BodyBag # Storage whitelist: BoxBodyBag # TODO cardboard boxes shouldn't have whitelisting - type: Tag - id: Boll + id: Boll # MaterialStorage whitelist: Sheetifier - type: Tag - id: Book + id: Book # Storage whitelist: BorgModuleService, BooksBag, Bookshelf. Blacklisting on various entities whitelisting PaperComponent - type: Tag - id: BorgArm + id: BorgArm # ConstructionGraphs for various bots - type: Tag - id: BorgHead + id: BorgHead # Used by PartAssemblyComponent on CyborgEndoskeleton. Also in ConstructionGraphs for various bots - type: Tag - id: BorgLArm + id: BorgLArm # Used by PartAssemblyComponent on CyborgEndoskeleton - type: Tag - id: BorgLLeg + id: BorgLLeg # Used by PartAssemblyComponent on CyborgEndoskeleton - type: Tag - id: BorgRArm + id: BorgRArm # Used by PartAssemblyComponent on CyborgEndoskeleton - type: Tag - id: BorgRLeg + id: BorgRLeg # Used by PartAssemblyComponent on CyborgEndoskeleton - type: Tag - id: BorgTorso + id: BorgTorso # Used by PartAssemblyComponent on CyborgEndoskeleton - type: Tag - id: BorgLeg + id: BorgLeg # Used by PartAssemblyComponent on VimHarness - type: Tag - id: BorgModuleCargo + id: BorgModuleCargo # Cyborg module category for salvage and cargo - type: Tag - id: BorgModuleEngineering + id: BorgModuleEngineering # Cyborg module category for engineers and saboteurs - type: Tag - id: BorgModuleGeneric + id: BorgModuleGeneric # Cyborg module category for general purpose - type: Tag - id: BorgModuleJanitor + id: BorgModuleJanitor # Cyborg module category for janitors - type: Tag - id: BorgModuleMedical + id: BorgModuleMedical # Cyborg module category for doctors - type: Tag - id: BorgModuleScience + id: BorgModuleScience # Cyborg module category for scientists - type: Tag - id: BorgModuleService + id: BorgModuleService # Cyborg module category for bartenders, botanists, and more - type: Tag - id: BorgModuleSyndicate + id: BorgModuleSyndicate # Cyborg module category for evil red robots - type: Tag - id: BorgModuleSyndicateAssault + id: BorgModuleSyndicateAssault # Cyborg module category for extra evil red robots (nukies) - type: Tag - id: Bot + id: Bot # Unused - type: Tag - id: BotanyHatchet + id: BotanyHatchet # Storage whitelist: ClothingBeltPlant, ItemMapper: ClothingBeltPlant - type: Tag - id: BotanyHoe + id: BotanyHoe # Storage whitelist: ClothingBeltPlant, ItemMapper: ClothingBeltPlant - type: Tag - id: BotanyShovel + id: BotanyShovel # Storage whitelist: ClothingBeltPlant, ItemMapper: ClothingBeltPlant + +- type: Tag # Used for specifically chemistry bottles + id: Bottle # Storage whitelist: ChemMaster, ChemBag, SmartFridge, ClothingBeltJanitor, ClothingBeltMedical, ClothingBeltPlant - type: Tag - id: Bottle + id: BoxCardboard # CargoBounty: BountyCardboardBox - type: Tag - id: BoxCardboard + id: BoxHug # Unused - type: Tag - id: BoxHug + id: Brain # Storage whitelist: MMI. CargoBounty: BountyBrain. FoodSequenceElement: Brain - type: Tag - id: Brain + id: BrassInstrument # MachineBoard construction: DawInstrumentMachineCircuitboard - type: Tag - id: BrassInstrument + id: Bread # CargoBounty: BountyBread. Blacklisted in BountyFruit and BountyVegetable - type: Tag - id: Bread + id: Briefcase # Unused - type: Tag - id: Briefcase + id: BrimFlatcapBrown # ConstructionGraph: BladedFlatcapBrown - type: Tag - id: BrimFlatcapBrown + id: BrimFlatcapGrey # ConstructionGraph: BladedFlatcapGrey - type: Tag - id: BrimFlatcapGrey + id: Brutepack # Storage whitelist: ClothingBeltMedical - type: Tag - id: Brutepack + id: Bucket # Storage whitelist: JanitorialTrolley. ItemMapper: JanitorialTrolley. ConstructionGraph: CleanBot, scraphelmet - type: Tag - id: Bucket + id: Burger # Unused x2 (this is the only place burger tag exists) - type: Tag - id: Burger + id: BulletFoam # BallisticAmmoProviderComponent whitelist for WeaponRifleFoam, FoamCrossbow, MagazineFoamBox, BoxDonkSoftBox - type: Tag - id: BulletFoam + id: Burnt # Storage whitelist: ashtray. Seemingly redundant - type: Tag - id: Burnt + id: Bun # FoodSequenceElement: BunTopBurger, CottonBunTopBurger - type: Tag - id: Bun + id: BypassDropChecks # Entities with this tag don't care about drop distance or walls (Aghost) - type: Tag - id: BypassDropChecks + id: BypassInteractionRangeChecks # Entities with this tag don't care about distance or walls when touching things (Aghost) -- type: Tag - id: BypassInteractionRangeChecks +## C ## - type: Tag id: CableCoil @@ -440,6 +447,8 @@ - type: Tag id: CubanCarp +## D ## + - type: Tag id: DeathAcidifier @@ -509,6 +518,8 @@ - type: Tag id: Duck +## E ## + - type: Tag id: Ectoplasm @@ -551,9 +562,20 @@ - type: Tag id: Enzyme +- type: Tag + id: ExCable + - type: Tag id: ExplosivePassable +## F ## + +- type: Tag + id: FakeMindShieldImplant + +- type: Tag + id: FakeNukeDisk + - type: Tag id: Figurine @@ -611,6 +633,8 @@ - type: Tag id: Fruit +## G ## + - type: Tag id: Galaxythistle @@ -666,12 +690,6 @@ - type: Tag id: GrenadeFlashBang -- type: Tag - id: HudMedical - -- type: Tag - id: HudSecurity - - type: Tag id: GuideEmbeded @@ -684,6 +702,8 @@ - type: Tag id: GunUpgradeReloadSpeed +## H ## + - type: Tag id: Hamster @@ -789,6 +809,14 @@ - type: Tag id: Hotsauce +- type: Tag + id: HudMedical + +- type: Tag + id: HudSecurity + +## I ## + - type: Tag id: Ice @@ -819,9 +847,13 @@ - type: Tag id: InvalidForSurvivorAntag +## J ## + - type: Tag id: JawsOfLife +## K ## + - type: Tag id: Kangaroo @@ -843,6 +875,8 @@ - type: Tag id: KnockdownImmune +## L ## + - type: Tag id: LavaBrig @@ -855,6 +889,8 @@ - type: Tag id: Lime +## M ## + - type: Tag id: Machete @@ -952,9 +988,6 @@ - type: Tag id: MimeHappyHonk -- type: Tag - id: FakeMindShieldImplant - - type: Tag id: MindTransferTarget @@ -988,6 +1021,8 @@ - type: Tag id: Mushroom +## N ## + - type: Tag id: NoBlockAnchoring @@ -1000,12 +1035,11 @@ - type: Tag id: Nugget # for chicken nuggets -- type: Tag - id: FakeNukeDisk - - type: Tag id: NukeOpsUplink +## O ## + - type: Tag id: Ointment @@ -1027,6 +1061,8 @@ - type: Tag id: OreUranium +## P ## + - type: Tag id: Packet @@ -1156,9 +1192,13 @@ - type: Tag id: ProximitySensor +## Q ## + - type: Tag id: QuantumSpinInverter +## R ## + - type: Tag id: Radio @@ -1214,6 +1254,8 @@ - type: Tag id: Ruminant +## S ## + - type: Tag id: SaltShaker @@ -1393,6 +1435,8 @@ - type: Tag id: Spellbook +## T ## + - type: Tag id: TabletopBoard @@ -1426,6 +1470,9 @@ - type: Tag id: Torch +- type: Tag + id: ToteBase + - type: Tag id: ToyRubberDuck @@ -1447,6 +1494,8 @@ - type: Tag id: TurretControlElectronics # Used in the construction of sentry turret control panels +## U ## + - type: Tag id: Unimplantable @@ -1459,6 +1508,11 @@ - type: Tag id: UtilityBelt +- type: Tag + id: UtilityKnife + +## V ## + - type: Tag id: Vegetable @@ -1471,6 +1525,8 @@ - type: Tag id: VoiceTrigger +## W ## + - type: Tag id: Wall @@ -1546,6 +1602,8 @@ - type: Tag id: WriteIgnoreStamps +## X ## + - type: Tag id: XenoborgModuleEngi @@ -1560,4 +1618,7 @@ - type: Tag id: XenoborgModuleStealth + +## Y ## +## Z ## # ALPHABETICAL diff --git a/Resources/Textures/Clothing/Head/Hardsuits/mime.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/mime.rsi/meta.json index 067e2ce8e2..f9287d14f2 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/mime.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/mime.rsi/meta.json @@ -1,6 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, sprited by Fazansen(https://github.com/Fazansen), modified for Vox by TrixxedHeart", "copyright": "Sprited by Roudenn(https://github.com/Roudenn)", "size": { "x": 32, diff --git a/Resources/Textures/Clothing/Head/Hardsuits/mime.rsi/off-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/mime.rsi/off-equipped-HELMET-vox.png new file mode 100644 index 0000000000..9331f30dd4 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/mime.rsi/off-equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/mime.rsi/on-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/mime.rsi/on-equipped-HELMET-vox.png new file mode 100644 index 0000000000..4abe590db8 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/mime.rsi/on-equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/mime.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/mime.rsi/equipped-OUTERCLOTHING-vox.png new file mode 100644 index 0000000000..95769b1cdc Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/mime.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/mime.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/mime.rsi/meta.json index d7df1a8a1a..f813e2582a 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/mime.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/mime.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, modified by brainfood1183 (github), sprited(resprited) by Fazansen(https://github.com/Fazansen). Tail sprites by Tiniest Shark (github)", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, modified by brainfood1183 (github), sprited(resprited) by Fazansen(https://github.com/Fazansen). Tail sprites by Tiniest Shark (github), modified for Vox by TrixxedHeart", "copyright": "Sprited by Roudenn(https://github.com/Roudenn)", "copyright": "inhand resprited by inventor05(gh: inventor055, discord: qwerty05555)", "size": { @@ -20,6 +20,10 @@ "name": "equipped-OUTERCLOTHING-reptilian", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Mobs/Species/Vox/displacement.rsi/neck.png b/Resources/Textures/Mobs/Species/Vox/displacement.rsi/neck.png index 8783d770ea..cb83fdb13b 100644 Binary files a/Resources/Textures/Mobs/Species/Vox/displacement.rsi/neck.png and b/Resources/Textures/Mobs/Species/Vox/displacement.rsi/neck.png differ diff --git a/Resources/Textures/Objects/Fun/Plushies/vulp.rsi/equipped-HELMET.png b/Resources/Textures/Objects/Fun/Plushies/vulp.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..8c77babba8 Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/vulp.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Objects/Fun/Plushies/vulp.rsi/icon.png b/Resources/Textures/Objects/Fun/Plushies/vulp.rsi/icon.png new file mode 100644 index 0000000000..453dc25bc8 Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/vulp.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Fun/Plushies/vulp.rsi/inhand-left.png b/Resources/Textures/Objects/Fun/Plushies/vulp.rsi/inhand-left.png new file mode 100644 index 0000000000..1601a78028 Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/vulp.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Fun/Plushies/vulp.rsi/inhand-right.png b/Resources/Textures/Objects/Fun/Plushies/vulp.rsi/inhand-right.png new file mode 100644 index 0000000000..0847f28475 Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/vulp.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Fun/Plushies/vulp.rsi/meta.json b/Resources/Textures/Objects/Fun/Plushies/vulp.rsi/meta.json new file mode 100644 index 0000000000..f77d2b2549 --- /dev/null +++ b/Resources/Textures/Objects/Fun/Plushies/vulp.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-3.0", + "copyright": "Sprite by Princess Cheeseballs (github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/meta.json b/Resources/Textures/Objects/Storage/boxes.rsi/meta.json index 55c8c1d0b4..969d9e8074 100644 --- a/Resources/Textures/Objects/Storage/boxes.rsi/meta.json +++ b/Resources/Textures/Objects/Storage/boxes.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/ca674eff9d23e04357b7609ef7e07eadfc1a993f and modified by Flareguy (github), encryptokey was taken from Baystation12 at https://github.com/infinitystation/Baystation12/blob/073f678cdce92edb8fcd55f9ffc9f0523bf31506/icons/obj/radio.dmi and modified by lapatison. boxwidetoy, shelltoy, swab, flare, inflatable, trashbag, magazine, holo and forensic created by potato1234x (github) for ss14 based on toys.rsi, mouth_swab.rsi, flare.rsi, inflatable_wall.rsi, trashbag.rsi, caseless_pistol_mag.rsi, guardians.rsi and bureaucracy.rsi respectively, candle and darts created by TheShuEd for ss14, throwing_knives and vials was drawn by Ubaser, evidence_markers by moomoobeef, nitrogentank modified from extendedtank by Errant, agrichemkit by Cerol, modified by ps3moira (github). sechud renamed to secglasses, new sechud, sunglasses by K-Dynamic (github). utensils by gentleman-bird (github)", + "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/ca674eff9d23e04357b7609ef7e07eadfc1a993f and modified by Flareguy (github), encryptokey was taken from Baystation12 at https://github.com/infinitystation/Baystation12/blob/073f678cdce92edb8fcd55f9ffc9f0523bf31506/icons/obj/radio.dmi and modified by lapatison. boxwidetoy, shelltoy, swab, flare, inflatable, trashbag, magazine, holo and forensic created by potato1234x (github) for ss14 based on toys.rsi, mouth_swab.rsi, flare.rsi, inflatable_wall.rsi, trashbag.rsi, caseless_pistol_mag.rsi, guardians.rsi and bureaucracy.rsi respectively, candle and darts created by TheShuEd for ss14, throwing_knives and vials was drawn by Ubaser, evidence_markers by moomoobeef, nitrogentank modified from extendedtank by Errant, agrichemkit by Cerol, modified by ps3moira (github). sechud renamed to secglasses, new sechud, sunglasses by K-Dynamic (github), trigger by IProduceWidgets, utensils by gentleman-bird (github). stamp, totes modified from box by Mixelz.", "copyright": "Taken from TauCetiStation at commit https://github.com/TauCetiStation/TauCetiClassic/commit/401d381d53ceb9a045bca9c0ae60eb52b5fab2c5, some icons from tgstation at commit https://github.com/tgstation/tgstation/commit/cc65477c04f7403ca8a457bd5bae69a01abadbf0, modified by github:Morb0, encryptokey was taken from Baystation12 at https://github.com/infinitystation/Baystation12/blob/073f678cdce92edb8fcd55f9ffc9f0523bf31506/icons/obj/radio.dmi and modified by lapatison. boxwidetoy, shelltoy resprite by Morb0, swab, flare, inflatable, trashbag, magazine, holo and forensic created by potato1234x (github) for ss14 based on toys.rsi, mouth_swab.rsi, flare.rsi, inflatable_wall.rsi, trashbag.rsi, caseless_pistol_mag.rsi, guardians.rsi and bureaucracy.rsi respectively, candle and darts created by TheShuEd for ss14, throwing_knives and vials was drawn by Ubaser, evidence_markers by moomoobeef, nitrogentank modified from extendedtank by Errant, agrichemkit by Cerol, modified by ps3moira (github). sechud renamed to secglasses, new sechud, sunglasses by K-Dynamic (github).", "size": { "x": 32, @@ -143,6 +143,9 @@ { "name": "solution_trays" }, + { + "name": "stamp" + }, { "name": "sterile" }, @@ -189,6 +192,15 @@ "name": "hug-inhand-right", "directions": 4 }, + { + "name": "tote-0" + }, + { + "name": "tote-1" + }, + { + "name": "tote-2" + }, { "name": "shelltoy" }, @@ -204,6 +216,9 @@ { "name": "vials" }, + { + "name": "trigger" + }, { "name": "envelope" }, diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/stamp.png b/Resources/Textures/Objects/Storage/boxes.rsi/stamp.png new file mode 100644 index 0000000000..812c721f20 Binary files /dev/null and b/Resources/Textures/Objects/Storage/boxes.rsi/stamp.png differ diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/tote-0.png b/Resources/Textures/Objects/Storage/boxes.rsi/tote-0.png new file mode 100644 index 0000000000..fbdcd51802 Binary files /dev/null and b/Resources/Textures/Objects/Storage/boxes.rsi/tote-0.png differ diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/tote-1.png b/Resources/Textures/Objects/Storage/boxes.rsi/tote-1.png new file mode 100644 index 0000000000..02a49d9dbb Binary files /dev/null and b/Resources/Textures/Objects/Storage/boxes.rsi/tote-1.png differ diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/tote-2.png b/Resources/Textures/Objects/Storage/boxes.rsi/tote-2.png new file mode 100644 index 0000000000..3066ce7254 Binary files /dev/null and b/Resources/Textures/Objects/Storage/boxes.rsi/tote-2.png differ diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/trigger.png b/Resources/Textures/Objects/Storage/boxes.rsi/trigger.png new file mode 100644 index 0000000000..5be60b4622 Binary files /dev/null and b/Resources/Textures/Objects/Storage/boxes.rsi/trigger.png differ diff --git a/Resources/Textures/Objects/Tools/cable-coils.rsi/coilex-10.png b/Resources/Textures/Objects/Tools/cable-coils.rsi/coilex-10.png new file mode 100644 index 0000000000..474a751b13 Binary files /dev/null and b/Resources/Textures/Objects/Tools/cable-coils.rsi/coilex-10.png differ diff --git a/Resources/Textures/Objects/Tools/cable-coils.rsi/coilex-20.png b/Resources/Textures/Objects/Tools/cable-coils.rsi/coilex-20.png new file mode 100644 index 0000000000..b9f4c45e07 Binary files /dev/null and b/Resources/Textures/Objects/Tools/cable-coils.rsi/coilex-20.png differ diff --git a/Resources/Textures/Objects/Tools/cable-coils.rsi/coilex-30.png b/Resources/Textures/Objects/Tools/cable-coils.rsi/coilex-30.png new file mode 100644 index 0000000000..1d04573c5c Binary files /dev/null and b/Resources/Textures/Objects/Tools/cable-coils.rsi/coilex-30.png differ diff --git a/Resources/Textures/Objects/Tools/cable-coils.rsi/coilex-equipped-BELT.png b/Resources/Textures/Objects/Tools/cable-coils.rsi/coilex-equipped-BELT.png new file mode 100644 index 0000000000..0ebbd08fae Binary files /dev/null and b/Resources/Textures/Objects/Tools/cable-coils.rsi/coilex-equipped-BELT.png differ diff --git a/Resources/Textures/Objects/Tools/cable-coils.rsi/coilex-inhand-left.png b/Resources/Textures/Objects/Tools/cable-coils.rsi/coilex-inhand-left.png new file mode 100644 index 0000000000..00ba40526d Binary files /dev/null and b/Resources/Textures/Objects/Tools/cable-coils.rsi/coilex-inhand-left.png differ diff --git a/Resources/Textures/Objects/Tools/cable-coils.rsi/coilex-inhand-right.png b/Resources/Textures/Objects/Tools/cable-coils.rsi/coilex-inhand-right.png new file mode 100644 index 0000000000..86ce3a5412 Binary files /dev/null and b/Resources/Textures/Objects/Tools/cable-coils.rsi/coilex-inhand-right.png differ diff --git a/Resources/Textures/Objects/Tools/cable-coils.rsi/meta.json b/Resources/Textures/Objects/Tools/cable-coils.rsi/meta.json index d1fcdea7f4..95b59f691d 100644 --- a/Resources/Textures/Objects/Tools/cable-coils.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/cable-coils.rsi/meta.json @@ -31,6 +31,14 @@ "name": "coillv-inhand-right", "directions": 4 }, + { + "name": "coilex-inhand-left", + "directions": 4 + }, + { + "name": "coilex-inhand-right", + "directions": 4 + }, { "name": "coil-30" }, @@ -70,6 +78,15 @@ { "name": "coilall-30" }, + { + "name": "coilex-30" + }, + { + "name": "coilex-20" + }, + { + "name": "coilex-10" + }, { "name": "coil-equipped-BELT", "directions": 4 @@ -85,6 +102,10 @@ { "name": "coilhv-equipped-BELT", "directions": 4 + }, + { + "name": "coilex-equipped-BELT", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Weapons/Bombs/detonator.rsi/addtrigger.png b/Resources/Textures/Objects/Weapons/Bombs/detonator.rsi/addtrigger.png new file mode 100644 index 0000000000..77e4b57293 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Bombs/detonator.rsi/addtrigger.png differ diff --git a/Resources/Textures/Objects/Weapons/Bombs/detonator.rsi/complete.png b/Resources/Textures/Objects/Weapons/Bombs/detonator.rsi/complete.png new file mode 100644 index 0000000000..a6c4d89d6c Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Bombs/detonator.rsi/complete.png differ diff --git a/Resources/Textures/Objects/Weapons/Bombs/detonator.rsi/empty.png b/Resources/Textures/Objects/Weapons/Bombs/detonator.rsi/empty.png new file mode 100644 index 0000000000..f5e5d3b5aa Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Bombs/detonator.rsi/empty.png differ diff --git a/Resources/Textures/Objects/Weapons/Bombs/detonator.rsi/meta.json b/Resources/Textures/Objects/Weapons/Bombs/detonator.rsi/meta.json new file mode 100644 index 0000000000..4b39b7a3be --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Bombs/detonator.rsi/meta.json @@ -0,0 +1,34 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from austation at commit https://github.com/austation/austation/commit/71d8e7406d84f8ec8cb79bf153b050e7e09d2a17 and modified by IProduceWidgets", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "empty", + "directions": 1 + }, + { + "name": "wired", + "directions": 1 + }, + { + "name": "addtrigger", + "directions": 1 + }, + { + "name": "complete", + "directions": 1 + }, + { + "name": "primed", + "directions": 1, + "delays": [ + [ 0.2, 0.2 ] + ] + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Bombs/detonator.rsi/primed.png b/Resources/Textures/Objects/Weapons/Bombs/detonator.rsi/primed.png new file mode 100644 index 0000000000..56a28ec57c Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Bombs/detonator.rsi/primed.png differ diff --git a/Resources/Textures/Objects/Weapons/Bombs/detonator.rsi/wired.png b/Resources/Textures/Objects/Weapons/Bombs/detonator.rsi/wired.png new file mode 100644 index 0000000000..c74ea20376 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Bombs/detonator.rsi/wired.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/utility_knife.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/utility_knife.rsi/icon.png new file mode 100644 index 0000000000..9f41d1a08e Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/utility_knife.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/utility_knife.rsi/inhand-left-blade.png b/Resources/Textures/Objects/Weapons/Melee/utility_knife.rsi/inhand-left-blade.png new file mode 100644 index 0000000000..b53a19e938 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/utility_knife.rsi/inhand-left-blade.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/utility_knife.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/utility_knife.rsi/inhand-left.png new file mode 100644 index 0000000000..5c64f929e1 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/utility_knife.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/utility_knife.rsi/inhand-right-blade.png b/Resources/Textures/Objects/Weapons/Melee/utility_knife.rsi/inhand-right-blade.png new file mode 100644 index 0000000000..acddabce4c Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/utility_knife.rsi/inhand-right-blade.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/utility_knife.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/utility_knife.rsi/inhand-right.png new file mode 100644 index 0000000000..4abf5049bd Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/utility_knife.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/utility_knife.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/utility_knife.rsi/meta.json new file mode 100644 index 0000000000..6d96094dee --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Melee/utility_knife.rsi/meta.json @@ -0,0 +1,36 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Icon sprited for SS14 by GitHub user sudobeans. Inhand sprites sprited for SS14 by Github user TiniestShark.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "utility_knife_blade" + }, + { + "name": "utility_knife_handle" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-right-blade", + "directions": 4 + }, + { + "name": "inhand-left-blade", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Melee/utility_knife.rsi/utility_knife_blade.png b/Resources/Textures/Objects/Weapons/Melee/utility_knife.rsi/utility_knife_blade.png new file mode 100644 index 0000000000..07599b94f5 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/utility_knife.rsi/utility_knife_blade.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/utility_knife.rsi/utility_knife_handle.png b/Resources/Textures/Objects/Weapons/Melee/utility_knife.rsi/utility_knife_handle.png new file mode 100644 index 0000000000..9769850ddd Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/utility_knife.rsi/utility_knife_handle.png differ diff --git a/Resources/Textures/Structures/Machines/microwave.rsi/inhand-left.png b/Resources/Textures/Structures/Machines/microwave.rsi/inhand-left.png new file mode 100644 index 0000000000..0f0e618e3b Binary files /dev/null and b/Resources/Textures/Structures/Machines/microwave.rsi/inhand-left.png differ diff --git a/Resources/Textures/Structures/Machines/microwave.rsi/inhand-right.png b/Resources/Textures/Structures/Machines/microwave.rsi/inhand-right.png new file mode 100644 index 0000000000..0f0e618e3b Binary files /dev/null and b/Resources/Textures/Structures/Machines/microwave.rsi/inhand-right.png differ diff --git a/Resources/Textures/Structures/Machines/microwave_syndie.rsi/inhand-left.png b/Resources/Textures/Structures/Machines/microwave_syndie.rsi/inhand-left.png new file mode 100644 index 0000000000..ac4fd25b57 Binary files /dev/null and b/Resources/Textures/Structures/Machines/microwave_syndie.rsi/inhand-left.png differ diff --git a/Resources/Textures/Structures/Machines/microwave_syndie.rsi/inhand-right.png b/Resources/Textures/Structures/Machines/microwave_syndie.rsi/inhand-right.png new file mode 100644 index 0000000000..ac4fd25b57 Binary files /dev/null and b/Resources/Textures/Structures/Machines/microwave_syndie.rsi/inhand-right.png differ diff --git a/Resources/Textures/Structures/Machines/microwave_syndie.rsi/mwbloody0.png b/Resources/Textures/Structures/Machines/microwave_syndie.rsi/mwbloody0.png index a51302a253..c3addeff32 100644 Binary files a/Resources/Textures/Structures/Machines/microwave_syndie.rsi/mwbloody0.png and b/Resources/Textures/Structures/Machines/microwave_syndie.rsi/mwbloody0.png differ diff --git a/Resources/Textures/Structures/Machines/microwave_syndie.rsi/mwbloody1.png b/Resources/Textures/Structures/Machines/microwave_syndie.rsi/mwbloody1.png index 8cfdf34281..e37a99946a 100644 Binary files a/Resources/Textures/Structures/Machines/microwave_syndie.rsi/mwbloody1.png and b/Resources/Textures/Structures/Machines/microwave_syndie.rsi/mwbloody1.png differ diff --git a/Resources/Textures/Structures/Power/Cables/ex_cable.rsi/excable_0.png b/Resources/Textures/Structures/Power/Cables/ex_cable.rsi/excable_0.png new file mode 100644 index 0000000000..dadf77beb8 Binary files /dev/null and b/Resources/Textures/Structures/Power/Cables/ex_cable.rsi/excable_0.png differ diff --git a/Resources/Textures/Structures/Power/Cables/ex_cable.rsi/excable_1.png b/Resources/Textures/Structures/Power/Cables/ex_cable.rsi/excable_1.png new file mode 100644 index 0000000000..c2cbf1272a Binary files /dev/null and b/Resources/Textures/Structures/Power/Cables/ex_cable.rsi/excable_1.png differ diff --git a/Resources/Textures/Structures/Power/Cables/ex_cable.rsi/excable_10.png b/Resources/Textures/Structures/Power/Cables/ex_cable.rsi/excable_10.png new file mode 100644 index 0000000000..c4335bdd6b Binary files /dev/null and b/Resources/Textures/Structures/Power/Cables/ex_cable.rsi/excable_10.png differ diff --git a/Resources/Textures/Structures/Power/Cables/ex_cable.rsi/excable_11.png b/Resources/Textures/Structures/Power/Cables/ex_cable.rsi/excable_11.png new file mode 100644 index 0000000000..83d067820b Binary files /dev/null and b/Resources/Textures/Structures/Power/Cables/ex_cable.rsi/excable_11.png differ diff --git a/Resources/Textures/Structures/Power/Cables/ex_cable.rsi/excable_12.png b/Resources/Textures/Structures/Power/Cables/ex_cable.rsi/excable_12.png new file mode 100644 index 0000000000..9590e82dbb Binary files /dev/null and b/Resources/Textures/Structures/Power/Cables/ex_cable.rsi/excable_12.png differ diff --git a/Resources/Textures/Structures/Power/Cables/ex_cable.rsi/excable_13.png b/Resources/Textures/Structures/Power/Cables/ex_cable.rsi/excable_13.png new file mode 100644 index 0000000000..b1a67c53fb Binary files /dev/null and b/Resources/Textures/Structures/Power/Cables/ex_cable.rsi/excable_13.png differ diff --git a/Resources/Textures/Structures/Power/Cables/ex_cable.rsi/excable_14.png b/Resources/Textures/Structures/Power/Cables/ex_cable.rsi/excable_14.png new file mode 100644 index 0000000000..61ef8cd47c Binary files /dev/null and b/Resources/Textures/Structures/Power/Cables/ex_cable.rsi/excable_14.png differ diff --git a/Resources/Textures/Structures/Power/Cables/ex_cable.rsi/excable_15.png b/Resources/Textures/Structures/Power/Cables/ex_cable.rsi/excable_15.png new file mode 100644 index 0000000000..01ce8b4944 Binary files /dev/null and b/Resources/Textures/Structures/Power/Cables/ex_cable.rsi/excable_15.png differ diff --git a/Resources/Textures/Structures/Power/Cables/ex_cable.rsi/excable_2.png b/Resources/Textures/Structures/Power/Cables/ex_cable.rsi/excable_2.png new file mode 100644 index 0000000000..05a9a89d9a Binary files /dev/null and b/Resources/Textures/Structures/Power/Cables/ex_cable.rsi/excable_2.png differ diff --git a/Resources/Textures/Structures/Power/Cables/ex_cable.rsi/excable_3.png b/Resources/Textures/Structures/Power/Cables/ex_cable.rsi/excable_3.png new file mode 100644 index 0000000000..d2046266b6 Binary files /dev/null and b/Resources/Textures/Structures/Power/Cables/ex_cable.rsi/excable_3.png differ diff --git a/Resources/Textures/Structures/Power/Cables/ex_cable.rsi/excable_4.png b/Resources/Textures/Structures/Power/Cables/ex_cable.rsi/excable_4.png new file mode 100644 index 0000000000..d1edbc5b69 Binary files /dev/null and b/Resources/Textures/Structures/Power/Cables/ex_cable.rsi/excable_4.png differ diff --git a/Resources/Textures/Structures/Power/Cables/ex_cable.rsi/excable_5.png b/Resources/Textures/Structures/Power/Cables/ex_cable.rsi/excable_5.png new file mode 100644 index 0000000000..bb9da73f71 Binary files /dev/null and b/Resources/Textures/Structures/Power/Cables/ex_cable.rsi/excable_5.png differ diff --git a/Resources/Textures/Structures/Power/Cables/ex_cable.rsi/excable_6.png b/Resources/Textures/Structures/Power/Cables/ex_cable.rsi/excable_6.png new file mode 100644 index 0000000000..0736f7b9a7 Binary files /dev/null and b/Resources/Textures/Structures/Power/Cables/ex_cable.rsi/excable_6.png differ diff --git a/Resources/Textures/Structures/Power/Cables/ex_cable.rsi/excable_7.png b/Resources/Textures/Structures/Power/Cables/ex_cable.rsi/excable_7.png new file mode 100644 index 0000000000..c606f14cd8 Binary files /dev/null and b/Resources/Textures/Structures/Power/Cables/ex_cable.rsi/excable_7.png differ diff --git a/Resources/Textures/Structures/Power/Cables/ex_cable.rsi/excable_8.png b/Resources/Textures/Structures/Power/Cables/ex_cable.rsi/excable_8.png new file mode 100644 index 0000000000..d4cfcb35da Binary files /dev/null and b/Resources/Textures/Structures/Power/Cables/ex_cable.rsi/excable_8.png differ diff --git a/Resources/Textures/Structures/Power/Cables/ex_cable.rsi/excable_9.png b/Resources/Textures/Structures/Power/Cables/ex_cable.rsi/excable_9.png new file mode 100644 index 0000000000..49abe32294 Binary files /dev/null and b/Resources/Textures/Structures/Power/Cables/ex_cable.rsi/excable_9.png differ diff --git a/Resources/Textures/Structures/Power/Cables/ex_cable.rsi/meta.json b/Resources/Textures/Structures/Power/Cables/ex_cable.rsi/meta.json new file mode 100644 index 0000000000..58fb0e4d29 --- /dev/null +++ b/Resources/Textures/Structures/Power/Cables/ex_cable.rsi/meta.json @@ -0,0 +1,75 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/fcf375d7d9ce6ceed5c7face899725e5655ab640, striping added by IProduceWidgets", + "states": [ + { + "name": "excable_0" + + }, + { + "name": "excable_1" + + }, + { + "name": "excable_2" + + }, + { + "name": "excable_3" + + }, + { + "name": "excable_4" + + }, + { + "name": "excable_5" + + }, + { + "name": "excable_6" + + }, + { + "name": "excable_7" + + }, + { + "name": "excable_8" + + }, + { + "name": "excable_9" + + }, + { + "name": "excable_10" + + }, + { + "name": "excable_11" + + }, + { + "name": "excable_12" + + }, + { + "name": "excable_13" + + }, + { + "name": "excable_14" + + }, + { + "name": "excable_15" + + } + ] +} diff --git a/Resources/keybinds.yml b/Resources/keybinds.yml index 1d86e4c5e7..870c8e1435 100644 --- a/Resources/keybinds.yml +++ b/Resources/keybinds.yml @@ -255,6 +255,18 @@ binds: type: State key: E mod1: Shift +- function: SmartEquipPocket1 + type: State + key: F + mod1: Shift +- function: SmartEquipPocket2 + type: State + key: G + mod1: Shift +- function: SmartEquipSuitStorage + type: State + key: H + mod1: Shift - function: OpenBackpack type: State key: V diff --git a/RobustToolbox b/RobustToolbox index c06ca39009..9e8f7092ea 160000 --- a/RobustToolbox +++ b/RobustToolbox @@ -1 +1 @@ -Subproject commit c06ca39009ce993bed98c216a8affef5f566cb66 +Subproject commit 9e8f7092ea32a2653776292703d20320f3f34cf5