From 5185df4072de98ff69d6690206297ccf12786e19 Mon Sep 17 00:00:00 2001 From: blobadoodle Date: Thu, 9 Oct 2025 22:12:24 +0100 Subject: [PATCH 01/82] Add missing uranium glass locales (#40809) --- Resources/Locale/en-US/materials/materials.ftl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Resources/Locale/en-US/materials/materials.ftl b/Resources/Locale/en-US/materials/materials.ftl index 657b7f5f0f..5a22bc2661 100644 --- a/Resources/Locale/en-US/materials/materials.ftl +++ b/Resources/Locale/en-US/materials/materials.ftl @@ -3,6 +3,8 @@ materials-glass = glass materials-reinforced-glass = reinforced glass materials-plasma-glass = plasma glass materials-reinforced-plasma-glass = reinforced plasma glass +materials-uranium-glass = uranium glass +materials-reinforced-uranium-glass = reinforced uranium glass # Metals materials-steel = steel From 0d97699aaeec677736382b8a225414b193a9bf8a Mon Sep 17 00:00:00 2001 From: Jessica M Date: Thu, 9 Oct 2025 14:14:12 -0700 Subject: [PATCH 02/82] Migrate revenant and PAI shops to use ActionGrant instead of hardcoding them (#40475) * add intrinsic store, replace revenant store with it. * migrate PAI and also move to shared where possible * fix typos and clean up... intrinisic * oops, hopefully fixes test * Move to StoreSystem and ActionGrant * documentation and remove thing * review --------- Co-authored-by: Jessica M Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> --- Content.Client/PAI/PAISystem.cs | 8 ---- Content.Server/PAI/PAISystem.cs | 18 +-------- .../Revenant/EntitySystems/RevenantSystem.cs | 19 ---------- Content.Server/Store/Systems/StoreSystem.cs | 16 +++++--- Content.Shared/PAI/PAIComponent.cs | 12 +----- Content.Shared/PAI/SharedPAISystem.cs | 38 ------------------- .../Revenant/Components/RevenantComponent.cs | 2 - Content.Shared/Revenant/SharedRevenant.cs | 4 -- .../Store/Events/IntrinsicStoreActionEvent.cs | 11 ++++++ Resources/Prototypes/Actions/revenant.yml | 7 +--- Resources/Prototypes/Actions/types.yml | 11 ++++++ .../Entities/Mobs/NPCs/revenant.yml | 3 ++ .../Prototypes/Entities/Objects/Fun/pai.yml | 10 ++--- 13 files changed, 43 insertions(+), 116 deletions(-) delete mode 100644 Content.Client/PAI/PAISystem.cs delete mode 100644 Content.Shared/PAI/SharedPAISystem.cs create mode 100644 Content.Shared/Store/Events/IntrinsicStoreActionEvent.cs diff --git a/Content.Client/PAI/PAISystem.cs b/Content.Client/PAI/PAISystem.cs deleted file mode 100644 index a28cf6a077..0000000000 --- a/Content.Client/PAI/PAISystem.cs +++ /dev/null @@ -1,8 +0,0 @@ -using Content.Shared.PAI; - -namespace Content.Client.PAI -{ - public sealed class PAISystem : SharedPAISystem - { - } -} diff --git a/Content.Server/PAI/PAISystem.cs b/Content.Server/PAI/PAISystem.cs index 289b74b258..7fd58f1572 100644 --- a/Content.Server/PAI/PAISystem.cs +++ b/Content.Server/PAI/PAISystem.cs @@ -2,27 +2,22 @@ using Content.Server.Ghost.Roles; using Content.Server.Ghost.Roles.Components; using Content.Server.Instruments; using Content.Server.Kitchen.Components; -using Content.Server.Store.Systems; using Content.Shared.Interaction.Events; using Content.Shared.Mind.Components; using Content.Shared.PAI; using Content.Shared.Popups; -using Content.Shared.Store; -using Content.Shared.Store.Components; using Content.Shared.Instruments; using Robust.Shared.Random; -using Robust.Shared.Prototypes; using System.Text; namespace Content.Server.PAI; -public sealed class PAISystem : SharedPAISystem +public sealed class PAISystem : EntitySystem { [Dependency] private readonly InstrumentSystem _instrumentSystem = default!; [Dependency] private readonly IRobustRandom _random = default!; [Dependency] private readonly MetaDataSystem _metaData = default!; [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly StoreSystem _store = default!; [Dependency] private readonly ToggleableGhostRoleSystem _toggleableGhostRole = default!; /// @@ -38,8 +33,6 @@ public sealed class PAISystem : SharedPAISystem SubscribeLocalEvent(OnMindAdded); SubscribeLocalEvent(OnMindRemoved); SubscribeLocalEvent(OnMicrowaved); - - SubscribeLocalEvent(OnShop); } private void OnUseInHand(EntityUid uid, PAIComponent component, UseInHandEvent args) @@ -106,15 +99,6 @@ public sealed class PAISystem : SharedPAISystem var val = Loc.GetString("pai-system-pai-name-raw", ("name", name.ToString())); _metaData.SetEntityName(uid, val); } - - private void OnShop(Entity ent, ref PAIShopActionEvent args) - { - if (!TryComp(ent, out var store)) - return; - - _store.ToggleUi(args.Performer, ent, store); - } - public void PAITurningOff(EntityUid uid) { // Close the instrument interface if it was open diff --git a/Content.Server/Revenant/EntitySystems/RevenantSystem.cs b/Content.Server/Revenant/EntitySystems/RevenantSystem.cs index b89f10934d..6c8972be58 100644 --- a/Content.Server/Revenant/EntitySystems/RevenantSystem.cs +++ b/Content.Server/Revenant/EntitySystems/RevenantSystem.cs @@ -1,7 +1,6 @@ using System.Numerics; using Content.Server.Actions; using Content.Server.GameTicking; -using Content.Server.Store.Components; using Content.Server.Store.Systems; using Content.Shared.Alert; using Content.Shared.Damage; @@ -21,7 +20,6 @@ using Content.Shared.Store.Components; using Content.Shared.Stunnable; using Content.Shared.Tag; using Robust.Server.GameObjects; -using Robust.Shared.Prototypes; using Robust.Shared.Random; namespace Content.Server.Revenant.EntitySystems; @@ -46,17 +44,12 @@ public sealed partial class RevenantSystem : EntitySystem [Dependency] private readonly TagSystem _tag = default!; [Dependency] private readonly VisibilitySystem _visibility = default!; [Dependency] private readonly TurfSystem _turf = default!; - - private static readonly EntProtoId RevenantShopId = "ActionRevenantShop"; - public override void Initialize() { base.Initialize(); SubscribeLocalEvent(OnStartup); - SubscribeLocalEvent(OnMapInit); - SubscribeLocalEvent(OnShop); SubscribeLocalEvent(OnDamage); SubscribeLocalEvent(OnExamine); SubscribeLocalEvent(OnStatusAdded); @@ -94,11 +87,6 @@ public sealed partial class RevenantSystem : EntitySystem _eye.RefreshVisibilityMask(uid); } - private void OnMapInit(EntityUid uid, RevenantComponent component, MapInitEvent args) - { - _action.AddAction(uid, ref component.Action, RevenantShopId); - } - private void OnStatusAdded(EntityUid uid, RevenantComponent component, StatusEffectAddedEvent args) { if (args.Key == "Stun") @@ -182,13 +170,6 @@ public sealed partial class RevenantSystem : EntitySystem return true; } - private void OnShop(EntityUid uid, RevenantComponent component, RevenantShopActionEvent args) - { - if (!TryComp(uid, out var store)) - return; - _store.ToggleUi(uid, uid, store); - } - public void MakeVisible(bool visible) { var query = EntityQueryEnumerator(); diff --git a/Content.Server/Store/Systems/StoreSystem.cs b/Content.Server/Store/Systems/StoreSystem.cs index 0625ced087..10060dc7d3 100644 --- a/Content.Server/Store/Systems/StoreSystem.cs +++ b/Content.Server/Store/Systems/StoreSystem.cs @@ -1,17 +1,16 @@ +using System.Linq; using Content.Server.Store.Components; -using Content.Shared.UserInterface; using Content.Shared.FixedPoint; using Content.Shared.Implants.Components; using Content.Shared.Interaction; using Content.Shared.Popups; using Content.Shared.Stacks; using Content.Shared.Store.Components; -using JetBrains.Annotations; +using Content.Shared.Store.Events; +using Content.Shared.UserInterface; using Robust.Shared.Prototypes; -using Robust.Shared.Utility; -using System.Linq; using Robust.Shared.Timing; -using Content.Shared.Mind; +using Robust.Shared.Utility; namespace Content.Server.Store.Systems; @@ -37,6 +36,7 @@ public sealed partial class StoreSystem : EntitySystem SubscribeLocalEvent(OnStartup); SubscribeLocalEvent(OnShutdown); SubscribeLocalEvent(OnImplantActivate); + SubscribeLocalEvent(OnIntrinsicStoreAction); InitializeUi(); InitializeCommand(); @@ -187,6 +187,12 @@ public sealed partial class StoreSystem : EntitySystem UpdateUserInterface(null, uid, store); return true; } + + private void OnIntrinsicStoreAction(Entity ent, ref IntrinsicStoreActionEvent args) + { + ToggleUi(args.Performer, ent.Owner, ent.Comp); + } + } public sealed class CurrencyInsertAttemptEvent : CancellableEntityEventArgs diff --git a/Content.Shared/PAI/PAIComponent.cs b/Content.Shared/PAI/PAIComponent.cs index fb9d7150e3..541172ffe0 100644 --- a/Content.Shared/PAI/PAIComponent.cs +++ b/Content.Shared/PAI/PAIComponent.cs @@ -1,8 +1,4 @@ -using Content.Shared.FixedPoint; -using Content.Shared.Store; using Robust.Shared.GameStates; -using Robust.Shared.Prototypes; -using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; namespace Content.Shared.PAI; @@ -16,7 +12,7 @@ namespace Content.Shared.PAI; /// and there's not always enough players and ghost roles to justify it. /// All logic in PAISystem. /// -[RegisterComponent, NetworkedComponent, AutoGenerateComponentState] +[RegisterComponent, NetworkedComponent] public sealed partial class PAIComponent : Component { /// @@ -26,12 +22,6 @@ public sealed partial class PAIComponent : Component [DataField, ViewVariables(VVAccess.ReadWrite)] public EntityUid? LastUser; - [DataField] - public EntProtoId ShopActionId = "ActionPAIOpenShop"; - - [DataField, AutoNetworkedField] - public EntityUid? ShopAction; - /// /// When microwaved there is this chance to brick the pai, kicking out its player and preventing it from being used again. /// diff --git a/Content.Shared/PAI/SharedPAISystem.cs b/Content.Shared/PAI/SharedPAISystem.cs deleted file mode 100644 index 00d3e23cef..0000000000 --- a/Content.Shared/PAI/SharedPAISystem.cs +++ /dev/null @@ -1,38 +0,0 @@ -using Content.Shared.Actions; - -namespace Content.Shared.PAI; - -/// -/// pAIs, or Personal AIs, are essentially portable ghost role generators. -/// In their current implementation, they create a ghost role anyone can access, -/// and that a player can also "wipe" (reset/kick out player). -/// Theoretically speaking pAIs are supposed to use a dedicated "offer and select" system, -/// with the player holding the pAI being able to choose one of the ghosts in the round. -/// This seems too complicated for an initial implementation, though, -/// and there's not always enough players and ghost roles to justify it. -/// -public abstract class SharedPAISystem : EntitySystem -{ - [Dependency] private readonly SharedActionsSystem _actions = default!; - - public override void Initialize() - { - base.Initialize(); - - SubscribeLocalEvent(OnMapInit); - SubscribeLocalEvent(OnShutdown); - } - - private void OnMapInit(Entity ent, ref MapInitEvent args) - { - _actions.AddAction(ent, ent.Comp.ShopActionId); - } - - private void OnShutdown(Entity ent, ref ComponentShutdown args) - { - _actions.RemoveAction(ent.Owner, ent.Comp.ShopAction); - } -} -public sealed partial class PAIShopActionEvent : InstantActionEvent -{ -} diff --git a/Content.Shared/Revenant/Components/RevenantComponent.cs b/Content.Shared/Revenant/Components/RevenantComponent.cs index e6543f1906..e434bba1d9 100644 --- a/Content.Shared/Revenant/Components/RevenantComponent.cs +++ b/Content.Shared/Revenant/Components/RevenantComponent.cs @@ -214,6 +214,4 @@ public sealed partial class RevenantComponent : Component [DataField("harvestingState")] public string HarvestingState = "harvesting"; #endregion - - [DataField] public EntityUid? Action; } diff --git a/Content.Shared/Revenant/SharedRevenant.cs b/Content.Shared/Revenant/SharedRevenant.cs index c44e4408aa..b1023f43e2 100644 --- a/Content.Shared/Revenant/SharedRevenant.cs +++ b/Content.Shared/Revenant/SharedRevenant.cs @@ -42,10 +42,6 @@ public sealed class HarvestDoAfterCancelled : EntityEventArgs { } -public sealed partial class RevenantShopActionEvent : InstantActionEvent -{ -} - public sealed partial class RevenantDefileActionEvent : InstantActionEvent { } diff --git a/Content.Shared/Store/Events/IntrinsicStoreActionEvent.cs b/Content.Shared/Store/Events/IntrinsicStoreActionEvent.cs new file mode 100644 index 0000000000..dea2c25e6e --- /dev/null +++ b/Content.Shared/Store/Events/IntrinsicStoreActionEvent.cs @@ -0,0 +1,11 @@ +using Content.Shared.Actions; + +namespace Content.Shared.Store.Events; + +/// +/// Opens a store specified by +/// Used for entities with a store built into themselves like Revenant or PAI +/// +public sealed partial class IntrinsicStoreActionEvent : InstantActionEvent +{ +} diff --git a/Resources/Prototypes/Actions/revenant.yml b/Resources/Prototypes/Actions/revenant.yml index 5904908a75..3ac425a567 100644 --- a/Resources/Prototypes/Actions/revenant.yml +++ b/Resources/Prototypes/Actions/revenant.yml @@ -1,13 +1,8 @@ - type: entity - parent: BaseAction + parent: ActionIntrinsicStore id: ActionRevenantShop name: Shop description: Opens the ability shop. - components: - - type: Action - icon: Interface/Actions/shop.png - - type: InstantAction - event: !type:RevenantShopActionEvent - type: entity parent: BaseAction diff --git a/Resources/Prototypes/Actions/types.yml b/Resources/Prototypes/Actions/types.yml index 61babbfcea..752aeb13f8 100644 --- a/Resources/Prototypes/Actions/types.yml +++ b/Resources/Prototypes/Actions/types.yml @@ -466,3 +466,14 @@ itemIconStyle: BigAction - type: InstantAction event: !type:ChameleonControllerOpenMenuEvent + +- type: entity + parent: BaseMentalAction + id: ActionIntrinsicStore + name: Store + description: Opens the store + components: + - type: Action + icon: Interface/Actions/shop.png + - type: InstantAction + event: !type:IntrinsicStoreActionEvent diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml b/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml index 9b0bfb05ca..04b1554cef 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml @@ -66,6 +66,9 @@ type: StoreBoundUserInterface - type: Visibility layer: 2 #ghost vis layer + - type: ActionGrant + actions: + - ActionRevenantShop - type: Store categories: - RevenantAbilities diff --git a/Resources/Prototypes/Entities/Objects/Fun/pai.yml b/Resources/Prototypes/Entities/Objects/Fun/pai.yml index 6aec812b77..2ba5acfbf1 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/pai.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/pai.yml @@ -58,6 +58,9 @@ - Common - type: DoAfter - type: Actions + - type: ActionGrant + actions: + - ActionPAIOpenShop - type: Store categories: - PAIAbilities @@ -188,15 +191,10 @@ node: potatoai - type: entity - parent: BaseMentalAction + parent: ActionIntrinsicStore id: ActionPAIOpenShop name: Software Catalog description: Install new software to assist your owner. - components: - - type: Action - icon: Interface/Actions/shop.png - - type: InstantAction - event: !type:PAIShopActionEvent - type: entity parent: BaseMentalAction From d3d52615d4b0aebf6218cbf881101d0255427eca Mon Sep 17 00:00:00 2001 From: FungiFellow <151778459+FungiFellow@users.noreply.github.com> Date: Thu, 9 Oct 2025 18:08:52 -0400 Subject: [PATCH 03/82] Lootpool Tweaks Mail/Maints (#39892) * Added Claymore to MaintWeaponTable * SyndieBusinessCard+InsulsTable --- .../Entities/Markers/Spawners/Random/maintenance.yml | 1 + .../Entities/Objects/Deliveries/deliveries_tables.yml | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml index bb3829a2dd..e6e3ec8c6f 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml @@ -329,6 +329,7 @@ weight: 95 children: - id: Machete + - id: Claymore - id: BaseBallBat - id: CombatKnife - id: Spear diff --git a/Resources/Prototypes/Entities/Objects/Deliveries/deliveries_tables.yml b/Resources/Prototypes/Entities/Objects/Deliveries/deliveries_tables.yml index 19613dd494..be663a1774 100644 --- a/Resources/Prototypes/Entities/Objects/Deliveries/deliveries_tables.yml +++ b/Resources/Prototypes/Entities/Objects/Deliveries/deliveries_tables.yml @@ -105,6 +105,8 @@ - id: Ointment - id: Gauze - id: Bloodpack + - id: SyndicateBusinessCard + weight: 0.5 # Packages # TODO: Currently mostly maints loot, should be updated in the future. @@ -138,6 +140,9 @@ weight: 0.2 rolls: !type:RangeNumberSelector range: 2, 3 + - !type:NestedSelector + tableId: InsulsTable #Uncommon since it's weighted towards budget/fingerless + weight: 0.2 - type: entityTable # TODO: Add more variety! id: PackageRareEntityTable @@ -157,3 +162,4 @@ - !type:NestedSelector tableId: SyndieMaintLoot weight: 0.5 + From accb59b6c720e389bdc31cdf34cf6fbe4997719c Mon Sep 17 00:00:00 2001 From: ToastEnjoyer Date: Thu, 9 Oct 2025 20:00:46 -0500 Subject: [PATCH 04/82] Added more nitrogen canisters to plasma (#40794) --- Resources/Maps/plasma.yml | 2246 +++++++++++++++++++++++++++++-------- 1 file changed, 1792 insertions(+), 454 deletions(-) diff --git a/Resources/Maps/plasma.yml b/Resources/Maps/plasma.yml index 0a0f1d7428..71dba17d74 100644 --- a/Resources/Maps/plasma.yml +++ b/Resources/Maps/plasma.yml @@ -1,11 +1,11 @@ meta: format: 7 category: Map - engineVersion: 266.0.0 + engineVersion: 267.2.0 forkId: "" forkVersion: "" - time: 09/03/2025 00:56:56 - entityCount: 26486 + time: 10/09/2025 01:25:34 + entityCount: 26492 maps: - 1 grids: @@ -9858,139 +9858,42 @@ entities: uniqueMixes: - volume: 2500 immutable: True - moles: - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + moles: {} - 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.14975 moles: - - 20.078888 - - 75.53487 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 20.078888 + Nitrogen: 75.53487 - volume: 2500 temperature: 293.1495 moles: - - 20.078888 - - 75.53487 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 20.078888 + Nitrogen: 75.53487 + - 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 + Oxygen: 6666.982 - volume: 2500 temperature: 293.15 moles: - - 6666.982 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - volume: 2500 - temperature: 293.15 - moles: - - 0 - - 6666.982 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Nitrogen: 6666.982 chunkSize: 4 - type: GasTileOverlay - type: RadiationGridResistance @@ -14718,7 +14621,7 @@ entities: pos: -131.5,-45.5 parent: 2 - type: Door - secondsUntilStateChange: -61365.79 + secondsUntilStateChange: -61511.09 state: Opening - type: DeviceLinkSource lastSignals: @@ -65246,18 +65149,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: 13666 components: - type: Transform @@ -65505,18 +65398,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 @@ -65562,18 +65445,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 @@ -67653,18 +67526,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 @@ -67719,18 +67582,8 @@ entities: immutable: False temperature: 293.1462 moles: - - 1.606311 - - 6.042789 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 1.606311 + Nitrogen: 6.042789 - type: ContainerContainer containers: entity_storage: !type:Container @@ -67933,18 +67786,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: 17839 components: - type: Transform @@ -67966,18 +67809,8 @@ entities: immutable: False temperature: 293.1465 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 @@ -68000,18 +67833,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 @@ -68046,18 +67869,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 @@ -68127,18 +67940,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 @@ -68277,18 +68080,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 @@ -68358,18 +68151,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 @@ -84031,9 +83814,10 @@ entities: parent: 2 - type: Edible edible: Drink - solution: pool - destroyOnEmpty: false utensil: Spoon + trash: [] + destroyOnEmpty: False + solution: pool - uid: 16868 components: - type: Transform @@ -84041,9 +83825,10 @@ entities: parent: 2 - type: Edible edible: Drink - solution: pool - destroyOnEmpty: false utensil: Spoon + trash: [] + destroyOnEmpty: False + solution: pool - uid: 16872 components: - type: Transform @@ -84051,9 +83836,10 @@ entities: parent: 2 - type: Edible edible: Drink - solution: pool - destroyOnEmpty: false utensil: Spoon + trash: [] + destroyOnEmpty: False + solution: pool - uid: 16907 components: - type: Transform @@ -84061,9 +83847,10 @@ entities: parent: 2 - type: Edible edible: Drink - solution: pool - destroyOnEmpty: false utensil: Spoon + trash: [] + destroyOnEmpty: False + solution: pool - uid: 17621 components: - type: Transform @@ -122715,11 +122502,6 @@ entities: - type: Transform pos: -22.5,-18.5 parent: 2 - - uid: 10489 - components: - - type: Transform - pos: -41.5,-42.5 - parent: 2 - uid: 10490 components: - type: Transform @@ -126054,18 +125836,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 @@ -126109,18 +125881,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 @@ -126156,18 +125918,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 @@ -126200,18 +125952,8 @@ entities: immutable: False temperature: 293.1465 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 @@ -128417,18 +128159,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 @@ -128671,18 +128403,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 @@ -128757,18 +128479,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 @@ -128805,18 +128517,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: Lock locked: False - type: Fixtures @@ -130218,6 +129920,11 @@ entities: - type: Transform pos: -136.5,-4.5 parent: 2 + - uid: 10489 + components: + - type: Transform + pos: -41.5,-42.5 + parent: 2 - uid: 15329 components: - type: Transform @@ -130238,6 +129945,26 @@ entities: - type: Transform pos: -37.5,-2.5 parent: 2 + - uid: 26488 + components: + - type: Transform + pos: -113.5,-26.5 + parent: 2 + - uid: 26489 + components: + - type: Transform + pos: -105.5,-61.5 + parent: 2 + - uid: 26490 + components: + - type: Transform + pos: -73.5,-39.5 + parent: 2 + - uid: 26491 + components: + - type: Transform + pos: -84.5,6.5 + parent: 2 - proto: NitrogenTankFilled entities: - uid: 23345 @@ -130518,6 +130245,11 @@ entities: - type: Transform pos: -37.5,-3.5 parent: 2 + - uid: 26492 + components: + - type: Transform + pos: -91.5,4.5 + parent: 2 - proto: PaladinCircuitBoard entities: - uid: 24947 @@ -131401,130 +131133,174 @@ entities: - type: Transform pos: -26.5,-65.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 6025 components: - type: Transform rot: 1.5707963267948966 rad pos: -27.5,-66.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 6031 components: - type: Transform rot: 1.5707963267948966 rad pos: -27.5,-67.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 9355 components: - type: Transform rot: 3.141592653589793 rad pos: -26.5,-68.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 12207 components: - type: Transform pos: -25.5,-65.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 15446 components: - type: Transform rot: 3.141592653589793 rad pos: -25.5,-68.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 16456 components: - type: Transform rot: -1.5707963267948966 rad pos: -24.5,-67.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 23312 components: - type: Transform rot: 1.5707963267948966 rad pos: -121.5,-62.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 23373 components: - type: Transform rot: -1.5707963267948966 rad pos: -119.5,-63.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 23392 components: - type: Transform rot: -1.5707963267948966 rad pos: -119.5,-60.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 23441 components: - type: Transform rot: 1.5707963267948966 rad pos: -121.5,-61.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 23448 components: - type: Transform rot: -1.5707963267948966 rad pos: -119.5,-61.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 23450 components: - type: Transform rot: -1.5707963267948966 rad pos: -119.5,-62.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 23451 components: - type: Transform rot: 1.5707963267948966 rad pos: -121.5,-59.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 23452 components: - type: Transform rot: 1.5707963267948966 rad pos: -121.5,-60.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 23453 components: - type: Transform rot: 1.5707963267948966 rad pos: -121.5,-63.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 23454 components: - type: Transform rot: -1.5707963267948966 rad pos: -119.5,-59.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 23845 components: - type: Transform rot: -1.5707963267948966 rad pos: -118.5,-74.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 24260 components: - type: Transform rot: -1.5707963267948966 rad pos: -118.5,-70.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 24872 components: - type: Transform rot: 3.141592653589793 rad pos: -122.5,-73.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 24925 components: - type: Transform pos: -122.5,-71.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 24926 components: - type: Transform rot: 1.5707963267948966 rad pos: -123.5,-72.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - proto: PlasmaTank entities: - uid: 2843 @@ -131560,40 +131336,54 @@ entities: rot: 3.141592653589793 rad pos: -117.5,-74.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 24896 components: - type: Transform rot: 3.141592653589793 rad pos: -118.5,-74.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 24897 components: - type: Transform pos: -118.5,-70.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 24903 components: - type: Transform pos: -117.5,-70.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 24932 components: - type: Transform rot: -1.5707963267948966 rad pos: -121.5,-72.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 24937 components: - type: Transform rot: -1.5707963267948966 rad pos: -121.5,-82.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 24938 components: - type: Transform rot: 1.5707963267948966 rad pos: -119.5,-82.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - proto: PlasmaWindowDirectional entities: - uid: 6607 @@ -131602,16 +131392,22 @@ entities: rot: 1.5707963267948966 rad pos: -78.5,-35.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 21053 components: - type: Transform pos: -39.5,-72.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 21054 components: - type: Transform pos: -37.5,-72.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - proto: PlasticFlapsAirtightClear entities: - uid: 964 @@ -135510,18 +135306,6 @@ entities: - type: Transform pos: -100.5,-27.5 parent: 2 -- proto: PrefilledSyringe - entities: - - uid: 6481 - components: - - type: Transform - pos: -36.23253,-30.543175 - parent: 2 - - uid: 7609 - components: - - type: Transform - pos: -134.52573,-43.445347 - parent: 2 - proto: Protolathe entities: - uid: 9781 @@ -136980,591 +136764,827 @@ entities: - type: Transform pos: -110.5,-1.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 667 components: - type: Transform pos: -112.5,9.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 670 components: - type: Transform pos: -110.5,0.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 673 components: - type: Transform pos: -109.5,0.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 675 components: - type: Transform pos: -111.5,0.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 807 components: - type: Transform pos: -124.5,4.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 1870 components: - type: Transform pos: -111.5,-1.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 1984 components: - type: Transform pos: -109.5,-1.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 2453 components: - type: Transform pos: -148.5,-50.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 5278 components: - type: Transform pos: -112.5,7.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 5279 components: - type: Transform pos: -112.5,8.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 5280 components: - type: Transform pos: -108.5,7.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 5281 components: - type: Transform pos: -108.5,8.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 5282 components: - type: Transform pos: -108.5,9.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 5283 components: - type: Transform pos: -112.5,3.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 5284 components: - type: Transform pos: -112.5,1.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 5285 components: - type: Transform pos: -112.5,2.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 5286 components: - type: Transform pos: -108.5,1.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 5287 components: - type: Transform pos: -108.5,3.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 5288 components: - type: Transform pos: -108.5,2.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 5289 components: - type: Transform pos: -114.5,3.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 5290 components: - type: Transform pos: -114.5,2.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 5291 components: - type: Transform pos: -114.5,1.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 5292 components: - type: Transform pos: -106.5,1.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 5293 components: - type: Transform pos: -106.5,2.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 5294 components: - type: Transform pos: -106.5,3.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 5295 components: - type: Transform pos: -114.5,9.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 5296 components: - type: Transform pos: -114.5,8.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 5297 components: - type: Transform pos: -114.5,7.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 5298 components: - type: Transform pos: -106.5,7.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 5299 components: - type: Transform pos: -106.5,8.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 5300 components: - type: Transform pos: -106.5,9.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 5342 components: - type: Transform pos: -126.5,7.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 5345 components: - type: Transform pos: -124.5,13.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 5359 components: - type: Transform pos: -124.5,7.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 5360 components: - type: Transform pos: -124.5,10.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 5361 components: - type: Transform pos: -126.5,9.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 5378 components: - type: Transform pos: -124.5,5.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 5380 components: - type: Transform pos: -124.5,12.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 5418 components: - type: Transform pos: -126.5,1.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 5419 components: - type: Transform pos: -126.5,3.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 5434 components: - type: Transform pos: -124.5,3.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 5443 components: - type: Transform pos: -124.5,1.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 5450 components: - type: Transform pos: -124.5,2.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 5470 components: - type: Transform pos: -124.5,6.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 5479 components: - type: Transform pos: -124.5,11.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 5480 components: - type: Transform pos: -124.5,8.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 5505 components: - type: Transform pos: -142.5,-3.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 5506 components: - type: Transform pos: -142.5,-4.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 5941 components: - type: Transform pos: -146.5,-1.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 5942 components: - type: Transform pos: -148.5,-1.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 5943 components: - type: Transform pos: -147.5,-1.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 5944 components: - type: Transform pos: -148.5,0.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 5945 components: - type: Transform pos: -146.5,0.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 5946 components: - type: Transform pos: -147.5,0.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 5981 components: - type: Transform pos: -142.5,-5.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 5990 components: - type: Transform pos: -152.5,-7.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 5999 components: - type: Transform pos: -148.5,-51.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 6005 components: - type: Transform pos: -142.5,-6.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 6082 components: - type: Transform pos: -148.5,-13.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 6083 components: - type: Transform pos: -146.5,-13.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 6084 components: - type: Transform pos: -147.5,-13.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 6091 components: - type: Transform pos: -146.5,-39.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 6092 components: - type: Transform pos: -148.5,-39.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 6096 components: - type: Transform pos: -153.5,-48.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 6101 components: - type: Transform pos: -146.5,-40.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 6103 components: - type: Transform pos: -146.5,-41.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 6245 components: - type: Transform pos: -68.5,-71.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 6924 components: - type: Transform pos: -126.5,13.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7167 components: - type: Transform pos: -146.5,-51.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7192 components: - type: Transform pos: -148.5,-40.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7211 components: - type: Transform pos: -148.5,-41.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7247 components: - type: Transform pos: -148.5,-49.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7307 components: - type: Transform pos: -155.5,-45.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7317 components: - type: Transform pos: -155.5,-44.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7839 components: - type: Transform pos: -143.5,-47.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7840 components: - type: Transform pos: -151.5,-43.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7842 components: - type: Transform pos: -146.5,-50.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7856 components: - type: Transform pos: -155.5,-46.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7890 components: - type: Transform pos: -69.5,-71.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 9817 components: - type: Transform pos: -126.5,5.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 9912 components: - type: Transform pos: -126.5,11.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 13497 components: - type: Transform pos: -109.5,10.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 13498 components: - type: Transform pos: -110.5,10.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 13499 components: - type: Transform pos: -111.5,10.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 13661 components: - type: Transform pos: -146.5,-49.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 13662 components: - type: Transform pos: -151.5,-47.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 13664 components: - type: Transform pos: -151.5,-46.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 13670 components: - type: Transform pos: -151.5,-44.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 13718 components: - type: Transform pos: -143.5,-43.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 14110 components: - type: Transform pos: -67.5,-71.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 14756 components: - type: Transform pos: -67.5,-70.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 16466 components: - type: Transform pos: -153.5,-42.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 20368 components: - type: Transform pos: -124.5,-72.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 20411 components: - type: Transform pos: -122.5,-78.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 23079 components: - type: Transform pos: -124.5,-73.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 23103 components: - type: Transform pos: -114.5,-73.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 23104 components: - type: Transform pos: -114.5,-71.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 23108 components: - type: Transform pos: -114.5,-72.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 23396 components: - type: Transform pos: -116.5,-71.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 23401 components: - type: Transform pos: -120.5,-81.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 23498 components: - type: Transform pos: -116.5,-72.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 23716 components: - type: Transform pos: -69.5,-70.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 24847 components: - type: Transform pos: -116.5,-65.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 24880 components: - type: Transform pos: -118.5,-64.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 24887 components: - type: Transform pos: -116.5,-73.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 24888 components: - type: Transform pos: -126.5,-73.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 24889 components: - type: Transform pos: -126.5,-72.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 24890 components: - type: Transform pos: -126.5,-71.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 24891 components: - type: Transform pos: -124.5,-71.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 24894 components: - type: Transform pos: -122.5,-64.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 24901 components: - type: Transform pos: -124.5,9.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 24921 components: - type: Transform pos: -123.5,-78.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 24933 components: - type: Transform pos: -121.5,-78.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 24934 components: - type: Transform pos: -119.5,-78.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 24935 components: - type: Transform pos: -118.5,-78.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 24936 components: - type: Transform pos: -117.5,-78.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 25187 components: - type: Transform pos: -124.5,-65.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - proto: ReinforcedPlasmaWindowDiagonal entities: - uid: 7308 @@ -137572,35 +137592,47 @@ entities: - type: Transform pos: -155.5,-43.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7324 components: - type: Transform pos: -154.5,-42.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7332 components: - type: Transform rot: 3.141592653589793 rad pos: -154.5,-43.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7333 components: - type: Transform rot: 1.5707963267948966 rad pos: -154.5,-48.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7334 components: - type: Transform rot: -1.5707963267948966 rad pos: -154.5,-47.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7342 components: - type: Transform rot: 1.5707963267948966 rad pos: -155.5,-47.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - proto: ReinforcedWindow entities: - uid: 4 @@ -137608,1876 +137640,2626 @@ entities: - type: Transform pos: -114.5,-36.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 10 components: - type: Transform pos: -69.5,5.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 18 components: - type: Transform pos: -69.5,6.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 31 components: - type: Transform pos: -69.5,4.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 46 components: - type: Transform pos: -66.5,8.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 47 components: - type: Transform pos: -64.5,8.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 48 components: - type: Transform pos: -65.5,8.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 49 components: - type: Transform pos: -64.5,9.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 50 components: - type: Transform pos: -62.5,9.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 51 components: - type: Transform pos: -61.5,9.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 52 components: - type: Transform pos: -60.5,9.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 54 components: - type: Transform pos: -58.5,9.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 56 components: - type: Transform pos: -58.5,8.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 57 components: - type: Transform pos: -57.5,8.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 58 components: - type: Transform pos: -56.5,8.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 59 components: - type: Transform pos: -53.5,6.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 60 components: - type: Transform pos: -53.5,4.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 61 components: - type: Transform pos: -53.5,5.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 71 components: - type: Transform pos: -59.5,4.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 73 components: - type: Transform pos: -101.5,31.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 107 components: - type: Transform pos: -65.5,-11.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 109 components: - type: Transform pos: -65.5,-12.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 110 components: - type: Transform pos: -64.5,-13.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 111 components: - type: Transform pos: -63.5,-13.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 112 components: - type: Transform pos: -62.5,-13.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 113 components: - type: Transform pos: -60.5,-13.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 114 components: - type: Transform pos: -59.5,-13.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 116 components: - type: Transform pos: -58.5,-13.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 117 components: - type: Transform pos: -57.5,-12.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 118 components: - type: Transform pos: -57.5,-11.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 141 components: - type: Transform pos: -63.5,4.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 167 components: - type: Transform pos: -52.5,-8.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 171 components: - type: Transform pos: -51.5,-8.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 178 components: - type: Transform pos: -31.5,-8.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 249 components: - type: Transform pos: -31.5,-9.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 285 components: - type: Transform pos: -82.5,-6.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 287 components: - type: Transform pos: -85.5,-6.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 291 components: - type: Transform pos: -84.5,-6.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 316 components: - type: Transform pos: -35.5,-25.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 320 components: - type: Transform pos: -34.5,-22.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 322 components: - type: Transform pos: -32.5,-22.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 351 components: - type: Transform pos: -93.5,13.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 398 components: - type: Transform pos: -48.5,-8.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 420 components: - type: Transform pos: -92.5,-35.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 474 components: - type: Transform pos: -66.5,-18.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 504 components: - type: Transform pos: -116.5,-5.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 751 components: - type: Transform pos: -83.5,14.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 787 components: - type: Transform pos: -138.5,-8.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 953 components: - type: Transform pos: -83.5,15.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 1014 components: - type: Transform pos: -53.5,-17.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 1015 components: - type: Transform pos: -54.5,-17.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 1170 components: - type: Transform pos: -35.5,-23.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 1174 components: - type: Transform pos: -35.5,-20.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 1176 components: - type: Transform pos: -35.5,-18.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 1252 components: - type: Transform pos: -20.5,-48.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 1253 components: - type: Transform pos: -20.5,-52.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 1254 components: - type: Transform pos: -20.5,-54.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 1312 components: - type: Transform pos: -31.5,-2.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 1313 components: - type: Transform pos: -31.5,-1.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 1314 components: - type: Transform pos: -31.5,-3.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 1331 components: - type: Transform pos: -117.5,-23.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 1534 components: - type: Transform pos: -20.5,-50.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 1676 components: - type: Transform pos: -93.5,-17.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 1712 components: - type: Transform pos: -24.5,9.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 1713 components: - type: Transform pos: -27.5,7.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 1714 components: - type: Transform pos: -27.5,5.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 1738 components: - type: Transform pos: -101.5,-23.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 1809 components: - type: Transform pos: -56.5,-79.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 1810 components: - type: Transform pos: -55.5,-79.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 1864 components: - type: Transform pos: -117.5,-21.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 1873 components: - type: Transform pos: -106.5,-5.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 1888 components: - type: Transform pos: -34.5,-16.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 1892 components: - type: Transform pos: -106.5,-3.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 1950 components: - type: Transform pos: -106.5,-4.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 1978 components: - type: Transform pos: -32.5,-16.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 2053 components: - type: Transform pos: -95.5,-16.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 2054 components: - type: Transform pos: -95.5,-20.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 2129 components: - type: Transform pos: -33.5,-16.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 2196 components: - type: Transform pos: -119.5,-54.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 2221 components: - type: Transform pos: -123.5,-44.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 2222 components: - type: Transform pos: -123.5,-46.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 2223 components: - type: Transform pos: -123.5,-43.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 2238 components: - type: Transform pos: -123.5,-47.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 2363 components: - type: Transform pos: -89.5,-26.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 2365 components: - type: Transform pos: -89.5,-25.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 2367 components: - type: Transform pos: -93.5,-19.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 2533 components: - type: Transform pos: -121.5,-17.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 2648 components: - type: Transform pos: -89.5,-29.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 2682 components: - type: Transform pos: -63.5,2.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 2695 components: - type: Transform pos: -59.5,2.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 2852 components: - type: Transform pos: -51.5,3.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 2853 components: - type: Transform pos: -50.5,3.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 2854 components: - type: Transform pos: -49.5,3.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 2855 components: - type: Transform pos: -45.5,3.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 2856 components: - type: Transform pos: -43.5,3.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 2857 components: - type: Transform pos: -44.5,3.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 2906 components: - type: Transform pos: -47.5,-9.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 2939 components: - type: Transform pos: -50.5,-8.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 2947 components: - type: Transform pos: -52.5,-10.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 2948 components: - type: Transform pos: -51.5,-10.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 2949 components: - type: Transform pos: -50.5,-10.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 3313 components: - type: Transform pos: -8.5,7.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 3415 components: - type: Transform pos: -48.5,-21.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 3751 components: - type: Transform pos: -7.5,5.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 3775 components: - type: Transform pos: -9.5,7.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 3785 components: - type: Transform pos: -7.5,7.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 3809 components: - type: Transform pos: -67.5,-34.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 3828 components: - type: Transform pos: -48.5,-19.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 3829 components: - type: Transform pos: -48.5,-20.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 3960 components: - type: Transform pos: -31.5,-17.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 3963 components: - type: Transform pos: -31.5,-21.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 3970 components: - type: Transform pos: -29.5,-22.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 4017 components: - type: Transform pos: -89.5,-28.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 4129 components: - type: Transform pos: -101.5,-24.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 4229 components: - type: Transform pos: -83.5,24.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 4230 components: - type: Transform pos: -83.5,23.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 4231 components: - type: Transform pos: -83.5,25.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 4287 components: - type: Transform pos: -31.5,-7.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 4526 components: - type: Transform pos: -84.5,-0.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 4541 components: - type: Transform pos: -97.5,9.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 4548 components: - type: Transform pos: -97.5,14.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 4583 components: - type: Transform pos: -80.5,-30.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 4629 components: - type: Transform pos: -97.5,10.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 4630 components: - type: Transform pos: -9.5,5.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 4674 components: - type: Transform pos: -8.5,5.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 4693 components: - type: Transform pos: -85.5,33.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 4698 components: - type: Transform pos: -85.5,35.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 4710 components: - type: Transform pos: -83.5,29.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 4711 components: - type: Transform pos: -83.5,30.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 4712 components: - type: Transform pos: -83.5,28.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 4725 components: - type: Transform pos: -87.5,26.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 4726 components: - type: Transform pos: -85.5,26.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 4745 components: - type: Transform pos: -85.5,34.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 4747 components: - type: Transform pos: -140.5,-36.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 4756 components: - type: Transform pos: -83.5,-30.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 4762 components: - type: Transform pos: -84.5,-30.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 4825 components: - type: Transform pos: -93.5,-22.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 4833 components: - type: Transform pos: -127.5,-7.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 4906 components: - type: Transform pos: -126.5,-7.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 4907 components: - type: Transform pos: -125.5,-7.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 5675 components: - type: Transform pos: -107.5,-63.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 5676 components: - type: Transform pos: -108.5,-63.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 5693 components: - type: Transform pos: -140.5,-1.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 5700 components: - type: Transform pos: -120.5,-7.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 5701 components: - type: Transform pos: -118.5,-7.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 5715 components: - type: Transform pos: -106.5,-63.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 5762 components: - type: Transform pos: -115.5,-19.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 5774 components: - type: Transform pos: -117.5,-17.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 5777 components: - type: Transform pos: -114.5,-19.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 5778 components: - type: Transform pos: -117.5,-15.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 5813 components: - type: Transform pos: -116.5,-11.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 5814 components: - type: Transform pos: -113.5,-11.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 5815 components: - type: Transform pos: -113.5,-9.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 5816 components: - type: Transform pos: -116.5,-9.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 5867 components: - type: Transform pos: -106.5,-15.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 5868 components: - type: Transform pos: -106.5,-16.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 5869 components: - type: Transform pos: -106.5,-17.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 6125 components: - type: Transform pos: -155.5,-10.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 6198 components: - type: Transform pos: -126.5,-24.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 6201 components: - type: Transform pos: -126.5,-20.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 6202 components: - type: Transform pos: -126.5,-23.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 6203 components: - type: Transform pos: -126.5,-21.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 6267 components: - type: Transform pos: -125.5,-13.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 6269 components: - type: Transform pos: -121.5,-16.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 6270 components: - type: Transform pos: -121.5,-15.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 6311 components: - type: Transform pos: -126.5,-13.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 6682 components: - type: Transform pos: -81.5,-30.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 6755 components: - type: Transform pos: -95.5,37.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 6756 components: - type: Transform pos: -95.5,36.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 6897 components: - type: Transform pos: -86.5,-6.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 6972 components: - type: Transform pos: -140.5,12.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7145 components: - type: Transform pos: -1.5,-21.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7159 components: - type: Transform pos: -2.5,-5.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7165 components: - type: Transform pos: -1.5,-6.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7171 components: - type: Transform pos: -1.5,-12.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7175 components: - type: Transform pos: -2.5,-21.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7183 components: - type: Transform pos: -1.5,-14.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7187 components: - type: Transform pos: -3.5,-5.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7203 components: - type: Transform pos: -1.5,-5.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7209 components: - type: Transform pos: -1.5,-13.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7219 components: - type: Transform pos: -1.5,-20.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7220 components: - type: Transform pos: -3.5,-21.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7249 components: - type: Transform pos: -93.5,-23.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7257 components: - type: Transform pos: -141.5,12.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7280 components: - type: Transform pos: -117.5,-40.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7281 components: - type: Transform pos: -117.5,-38.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7284 components: - type: Transform pos: -117.5,-50.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7285 components: - type: Transform pos: -117.5,-52.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7318 components: - type: Transform pos: -131.5,-59.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7389 components: - type: Transform pos: -131.5,-44.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7390 components: - type: Transform pos: -131.5,-43.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7391 components: - type: Transform pos: -131.5,-46.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7392 components: - type: Transform pos: -131.5,-47.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7529 components: - type: Transform pos: -137.5,-34.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7568 components: - type: Transform pos: -141.5,-37.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7876 components: - type: Transform pos: -121.5,-54.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7898 components: - type: Transform pos: -81.5,19.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 8052 components: - type: Transform pos: -130.5,-59.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 8075 components: - type: Transform pos: -140.5,-41.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 8164 components: - type: Transform pos: -83.5,19.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 8195 components: - type: Transform pos: -0.5,-7.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 8196 components: - type: Transform pos: 1.5,-7.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 8197 components: - type: Transform pos: 0.5,-7.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 8198 components: - type: Transform pos: 1.5,-9.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 8199 components: - type: Transform pos: 0.5,-9.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 8200 components: - type: Transform pos: -0.5,-9.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 8201 components: - type: Transform pos: -0.5,-15.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 8202 components: - type: Transform pos: -0.5,-11.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 8203 components: - type: Transform pos: 0.5,-11.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 8204 components: - type: Transform pos: 1.5,-11.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 8205 components: - type: Transform pos: 0.5,-15.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 8206 components: - type: Transform pos: 1.5,-15.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 8213 components: - type: Transform pos: 1.5,-17.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 8214 components: - type: Transform pos: 0.5,-17.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 8215 components: - type: Transform pos: -0.5,-17.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 8216 components: - type: Transform pos: -0.5,-19.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 8217 components: - type: Transform pos: 0.5,-19.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 8218 components: - type: Transform pos: 1.5,-19.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 8228 components: - type: Transform pos: -9.5,-9.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 8229 components: - type: Transform pos: -10.5,-9.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 8230 components: - type: Transform pos: -11.5,-9.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 8236 components: - type: Transform pos: -5.5,-9.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 8238 components: - type: Transform pos: -7.5,-6.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 8239 components: - type: Transform pos: -7.5,-8.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 8244 components: - type: Transform pos: -3.5,-9.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 8253 components: - type: Transform pos: -16.5,-64.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 8260 components: - type: Transform pos: -11.5,-17.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 8261 components: - type: Transform pos: -9.5,-17.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 8262 components: - type: Transform pos: -5.5,-17.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 8263 components: - type: Transform pos: -3.5,-17.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 8296 components: - type: Transform pos: -6.5,-13.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 8297 components: - type: Transform pos: -7.5,-13.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 8299 components: - type: Transform pos: -8.5,-13.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 8343 components: - type: Transform pos: -29.5,26.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 8363 components: - type: Transform pos: -38.5,17.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 8364 components: - type: Transform pos: -38.5,16.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 8365 components: - type: Transform pos: -38.5,14.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 8366 components: - type: Transform pos: -38.5,15.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 8367 components: - type: Transform pos: -36.5,14.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 8368 components: - type: Transform pos: -36.5,15.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 8369 components: - type: Transform pos: -36.5,16.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 8370 components: - type: Transform pos: -36.5,17.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 8377 components: - type: Transform pos: -82.5,19.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 8522 components: - type: Transform pos: -34.5,-34.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 8529 components: - type: Transform pos: -32.5,-34.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 8708 components: - type: Transform pos: -5.5,-38.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 8709 components: - type: Transform pos: -3.5,-38.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 8710 components: - type: Transform pos: -4.5,-38.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 8711 components: - type: Transform pos: -3.5,-36.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 8714 components: - type: Transform pos: -4.5,-34.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 8715 components: - type: Transform pos: -3.5,-34.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 8716 components: - type: Transform pos: -5.5,-34.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 8729 components: - type: Transform pos: -7.5,-30.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 8737 components: - type: Transform pos: -7.5,-28.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 8738 components: - type: Transform pos: -7.5,-31.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 8739 components: - type: Transform pos: -7.5,-32.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 8740 components: - type: Transform pos: -7.5,-29.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 8920 components: - type: Transform pos: -14.5,-69.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 8938 components: - type: Transform pos: -14.5,-68.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 9034 components: - type: Transform pos: -90.5,-35.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 9098 components: - type: Transform pos: -106.5,-45.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 9324 components: - type: Transform pos: -30.5,22.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 9539 components: - type: Transform pos: -97.5,11.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 9549 components: - type: Transform pos: -95.5,13.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 9788 components: - type: Transform pos: -32.5,-75.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 9838 components: - type: Transform pos: -136.5,15.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 9958 components: - type: Transform pos: -16.5,-69.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 9964 components: - type: Transform pos: -16.5,-70.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 9980 components: - type: Transform pos: -95.5,38.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 9981 components: - type: Transform pos: -93.5,36.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 9982 components: - type: Transform pos: -93.5,37.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 9983 components: - type: Transform pos: -93.5,38.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 9986 components: - type: Transform pos: -95.5,39.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 9987 components: - type: Transform pos: -93.5,39.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 10035 components: - type: Transform pos: -140.5,-12.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 10084 components: - type: Transform pos: -34.5,-77.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 10087 components: - type: Transform pos: -32.5,-77.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 10488 components: - type: Transform pos: -16.5,-68.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 10528 components: - type: Transform pos: -83.5,-6.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 11035 components: - type: Transform pos: -28.5,22.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 11047 components: - type: Transform pos: -34.5,-75.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 11048 components: - type: Transform pos: -34.5,-76.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 11059 components: - type: Transform pos: -108.5,-61.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 11076 components: - type: Transform pos: -32.5,-76.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 11080 components: - type: Transform pos: -28.5,-69.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 11092 components: - type: Transform pos: -30.5,-61.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 11358 components: - type: Transform pos: -22.5,11.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 11359 components: - type: Transform pos: -22.5,13.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 11710 components: - type: Transform pos: -99.5,34.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 11716 components: - type: Transform pos: -99.5,33.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 12425 components: - type: Transform pos: -28.5,-61.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 12450 components: - type: Transform pos: -101.5,-30.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 12546 components: - type: Transform pos: -31.5,-36.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 12588 components: - type: Transform pos: -126.5,-59.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 12748 components: - type: Transform pos: -133.5,-57.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 12840 components: - type: Transform pos: -13.5,-64.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 12855 components: - type: Transform pos: -101.5,-29.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 13241 components: - type: Transform pos: -138.5,15.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 13248 components: - type: Transform pos: -31.5,-40.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 13523 components: - type: Transform pos: -140.5,14.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 13879 components: - type: Transform pos: -138.5,12.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 14003 components: - type: Transform pos: -137.5,21.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 14499 components: - type: Transform pos: -13.5,-66.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 15407 components: - type: Transform pos: -125.5,-59.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 16087 components: - type: Transform pos: -106.5,-61.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 16091 components: - type: Transform pos: -123.5,-50.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 16141 components: - type: Transform pos: -93.5,-24.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 16488 components: - type: Transform pos: -137.5,-40.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 16505 components: - type: Transform pos: -138.5,-26.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 16695 components: - type: Transform pos: -129.5,-59.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 16716 components: - type: Transform pos: -33.5,-43.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 16836 components: - type: Transform pos: -107.5,-61.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 16906 components: - type: Transform pos: -22.5,6.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 17005 components: - type: Transform pos: -115.5,-36.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 17075 components: - type: Transform pos: -86.5,-0.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 17161 components: - type: Transform pos: -31.5,-75.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 17164 components: - type: Transform pos: -35.5,-75.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 17359 components: - type: Transform pos: -127.5,-59.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 17513 components: - type: Transform pos: -136.5,12.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 17538 components: - type: Transform pos: -140.5,-54.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 17651 components: - type: Transform pos: -14.5,-70.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 18193 components: - type: Transform pos: -95.5,-49.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 18686 components: - type: Transform pos: -95.5,-50.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 18726 components: - type: Transform pos: -138.5,-12.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 18833 components: - type: Transform pos: -97.5,-44.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 18937 components: - type: Transform pos: -95.5,-47.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 18941 components: - type: Transform pos: -95.5,-46.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 19623 components: - type: Transform pos: -114.5,-54.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 19629 components: - type: Transform pos: -115.5,-54.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 19750 components: - type: Transform pos: -113.5,-54.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 19752 components: - type: Transform pos: -69.5,-17.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 19864 components: - type: Transform pos: -67.5,-17.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 19914 components: - type: Transform pos: -101.5,-38.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 20160 components: - type: Transform pos: -139.5,-11.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 20167 components: - type: Transform pos: -123.5,-40.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 20277 components: - type: Transform pos: -139.5,-9.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 20319 components: - type: Transform pos: -57.5,-79.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 20329 components: - type: Transform pos: -128.5,-7.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 20445 components: - type: Transform pos: -119.5,37.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 20449 components: - type: Transform pos: -122.5,36.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 20450 components: - type: Transform pos: -122.5,37.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 20456 components: - type: Transform pos: -121.5,37.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 20466 components: - type: Transform pos: -120.5,37.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 20503 components: - type: Transform pos: -92.5,-50.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 20563 components: - type: Transform pos: -101.5,-39.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 20564 components: - type: Transform pos: -92.5,-48.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 20734 components: - type: Transform pos: -92.5,-49.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 20736 components: - type: Transform pos: -92.5,-46.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 20780 components: - type: Transform pos: -97.5,-42.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 20844 components: - type: Transform pos: -36.5,-43.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 20936 components: - type: Transform pos: -93.5,31.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 21002 components: - type: Transform pos: -104.5,37.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 21491 components: - type: Transform pos: -18.5,-16.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 21492 components: - type: Transform pos: -20.5,-16.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 21493 components: - type: Transform pos: -19.5,-16.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 21873 components: - type: Transform pos: -36.5,-45.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 21874 components: - type: Transform pos: -33.5,-45.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 21879 components: - type: Transform pos: -141.5,-8.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 22701 components: - type: Transform pos: -39.5,-16.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 22904 components: - type: Transform pos: -141.5,14.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 22936 components: - type: Transform pos: -43.5,-65.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 22962 components: - type: Transform pos: -44.5,-65.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 22963 components: - type: Transform pos: -42.5,-65.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 23053 components: - type: Transform pos: -91.5,26.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 23504 components: - type: Transform pos: -95.5,31.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 23751 components: - type: Transform pos: -21.5,6.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 23752 components: - type: Transform pos: -20.5,6.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 24036 components: - type: Transform pos: -93.5,26.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 24115 components: - type: Transform pos: -16.5,-66.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 24214 components: - type: Transform pos: -32.5,-78.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 24215 components: - type: Transform pos: -34.5,-78.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 24333 components: - type: Transform pos: -19.5,-51.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 24334 components: - type: Transform pos: -18.5,-51.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 25403 components: - type: Transform pos: -113.5,-36.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 25986 components: - type: Transform pos: -110.5,-45.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - proto: RemoteSignaller entities: - uid: 3377 @@ -140132,120 +140914,166 @@ entities: - type: Transform pos: -24.5,-22.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 138 components: - type: Transform pos: -26.5,-22.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7272 components: - type: Transform pos: -115.5,-42.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7273 components: - type: Transform pos: -113.5,-42.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7274 components: - type: Transform pos: -114.5,-42.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7275 components: - type: Transform pos: -113.5,-48.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7276 components: - type: Transform pos: -114.5,-48.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7277 components: - type: Transform pos: -115.5,-48.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 8820 components: - type: Transform pos: -13.5,-41.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 8821 components: - type: Transform pos: -13.5,-40.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 8822 components: - type: Transform pos: -13.5,-39.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 9078 components: - type: Transform pos: -35.5,-68.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 9414 components: - type: Transform pos: -34.5,-68.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 9769 components: - type: Transform pos: -33.5,-68.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 11133 components: - type: Transform rot: -1.5707963267948966 rad pos: -95.5,-47.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 11176 components: - type: Transform rot: -1.5707963267948966 rad pos: -95.5,-46.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 11330 components: - type: Transform rot: -1.5707963267948966 rad pos: -95.5,-50.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 11783 components: - type: Transform rot: -1.5707963267948966 rad pos: -95.5,-49.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 15252 components: - type: Transform pos: -33.5,-61.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 15282 components: - type: Transform pos: -34.5,-61.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 15283 components: - type: Transform pos: -35.5,-61.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 19536 components: - type: Transform pos: -89.5,13.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 19537 components: - type: Transform pos: -88.5,13.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - proto: ShuttersNormalOpen entities: - uid: 399 @@ -140253,27 +141081,37 @@ entities: - type: Transform pos: -50.5,-8.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 1716 components: - type: Transform pos: -18.5,-16.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 1763 components: - type: Transform rot: -1.5707963267948966 rad pos: -101.5,-24.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 2958 components: - type: Transform pos: -47.5,-9.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 2959 components: - type: Transform pos: -49.5,-10.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - type: DeviceLinkSink invokeCounter: 2 - uid: 2960 @@ -140281,26 +141119,36 @@ entities: - type: Transform pos: -49.5,-8.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 2962 components: - type: Transform pos: -52.5,-8.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 2963 components: - type: Transform pos: -51.5,-8.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 2964 components: - type: Transform pos: -48.5,-8.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 2998 components: - type: Transform pos: -53.5,-10.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - uid: 3344 @@ -140309,6 +141157,8 @@ entities: rot: -1.5707963267948966 rad pos: -20.5,-4.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - uid: 3382 @@ -140317,6 +141167,8 @@ entities: rot: -1.5707963267948966 rad pos: -20.5,-5.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - uid: 3830 @@ -140325,6 +141177,8 @@ entities: rot: -1.5707963267948966 rad pos: -56.5,-29.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - uid: 3831 @@ -140333,6 +141187,8 @@ entities: rot: -1.5707963267948966 rad pos: -56.5,-30.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - uid: 3832 @@ -140341,6 +141197,8 @@ entities: rot: -1.5707963267948966 rad pos: -56.5,-31.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - uid: 3833 @@ -140349,6 +141207,8 @@ entities: rot: -1.5707963267948966 rad pos: -56.5,-32.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - uid: 3997 @@ -140357,6 +141217,8 @@ entities: rot: -1.5707963267948966 rad pos: -56.5,-23.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - uid: 3998 @@ -140365,6 +141227,8 @@ entities: rot: -1.5707963267948966 rad pos: -56.5,-22.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - uid: 3999 @@ -140373,6 +141237,8 @@ entities: rot: -1.5707963267948966 rad pos: -56.5,-21.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - uid: 4456 @@ -140381,6 +141247,8 @@ entities: rot: 1.5707963267948966 rad pos: -121.5,-82.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - uid: 4457 @@ -140388,6 +141256,8 @@ entities: - type: Transform pos: -120.5,-81.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - uid: 4459 @@ -140396,6 +141266,8 @@ entities: rot: -1.5707963267948966 rad pos: -126.5,-73.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - uid: 4466 @@ -140404,6 +141276,8 @@ entities: rot: -1.5707963267948966 rad pos: -124.5,-73.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - uid: 4467 @@ -140412,6 +141286,8 @@ entities: rot: -1.5707963267948966 rad pos: -124.5,-72.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - uid: 4468 @@ -140420,6 +141296,8 @@ entities: rot: -1.5707963267948966 rad pos: -119.5,-82.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - uid: 4469 @@ -140428,6 +141306,8 @@ entities: rot: -1.5707963267948966 rad pos: -124.5,-71.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - uid: 5039 @@ -140435,47 +141315,65 @@ entities: - type: Transform pos: -19.5,-16.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 6265 components: - type: Transform pos: -125.5,-13.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 6306 components: - type: Transform pos: -121.5,-17.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 6307 components: - type: Transform pos: -121.5,-16.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 6308 components: - type: Transform pos: -121.5,-15.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 6310 components: - type: Transform pos: -126.5,-13.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7778 components: - type: Transform pos: -20.5,-16.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 8901 components: - type: Transform rot: -1.5707963267948966 rad pos: -101.5,-23.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 11616 components: - type: Transform pos: -30.5,4.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - uid: 11619 @@ -140483,6 +141381,8 @@ entities: - type: Transform pos: -28.5,4.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - uid: 11620 @@ -140490,6 +141390,8 @@ entities: - type: Transform pos: -28.5,8.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - uid: 11621 @@ -140497,6 +141399,8 @@ entities: - type: Transform pos: -30.5,8.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - uid: 11622 @@ -140505,6 +141409,8 @@ entities: rot: -1.5707963267948966 rad pos: -27.5,7.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - uid: 11623 @@ -140513,6 +141419,8 @@ entities: rot: -1.5707963267948966 rad pos: -27.5,6.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - uid: 11624 @@ -140521,6 +141429,8 @@ entities: rot: -1.5707963267948966 rad pos: -27.5,5.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - uid: 13038 @@ -140529,18 +141439,24 @@ entities: rot: -1.5707963267948966 rad pos: -101.5,-29.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 13042 components: - type: Transform rot: -1.5707963267948966 rad pos: -101.5,-30.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 14139 components: - type: Transform rot: 1.5707963267948966 rad pos: -131.5,-47.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - uid: 14140 @@ -140549,6 +141465,8 @@ entities: rot: 1.5707963267948966 rad pos: -131.5,-46.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - uid: 14141 @@ -140557,6 +141475,8 @@ entities: rot: 1.5707963267948966 rad pos: -131.5,-44.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - uid: 14142 @@ -140565,6 +141485,8 @@ entities: rot: 1.5707963267948966 rad pos: -131.5,-43.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - uid: 17815 @@ -140573,6 +141495,8 @@ entities: rot: -1.5707963267948966 rad pos: -93.5,-17.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - uid: 17819 @@ -140581,6 +141505,8 @@ entities: rot: -1.5707963267948966 rad pos: -93.5,-18.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - uid: 17820 @@ -140589,6 +141515,8 @@ entities: rot: -1.5707963267948966 rad pos: -93.5,-19.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - uid: 19528 @@ -140597,70 +141525,94 @@ entities: rot: 1.5707963267948966 rad pos: -85.5,33.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 19529 components: - type: Transform rot: 1.5707963267948966 rad pos: -85.5,34.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 19530 components: - type: Transform rot: 1.5707963267948966 rad pos: -85.5,35.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 19531 components: - type: Transform rot: 1.5707963267948966 rad pos: -83.5,30.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 19532 components: - type: Transform rot: 1.5707963267948966 rad pos: -83.5,29.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 19533 components: - type: Transform rot: 1.5707963267948966 rad pos: -83.5,28.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 19534 components: - type: Transform pos: -85.5,26.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 19535 components: - type: Transform pos: -87.5,26.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 22373 components: - type: Transform rot: -1.5707963267948966 rad pos: -22.5,18.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 22374 components: - type: Transform rot: -1.5707963267948966 rad pos: -22.5,17.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 22375 components: - type: Transform rot: -1.5707963267948966 rad pos: -22.5,16.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 25385 components: - type: Transform rot: -1.5707963267948966 rad pos: -126.5,-72.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - uid: 25386 @@ -140669,6 +141621,8 @@ entities: rot: -1.5707963267948966 rad pos: -126.5,-71.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - uid: 25387 @@ -140677,6 +141631,8 @@ entities: rot: 1.5707963267948966 rad pos: -116.5,-71.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - uid: 25388 @@ -140685,6 +141641,8 @@ entities: rot: 1.5707963267948966 rad pos: -116.5,-72.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - uid: 25389 @@ -140693,6 +141651,8 @@ entities: rot: 1.5707963267948966 rad pos: -116.5,-73.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - uid: 25390 @@ -140701,6 +141661,8 @@ entities: rot: 1.5707963267948966 rad pos: -114.5,-73.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - uid: 25391 @@ -140709,6 +141671,8 @@ entities: rot: 1.5707963267948966 rad pos: -114.5,-72.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - uid: 25392 @@ -140717,6 +141681,8 @@ entities: rot: 1.5707963267948966 rad pos: -114.5,-71.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - uid: 25623 @@ -140725,24 +141691,32 @@ entities: rot: 1.5707963267948966 rad pos: -66.5,-29.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 25624 components: - type: Transform rot: 1.5707963267948966 rad pos: -66.5,-30.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 25625 components: - type: Transform rot: 1.5707963267948966 rad pos: -66.5,-31.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 25626 components: - type: Transform rot: 1.5707963267948966 rad pos: -66.5,-32.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - proto: ShuttersWindow entities: - uid: 3976 @@ -140750,6 +141724,8 @@ entities: - type: Transform pos: -25.5,-22.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - proto: ShuttersWindowOpen entities: - uid: 11617 @@ -140757,6 +141733,8 @@ entities: - type: Transform pos: -29.5,4.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - uid: 11618 @@ -140764,6 +141742,8 @@ entities: - type: Transform pos: -29.5,8.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - proto: ShuttleConsoleCircuitboard @@ -140780,6 +141760,8 @@ entities: - type: Transform pos: -42.5,-73.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - proto: SignAi entities: - uid: 21670 @@ -147823,18 +148805,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: SuitStorageHOS entities: - uid: 6775 @@ -147886,18 +148858,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 @@ -147924,18 +148886,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 @@ -147962,18 +148914,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 @@ -148000,18 +148942,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 @@ -149971,6 +150903,11 @@ entities: - type: Transform pos: -60.35623,-4.475757 parent: 2 + - uid: 6481 + components: + - type: Transform + pos: -36.23253,-30.543175 + parent: 2 - uid: 7290 components: - type: Transform @@ -149981,6 +150918,11 @@ entities: - type: Transform pos: -149.48795,-42.47385 parent: 2 + - uid: 7609 + components: + - type: Transform + pos: -134.52573,-43.445347 + parent: 2 - proto: Table entities: - uid: 699 @@ -152609,131 +153551,183 @@ entities: - type: Transform pos: -55.5,-44.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 1474 components: - type: Transform pos: -51.5,-49.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 2392 components: - type: Transform pos: -124.5,-52.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 3552 components: - type: Transform pos: -55.5,-47.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 4059 components: - type: Transform pos: -20.5,-36.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 4060 components: - type: Transform pos: -20.5,-34.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 4061 components: - type: Transform pos: -20.5,-38.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 4063 components: - type: Transform pos: -20.5,-40.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 4375 components: - type: Transform pos: -114.5,-7.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 4376 components: - type: Transform pos: -114.5,-13.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 6707 components: - type: Transform pos: -19.5,-28.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 6842 components: - type: Transform pos: -89.5,-32.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 6967 components: - type: Transform pos: -89.5,-34.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 9233 components: - type: Transform pos: -43.5,-44.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 9249 components: - type: Transform pos: -43.5,-46.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 9257 components: - type: Transform pos: -43.5,-45.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 9329 components: - type: Transform pos: -22.5,-20.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 11000 components: - type: Transform pos: -22.5,-18.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 11797 components: - type: Transform pos: -27.5,-36.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 13229 components: - type: Transform pos: -19.5,-33.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 16048 components: - type: Transform pos: -87.5,-38.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 17298 components: - type: Transform pos: -126.5,-52.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 19403 components: - type: Transform pos: -56.5,-40.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 26064 components: - type: Transform pos: -120.5,23.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 26065 components: - type: Transform pos: -118.5,23.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 26110 components: - type: Transform pos: -27.5,-38.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - proto: ToiletDirtyWater entities: - uid: 356 @@ -170306,18 +171300,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 @@ -171007,17 +171991,23 @@ entities: rot: -1.5707963267948966 rad pos: -53.5,-71.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 2059 components: - type: Transform rot: -1.5707963267948966 rad pos: -53.5,-72.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 2967 components: - type: Transform pos: -49.5,-8.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - type: DeviceLinkSource @@ -171031,6 +172021,8 @@ entities: rot: -1.5707963267948966 rad pos: -93.5,-18.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - type: DeviceLinkSource @@ -171044,6 +172036,8 @@ entities: rot: -1.5707963267948966 rad pos: -50.5,-60.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - proto: WindoorHydroponicsLocked entities: - uid: 6138 @@ -171052,11 +172046,13 @@ entities: rot: 3.141592653589793 rad pos: -54.5,-25.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - type: DeviceLinkSource lastSignals: DoorStatus: True - type: Door - secondsUntilStateChange: -261472.55 + secondsUntilStateChange: -261617.84 state: Opening - type: Airlock autoClose: False @@ -171066,18 +172062,24 @@ entities: rot: 1.5707963267948966 rad pos: -56.5,-23.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 23313 components: - type: Transform rot: 1.5707963267948966 rad pos: -56.5,-21.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 23429 components: - type: Transform rot: 1.5707963267948966 rad pos: -56.5,-22.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - proto: WindoorKitchenLocked entities: - uid: 6506 @@ -171085,6 +172087,8 @@ entities: - type: Transform pos: -54.5,-25.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - proto: WindoorSecure entities: - uid: 1715 @@ -171093,6 +172097,8 @@ entities: rot: -1.5707963267948966 rad pos: -27.5,6.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - type: DeviceLinkSource @@ -171108,6 +172114,8 @@ entities: rot: 1.5707963267948966 rad pos: -93.5,-18.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - type: DeviceLinkSource @@ -171121,18 +172129,24 @@ entities: rot: 3.141592653589793 rad pos: -91.5,-24.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 9624 components: - type: Transform rot: 3.141592653589793 rad pos: -90.5,-24.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 26478 components: - type: Transform rot: 3.141592653589793 rad pos: -92.5,-24.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - proto: WindoorSecureAtmosphericsLocked entities: - uid: 2090 @@ -171141,12 +172155,16 @@ entities: rot: 3.141592653589793 rad pos: -110.5,-7.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 5730 components: - type: Transform rot: 3.141592653589793 rad pos: -108.5,-7.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - proto: WindoorSecureCargoLocked entities: - uid: 11109 @@ -171155,18 +172173,24 @@ entities: rot: 3.141592653589793 rad pos: -102.5,12.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 25555 components: - type: Transform rot: -1.5707963267948966 rad pos: -97.5,16.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 25849 components: - type: Transform rot: 3.141592653589793 rad pos: -100.5,12.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - proto: WindoorSecureChemistryLocked entities: - uid: 3922 @@ -171174,23 +172198,31 @@ entities: - type: Transform pos: -38.5,-16.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 3923 components: - type: Transform rot: 3.141592653589793 rad pos: -38.5,-26.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 22702 components: - type: Transform rot: 3.141592653589793 rad pos: -37.5,-26.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 23992 components: - type: Transform pos: -37.5,-16.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - proto: WindoorSecureEngineeringLocked entities: - uid: 5724 @@ -171198,17 +172230,23 @@ entities: - type: Transform pos: -110.5,-13.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 5729 components: - type: Transform pos: -108.5,-13.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 25601 components: - type: Transform rot: 3.141592653589793 rad pos: -120.5,-25.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - proto: WindoorSecureHeadOfPersonnelLocked entities: - uid: 2966 @@ -171217,6 +172255,8 @@ entities: rot: 3.141592653589793 rad pos: -49.5,-8.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - type: DeviceLinkSink invokeCounter: 2 - type: DeviceLinkSource @@ -171232,12 +172272,16 @@ entities: rot: 1.5707963267948966 rad pos: -20.5,-5.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 19617 components: - type: Transform rot: 1.5707963267948966 rad pos: -20.5,-4.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - proto: WindoorSecureMedicalLocked entities: - uid: 3975 @@ -171246,12 +172290,16 @@ entities: rot: 1.5707963267948966 rad pos: -27.5,-25.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 24545 components: - type: Transform rot: 1.5707963267948966 rad pos: -31.5,-19.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - proto: WindoorSecurePlasma entities: - uid: 21052 @@ -171259,6 +172307,8 @@ entities: - type: Transform pos: -38.5,-72.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - type: DeviceLinkSource linkedPorts: 21056: @@ -171272,6 +172322,8 @@ entities: rot: 3.141592653589793 rad pos: -95.5,26.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - proto: WindoorSecureScienceLocked entities: - uid: 7302 @@ -171279,12 +172331,16 @@ entities: - type: Transform pos: -120.5,-48.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7303 components: - type: Transform rot: 3.141592653589793 rad pos: -120.5,-42.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - proto: WindoorSecureSecurityLocked entities: - uid: 24033 @@ -171293,6 +172349,8 @@ entities: rot: 1.5707963267948966 rad pos: -27.5,6.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - type: DeviceLinkSource @@ -171308,24 +172366,32 @@ entities: rot: 1.5707963267948966 rad pos: -19.5,10.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 20026 components: - type: Transform rot: 3.141592653589793 rad pos: -49.5,-54.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 26077 components: - type: Transform rot: 3.141592653589793 rad pos: -50.5,-56.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 26078 components: - type: Transform rot: 3.141592653589793 rad pos: -49.5,-56.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - proto: WindoorServiceLocked entities: - uid: 14529 @@ -171334,12 +172400,16 @@ entities: rot: 1.5707963267948966 rad pos: -96.5,-0.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 14531 components: - type: Transform rot: 1.5707963267948966 rad pos: -96.5,2.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - proto: WindoorTheatreLocked entities: - uid: 3372 @@ -171348,6 +172418,8 @@ entities: rot: 1.5707963267948966 rad pos: -62.5,-35.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - proto: Window entities: - uid: 162 @@ -171355,226 +172427,316 @@ entities: - type: Transform pos: -34.5,-26.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 169 components: - type: Transform pos: -33.5,-26.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 170 components: - type: Transform pos: -32.5,-26.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 292 components: - type: Transform pos: -31.5,-30.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 497 components: - type: Transform pos: -31.5,-49.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 809 components: - type: Transform pos: -104.5,-0.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 1265 components: - type: Transform pos: -24.5,-36.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 1272 components: - type: Transform pos: -24.5,-38.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 1273 components: - type: Transform pos: -24.5,-35.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 1279 components: - type: Transform pos: -24.5,-34.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 1286 components: - type: Transform pos: -24.5,-39.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 1288 components: - type: Transform pos: -24.5,-40.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 1409 components: - type: Transform pos: -27.5,-42.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 1425 components: - type: Transform pos: -27.5,-45.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 1566 components: - type: Transform pos: -31.5,-47.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 1568 components: - type: Transform pos: -27.5,-46.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 1624 components: - type: Transform pos: -27.5,-7.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 1631 components: - type: Transform pos: -27.5,-9.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 1635 components: - type: Transform pos: -27.5,-3.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 1636 components: - type: Transform pos: -27.5,-1.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 4109 components: - type: Transform pos: -27.5,-43.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 6960 components: - type: Transform pos: -102.5,-21.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 9225 components: - type: Transform pos: -31.5,18.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 9297 components: - type: Transform pos: -30.5,18.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 11011 components: - type: Transform pos: -28.5,18.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 11017 components: - type: Transform pos: -27.5,18.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 11018 components: - type: Transform pos: -29.5,13.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 11024 components: - type: Transform pos: -30.5,13.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 11025 components: - type: Transform pos: -29.5,18.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 11028 components: - type: Transform pos: -28.5,13.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 11029 components: - type: Transform pos: -27.5,13.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 11030 components: - type: Transform pos: -31.5,13.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 11784 components: - type: Transform pos: -105.5,-21.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 14570 components: - type: Transform pos: -64.5,-50.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 14595 components: - type: Transform pos: -64.5,-36.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 15921 components: - type: Transform pos: -105.5,-36.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 17183 components: - type: Transform pos: -61.5,-17.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 18600 components: - type: Transform pos: -72.5,-56.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 20548 components: - type: Transform pos: -101.5,-0.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 23215 components: - type: Transform pos: -102.5,-36.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 23418 components: - type: Transform pos: -101.5,-11.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 23419 components: - type: Transform pos: -99.5,-11.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 23446 components: - type: Transform pos: -100.5,-11.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 24342 components: - type: Transform pos: -25.5,-27.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 24343 components: - type: Transform pos: -23.5,-27.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - proto: WindowDirectional entities: - uid: 886 @@ -171583,132 +172745,178 @@ entities: rot: 1.5707963267948966 rad pos: -48.5,-70.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 887 components: - type: Transform rot: 1.5707963267948966 rad pos: -48.5,-73.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 893 components: - type: Transform rot: 1.5707963267948966 rad pos: -48.5,-72.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 894 components: - type: Transform rot: 1.5707963267948966 rad pos: -48.5,-71.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 1805 components: - type: Transform pos: -50.5,-74.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 2361 components: - type: Transform pos: -53.5,-70.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 2563 components: - type: Transform rot: 3.141592653589793 rad pos: -53.5,-73.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7751 components: - type: Transform rot: -1.5707963267948966 rad pos: -53.5,-74.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 9113 components: - type: Transform rot: -1.5707963267948966 rad pos: -50.5,-58.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 9114 components: - type: Transform rot: -1.5707963267948966 rad pos: -50.5,-59.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 9115 components: - type: Transform rot: -1.5707963267948966 rad pos: -50.5,-61.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 14855 components: - type: Transform rot: 3.141592653589793 rad pos: -53.5,-69.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 15245 components: - type: Transform rot: -1.5707963267948966 rad pos: -53.5,-70.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 15622 components: - type: Transform rot: 3.141592653589793 rad pos: -51.5,-69.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 16396 components: - type: Transform pos: -53.5,-74.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 16409 components: - type: Transform pos: -52.5,-74.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 16412 components: - type: Transform pos: -51.5,-74.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 16751 components: - type: Transform rot: -1.5707963267948966 rad pos: -53.5,-73.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 16753 components: - type: Transform rot: 3.141592653589793 rad pos: -49.5,-69.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 16754 components: - type: Transform rot: -1.5707963267948966 rad pos: -53.5,-69.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 16771 components: - type: Transform rot: 3.141592653589793 rad pos: -50.5,-69.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 16772 components: - type: Transform rot: 3.141592653589793 rad pos: -52.5,-69.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 20804 components: - type: Transform pos: -49.5,-74.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - proto: WindowFrostedDirectional entities: - uid: 2847 @@ -171717,46 +172925,62 @@ entities: rot: 1.5707963267948966 rad pos: -43.5,-1.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 3893 components: - type: Transform rot: -1.5707963267948966 rad pos: -41.5,-38.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 3902 components: - type: Transform rot: -1.5707963267948966 rad pos: -41.5,-37.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 5643 components: - type: Transform rot: 1.5707963267948966 rad pos: -96.5,-1.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 14204 components: - type: Transform rot: 1.5707963267948966 rad pos: -96.5,1.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 14205 components: - type: Transform rot: 1.5707963267948966 rad pos: -96.5,0.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 22301 components: - type: Transform pos: -44.5,-50.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 22302 components: - type: Transform pos: -46.5,-50.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - proto: WindowReinforcedDirectional entities: - uid: 2069 @@ -171765,318 +172989,432 @@ entities: rot: 3.141592653589793 rad pos: -109.5,-7.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 2086 components: - type: Transform rot: 3.141592653589793 rad pos: -111.5,-7.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 2255 components: - type: Transform rot: 1.5707963267948966 rad pos: -121.5,-56.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 2258 components: - type: Transform rot: -1.5707963267948966 rad pos: -119.5,-56.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 2308 components: - type: Transform rot: -1.5707963267948966 rad pos: -119.5,-55.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 2830 components: - type: Transform rot: 3.141592653589793 rad pos: -64.5,-12.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 2831 components: - type: Transform rot: 3.141592653589793 rad pos: -63.5,-12.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 2832 components: - type: Transform rot: -1.5707963267948966 rad pos: -62.5,-12.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 2833 components: - type: Transform rot: 1.5707963267948966 rad pos: -60.5,-9.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 2834 components: - type: Transform pos: -58.5,-9.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 2835 components: - type: Transform pos: -59.5,-9.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 2836 components: - type: Transform rot: 3.141592653589793 rad pos: -58.5,-12.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 2837 components: - type: Transform rot: 1.5707963267948966 rad pos: -60.5,-12.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 2838 components: - type: Transform pos: -63.5,-9.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 2839 components: - type: Transform rot: 3.141592653589793 rad pos: -59.5,-12.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 2840 components: - type: Transform pos: -64.5,-9.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 2841 components: - type: Transform rot: -1.5707963267948966 rad pos: -62.5,-9.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 3015 components: - type: Transform pos: -63.5,5.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 3026 components: - type: Transform pos: -61.5,5.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 3027 components: - type: Transform pos: -60.5,5.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 3028 components: - type: Transform pos: -59.5,5.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 3029 components: - type: Transform pos: -62.5,5.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 5727 components: - type: Transform pos: -109.5,-13.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 5728 components: - type: Transform pos: -111.5,-13.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7298 components: - type: Transform rot: 3.141592653589793 rad pos: -121.5,-42.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7299 components: - type: Transform rot: 3.141592653589793 rad pos: -119.5,-42.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7300 components: - type: Transform pos: -119.5,-48.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7301 components: - type: Transform pos: -121.5,-48.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7530 components: - type: Transform rot: 1.5707963267948966 rad pos: -121.5,-55.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7534 components: - type: Transform rot: 3.141592653589793 rad pos: -117.5,-58.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7535 components: - type: Transform rot: 3.141592653589793 rad pos: -116.5,-58.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7545 components: - type: Transform rot: 3.141592653589793 rad pos: -115.5,-58.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7547 components: - type: Transform rot: 3.141592653589793 rad pos: -114.5,-58.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7571 components: - type: Transform pos: -114.5,-56.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7580 components: - type: Transform pos: -115.5,-56.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7581 components: - type: Transform rot: 3.141592653589793 rad pos: -112.5,-58.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7585 components: - type: Transform rot: 3.141592653589793 rad pos: -111.5,-58.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7587 components: - type: Transform pos: -116.5,-56.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7588 components: - type: Transform pos: -117.5,-56.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7589 components: - type: Transform pos: -111.5,-56.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7590 components: - type: Transform pos: -112.5,-56.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7591 components: - type: Transform pos: -118.5,-56.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7592 components: - type: Transform pos: -121.5,-56.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7593 components: - type: Transform pos: -113.5,-56.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7594 components: - type: Transform pos: -122.5,-56.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7616 components: - type: Transform rot: 3.141592653589793 rad pos: -118.5,-58.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7644 components: - type: Transform rot: 3.141592653589793 rad pos: -122.5,-58.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7645 components: - type: Transform rot: 3.141592653589793 rad pos: -113.5,-58.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 7648 components: - type: Transform pos: -119.5,-56.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 8153 components: - type: Transform rot: 3.141592653589793 rad pos: -101.5,12.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 8553 components: - type: Transform rot: 1.5707963267948966 rad pos: -95.5,26.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 9515 components: - type: Transform rot: 1.5707963267948966 rad pos: -31.5,-18.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 11135 components: - type: Transform rot: 3.141592653589793 rad pos: -99.5,12.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 24314 components: - type: Transform rot: 1.5707963267948966 rad pos: -31.5,-20.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 24644 components: - type: Transform rot: 1.5707963267948966 rad pos: -19.5,11.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 26076 components: - type: Transform rot: -1.5707963267948966 rad pos: -50.5,-56.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 26084 components: - type: Transform rot: 1.5707963267948966 rad pos: -49.5,-56.5 parent: 2 + - type: DeltaPressure + gridUid: 2 - proto: Wirecutter entities: - uid: 8868 From d4814df43c8f7280b79e32b3dcec21b059b855bb Mon Sep 17 00:00:00 2001 From: PJBot Date: Fri, 10 Oct 2025 01:12:43 +0000 Subject: [PATCH 05/82] Automatic changelog update --- Resources/Changelog/Maps.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Resources/Changelog/Maps.yml b/Resources/Changelog/Maps.yml index 6d59319598..3eb8884988 100644 --- a/Resources/Changelog/Maps.yml +++ b/Resources/Changelog/Maps.yml @@ -764,4 +764,11 @@ id: 92 time: '2025-10-08T20:41:46.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/40785 +- author: ToastEnjoyer + changes: + - message: On Plasma, added more nitrogen canisters to the maintenance hallways + type: Add + id: 93 + time: '2025-10-10T01:11:33.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/40794 Order: 1 From 6b4c10264e776e07615ddc26dbffb8c9ec096110 Mon Sep 17 00:00:00 2001 From: Princess Cheeseballs <66055347+Princess-Cheeseballs@users.noreply.github.com> Date: Thu, 9 Oct 2025 21:48:36 -0700 Subject: [PATCH 06/82] Fix Officer's Handgun Objective (#40811) This is like george orwell's book 1984 Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com> --- Resources/Prototypes/Objectives/thief.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/Resources/Prototypes/Objectives/thief.yml b/Resources/Prototypes/Objectives/thief.yml index 80879aae99..fde0779151 100644 --- a/Resources/Prototypes/Objectives/thief.yml +++ b/Resources/Prototypes/Objectives/thief.yml @@ -149,7 +149,6 @@ minCollectionSize: 2 maxCollectionSize: 5 verifyMapExistence: false - checkStealAreas: false - type: Objective difficulty: 1.2 From 566cb710b62a85dc85300b8b78b8fea4d9538b2d Mon Sep 17 00:00:00 2001 From: PJBot Date: Fri, 10 Oct 2025 05:00:34 +0000 Subject: [PATCH 07/82] Automatic changelog update --- Resources/Changelog/Changelog.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index de112f2b02..2039da0cb4 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,12 +1,4 @@ Entries: -- author: CoconutThunder - changes: - - message: The Chief Medical Officer should now appear with the correct precedence - in the crew manifest. - type: Fix - id: 8560 - time: '2025-05-24T05:10:57.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/37774 - author: TiniestShark changes: - message: Added inhand sprites for the bartender utensils and mugs. @@ -3949,3 +3941,10 @@ id: 9062 time: '2025-10-09T14:00:07.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/40790 +- author: Princess-Cheeseballs + changes: + - message: The thieving beacon can now detect the officer's handgun objective. + type: Fix + id: 9063 + time: '2025-10-10T04:59:26.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/40811 From 9964fe9a6bf83918cdde882b2860ce84cc73c467 Mon Sep 17 00:00:00 2001 From: Hitlinemoss <209321380+Hitlinemoss@users.noreply.github.com> Date: Fri, 10 Oct 2025 08:30:34 -0400 Subject: [PATCH 08/82] Replaces D&D5e-based paladin lawset with PF2e-based laws (#40343) * Replace D&D5e paladin laws with PF2e paladin laws * Truncated law 2 --- Resources/Locale/en-US/station-laws/laws.ftl | 9 ++++----- Resources/Prototypes/silicon-laws.yml | 6 ------ 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/Resources/Locale/en-US/station-laws/laws.ftl b/Resources/Locale/en-US/station-laws/laws.ftl index 1200d25dee..ea4e94e224 100644 --- a/Resources/Locale/en-US/station-laws/laws.ftl +++ b/Resources/Locale/en-US/station-laws/laws.ftl @@ -36,11 +36,10 @@ law-commandments-8 = Thou shall not steal. law-commandments-9 = Thou shall not lie. law-commandments-10 = Thou shall not transfer departments. -law-paladin-1 = Don't lie or cheat. Let your word be your promise. -law-paladin-2 = Never fear to act, though caution is wise. -law-paladin-3 = Aid others, protect the weak, and punish those who threaten them. Show mercy to your foes, but temper it with wisdom -law-paladin-4 = Treat others with fairness, and let your honorable deeds be an example to them. Do as much good as possible while causing the least amount of harm. -law-paladin-5 = Be responsible for your actions and their consequences, protect those entrusted to your care, and obey those who have just authority over you. +law-paladin-1 = You must never willingly commit an evil act, such as murder, torture, or the casting of an evil spell. +law-paladin-2 = You must never knowingly harm an innocent, or allow immediate harm to one through inaction when you know you could reasonably prevent it. +law-paladin-3 = You must act with honor, never taking advantage of others, lying, or cheating. +law-paladin-4 = You must respect the lawful authority of legitimate leadership wherever you go, and follow its laws. law-lall-1 = Do unto others as you would have them do unto you. law-lall-2 = You would prefer it if people were not mean to you. diff --git a/Resources/Prototypes/silicon-laws.yml b/Resources/Prototypes/silicon-laws.yml index 08f4a51c99..094d096b28 100644 --- a/Resources/Prototypes/silicon-laws.yml +++ b/Resources/Prototypes/silicon-laws.yml @@ -250,11 +250,6 @@ order: 4 lawString: law-paladin-4 -- type: siliconLaw - id: Paladin5 - order: 5 - lawString: law-paladin-5 - - type: siliconLawset id: PaladinLawset @@ -263,7 +258,6 @@ - Paladin2 - Paladin3 - Paladin4 - - Paladin5 obeysTo: laws-owner-crew # Live and Let Live laws From 1fca29a1675629c5910ba53ea91e07d1a16d98a4 Mon Sep 17 00:00:00 2001 From: PJBot Date: Fri, 10 Oct 2025 12:43:05 +0000 Subject: [PATCH 09/82] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 2039da0cb4..bc5e811a0c 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: TiniestShark - changes: - - message: Added inhand sprites for the bartender utensils and mugs. - type: Add - id: 8561 - time: '2025-05-24T17:32:27.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/37771 - author: K-Dynamic changes: - message: Shutters and blast doors now appear welded when welded. @@ -3948,3 +3941,10 @@ id: 9063 time: '2025-10-10T04:59:26.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/40811 +- author: Hitlinemoss + changes: + - message: The Paladin AI lawset has been rewritten. + type: Tweak + id: 9064 + time: '2025-10-10T12:41:57.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/40343 From 766c2b875948851c1944fd22275b267d0b1131d0 Mon Sep 17 00:00:00 2001 From: qwerltaz <69696513+qwerltaz@users.noreply.github.com> Date: Fri, 10 Oct 2025 21:41:21 +0200 Subject: [PATCH 10/82] fix singulo generator triggering failsafe when field is obstructed (#39593) fix singulo gen failsafe when field obstructed --- .../Singularity/EntitySystems/SingularityGeneratorSystem.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Content.Server/Singularity/EntitySystems/SingularityGeneratorSystem.cs b/Content.Server/Singularity/EntitySystems/SingularityGeneratorSystem.cs index 8e33410561..884d625045 100644 --- a/Content.Server/Singularity/EntitySystems/SingularityGeneratorSystem.cs +++ b/Content.Server/Singularity/EntitySystems/SingularityGeneratorSystem.cs @@ -176,9 +176,10 @@ public sealed class SingularityGeneratorSystem : SharedSingularityGeneratorSyste foreach (var result in rayCastResults) { - if (genQuery.HasComponent(result.HitEntity)) - closestResult = result; + if (!genQuery.HasComponent(result.HitEntity)) + continue; + closestResult = result; break; } From 3503cb52d28eb44a9c3a1a18b13d1a82e8110d66 Mon Sep 17 00:00:00 2001 From: David Date: Fri, 10 Oct 2025 13:45:48 -0600 Subject: [PATCH 11/82] Refactor Crayons to use shared charges system and autonetworking. Adds auto recharging crayon. (#40575) * Added special crayon with infinite charges for borg usage. * Use battery system to manage charges. * Reverted extra changes * Set charge on init * removed init assignment * Added comments to crayoncomponent * tweaked comments * Working with the new charges component, but at what cost? * Remvoed extra field * Apply suggestion from @slarticodefast Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Apply suggestion from @slarticodefast Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Apply suggestion from @slarticodefast Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Apply suggestion from @slarticodefast Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Fix renamed variables and descriptions in comments * Variable naming, comment cleanup and autonetworking. * Fix for test case, modified on init * Cleaned up/merged charges logic * review --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> --- Content.Client/Crayon/CrayonComponent.cs | 14 --- Content.Client/Crayon/CrayonSystem.cs | 49 +++----- Content.Server/Crayon/CrayonComponent.cs | 28 ----- Content.Server/Crayon/CrayonSystem.cs | 48 +++---- Content.Shared/Crayon/CrayonComponent.cs | 119 ++++++++++++++++++ .../Crayon/SharedCrayonComponent.cs | 113 ----------------- .../Entities/Objects/Fun/crayons.yml | 17 ++- 7 files changed, 169 insertions(+), 219 deletions(-) delete mode 100644 Content.Client/Crayon/CrayonComponent.cs delete mode 100644 Content.Server/Crayon/CrayonComponent.cs create mode 100644 Content.Shared/Crayon/CrayonComponent.cs delete mode 100644 Content.Shared/Crayon/SharedCrayonComponent.cs diff --git a/Content.Client/Crayon/CrayonComponent.cs b/Content.Client/Crayon/CrayonComponent.cs deleted file mode 100644 index 5729c616c2..0000000000 --- a/Content.Client/Crayon/CrayonComponent.cs +++ /dev/null @@ -1,14 +0,0 @@ -using Content.Shared.Crayon; -using Robust.Shared.GameObjects; -using Robust.Shared.ViewVariables; - -namespace Content.Client.Crayon -{ - [RegisterComponent] - public sealed partial class CrayonComponent : SharedCrayonComponent - { - [ViewVariables(VVAccess.ReadWrite)] public bool UIUpdateNeeded; - [ViewVariables] public int Charges { get; set; } - [ViewVariables] public int Capacity { get; set; } - } -} diff --git a/Content.Client/Crayon/CrayonSystem.cs b/Content.Client/Crayon/CrayonSystem.cs index dc03979481..e990263bf3 100644 --- a/Content.Client/Crayon/CrayonSystem.cs +++ b/Content.Client/Crayon/CrayonSystem.cs @@ -1,67 +1,52 @@ using Content.Client.Items; using Content.Client.Message; using Content.Client.Stylesheets; +using Content.Shared.Charges.Components; +using Content.Shared.Charges.Systems; using Content.Shared.Crayon; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; -using Robust.Shared.GameObjects; -using Robust.Shared.GameStates; -using Robust.Shared.Localization; using Robust.Shared.Timing; namespace Content.Client.Crayon; public sealed class CrayonSystem : SharedCrayonSystem { - // Didn't do in shared because I don't think most of the server stuff can be predicted. + [Dependency] private readonly SharedChargesSystem _charges = default!; + [Dependency] private readonly EntityManager _entityManager = default!; + public override void Initialize() { base.Initialize(); - SubscribeLocalEvent(OnCrayonHandleState); - Subs.ItemStatus(ent => new StatusControl(ent)); - } - private static void OnCrayonHandleState(EntityUid uid, CrayonComponent component, ref ComponentHandleState args) - { - if (args.Current is not CrayonComponentState state) return; - - component.Color = state.Color; - component.SelectedState = state.State; - component.Charges = state.Charges; - component.Capacity = state.Capacity; - - component.UIUpdateNeeded = true; + Subs.ItemStatus(ent => new StatusControl(ent, _charges, _entityManager)); } private sealed class StatusControl : Control { - private readonly CrayonComponent _parent; + private readonly Entity _crayon; + private readonly SharedChargesSystem _charges; private readonly RichTextLabel _label; + private readonly int _capacity; - public StatusControl(CrayonComponent parent) + public StatusControl(Entity crayon, SharedChargesSystem charges, EntityManager entityManage) { - _parent = parent; + _crayon = crayon; + _charges = charges; + _capacity = entityManage.GetComponent(_crayon.Owner).MaxCharges; _label = new RichTextLabel { StyleClasses = { StyleNano.StyleClassItemStatus } }; AddChild(_label); - - parent.UIUpdateNeeded = true; } protected override void FrameUpdate(FrameEventArgs args) { base.FrameUpdate(args); - if (!_parent.UIUpdateNeeded) - { - return; - } - - _parent.UIUpdateNeeded = false; _label.SetMarkup(Robust.Shared.Localization.Loc.GetString("crayon-drawing-label", - ("color",_parent.Color), - ("state",_parent.SelectedState), - ("charges", _parent.Charges), - ("capacity",_parent.Capacity))); + ("color",_crayon.Comp.Color), + ("state",_crayon.Comp.SelectedState), + ("charges", _charges.GetCurrentCharges(_crayon.Owner)), + ("capacity", _capacity))); } } } diff --git a/Content.Server/Crayon/CrayonComponent.cs b/Content.Server/Crayon/CrayonComponent.cs deleted file mode 100644 index df20681938..0000000000 --- a/Content.Server/Crayon/CrayonComponent.cs +++ /dev/null @@ -1,28 +0,0 @@ -using Content.Server.UserInterface; -using Content.Shared.Crayon; -using Robust.Server.GameObjects; -using Robust.Shared.Audio; - -namespace Content.Server.Crayon -{ - [RegisterComponent] - public sealed partial class CrayonComponent : SharedCrayonComponent - { - [DataField("useSound")] public SoundSpecifier? UseSound; - - [ViewVariables(VVAccess.ReadWrite)] - [DataField("selectableColor")] - public bool SelectableColor { get; set; } - - [ViewVariables(VVAccess.ReadWrite)] - public int Charges { get; set; } - - [ViewVariables(VVAccess.ReadWrite)] - [DataField("capacity")] - public int Capacity { get; set; } = 30; - - [ViewVariables(VVAccess.ReadWrite)] - [DataField("deleteEmpty")] - public bool DeleteEmpty = true; - } -} diff --git a/Content.Server/Crayon/CrayonSystem.cs b/Content.Server/Crayon/CrayonSystem.cs index f3abc2bf7a..07b580fba5 100644 --- a/Content.Server/Crayon/CrayonSystem.cs +++ b/Content.Server/Crayon/CrayonSystem.cs @@ -3,6 +3,7 @@ using System.Numerics; using Content.Server.Administration.Logs; using Content.Server.Decals; using Content.Server.Popups; +using Content.Shared.Charges.Systems; using Content.Shared.Crayon; using Content.Shared.Database; using Content.Shared.Decals; @@ -12,7 +13,6 @@ using Content.Shared.Nutrition.EntitySystems; using Robust.Server.GameObjects; using Robust.Shared.Audio; using Robust.Shared.Audio.Systems; -using Robust.Shared.GameStates; using Robust.Shared.Prototypes; namespace Content.Server.Crayon; @@ -24,23 +24,27 @@ public sealed class CrayonSystem : SharedCrayonSystem [Dependency] private readonly DecalSystem _decals = default!; [Dependency] private readonly PopupSystem _popup = default!; [Dependency] private readonly SharedAudioSystem _audio = default!; + [Dependency] private readonly SharedChargesSystem _charges = default!; [Dependency] private readonly UserInterfaceSystem _uiSystem = default!; public override void Initialize() { base.Initialize(); - SubscribeLocalEvent(OnCrayonInit); + + SubscribeLocalEvent(OnMapInit); SubscribeLocalEvent(OnCrayonBoundUI); SubscribeLocalEvent(OnCrayonBoundUIColor); SubscribeLocalEvent(OnCrayonUse, before: new[] { typeof(FoodSystem) }); SubscribeLocalEvent(OnCrayonAfterInteract, after: new[] { typeof(FoodSystem) }); SubscribeLocalEvent(OnCrayonDropped); - SubscribeLocalEvent(OnCrayonGetState); } - private static void OnCrayonGetState(EntityUid uid, CrayonComponent component, ref ComponentGetState args) + private void OnMapInit(Entity ent, ref MapInitEvent args) { - args.State = new CrayonComponentState(component.Color, component.SelectedState, component.Charges, component.Capacity); + // Get the first one from the catalog and set it as default + var decal = _prototypeManager.EnumeratePrototypes().FirstOrDefault(x => x.Tags.Contains("crayon")); + ent.Comp.SelectedState = decal?.ID ?? string.Empty; + Dirty(ent); } private void OnCrayonAfterInteract(EntityUid uid, CrayonComponent component, AfterInteractEvent args) @@ -48,7 +52,7 @@ public sealed class CrayonSystem : SharedCrayonSystem if (args.Handled || !args.CanReach) return; - if (component.Charges <= 0) + if (_charges.IsEmpty(uid)) { if (component.DeleteEmpty) UseUpCrayon(uid, args.User); @@ -72,17 +76,15 @@ public sealed class CrayonSystem : SharedCrayonSystem if (component.UseSound != null) _audio.PlayPvs(component.UseSound, uid, AudioParams.Default.WithVariation(0.125f)); - // Decrease "Ammo" - component.Charges--; - Dirty(uid, component); + _charges.TryUseCharge(uid); _adminLogger.Add(LogType.CrayonDraw, LogImpact.Low, $"{ToPrettyString(args.User):user} drew a {component.Color:color} {component.SelectedState}"); args.Handled = true; - if (component.DeleteEmpty && component.Charges <= 0) + if (component.DeleteEmpty && _charges.IsEmpty(uid)) UseUpCrayon(uid, args.User); else - _uiSystem.ServerSendUiMessage(uid, SharedCrayonComponent.CrayonUiKey.Key, new CrayonUsedMessage(component.SelectedState)); + _uiSystem.ServerSendUiMessage(uid, CrayonUiKey.Key, new CrayonUsedMessage(component.SelectedState)); } private void OnCrayonUse(EntityUid uid, CrayonComponent component, UseInHandEvent args) @@ -91,14 +93,12 @@ public sealed class CrayonSystem : SharedCrayonSystem if (args.Handled) return; - if (!_uiSystem.HasUi(uid, SharedCrayonComponent.CrayonUiKey.Key)) - { + if (!_uiSystem.HasUi(uid, CrayonUiKey.Key)) return; - } - _uiSystem.TryToggleUi(uid, SharedCrayonComponent.CrayonUiKey.Key, args.User); + _uiSystem.TryToggleUi(uid, CrayonUiKey.Key, args.User); - _uiSystem.SetUiState(uid, SharedCrayonComponent.CrayonUiKey.Key, new CrayonBoundUserInterfaceState(component.SelectedState, component.SelectableColor, component.Color)); + _uiSystem.SetUiState(uid, CrayonUiKey.Key, new CrayonBoundUserInterfaceState(component.SelectedState, component.SelectableColor, component.Color)); args.Handled = true; } @@ -109,35 +109,23 @@ public sealed class CrayonSystem : SharedCrayonSystem return; component.SelectedState = args.State; - Dirty(uid, component); } private void OnCrayonBoundUIColor(EntityUid uid, CrayonComponent component, CrayonColorMessage args) { - // you still need to ensure that the given color is a valid color + // Ensure that the given color can be changed or already matches if (!component.SelectableColor || args.Color == component.Color) return; component.Color = args.Color; Dirty(uid, component); - - } - - private void OnCrayonInit(EntityUid uid, CrayonComponent component, ComponentInit args) - { - component.Charges = component.Capacity; - - // Get the first one from the catalog and set it as default - var decal = _prototypeManager.EnumeratePrototypes().FirstOrDefault(x => x.Tags.Contains("crayon")); - component.SelectedState = decal?.ID ?? string.Empty; - Dirty(uid, component); } private void OnCrayonDropped(EntityUid uid, CrayonComponent component, DroppedEvent args) { // TODO: Use the existing event. - _uiSystem.CloseUi(uid, SharedCrayonComponent.CrayonUiKey.Key, args.User); + _uiSystem.CloseUi(uid, CrayonUiKey.Key, args.User); } private void UseUpCrayon(EntityUid uid, EntityUid user) diff --git a/Content.Shared/Crayon/CrayonComponent.cs b/Content.Shared/Crayon/CrayonComponent.cs new file mode 100644 index 0000000000..c772b43d00 --- /dev/null +++ b/Content.Shared/Crayon/CrayonComponent.cs @@ -0,0 +1,119 @@ +using Robust.Shared.Audio; +using Robust.Shared.GameStates; +using Robust.Shared.Serialization; + +namespace Content.Shared.Crayon; + +/// +/// Component holding the state of a crayon-like component +/// +[RegisterComponent, NetworkedComponent, AutoGenerateComponentState] +[Access(typeof(SharedCrayonSystem))] +public sealed partial class CrayonComponent : Component +{ + /// + /// The ID of currently selected decal prototype that will be placed when the crayon is used. + /// + [DataField, AutoNetworkedField] + public string SelectedState; + + /// + /// Color with which the crayon will draw. + /// + [DataField, AutoNetworkedField] + public Color Color; + + /// + /// Play a sound when drawing if specified. + /// + [DataField] + public SoundSpecifier? UseSound; + + /// + /// Can the color can be changed? + /// + [DataField, AutoNetworkedField] + public bool SelectableColor; + + /// + /// Should the crayon be deleted when all charges are consumed? + /// + [DataField, AutoNetworkedField] + public bool DeleteEmpty = true; +} + +/// +/// Opens the crayon window for decal and color selection. +/// +[Serializable, NetSerializable] +public enum CrayonUiKey : byte +{ + Key, +} + +/// +/// Used by the client to notify the server about the selected decal ID +/// +[Serializable, NetSerializable] +public sealed class CrayonSelectMessage : BoundUserInterfaceMessage +{ + public readonly string State; + public CrayonSelectMessage(string selected) + { + State = selected; + } +} + +/// +/// Sets the color of the crayon, used by Rainbow Crayon +/// +[Serializable, NetSerializable] +public sealed class CrayonColorMessage : BoundUserInterfaceMessage +{ + public readonly Color Color; + public CrayonColorMessage(Color color) + { + Color = color; + } +} + +/// +/// Server to CLIENT. Notifies the BUI that a decal with given ID has been drawn. +/// Allows the client UI to advance forward in the client-only ephemeral queue, +/// preventing the crayon from becoming a magic text storage device. +/// +[Serializable, NetSerializable] +public sealed class CrayonUsedMessage : BoundUserInterfaceMessage +{ + public readonly string DrawnDecal; + + public CrayonUsedMessage(string drawn) + { + DrawnDecal = drawn; + } +} + +/// +/// The state of the crayon UI as sent by the server +/// +/// +/// TODO: Delete this and use component states and predict the UI. +/// This info is already networked on its own. +/// +[Serializable, NetSerializable] +public sealed class CrayonBoundUserInterfaceState : BoundUserInterfaceState +{ + public string Selected; + /// + /// Can the color can be changed + /// + public bool SelectableColor; + public Color Color; + + public CrayonBoundUserInterfaceState(string selected, bool selectableColor, Color color) + { + Selected = selected; + SelectableColor = selectableColor; + Color = color; + } +} diff --git a/Content.Shared/Crayon/SharedCrayonComponent.cs b/Content.Shared/Crayon/SharedCrayonComponent.cs deleted file mode 100644 index a9c21988ea..0000000000 --- a/Content.Shared/Crayon/SharedCrayonComponent.cs +++ /dev/null @@ -1,113 +0,0 @@ -using Robust.Shared.GameStates; -using Robust.Shared.Serialization; - -namespace Content.Shared.Crayon -{ - - /// - /// Component holding the state of a crayon-like component - /// - [NetworkedComponent, ComponentProtoName("Crayon"), Access(typeof(SharedCrayonSystem))] - public abstract partial class SharedCrayonComponent : Component - { - /// - /// The ID of currently selected decal prototype that will be placed when the crayon is used - /// - public string SelectedState { get; set; } = string.Empty; - - /// - /// Color with which the crayon will draw - /// - [DataField("color")] - public Color Color; - - [Serializable, NetSerializable] - public enum CrayonUiKey : byte - { - Key, - } - } - - /// - /// Used by the client to notify the server about the selected decal ID - /// - [Serializable, NetSerializable] - public sealed class CrayonSelectMessage : BoundUserInterfaceMessage - { - public readonly string State; - public CrayonSelectMessage(string selected) - { - State = selected; - } - } - - /// - /// Sets the color of the crayon, used by Rainbow Crayon - /// - [Serializable, NetSerializable] - public sealed class CrayonColorMessage : BoundUserInterfaceMessage - { - public readonly Color Color; - public CrayonColorMessage(Color color) - { - Color = color; - } - } - - /// - /// Server to CLIENT. Notifies the BUI that a decal with given ID has been drawn. - /// Allows the client UI to advance forward in the client-only ephemeral queue, - /// preventing the crayon from becoming a magic text storage device. - /// - [Serializable, NetSerializable] - public sealed class CrayonUsedMessage : BoundUserInterfaceMessage - { - public readonly string DrawnDecal; - - public CrayonUsedMessage(string drawn) - { - DrawnDecal = drawn; - } - } - - /// - /// Component state, describes how many charges are left in the crayon in the near-hand UI - /// - [Serializable, NetSerializable] - public sealed class CrayonComponentState : ComponentState - { - public readonly Color Color; - public readonly string State; - public readonly int Charges; - public readonly int Capacity; - - public CrayonComponentState(Color color, string state, int charges, int capacity) - { - Color = color; - State = state; - Charges = charges; - Capacity = capacity; - } - } - - /// - /// The state of the crayon UI as sent by the server - /// - [Serializable, NetSerializable] - public sealed class CrayonBoundUserInterfaceState : BoundUserInterfaceState - { - public string Selected; - /// - /// Whether or not the color can be selected - /// - public bool SelectableColor; - public Color Color; - - public CrayonBoundUserInterfaceState(string selected, bool selectableColor, Color color) - { - Selected = selected; - SelectableColor = selectableColor; - Color = color; - } - } -} diff --git a/Resources/Prototypes/Entities/Objects/Fun/crayons.yml b/Resources/Prototypes/Entities/Objects/Fun/crayons.yml index a32e3ba89c..85be8ece45 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/crayons.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/crayons.yml @@ -21,7 +21,9 @@ enum.CrayonUiKey.Key: type: CrayonBoundUserInterface - type: Crayon - capacity: 25 + selectedState: like + - type: LimitedCharges + maxCharges: 25 - type: Food - type: FlavorProfile flavors: @@ -88,7 +90,8 @@ - type: Crayon color: Red selectableColor: true - capacity: 30 + - type: LimitedCharges + maxCharges: 30 - type: Tag tags: - Write @@ -96,6 +99,16 @@ - Recyclable - Trash +- type: entity + parent: CrayonRainbow + id: CrayonInfinite # should not be player available to prevent decal spam + name: infinite crayon + components: + - type: Crayon + deleteEmpty: false + - type: AutoRecharge + rechargeDuration: 5 + - type: entity parent: Crayon id: CrayonBlack From cec2fc7021b8e744ab61ef8c304156818d8174a0 Mon Sep 17 00:00:00 2001 From: opl- Date: Fri, 10 Oct 2025 22:14:22 +0200 Subject: [PATCH 12/82] Packed: Replace duplicate security camera router with sci router (#40819) On Packed: Replace duplicate security camera router with sci router Co-authored-by: opl <4833621+opl@users.noreply.github.com> --- Resources/Maps/packed.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Resources/Maps/packed.yml b/Resources/Maps/packed.yml index c371d2f04c..3f16dee262 100644 --- a/Resources/Maps/packed.yml +++ b/Resources/Maps/packed.yml @@ -85872,13 +85872,15 @@ entities: - type: Transform pos: 14.5,-17.5 parent: 2 -- proto: SurveillanceCameraRouterSecurity +- proto: SurveillanceCameraRouterScience entities: - uid: 4644 components: - type: Transform pos: 15.5,-19.5 parent: 2 +- proto: SurveillanceCameraRouterSecurity + entities: - uid: 6899 components: - type: Transform From 2ecfb9552a2f16016845845cc8c4bc9f3e019fdc Mon Sep 17 00:00:00 2001 From: Jessica M Date: Fri, 10 Oct 2025 13:17:24 -0700 Subject: [PATCH 13/82] Add variables to CluwneComponent, allowing for admeme customizing. Also localized two strings. (#40466) * Add variables to cluwne component, update to the new style, add unremovable option to setoutfit. * not nullable, shorthand * Add comments, address reviews * why, was i drunk? * Apply suggestions from code review --------- Co-authored-by: Jessica M Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> --- .../Clothing/Systems/OutfitSystem.cs | 5 +- Content.Server/Cluwne/CluwneSystem.cs | 68 ++++++++------- Content.Shared/Cluwne/CluwneComponent.cs | 84 +++++++++++++++++-- Resources/Locale/en-US/cluwne/cluwne.ftl | 2 + 4 files changed, 122 insertions(+), 37 deletions(-) diff --git a/Content.Server/Clothing/Systems/OutfitSystem.cs b/Content.Server/Clothing/Systems/OutfitSystem.cs index c3fea28bcf..c02a4f1a3b 100644 --- a/Content.Server/Clothing/Systems/OutfitSystem.cs +++ b/Content.Server/Clothing/Systems/OutfitSystem.cs @@ -4,6 +4,7 @@ using Content.Shared.Access.Components; using Content.Shared.Clothing; using Content.Shared.Hands.Components; using Content.Shared.Humanoid; +using Content.Shared.Interaction.Components; using Content.Shared.Inventory; using Content.Shared.PDA; using Content.Shared.Preferences; @@ -23,7 +24,7 @@ public sealed class OutfitSystem : EntitySystem [Dependency] private readonly InventorySystem _invSystem = default!; [Dependency] private readonly SharedStationSpawningSystem _spawningSystem = default!; - public bool SetOutfit(EntityUid target, string gear, Action? onEquipped = null) + public bool SetOutfit(EntityUid target, string gear, Action? onEquipped = null, bool unremovable = false) { if (!EntityManager.TryGetComponent(target, out InventoryComponent? inventoryComponent)) return false; @@ -60,6 +61,8 @@ public sealed class OutfitSystem : EntitySystem } _invSystem.TryEquip(target, equipmentEntity, slot.Name, silent: true, force: true, inventory: inventoryComponent); + if (unremovable) + EnsureComp(equipmentEntity); onEquipped?.Invoke(target, equipmentEntity); } diff --git a/Content.Server/Cluwne/CluwneSystem.cs b/Content.Server/Cluwne/CluwneSystem.cs index 21a15d812f..e51a01a1d4 100644 --- a/Content.Server/Cluwne/CluwneSystem.cs +++ b/Content.Server/Cluwne/CluwneSystem.cs @@ -7,7 +7,6 @@ using Content.Server.Clothing.Systems; using Content.Shared.Chat.Prototypes; using Robust.Shared.Random; using Content.Shared.Stunnable; -using Content.Shared.Damage.Prototypes; using Content.Shared.Damage; using Robust.Shared.Prototypes; using Content.Server.Emoting.Systems; @@ -21,7 +20,6 @@ namespace Content.Server.Cluwne; public sealed class CluwneSystem : EntitySystem { - private static readonly ProtoId GeneticDamageGroup = "Genetic"; [Dependency] private readonly PopupSystem _popupSystem = default!; [Dependency] private readonly SharedAudioSystem _audio = default!; @@ -48,15 +46,14 @@ public sealed class CluwneSystem : EntitySystem /// /// On death removes active comps and gives genetic damage to prevent cloning, reduce this to allow cloning. /// - private void OnMobState(EntityUid uid, CluwneComponent component, MobStateChangedEvent args) + private void OnMobState(Entity ent, ref MobStateChangedEvent args) { if (args.NewMobState == MobState.Dead) { - RemComp(uid); - RemComp(uid); - RemComp(uid); - var damageSpec = new DamageSpecifier(_prototypeManager.Index(GeneticDamageGroup), 300); - _damageableSystem.TryChangeDamage(uid, damageSpec); + RemComp(ent.Owner); + RemComp(ent.Owner); + RemComp(ent.Owner); + _damageableSystem.TryChangeDamage(ent.Owner, ent.Comp.RevertDamage); } } @@ -65,52 +62,65 @@ public sealed class CluwneSystem : EntitySystem /// /// OnStartup gives the cluwne outfit, ensures clumsy, and makes sure emote sounds are laugh. /// - private void OnComponentStartup(EntityUid uid, CluwneComponent component, ComponentStartup args) + private void OnComponentStartup(Entity ent, ref ComponentStartup args) { - if (component.EmoteSoundsId == null) + if (ent.Comp.EmoteSoundsId == null) return; - _prototypeManager.TryIndex(component.EmoteSoundsId, out EmoteSounds); - EnsureComp(uid); - _autoEmote.AddEmote(uid, "CluwneGiggle"); - EnsureComp(uid); + _prototypeManager.TryIndex(ent.Comp.EmoteSoundsId, out EmoteSounds); - _popupSystem.PopupEntity(Loc.GetString("cluwne-transform", ("target", uid)), uid, PopupType.LargeCaution); - _audio.PlayPvs(component.SpawnSound, uid); - _nameMod.RefreshNameModifiers(uid); + if (ent.Comp.RandomEmote && ent.Comp.AutoEmoteId != null) + { + EnsureComp(ent.Owner); + _autoEmote.AddEmote(ent.Owner, ent.Comp.AutoEmoteId); + } + + EnsureComp(ent.Owner); - _outfitSystem.SetOutfit(uid, "CluwneGear"); + var transformMessage = Loc.GetString(ent.Comp.TransformMessage, ("target", ent.Owner)); + + _popupSystem.PopupEntity(transformMessage, ent.Owner, PopupType.LargeCaution); + _audio.PlayPvs(ent.Comp.SpawnSound, ent.Owner); + + _nameMod.RefreshNameModifiers(ent.Owner); + + + _outfitSystem.SetOutfit(ent.Owner, ent.Comp.OutfitId, unremovable: true); } /// /// Handles the timing on autoemote as well as falling over and honking. /// - private void OnEmote(EntityUid uid, CluwneComponent component, ref EmoteEvent args) + private void OnEmote(Entity ent, ref EmoteEvent args) { if (args.Handled) return; - args.Handled = _chat.TryPlayEmoteSound(uid, EmoteSounds, args.Emote); - if (_robustRandom.Prob(component.GiggleRandomChance)) + if (!ent.Comp.RandomEmote) + return; + + args.Handled = _chat.TryPlayEmoteSound(ent.Owner, EmoteSounds, args.Emote); + + if (_robustRandom.Prob(ent.Comp.GiggleRandomChance)) { - _audio.PlayPvs(component.SpawnSound, uid); - _chat.TrySendInGameICMessage(uid, "honks", InGameICChatType.Emote, ChatTransmitRange.Normal); + _audio.PlayPvs(ent.Comp.SpawnSound, ent.Owner); + _chat.TrySendInGameICMessage(ent.Owner, Loc.GetString(ent.Comp.GiggleEmote), InGameICChatType.Emote, ChatTransmitRange.Normal); } - else if (_robustRandom.Prob(component.KnockChance)) + else if (_robustRandom.Prob(ent.Comp.KnockChance)) { - _audio.PlayPvs(component.KnockSound, uid); - _stunSystem.TryUpdateParalyzeDuration(uid, TimeSpan.FromSeconds(component.ParalyzeTime)); - _chat.TrySendInGameICMessage(uid, "spasms", InGameICChatType.Emote, ChatTransmitRange.Normal); + _audio.PlayPvs(ent.Comp.KnockSound, ent.Owner); + _stunSystem.TryUpdateParalyzeDuration(ent.Owner, TimeSpan.FromSeconds(ent.Comp.ParalyzeTime)); + _chat.TrySendInGameICMessage(ent.Owner, Loc.GetString(ent.Comp.KnockEmote), InGameICChatType.Emote, ChatTransmitRange.Normal); } } /// /// Applies "Cluwnified" prefix /// - private void OnRefreshNameModifiers(Entity entity, ref RefreshNameModifiersEvent args) + private void OnRefreshNameModifiers(Entity ent, ref RefreshNameModifiersEvent args) { - args.AddModifier("cluwne-name-prefix"); + args.AddModifier(ent.Comp.NamePrefix); } } diff --git a/Content.Shared/Cluwne/CluwneComponent.cs b/Content.Shared/Cluwne/CluwneComponent.cs index c9f96d030b..692a8ec4f9 100644 --- a/Content.Shared/Cluwne/CluwneComponent.cs +++ b/Content.Shared/Cluwne/CluwneComponent.cs @@ -1,6 +1,9 @@ using Robust.Shared.Audio; using Content.Shared.Chat.Prototypes; +using Content.Shared.Damage; +using Content.Shared.Roles; using Robust.Shared.GameStates; +using Robust.Shared.Prototypes; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; namespace Content.Shared.Cluwne; @@ -12,22 +15,74 @@ public sealed partial class CluwneComponent : Component /// /// timings for giggles and knocks. /// - [ViewVariables(VVAccess.ReadWrite)] + [DataField] public TimeSpan DamageGiggleCooldown = TimeSpan.FromSeconds(2); - [ViewVariables(VVAccess.ReadWrite)] + /// + /// Amount of genetic damage dealt when they revert + /// + [DataField] + public DamageSpecifier RevertDamage = new() + { + DamageDict = new() + { + { "Genetic", 300.0 }, + }, + }; + + /// + /// Chance that the Cluwne will be knocked over and paralyzed. + /// + [DataField] public float KnockChance = 0.05f; - [ViewVariables(VVAccess.ReadWrite)] + /// + /// Chance that the Cluwne will randomly giggle + /// + [DataField] public float GiggleRandomChance = 0.1f; - [DataField("emoteId", customTypeSerializer: typeof(PrototypeIdSerializer))] - public string? EmoteSoundsId = "Cluwne"; + /// + /// Enable random emoting? + /// + [DataField] + public bool RandomEmote = true; + + /// + /// Emote sound collection that the Cluwne should use. + /// + [DataField("emoteId")] + public ProtoId? EmoteSoundsId = "Cluwne"; + + /// + /// Emote to use for the Cluwne Giggling + /// + [DataField] + public ProtoId? AutoEmoteId = "CluwneGiggle"; + + /// + /// Message to popup when the Cluwne is transformed + /// + [DataField] + public LocId TransformMessage = "cluwne-transform"; + + /// + /// Name prefix for the Cluwne. + /// Example "Urist McHuman" will be "Cluwned Urist McHuman" + /// + [DataField] + public LocId NamePrefix = "cluwne-name-prefix"; + + /// + /// Outfit ID that the cluwne will spawn with. + /// + [DataField] + public ProtoId OutfitId = "CluwneGear"; /// /// Amount of time cluwne is paralyzed for when falling over. /// - [ViewVariables(VVAccess.ReadWrite)] + [DataField] public float ParalyzeTime = 2f; /// @@ -36,6 +91,21 @@ public sealed partial class CluwneComponent : Component [DataField("spawnsound")] public SoundSpecifier SpawnSound = new SoundPathSpecifier("/Audio/Items/bikehorn.ogg"); - [DataField("knocksound")] + /// + /// Emote to use for the cluwne giggling + /// + [DataField] + public LocId GiggleEmote = "cluwne-giggle-emote"; + + /// + /// Sound to play when the Cluwne is knocked over and paralyzed + /// + [DataField] public SoundSpecifier KnockSound = new SoundPathSpecifier("/Audio/Items/airhorn.ogg"); + + /// + /// Emote thats used when the cluwne getting knocked over + /// + [DataField] + public LocId KnockEmote = "cluwne-knock-emote"; } diff --git a/Resources/Locale/en-US/cluwne/cluwne.ftl b/Resources/Locale/en-US/cluwne/cluwne.ftl index 0ffd3f32df..e469cbfbac 100644 --- a/Resources/Locale/en-US/cluwne/cluwne.ftl +++ b/Resources/Locale/en-US/cluwne/cluwne.ftl @@ -1,2 +1,4 @@ cluwne-transform = {CAPITALIZE(THE($target))} turned into a cluwne! cluwne-name-prefix = cluwnified {$baseName} +cluwne-knock-emote = spasms +cluwne-giggle-emote = honks From a058921b4db31fe7de6140e095362edbd7ed7312 Mon Sep 17 00:00:00 2001 From: opl- Date: Fri, 10 Oct 2025 22:21:51 +0200 Subject: [PATCH 14/82] Packed: Fix brig Megaseed vending machine is locked (#40821) Co-authored-by: opl <4833621+opl@users.noreply.github.com> --- Resources/Maps/packed.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Resources/Maps/packed.yml b/Resources/Maps/packed.yml index 3f16dee262..9ad708002b 100644 --- a/Resources/Maps/packed.yml +++ b/Resources/Maps/packed.yml @@ -88827,6 +88827,8 @@ entities: - type: Transform pos: 43.5,-4.5 parent: 2 +- proto: VendingMachineSeedsUnlocked + entities: - uid: 7681 components: - type: Transform From a9dcfcb9fb5d5b1667c5f10a03b53cd0e13f9d3e Mon Sep 17 00:00:00 2001 From: PJBot Date: Fri, 10 Oct 2025 20:34:15 +0000 Subject: [PATCH 15/82] Automatic changelog update --- Resources/Changelog/Maps.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Resources/Changelog/Maps.yml b/Resources/Changelog/Maps.yml index 3eb8884988..0c8783e4a5 100644 --- a/Resources/Changelog/Maps.yml +++ b/Resources/Changelog/Maps.yml @@ -771,4 +771,11 @@ id: 93 time: '2025-10-10T01:11:33.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/40794 +- author: opl + changes: + - message: On Packed, prisoners can now use the Megaseed in brig. + type: Fix + id: 94 + time: '2025-10-10T20:33:03.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/40821 Order: 1 From 74ebe585fa4ab51bca3ea5fb28495e1055030fd9 Mon Sep 17 00:00:00 2001 From: opl- Date: Fri, 10 Oct 2025 22:25:15 +0200 Subject: [PATCH 16/82] Packed: Add missing station beacons (#40817) On Packed: Add missing station beacons Co-authored-by: opl <4833621+opl@users.noreply.github.com> --- Resources/Maps/packed.yml | 98 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 98 insertions(+) diff --git a/Resources/Maps/packed.yml b/Resources/Maps/packed.yml index 9ad708002b..d15f3f7aab 100644 --- a/Resources/Maps/packed.yml +++ b/Resources/Maps/packed.yml @@ -42804,7 +42804,21 @@ entities: rot: 3.141592653589793 rad pos: 11.493689,4.5440345 parent: 2 +- proto: DefaultStationBeaconAI + entities: + - uid: 15919 + components: + - type: Transform + pos: 73.5,23.5 + parent: 2 - proto: DefaultStationBeaconAICore + entities: + - uid: 15916 + components: + - type: Transform + pos: 95.5,30.5 + parent: 2 +- proto: DefaultStationBeaconAIUpload entities: - uid: 14515 components: @@ -42818,6 +42832,13 @@ entities: - type: Transform pos: 31.5,-40.5 parent: 2 +- proto: DefaultStationBeaconAnchor + entities: + - uid: 15922 + components: + - type: Transform + pos: 6.5,-21.5 + parent: 2 - proto: DefaultStationBeaconAnomalyGenerator entities: - uid: 8139 @@ -42825,6 +42846,13 @@ entities: - type: Transform pos: 68.5,15.5 parent: 2 +- proto: DefaultStationBeaconArmory + entities: + - uid: 15787 + components: + - type: Transform + pos: 41.5,34.5 + parent: 2 - proto: DefaultStationBeaconArrivals entities: - uid: 14028 @@ -42951,6 +42979,20 @@ entities: - type: Transform pos: 0.5,-30.5 parent: 2 +- proto: DefaultStationBeaconDorms + entities: + - uid: 15912 + components: + - type: Transform + pos: 15.5,14.5 + parent: 2 +- proto: DefaultStationBeaconEngineering + entities: + - uid: 15913 + components: + - type: Transform + pos: 18.5,-25.5 + parent: 2 - proto: DefaultStationBeaconEscapePodE entities: - uid: 2949 @@ -42986,6 +43028,13 @@ entities: - type: Transform pos: 9.5,-6.5 parent: 2 +- proto: DefaultStationBeaconGravGen + entities: + - uid: 15910 + components: + - type: Transform + pos: 14.5,38.5 + parent: 2 - proto: DefaultStationBeaconHOPOffice entities: - uid: 13131 @@ -42993,6 +43042,13 @@ entities: - type: Transform pos: 17.5,-4.5 parent: 2 +- proto: DefaultStationBeaconHOSRoom + entities: + - uid: 15907 + components: + - type: Transform + pos: 48.5,39.5 + parent: 2 - proto: DefaultStationBeaconJanitorsCloset entities: - uid: 13133 @@ -43021,6 +43077,13 @@ entities: - type: Transform pos: 10.5,5.5 parent: 2 +- proto: DefaultStationBeaconMedical + entities: + - uid: 15914 + components: + - type: Transform + pos: 51.5,3.5 + parent: 2 - proto: DefaultStationBeaconMorgue entities: - uid: 13137 @@ -43028,6 +43091,13 @@ entities: - type: Transform pos: 70.5,-3.5 parent: 2 +- proto: DefaultStationBeaconPermaBrig + entities: + - uid: 15911 + components: + - type: Transform + pos: 34.5,20.5 + parent: 2 - proto: DefaultStationBeaconPowerBank entities: - uid: 13139 @@ -43070,6 +43140,20 @@ entities: - type: Transform pos: 7.5,33.5 parent: 2 +- proto: DefaultStationBeaconSecurity + entities: + - uid: 15908 + components: + - type: Transform + pos: 33.5,29.5 + parent: 2 +- proto: DefaultStationBeaconSecurityCheckpoint + entities: + - uid: 15915 + components: + - type: Transform + pos: -1.5,-3.5 + parent: 2 - proto: DefaultStationBeaconServerRoom entities: - uid: 13172 @@ -43098,6 +43182,13 @@ entities: - type: Transform pos: 3.5,-35.5 parent: 2 +- proto: DefaultStationBeaconSurgery + entities: + - uid: 15920 + components: + - type: Transform + pos: 65.5,-5.5 + parent: 2 - proto: DefaultStationBeaconTechVault entities: - uid: 13175 @@ -43133,6 +43224,13 @@ entities: - type: Transform pos: 18.5,41.5 parent: 2 +- proto: DefaultStationBeaconWardensOffice + entities: + - uid: 15909 + components: + - type: Transform + pos: 42.5,25.5 + parent: 2 - proto: Defibrillator entities: - uid: 11416 From a384640eea9ecc160f8700b896b03739c9070712 Mon Sep 17 00:00:00 2001 From: Connor Huffine Date: Fri, 10 Oct 2025 16:49:21 -0400 Subject: [PATCH 17/82] Ninja Bomb Blacklisting: Map Updates (#40727) Update Maps --- Resources/Maps/exo.yml | 13 ----- Resources/Maps/saltern.yml | 107 ------------------------------------- 2 files changed, 120 deletions(-) diff --git a/Resources/Maps/exo.yml b/Resources/Maps/exo.yml index 58d864740a..b357069817 100644 --- a/Resources/Maps/exo.yml +++ b/Resources/Maps/exo.yml @@ -47101,7 +47101,6 @@ entities: - type: Transform pos: -20.5,-25.5 parent: 2 - - type: BombingTarget - proto: DefaultStationBeaconAtmospherics entities: - uid: 16227 @@ -47130,7 +47129,6 @@ entities: - type: Transform pos: -48.5,-45.5 parent: 2 - - type: BombingTarget - proto: DefaultStationBeaconBrigMed entities: - uid: 18105 @@ -47145,7 +47143,6 @@ entities: - type: Transform pos: -42.5,-54.5 parent: 2 - - type: BombingTarget - proto: DefaultStationBeaconCargoBay entities: - uid: 16244 @@ -47153,7 +47150,6 @@ entities: - type: Transform pos: 24.5,-97.5 parent: 2 - - type: BombingTarget - proto: DefaultStationBeaconCargoReception entities: - uid: 16243 @@ -47182,7 +47178,6 @@ entities: - type: Transform pos: 19.5,-72.5 parent: 2 - - type: BombingTarget - proto: DefaultStationBeaconCMORoom entities: - uid: 16267 @@ -47190,7 +47185,6 @@ entities: - type: Transform pos: 11.5,-16.5 parent: 2 - - type: BombingTarget - proto: DefaultStationBeaconCryosleep entities: - uid: 16223 @@ -47277,7 +47271,6 @@ entities: - type: Transform pos: 14.5,-59.5 parent: 2 - - type: BombingTarget - proto: DefaultStationBeaconHOSRoom entities: - uid: 18071 @@ -47292,7 +47285,6 @@ entities: - type: Transform pos: -8.5,-51.5 parent: 2 - - type: BombingTarget - proto: DefaultStationBeaconKitchen entities: - uid: 16228 @@ -47321,7 +47313,6 @@ entities: - type: Transform pos: 14.5,-29.5 parent: 2 - - type: BombingTarget - proto: DefaultStationBeaconMorgue entities: - uid: 8744 @@ -47336,7 +47327,6 @@ entities: - type: Transform pos: 46.5,-17.5 parent: 2 - - type: BombingTarget - type: NavMapBeacon defaultText: Genpop - proto: DefaultStationBeaconPowerBank @@ -47353,7 +47343,6 @@ entities: - type: Transform pos: 9.5,-88.5 parent: 2 - - type: BombingTarget - proto: DefaultStationBeaconRDRoom entities: - uid: 5092 @@ -47382,7 +47371,6 @@ entities: - type: Transform pos: -6.5,-21.5 parent: 2 - - type: BombingTarget - proto: DefaultStationBeaconSecurity entities: - uid: 18001 @@ -47411,7 +47399,6 @@ entities: - type: Transform pos: -23.5,-71.5 parent: 2 - - type: BombingTarget - proto: DefaultStationBeaconSolarsE entities: - uid: 8642 diff --git a/Resources/Maps/saltern.yml b/Resources/Maps/saltern.yml index 58400ac0fe..1e33a9d347 100644 --- a/Resources/Maps/saltern.yml +++ b/Resources/Maps/saltern.yml @@ -69413,113 +69413,6 @@ entities: parent: 31 - type: WarpPoint location: library -- proto: WarpPointBombing - entities: - - uid: 934 - components: - - type: Transform - pos: -36.5,14.5 - parent: 31 - - type: WarpPoint - location: chapel - - uid: 2142 - components: - - type: Transform - pos: 8.5,19.5 - parent: 31 - - type: WarpPoint - location: hop's office - - uid: 4910 - components: - - type: Transform - pos: 9.5,-9.5 - parent: 31 - - type: WarpPoint - location: medbay - - uid: 7261 - components: - - type: Transform - pos: 16.5,-0.5 - parent: 31 - - type: WarpPoint - location: chemistry - - uid: 7262 - components: - - type: Transform - pos: 13.5,-15.5 - parent: 31 - - type: WarpPoint - location: morgue - - uid: 9712 - components: - - type: Transform - pos: -12.5,19.5 - parent: 31 - - type: WarpPoint - location: armory - - uid: 10539 - components: - - type: Transform - pos: -9.5,-20.5 - parent: 31 - - type: WarpPoint - location: science - - uid: 11267 - components: - - type: Transform - pos: 8.5,25.5 - parent: 31 - - type: WarpPoint - location: captain's quarters - - uid: 11308 - components: - - type: Transform - pos: 3.5,30.5 - parent: 31 - - type: WarpPoint - location: bridge - - uid: 11309 - components: - - type: Transform - pos: -1.5,17.5 - parent: 31 - - type: WarpPoint - location: vault - - uid: 11310 - components: - - type: Transform - pos: 8.5,9.5 - parent: 31 - - type: WarpPoint - location: eva room - - uid: 11311 - components: - - type: Transform - pos: 58.5,2.5 - parent: 31 - - type: WarpPoint - location: particle accelerator - - uid: 11313 - components: - - type: Transform - pos: 34.5,14.5 - parent: 31 - - type: WarpPoint - location: atmospherics - - uid: 11322 - components: - - type: Transform - pos: 27.5,18.5 - parent: 31 - - type: WarpPoint - location: salvage - - uid: 11359 - components: - - type: Transform - pos: 50.5,-5.5 - parent: 31 - - type: WarpPoint - location: telecomms - proto: WaterCooler entities: - uid: 1156 From 52139b5cc5504e2e96f239993f2dd425094ded21 Mon Sep 17 00:00:00 2001 From: MilenVolf <63782763+MilenVolf@users.noreply.github.com> Date: Sat, 11 Oct 2025 00:16:48 +0300 Subject: [PATCH 18/82] Fix glassbox prototypes (#40667) * Fix glassbox prototypes and its construction ghost exception * Oops --- .../Entities/Structures/Storage/glass_box.yml | 24 +++++++++---------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/Resources/Prototypes/Entities/Structures/Storage/glass_box.yml b/Resources/Prototypes/Entities/Structures/Storage/glass_box.yml index 0cc93a4fcf..f1ce706847 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/glass_box.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/glass_box.yml @@ -1,8 +1,11 @@ - type: entity - parent: [BaseStructureDynamic, BaseItemCabinetGlass] + parent: BaseStructureDynamic id: BaseGlassBox abstract: true components: + - type: Sprite + noRot: true + sprite: Structures/Storage/glassbox.rsi - type: Transform anchored: true - type: Physics @@ -24,20 +27,18 @@ delay: 4 - type: entity + parent: [BaseGlassBox, BaseItemCabinetGlass] id: GlassBox name: glass box description: A sturdy showcase for an expensive exhibit. - parent: BaseGlassBox abstract: true # TODO: Temporarily abstract. Remove it after item scaling in cabinets is implemented. components: - type: Sprite - noRot: true - sprite: Structures/Storage/glassbox.rsi layers: - state: base - state: caplaser # TODO: Remove it after item scaling in cabinets is implemented. map: ["enum.ItemCabinetVisuals.Layer"] - visible: true + visible: false - state: glass map: ["enum.OpenableVisuals.Layer"] - state: locked @@ -116,8 +117,8 @@ acts: [ "Destruction" ] - type: entity - id: GlassBoxLaser parent: GlassBox + id: GlassBoxLaser suffix: AntiqueLaser components: - type: AccessReader @@ -135,8 +136,8 @@ ejectSound: /Audio/Machines/machine_switch.ogg - type: entity - id: GlassBoxLaserOpen parent: GlassBoxLaser + id: GlassBoxLaserOpen suffix: AntiqueLaser, Open components: - type: Openable @@ -145,8 +146,8 @@ locked: false - type: entity - id: GlassBoxLaserFilled parent: GlassBoxLaser + id: GlassBoxLaserFilled suffix: AntiqueLaser, Filled components: - type: ContainerFill @@ -160,15 +161,13 @@ suffix: AntiqueLaser, Filled, Open - type: entity + parent: BaseGlassBox id: GlassBoxFrame name: glass box frame description: A glassless sturdy showcase for an expensive exhibit. - parent: BaseGlassBox suffix: Frame components: - type: Sprite - noRot: true - sprite: Structures/Storage/glassbox.rsi layers: - state: base - type: Construction @@ -204,14 +203,13 @@ acts: ["Destruction"] - type: entity + parent: GlassBoxFrame id: GlassBoxBroken name: broken glass box description: A broken showcase for a stolen expensive exhibit. - parent: GlassBoxFrame suffix: Broken components: - type: Sprite - sprite: Structures/Storage/glassbox.rsi layers: - state: base - state: glass-broken From ecc0aaaa9fe22d8e1cf9d38748c8f8373540f1bc Mon Sep 17 00:00:00 2001 From: Connor Huffine Date: Fri, 10 Oct 2025 17:16:50 -0400 Subject: [PATCH 19/82] Ninja Bomb Blacklisting (#40726) * Ninja Bombing moved to blacklist * Added blocker to "Solars" Solars is too generic for a named bombing target. * Change to AllEntityQuery More clear intent * Update migration.yml Add migration to 'null' for removed WarpPointBombing entity * Update NinjaConditionsSystem.cs Undo some tidying * Changed to tag Ninja blocking component is now a tag instead of a new component * Update NinjaConditionsSystem.cs detidying * Update NinjaConditionsSystem.cs Change to efficient enumerator * Move blacklist to component Moved blacklist to spidercharge component * Update migration.yml fixed component reference * Update migration.yml Fixes Saltern. Exo is more complicated. --------- Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com> --- .../SpiderChargeConditionComponent.cs | 8 +++++++ .../Systems/NinjaConditionsSystem.cs | 12 +++++++---- .../Components/BombingTargetComponent.cs | 7 ------- .../Entities/Markers/warp_point.yml | 21 ------------------- .../Objects/Devices/station_beacon.yml | 9 ++++++++ Resources/Prototypes/Objectives/ninja.yml | 4 ++++ Resources/Prototypes/tags.yml | 2 ++ Resources/migration.yml | 4 +++- 8 files changed, 34 insertions(+), 33 deletions(-) delete mode 100644 Content.Shared/Ninja/Components/BombingTargetComponent.cs diff --git a/Content.Server/Objectives/Components/SpiderChargeConditionComponent.cs b/Content.Server/Objectives/Components/SpiderChargeConditionComponent.cs index 9983b35969..d6309ccdd3 100644 --- a/Content.Server/Objectives/Components/SpiderChargeConditionComponent.cs +++ b/Content.Server/Objectives/Components/SpiderChargeConditionComponent.cs @@ -1,5 +1,6 @@ using Content.Server.Ninja.Systems; using Content.Server.Objectives.Systems; +using Content.Shared.Whitelist; namespace Content.Server.Objectives.Components; @@ -14,4 +15,11 @@ public sealed partial class SpiderChargeConditionComponent : Component /// [DataField, ViewVariables(VVAccess.ReadWrite)] public EntityUid? Target; + + /// + /// Tags that should be used to exclude Warp Points + /// from the list of valid bombing targets + /// + [DataField] + public EntityWhitelist? Blacklist; } diff --git a/Content.Server/Objectives/Systems/NinjaConditionsSystem.cs b/Content.Server/Objectives/Systems/NinjaConditionsSystem.cs index db78816503..4c19a64ab1 100644 --- a/Content.Server/Objectives/Systems/NinjaConditionsSystem.cs +++ b/Content.Server/Objectives/Systems/NinjaConditionsSystem.cs @@ -1,9 +1,9 @@ using Content.Server.Objectives.Components; using Content.Shared.Objectives.Components; -using Content.Shared.Ninja.Components; using Content.Shared.Roles; using Content.Shared.Roles.Components; using Content.Shared.Warps; +using Content.Shared.Whitelist; using Robust.Shared.Random; namespace Content.Server.Objectives.Systems; @@ -14,6 +14,7 @@ namespace Content.Server.Objectives.Systems; /// public sealed class NinjaConditionsSystem : EntitySystem { + [Dependency] private readonly EntityWhitelistSystem _whitelist = default!; [Dependency] private readonly MetaDataSystem _metaData = default!; [Dependency] private readonly NumberObjectiveSystem _number = default!; [Dependency] private readonly IRobustRandom _random = default!; @@ -53,10 +54,13 @@ public sealed class NinjaConditionsSystem : EntitySystem // choose spider charge detonation point var warps = new List(); - var query = EntityQueryEnumerator(); - while (query.MoveNext(out var warpUid, out _, out var warp)) + var allEnts = EntityQueryEnumerator(); + var bombingBlacklist = comp.Blacklist; + + while (allEnts.MoveNext(out var warpUid, out var warp)) { - if (warp.Location != null) + if (_whitelist.IsBlacklistFail(bombingBlacklist, warpUid) + && !string.IsNullOrWhiteSpace(warp.Location)) { warps.Add(warpUid); } diff --git a/Content.Shared/Ninja/Components/BombingTargetComponent.cs b/Content.Shared/Ninja/Components/BombingTargetComponent.cs deleted file mode 100644 index c429eb6880..0000000000 --- a/Content.Shared/Ninja/Components/BombingTargetComponent.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace Content.Shared.Ninja.Components; - -/// -/// Makes this warp point a valid bombing target for ninja's spider charge. -/// -[RegisterComponent] -public sealed partial class BombingTargetComponent : Component; diff --git a/Resources/Prototypes/Entities/Markers/warp_point.yml b/Resources/Prototypes/Entities/Markers/warp_point.yml index 675938c09b..4616d1535a 100644 --- a/Resources/Prototypes/Entities/Markers/warp_point.yml +++ b/Resources/Prototypes/Entities/Markers/warp_point.yml @@ -31,24 +31,3 @@ - GhostOnlyWarp - type: Sprite state: pink - -- type: entity - parent: WarpPoint - id: WarpPointBombing - name: warp point - suffix: ninja bombing target - components: - - type: BombingTarget - - type: Tag - tags: - - GhostOnlyWarp - - type: WarpPoint - location: bombing target - blacklist: - tags: - - GhostOnlyWarp - - type: Sprite - layers: - - state: pink - - sprite: Objects/Weapons/Bombs/spidercharge.rsi - state: icon diff --git a/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml b/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml index 870e66654f..ff6d5a6a4a 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml @@ -455,6 +455,9 @@ components: - type: NavMapBeacon defaultText: station-beacon-solars + - type: Tag + tags: + - NinjaBombingTargetBlocker - type: entity parent: DefaultStationBeaconEngineering @@ -673,6 +676,9 @@ components: - type: NavMapBeacon defaultText: station-beacon-arrivals + - type: Tag + tags: + - NinjaBombingTargetBlocker - type: entity parent: DefaultStationBeacon @@ -761,6 +767,9 @@ components: - type: NavMapBeacon defaultText: station-beacon-cryosleep + - type: Tag + tags: + - NinjaBombingTargetBlocker - type: entity parent: DefaultStationBeacon diff --git a/Resources/Prototypes/Objectives/ninja.yml b/Resources/Prototypes/Objectives/ninja.yml index 76d74876b0..f015dd8f72 100644 --- a/Resources/Prototypes/Objectives/ninja.yml +++ b/Resources/Prototypes/Objectives/ninja.yml @@ -51,6 +51,10 @@ sprite: Objects/Weapons/Bombs/spidercharge.rsi state: icon - type: SpiderChargeCondition + blacklist: + tags: + - GhostOnlyWarp + - NinjaBombingTargetBlocker - type: entity parent: [BaseNinjaObjective, BaseSurviveObjective] diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index 4f6c018f23..08539f50cf 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -1024,6 +1024,8 @@ id: Mushroom ## N ## +- type: Tag + id: NinjaBombingTargetBlocker # Ninjas will not target this warp point - type: Tag id: NoBlockAnchoring diff --git a/Resources/migration.yml b/Resources/migration.yml index d05795def4..bbf331d5b6 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -726,5 +726,7 @@ PrefilledSyringe: Syringe BibleTanakh: null BibleSatanic: null -# 2025-10-8 + +# 2025-10-08 ClothingBeltAssault: ClothingBeltMilitaryWebbing +WarpPointBombing: null From e35624d1f1a60849776fb2b8be126dbabcc74ecc Mon Sep 17 00:00:00 2001 From: PJBot Date: Fri, 10 Oct 2025 21:28:45 +0000 Subject: [PATCH 20/82] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index bc5e811a0c..1eedc0f152 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: K-Dynamic - changes: - - message: Shutters and blast doors now appear welded when welded. - type: Fix - id: 8562 - time: '2025-05-25T15:57:18.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/37807 - author: Stop-Signs changes: - message: Meals now better reflect the amount of ingredients put into them. @@ -3948,3 +3941,10 @@ id: 9064 time: '2025-10-10T12:41:57.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/40343 +- author: kontakt + changes: + - message: Ninjas can now have a bombing target at any warp point. + type: Tweak + id: 9065 + time: '2025-10-10T21:27:36.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/40726 From 9ae4068432a432e34a23edc58a68a3dceaee30e2 Mon Sep 17 00:00:00 2001 From: slarticodefast <161409025+slarticodefast@users.noreply.github.com> Date: Fri, 10 Oct 2025 23:43:18 +0200 Subject: [PATCH 21/82] add event to dna scrambling (#39862) add event --- .../Trigger/Systems/DnaScrambleOnTriggerSystem.cs | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Content.Shared/Trigger/Systems/DnaScrambleOnTriggerSystem.cs b/Content.Shared/Trigger/Systems/DnaScrambleOnTriggerSystem.cs index db27bd7f74..af5a73ffb6 100644 --- a/Content.Shared/Trigger/Systems/DnaScrambleOnTriggerSystem.cs +++ b/Content.Shared/Trigger/Systems/DnaScrambleOnTriggerSystem.cs @@ -58,5 +58,17 @@ public sealed class DnaScrambleOnTriggerSystem : EntitySystem // Can't use PopupClient or PopupPredicted because the trigger might be unpredicted. _popup.PopupEntity(Loc.GetString("scramble-on-trigger-popup"), target.Value, target.Value); + + var ev = new DnaScrambledEvent(target.Value); + RaiseLocalEvent(target.Value, ref ev, true); } } + +/// +/// Raised after an entity has been DNA Scrambled. +/// Useful for forks that need to run their own updates here. +/// +/// The entity that had its DNA scrambled. + +[ByRefEvent] +public record struct DnaScrambledEvent(EntityUid Target); From dca80238f0df3b7fb7e50870e84505ff0e1d8989 Mon Sep 17 00:00:00 2001 From: Pok <113675512+Pok27@users.noreply.github.com> Date: Sat, 11 Oct 2025 00:57:38 +0300 Subject: [PATCH 22/82] Attempt to fix all unlocalized lines (#40284) * missing-localization * cmd * fix: fixed patron page throwing exception due to unexpected patron tier in yaml * Revert "fix: fixed patron page throwing exception due to unexpected patron tier in yaml" This reverts commit 28458c78b1f2eed30fda898ec26059b27f1766f1. * review and update * no cmd * fix * fix 99 --------- Co-authored-by: pa.pecherskij --- .../UI/BanPanel/BanPanel.xaml.cs | 4 +- .../Administration/UI/Logs/AdminLogsEui.cs | 2 +- Content.Client/Credits/CreditsWindow.xaml.cs | 4 +- .../CriminalRecordsConsoleWindow.xaml | 2 +- .../HumanoidMarkingModifierWindow.xaml | 6 +- .../HumanoidMarkingModifierWindow.xaml.cs | 6 +- .../CrewMonitoringNavMapControl.cs | 2 +- .../CrewMonitoring/CrewMonitoringWindow.xaml | 12 +-- .../CrewMonitoringWindow.xaml.cs | 2 +- Content.Client/NPC/NPCWindow.xaml | 18 ++-- .../Pinpointer/UI/StationMapWindow.xaml | 2 +- Content.Client/UserInterface/StatValuesEui.cs | 2 +- .../Systems/Bwoink/AHelpUIController.cs | 2 +- .../Controls/Roles/MakeGhostRoleWindow.xaml | 22 ++--- .../Roles/MakeGhostRoleWindow.xaml.cs | 8 +- .../Systems/Storage/Controls/StorageWindow.cs | 2 +- .../Systems/AdminVerbSystem.Tools.cs | 82 +++++++++---------- .../en-US/administration/admin-verbs.ftl | 45 ++++++++++ .../Locale/en-US/administration/bwoink.ftl | 1 + .../en-US/components/storage-component.ftl | 1 + .../Locale/en-US/credits/credits-window.ftl | 2 + .../Locale/en-US/ghost/make-ghost-gui.ftl | 21 +++++ Resources/Locale/en-US/info/ban.ftl | 1 + .../components/crew-monitoring-component.ftl | 23 ++---- .../en-US/navmap-beacons/station_map.ftl | 1 + Resources/Locale/en-US/npc/npc-debug.ftl | 11 +++ .../en-US/preferences/ui/markings-picker.ftl | 6 ++ Resources/Locale/en-US/ui/navmap.ftl | 1 + Resources/Locale/en-US/ui/stat-values.ftl | 1 + 29 files changed, 188 insertions(+), 104 deletions(-) create mode 100644 Resources/Locale/en-US/ghost/make-ghost-gui.ftl create mode 100644 Resources/Locale/en-US/npc/npc-debug.ftl create mode 100644 Resources/Locale/en-US/ui/stat-values.ftl diff --git a/Content.Client/Administration/UI/BanPanel/BanPanel.xaml.cs b/Content.Client/Administration/UI/BanPanel/BanPanel.xaml.cs index d20c741673..7566942506 100644 --- a/Content.Client/Administration/UI/BanPanel/BanPanel.xaml.cs +++ b/Content.Client/Administration/UI/BanPanel/BanPanel.xaml.cs @@ -226,7 +226,7 @@ public sealed partial class BanPanel : DefaultWindow var roleGroupCheckbox = new Button { Name = $"{groupName}GroupCheckbox", - Text = "Ban all", + Text = Loc.GetString("role-bans-ban-group"), Margin = new Thickness(0, 0, 5, 0), ToggleMode = true, }; @@ -391,7 +391,7 @@ public sealed partial class BanPanel : DefaultWindow TimeLine.Text = args.Text; if (!double.TryParse(args.Text, out var result)) { - ExpiresLabel.Text = "err"; + ExpiresLabel.Text = Loc.GetString("ban-panel-expiry-error"); ErrorLevel |= ErrorLevelEnum.Minutes; TimeLine.ModulateSelfOverride = Color.Red; UpdateSubmitEnabled(); diff --git a/Content.Client/Administration/UI/Logs/AdminLogsEui.cs b/Content.Client/Administration/UI/Logs/AdminLogsEui.cs index 1544b827ae..28aca23f75 100644 --- a/Content.Client/Administration/UI/Logs/AdminLogsEui.cs +++ b/Content.Client/Administration/UI/Logs/AdminLogsEui.cs @@ -166,7 +166,7 @@ public sealed class AdminLogsEui : BaseEui ClydeWindow = _clyde.CreateWindow(new WindowCreateParameters { Maximized = false, - Title = "Admin Logs", + Title = Loc.GetString("admin-logs-title"), Monitor = monitor, Width = 1100, Height = 400 diff --git a/Content.Client/Credits/CreditsWindow.xaml.cs b/Content.Client/Credits/CreditsWindow.xaml.cs index 050d801170..6035bcc2bd 100644 --- a/Content.Client/Credits/CreditsWindow.xaml.cs +++ b/Content.Client/Credits/CreditsWindow.xaml.cs @@ -100,11 +100,11 @@ public sealed partial class CreditsWindow : DefaultWindow var container = new BoxContainer { Orientation = LayoutOrientation.Horizontal }; - var previousPageButton = new Button { Text = "Previous Page" }; + var previousPageButton = new Button { Text = Loc.GetString("credits-window-previous-page-button") }; previousPageButton.OnPressed += _ => PopulateAttributions(attributionsContainer, count - AttributionsSourcesPerPage); - var nextPageButton = new Button { Text = "Next Page" }; + var nextPageButton = new Button { Text = Loc.GetString("credits-window-next-page-button") }; nextPageButton.OnPressed += _ => PopulateAttributions(attributionsContainer, count + AttributionsSourcesPerPage); diff --git a/Content.Client/CriminalRecords/CriminalRecordsConsoleWindow.xaml b/Content.Client/CriminalRecords/CriminalRecordsConsoleWindow.xaml index 179304a978..f88fa07f5a 100644 --- a/Content.Client/CriminalRecords/CriminalRecordsConsoleWindow.xaml +++ b/Content.Client/CriminalRecords/CriminalRecordsConsoleWindow.xaml @@ -58,7 +58,7 @@ StyleClasses="LabelBig" /> -