diff --git a/Content.Server/Chemistry/EntitySystems/InjectorSystem.cs b/Content.Server/Chemistry/EntitySystems/InjectorSystem.cs index 54c3fd576f..d94faa8123 100644 --- a/Content.Server/Chemistry/EntitySystems/InjectorSystem.cs +++ b/Content.Server/Chemistry/EntitySystems/InjectorSystem.cs @@ -203,9 +203,9 @@ public sealed class InjectorSystem : SharedInjectorSystem BreakOnMove = true, BreakOnWeightlessMove = false, BreakOnDamage = true, - NeedHand = true, - BreakOnHandChange = true, - MovementThreshold = 0.1f, + NeedHand = injector.Comp.NeedHand, + BreakOnHandChange = injector.Comp.BreakOnHandChange, + MovementThreshold = injector.Comp.MovementThreshold, }); } diff --git a/Content.Shared/Chemistry/Components/InjectorComponent.cs b/Content.Shared/Chemistry/Components/InjectorComponent.cs index aec6834063..1f2716356c 100644 --- a/Content.Shared/Chemistry/Components/InjectorComponent.cs +++ b/Content.Shared/Chemistry/Components/InjectorComponent.cs @@ -87,6 +87,22 @@ public sealed partial class InjectorComponent : Component [AutoNetworkedField] [DataField] public InjectorToggleMode ToggleState = InjectorToggleMode.Draw; + + #region Arguments for injection doafter + + /// + [DataField] + public bool NeedHand = true; + + /// + [DataField] + public bool BreakOnHandChange = true; + + /// + [DataField] + public float MovementThreshold = 0.1f; + + #endregion } /// diff --git a/Content.Shared/Teleportation/Systems/SwapTeleporterSystem.cs b/Content.Shared/Teleportation/Systems/SwapTeleporterSystem.cs index 15807794c3..3852f260f7 100644 --- a/Content.Shared/Teleportation/Systems/SwapTeleporterSystem.cs +++ b/Content.Shared/Teleportation/Systems/SwapTeleporterSystem.cs @@ -45,7 +45,7 @@ public sealed class SwapTeleporterSystem : EntitySystem private void OnInteract(Entity ent, ref AfterInteractEvent args) { var (uid, comp) = ent; - if (args.Target == null) + if (args.Target == null || !args.CanReach) return; var target = args.Target.Value; diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 4d2beb2aac..76058bdc1a 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Piksqu & Boaz1111 - changes: - - message: Added the hyperconvection circuit imprinter - type: Add - id: 6477 - time: '2024-04-28T05:49:03.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27283 - author: exincore changes: - message: Fax machines now copy the labels attached to papers. @@ -3780,3 +3773,10 @@ id: 6976 time: '2024-07-24T08:57:03.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30313 +- author: Cojoke-dot + changes: + - message: Fix infinite QSI linking range + type: Fix + id: 6977 + time: '2024-07-24T20:57:45.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30332 diff --git a/Resources/Maps/atlas.yml b/Resources/Maps/atlas.yml index e376a1a91e..7bb91cde06 100644 --- a/Resources/Maps/atlas.yml +++ b/Resources/Maps/atlas.yml @@ -2921,6 +2921,9 @@ entities: - type: DeviceList devices: - 5914 + - 1087 + - 6891 + - 6173 - uid: 1948 components: - type: Transform @@ -2930,6 +2933,7 @@ entities: - type: DeviceList devices: - 6719 + - 7056 - uid: 1949 components: - type: Transform @@ -3031,6 +3035,9 @@ entities: devices: - 6799 - 7235 + - 7798 + - 8673 + - 8508 - uid: 6648 components: - type: Transform @@ -3045,6 +3052,7 @@ entities: - 3817 - 3815 - 7599 + - 929 - uid: 7372 components: - type: Transform @@ -3060,6 +3068,11 @@ entities: - 3771 - 2164 - 2131 + - 4537 + - 8468 + - 2085 + - 819 + - 820 - uid: 7532 components: - type: Transform @@ -3342,6 +3355,15 @@ entities: - type: DeviceList devices: - 8623 + - uid: 8680 + components: + - type: Transform + pos: 1.5,8.5 + parent: 30 + - type: DeviceList + devices: + - 8668 + - 8669 - proto: AirCanister entities: - uid: 5877 @@ -4717,6 +4739,11 @@ entities: rot: 3.141592653589793 rad pos: 22.5,34.5 parent: 30 + - uid: 2442 + components: + - type: Transform + pos: -15.5,4.5 + parent: 30 - uid: 6874 components: - type: Transform @@ -4767,13 +4794,6 @@ entities: rot: 3.141592653589793 rad pos: 7.5,30.5 parent: 30 -- proto: AtmosDeviceFanTiny - entities: - - uid: 2442 - components: - - type: Transform - pos: -15.5,4.5 - parent: 30 - proto: AtmosFixBlockerMarker entities: - uid: 4894 @@ -24027,12 +24047,18 @@ entities: rot: 3.141592653589793 rad pos: -40.5,-0.5 parent: 30 + - type: DeviceNetwork + deviceLists: + - 1947 - uid: 6891 components: - type: Transform rot: 3.141592653589793 rad pos: -40.5,0.5 parent: 30 + - type: DeviceNetwork + deviceLists: + - 1947 - uid: 7205 components: - type: Transform @@ -34907,6 +34933,9 @@ entities: rot: -1.5707963267948966 rad pos: 15.5,5.5 parent: 30 + - type: DeviceNetwork + deviceLists: + - 7372 - type: AtmosPipeColor color: '#0055CCFF' - uid: 1087 @@ -34915,6 +34944,9 @@ entities: rot: -1.5707963267948966 rad pos: -38.5,5.5 parent: 30 + - type: DeviceNetwork + deviceLists: + - 1947 - type: AtmosPipeColor color: '#0055CCFF' - uid: 1146 @@ -35236,6 +35268,9 @@ entities: rot: 1.5707963267948966 rad pos: 6.5,17.5 parent: 30 + - type: DeviceNetwork + deviceLists: + - 7372 - type: AtmosPipeColor color: '#0055CCFF' - uid: 4548 @@ -35511,6 +35546,9 @@ entities: rot: 3.141592653589793 rad pos: -61.5,-1.5 parent: 30 + - type: DeviceNetwork + deviceLists: + - 6101 - type: AtmosPipeColor color: '#0055CCFF' - uid: 8226 @@ -35536,11 +35574,23 @@ entities: parent: 30 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 8508 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -62.5,1.5 + parent: 30 + - type: DeviceNetwork + deviceLists: + - 6101 - uid: 8669 components: - type: Transform pos: 2.5,6.5 parent: 30 + - type: DeviceNetwork + deviceLists: + - 8680 - type: AtmosPipeColor color: '#0055CCFF' - proto: GasVentScrubber @@ -35636,6 +35686,9 @@ entities: rot: 1.5707963267948966 rad pos: 14.5,7.5 parent: 30 + - type: DeviceNetwork + deviceLists: + - 7372 - type: AtmosPipeColor color: '#990000FF' - uid: 845 @@ -35650,6 +35703,9 @@ entities: - type: Transform pos: 1.5,10.5 parent: 30 + - type: DeviceNetwork + deviceLists: + - 6648 - type: AtmosPipeColor color: '#990000FF' - uid: 1099 @@ -35715,6 +35771,9 @@ entities: rot: 1.5707963267948966 rad pos: 9.5,11.5 parent: 30 + - type: DeviceNetwork + deviceLists: + - 7372 - type: AtmosPipeColor color: '#990000FF' - uid: 2127 @@ -36074,6 +36133,9 @@ entities: - type: Transform pos: -36.5,9.5 parent: 30 + - type: DeviceNetwork + deviceLists: + - 1948 - type: AtmosPipeColor color: '#990000FF' - uid: 7235 @@ -36197,6 +36259,9 @@ entities: rot: 1.5707963267948966 rad pos: 6.5,18.5 parent: 30 + - type: DeviceNetwork + deviceLists: + - 7372 - type: AtmosPipeColor color: '#990000FF' - uid: 8629 @@ -36213,8 +36278,20 @@ entities: rot: 3.141592653589793 rad pos: 2.5,7.5 parent: 30 + - type: DeviceNetwork + deviceLists: + - 8680 - type: AtmosPipeColor color: '#990000FF' + - uid: 8673 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -62.5,2.5 + parent: 30 + - type: DeviceNetwork + deviceLists: + - 6101 - proto: GasVolumePump entities: - uid: 7730 diff --git a/Resources/Maps/bagel.yml b/Resources/Maps/bagel.yml index ed153964bd..90d0061f77 100644 --- a/Resources/Maps/bagel.yml +++ b/Resources/Maps/bagel.yml @@ -14327,6 +14327,17 @@ entities: rot: 3.141592653589793 rad pos: 46.5,31.5 parent: 60 + - uid: 898 + components: + - type: Transform + pos: 23.5,-29.5 + parent: 60 + - uid: 902 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 25.5,-25.5 + parent: 60 - uid: 3189 components: - type: Transform @@ -14339,6 +14350,18 @@ entities: rot: 1.5707963267948966 rad pos: 59.5,14.5 parent: 60 + - uid: 6129 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 20.5,29.5 + parent: 60 + - uid: 6130 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -11.5,-0.5 + parent: 7536 - uid: 6768 components: - type: Transform @@ -14363,6 +14386,17 @@ entities: rot: -1.5707963267948966 rad pos: -5.5,-70.5 parent: 60 + - uid: 9110 + components: + - type: Transform + pos: -11.5,-4.5 + parent: 7536 + - uid: 9214 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,-0.5 + parent: 7536 - uid: 12269 components: - type: Transform @@ -14410,38 +14444,6 @@ entities: rot: 1.5707963267948966 rad pos: 15.5,-70.5 parent: 60 -- proto: AtmosDeviceFanTiny - entities: - - uid: 6129 - components: - - type: Transform - pos: -11.5,-0.5 - parent: 7536 - - uid: 6130 - components: - - type: Transform - pos: -11.5,-4.5 - parent: 7536 - - uid: 9110 - components: - - type: Transform - pos: 0.5,-0.5 - parent: 7536 - - uid: 9214 - components: - - type: Transform - pos: 23.5,-29.5 - parent: 60 - - uid: 13825 - components: - - type: Transform - pos: 25.5,-25.5 - parent: 60 - - uid: 19808 - components: - - type: Transform - pos: 20.5,28.5 - parent: 60 - proto: AtmosFixBlockerMarker entities: - uid: 6252 @@ -74858,18 +74860,6 @@ entities: parent: 60 - type: AtmosPipeColor color: '#0335FCFF' - - uid: 898 - components: - - type: Transform - anchored: False - rot: 1.5707963267948966 rad - pos: -10.5,-22.5 - parent: 60 - - type: AtmosPipeColor - color: '#0335FCFF' - - type: Physics - canCollide: True - bodyType: Dynamic - uid: 899 components: - type: Transform @@ -74894,18 +74884,6 @@ entities: parent: 60 - type: AtmosPipeColor color: '#0335FCFF' - - uid: 902 - components: - - type: Transform - anchored: False - rot: 1.5707963267948966 rad - pos: -13.5,-22.5 - parent: 60 - - type: AtmosPipeColor - color: '#0335FCFF' - - type: Physics - canCollide: True - bodyType: Dynamic - uid: 903 components: - type: Transform diff --git a/Resources/Maps/box.yml b/Resources/Maps/box.yml index ea4dd61dd9..e90185d116 100644 --- a/Resources/Maps/box.yml +++ b/Resources/Maps/box.yml @@ -6453,7 +6453,8 @@ entities: 0,8: 0: 65535 0,9: - 0: 65535 + 0: 32767 + 3: 32768 0,10: 0: 65535 0,11: @@ -6461,7 +6462,8 @@ entities: 1,8: 0: 65535 1,9: - 0: 65535 + 0: 61439 + 3: 4096 1,10: 0: 65535 1,11: @@ -6540,7 +6542,7 @@ entities: 0: 52462 8,0: 0: 65527 - 3: 8 + 4: 8 8,1: 0: 65295 8,2: @@ -6548,7 +6550,7 @@ entities: 8,3: 0: 65535 9,0: - 3: 15 + 4: 15 0: 65520 9,1: 0: 65487 @@ -6557,7 +6559,7 @@ entities: 9,3: 0: 32767 10,0: - 3: 1 + 4: 1 0: 65534 10,1: 0: 65535 @@ -6901,7 +6903,7 @@ entities: 0: 65535 8,-1: 0: 30591 - 3: 34944 + 4: 34944 9,-4: 0: 65535 9,-3: @@ -6910,7 +6912,7 @@ entities: 0: 65535 9,-1: 0: 15 - 3: 65520 + 4: 65520 10,-4: 0: 65535 10,-3: @@ -6919,7 +6921,7 @@ entities: 0: 65535 10,-1: 0: 61167 - 3: 4368 + 4: 4368 11,-4: 0: 65535 11,-3: @@ -7746,7 +7748,7 @@ entities: 0: 65535 4,-17: 0: 34959 - 4: 30576 + 5: 30576 5,-20: 0: 62813 5,-19: @@ -7953,7 +7955,7 @@ entities: 0: 65535 3,-17: 0: 34959 - 5: 30576 + 6: 30576 0,-24: 0: 65416 0,-23: @@ -8476,6 +8478,21 @@ entities: - 0 - 0 - 0 + - volume: 2500 + temperature: 293.14975 + moles: + - 20.078888 + - 75.53487 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 - volume: 2500 temperature: 235 moles: @@ -11408,7 +11425,7 @@ entities: pos: 24.5,16.5 parent: 8364 - type: Door - secondsUntilStateChange: -1003.90155 + secondsUntilStateChange: -1139.9778 state: Opening - type: DeviceLinkSource lastSignals: @@ -14671,6 +14688,17 @@ entities: rot: 1.5707963267948966 rad pos: 87.5,-3.5 parent: 8364 + - uid: 7209 + components: + - type: Transform + pos: 36.5,-3.5 + parent: 8364 + - uid: 9934 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 41.5,-0.5 + parent: 8364 - uid: 12475 components: - type: Transform @@ -14689,6 +14717,12 @@ entities: rot: 3.141592653589793 rad pos: -70.5,-2.5 parent: 8364 + - uid: 13399 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 36.5,1.5 + parent: 8364 - uid: 13779 components: - type: Transform @@ -14740,23 +14774,6 @@ entities: - type: Transform pos: -0.5,-0.5 parent: 11906 -- proto: AtmosDeviceFanTiny - entities: - - uid: 7209 - components: - - type: Transform - pos: 36.5,-3.5 - parent: 8364 - - uid: 9934 - components: - - type: Transform - pos: 36.5,1.5 - parent: 8364 - - uid: 13399 - components: - - type: Transform - pos: 41.5,-0.5 - parent: 8364 - proto: AtmosFixBlockerMarker entities: - uid: 110 @@ -68529,6 +68546,22 @@ entities: - type: Transform pos: 66.509186,-76.72045 parent: 8364 +- proto: ClothingOuterHardsuitSecurity + entities: + - uid: 20856 + components: + - type: Transform + parent: 11965 + - type: Physics + canCollide: False + - type: InsideEntityStorage + - uid: 20857 + components: + - type: Transform + parent: 17151 + - type: Physics + canCollide: False + - type: InsideEntityStorage - proto: ClothingOuterHoodieGrey entities: - uid: 21633 @@ -143864,6 +143897,31 @@ entities: - type: Transform pos: 3.5,39.5 parent: 8364 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14673 + moles: + - 1.7459903 + - 6.568249 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - type: ContainerContainer + containers: + entity_storage: !type:Container + showEnts: False + occludes: True + ents: + - 20856 - uid: 16531 components: - type: Transform @@ -143874,6 +143932,31 @@ entities: - type: Transform pos: 4.5,39.5 parent: 8364 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14673 + moles: + - 1.7459903 + - 6.568249 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - type: ContainerContainer + containers: + entity_storage: !type:Container + showEnts: False + occludes: True + ents: + - 20857 - proto: SuitStorageWarden entities: - uid: 11999 diff --git a/Resources/Maps/cluster.yml b/Resources/Maps/cluster.yml index a8c3becaf3..32f860cae6 100644 --- a/Resources/Maps/cluster.yml +++ b/Resources/Maps/cluster.yml @@ -7605,6 +7605,18 @@ entities: rot: -1.5707963267948966 rad pos: -44.5,3.5 parent: 1 + - uid: 3147 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,2.5 + parent: 1 + - uid: 3148 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -3.5,2.5 + parent: 1 - uid: 4816 components: - type: Transform @@ -7647,18 +7659,6 @@ entities: rot: 3.141592653589793 rad pos: 23.5,38.5 parent: 1 -- proto: AtmosDeviceFanTiny - entities: - - uid: 3147 - components: - - type: Transform - pos: -0.5,2.5 - parent: 1 - - uid: 3148 - components: - - type: Transform - pos: -3.5,2.5 - parent: 1 - proto: AtmosFixBlockerMarker entities: - uid: 7260 diff --git a/Resources/Maps/fland.yml b/Resources/Maps/fland.yml index 58ff9247b8..80bce4b922 100644 --- a/Resources/Maps/fland.yml +++ b/Resources/Maps/fland.yml @@ -18042,6 +18042,12 @@ entities: - type: Transform pos: 91.5,71.5 parent: 13329 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 31366: + - DoorStatus: Close - uid: 16663 components: - type: Transform @@ -18492,12 +18498,24 @@ entities: rot: -1.5707963267948966 rad pos: -42.5,-55.5 parent: 13329 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 12402: + - DoorStatus: DoorBolt - uid: 12402 components: - type: Transform rot: -1.5707963267948966 rad pos: -45.5,-55.5 parent: 13329 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 12401: + - DoorStatus: DoorBolt - uid: 23029 components: - type: Transform @@ -18512,6 +18530,12 @@ entities: - type: Transform pos: 99.5,0.5 parent: 13329 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 23457: + - DoorStatus: DoorBolt - proto: AirlockExternalGlass entities: - uid: 2870 @@ -18586,11 +18610,23 @@ entities: - type: Transform pos: 25.5,-59.5 parent: 13329 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 15609: + - DoorStatus: Close - uid: 15612 components: - type: Transform pos: 27.5,-59.5 parent: 13329 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 15610: + - DoorStatus: Close - uid: 33581 components: - type: Transform @@ -18618,11 +18654,23 @@ entities: - type: Transform pos: 16.5,-36.5 parent: 13329 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 10120: + - DoorStatus: DoorBolt - uid: 10120 components: - type: Transform pos: 16.5,-33.5 parent: 13329 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 10119: + - DoorStatus: DoorBolt - proto: AirlockExternalGlassEngineeringLocked entities: - uid: 3715 @@ -18649,36 +18697,72 @@ entities: rot: -1.5707963267948966 rad pos: -45.5,-59.5 parent: 13329 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 12421: + - DoorStatus: DoorBolt - uid: 12404 components: - type: Transform rot: -1.5707963267948966 rad pos: -31.5,-47.5 parent: 13329 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 12395: + - DoorStatus: Close - uid: 12420 components: - type: Transform rot: -1.5707963267948966 rad pos: -37.5,-62.5 parent: 13329 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 12400: + - DoorStatus: Close - uid: 12421 components: - type: Transform rot: -1.5707963267948966 rad pos: -45.5,-62.5 parent: 13329 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 12403: + - DoorStatus: DoorBolt - uid: 12503 components: - type: Transform rot: -1.5707963267948966 rad pos: -31.5,-59.5 parent: 13329 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 12397: + - DoorStatus: Close - uid: 12504 components: - type: Transform rot: -1.5707963267948966 rad pos: -32.5,-62.5 parent: 13329 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 12399: + - DoorStatus: Close - uid: 20640 components: - type: Transform @@ -18713,6 +18797,12 @@ entities: - type: Transform pos: 96.5,0.5 parent: 13329 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 23458: + - DoorStatus: DoorBolt - uid: 24737 components: - type: Transform @@ -18792,6 +18882,8 @@ entities: - type: Transform pos: -41.5,-1.5 parent: 13329 + - type: DeviceLinkSink + invokeCounter: 1 - type: DeviceLinkSource linkedPorts: 3000: @@ -18837,21 +18929,53 @@ entities: - type: Transform pos: 22.5,-50.5 parent: 13329 + - type: DeviceLinkSink + invokeCounter: 3 + - type: DeviceLinkSource + linkedPorts: + 19166: + - DoorStatus: DoorBolt + 19165: + - DoorStatus: DoorBolt - uid: 19164 components: - type: Transform pos: 22.5,-49.5 parent: 13329 + - type: DeviceLinkSink + invokeCounter: 2 + - type: DeviceLinkSource + linkedPorts: + 19166: + - DoorStatus: DoorBolt + 19165: + - DoorStatus: DoorBolt - uid: 19165 components: - type: Transform pos: 20.5,-50.5 parent: 13329 + - type: DeviceLinkSink + invokeCounter: 2 + - type: DeviceLinkSource + linkedPorts: + 19164: + - DoorStatus: DoorBolt + 19163: + - DoorStatus: DoorBolt - uid: 19166 components: - type: Transform pos: 20.5,-49.5 parent: 13329 + - type: DeviceLinkSink + invokeCounter: 2 + - type: DeviceLinkSource + linkedPorts: + 19164: + - DoorStatus: DoorBolt + 19163: + - DoorStatus: DoorBolt - uid: 26786 components: - type: Transform @@ -18938,6 +19062,8 @@ entities: rot: -1.5707963267948966 rad pos: -41.5,32.5 parent: 13329 + - type: DeviceLinkSink + invokeCounter: 1 - proto: AirlockExternalGlassShuttleEscape entities: - uid: 6767 @@ -19008,38 +19134,80 @@ entities: - type: Transform pos: -29.5,-48.5 parent: 13329 + - type: DeviceLinkSource + linkedPorts: + 12404: + - DoorStatus: Close + - type: DeviceLinkSink + invokeCounter: 1 - uid: 12397 components: - type: Transform rot: 3.141592653589793 rad pos: -29.5,-58.5 parent: 13329 + - type: DeviceLinkSource + linkedPorts: + 12503: + - DoorStatus: Close + - type: DeviceLinkSink + invokeCounter: 1 - uid: 12399 components: - type: Transform pos: -32.5,-64.5 parent: 13329 + - type: DeviceLinkSource + linkedPorts: + 12504: + - DoorStatus: Close + - type: DeviceLinkSink + invokeCounter: 1 - uid: 12400 components: - type: Transform pos: -37.5,-64.5 parent: 13329 + - type: DeviceLinkSource + linkedPorts: + 12420: + - DoorStatus: Close + - type: DeviceLinkSink + invokeCounter: 1 - uid: 15609 components: - type: Transform pos: 25.5,-61.5 parent: 13329 + - type: DeviceLinkSource + linkedPorts: + 15611: + - DoorStatus: Close + - type: DeviceLinkSink + invokeCounter: 1 - uid: 15610 components: - type: Transform pos: 27.5,-61.5 parent: 13329 + - type: DeviceLinkSource + linkedPorts: + 15612: + - DoorStatus: Close + - type: DeviceLinkSink + invokeCounter: 1 - uid: 31366 components: - type: Transform rot: 3.141592653589793 rad pos: 91.5,74.5 parent: 13329 + - type: DeviceLinkSource + linkedPorts: + 16079: + - DoorStatus: Close + - type: DeviceLinkSink + invokeCounter: 1 - proto: AirlockExternalLocked entities: - uid: 3833 @@ -19047,6 +19215,8 @@ entities: - type: Transform pos: -38.5,16.5 parent: 13329 + - type: DeviceLinkSink + invokeCounter: 1 - type: DeviceLinkSource linkedPorts: 3834: @@ -27381,17 +27551,18 @@ entities: - type: Transform pos: 63.5,-57.5 parent: 13329 -- proto: AtmosDeviceFanTiny +- proto: AtmosDeviceFanDirectional entities: - uid: 1203 components: - type: Transform - pos: -6.5,25.5 + rot: -1.5707963267948966 rad + pos: -7.5,28.5 parent: 13329 - uid: 1204 components: - type: Transform - pos: -7.5,28.5 + pos: -6.5,25.5 parent: 13329 - uid: 3030 components: @@ -27401,52 +27572,62 @@ entities: - uid: 3758 components: - type: Transform + rot: -1.5707963267948966 rad pos: -41.5,32.5 parent: 13329 - uid: 3759 components: - type: Transform + rot: -1.5707963267948966 rad pos: -41.5,34.5 parent: 13329 - uid: 3760 components: - type: Transform + rot: -1.5707963267948966 rad pos: -41.5,40.5 parent: 13329 - uid: 3761 components: - type: Transform + rot: -1.5707963267948966 rad pos: -41.5,42.5 parent: 13329 - uid: 6764 components: - type: Transform + rot: 3.141592653589793 rad pos: -4.5,76.5 parent: 13329 - uid: 10112 components: - type: Transform + rot: -1.5707963267948966 rad pos: 1.5,-37.5 parent: 13329 - uid: 10113 components: - type: Transform + rot: -1.5707963267948966 rad pos: 1.5,-35.5 parent: 13329 - uid: 12422 components: - type: Transform + rot: -1.5707963267948966 rad pos: -43.5,-32.5 parent: 13329 - uid: 12423 components: - type: Transform + rot: -1.5707963267948966 rad pos: -43.5,-39.5 parent: 13329 - uid: 13166 components: - type: Transform - pos: -30.5,-20.5 + rot: 3.141592653589793 rad + pos: -37.5,-20.5 parent: 13329 - uid: 13167 components: @@ -27456,27 +27637,30 @@ entities: - uid: 13252 components: - type: Transform - pos: -37.5,-20.5 + rot: 3.141592653589793 rad + pos: -30.5,-20.5 parent: 13329 - uid: 13282 components: - type: Transform - pos: -28.5,-30.5 + pos: -33.5,-30.5 parent: 13329 - uid: 13283 components: - type: Transform - pos: -33.5,-30.5 + rot: 1.5707963267948966 rad + pos: 95.5,61.5 parent: 13329 - uid: 13284 components: - type: Transform - pos: 95.5,61.5 + rot: 1.5707963267948966 rad + pos: 95.5,66.5 parent: 13329 - uid: 13285 components: - type: Transform - pos: 95.5,66.5 + pos: -28.5,-30.5 parent: 13329 - proto: AtmosFixBlockerMarker entities: @@ -164811,6 +164995,11 @@ entities: - type: Transform pos: 106.5,-45.5 parent: 13329 + - uid: 34593 + components: + - type: Transform + pos: 17.5,-35.5 + parent: 13329 - uid: 35403 components: - type: Transform @@ -165044,6 +165233,11 @@ entities: - type: Transform pos: 36.5,56.5 parent: 13329 + - uid: 34228 + components: + - type: Transform + pos: 17.5,-34.5 + parent: 13329 - uid: 34456 components: - type: Transform @@ -182222,13 +182416,6 @@ entities: pos: 22.5,15.5 parent: 13329 - proto: SignAtmos - entities: - - uid: 26471 - components: - - type: Transform - pos: 78.5,-21.5 - parent: 13329 -- proto: SignAtmosMinsky entities: - uid: 26468 components: @@ -182245,6 +182432,11 @@ entities: - type: Transform pos: 90.5,-19.5 parent: 13329 + - uid: 26471 + components: + - type: Transform + pos: 78.5,-21.5 + parent: 13329 - proto: SignBar entities: - uid: 1188 @@ -182333,8 +182525,6 @@ entities: - type: Transform pos: 16.5,39.5 parent: 13329 -- proto: SignChemistry1 - entities: - uid: 18455 components: - type: Transform @@ -182775,13 +182965,6 @@ entities: - type: Transform pos: 70.5,42.5 parent: 13329 -- proto: SignDrones - entities: - - uid: 26692 - components: - - type: Transform - pos: 82.5,-21.5 - parent: 13329 - proto: SignElectricalMed entities: - uid: 4728 @@ -182975,21 +183158,17 @@ entities: pos: 66.5,46.5 parent: 13329 - proto: SignHydro1 - entities: - - uid: 20091 - components: - - type: Transform - pos: -11.5,33.5 - parent: 13329 -- proto: SignHydro2 entities: - uid: 20090 components: - type: Transform pos: -2.5,37.5 parent: 13329 -- proto: SignHydro3 - entities: + - uid: 20091 + components: + - type: Transform + pos: -11.5,33.5 + parent: 13329 - uid: 20092 components: - type: Transform @@ -183068,6 +183247,13 @@ entities: - type: Transform pos: 14.5,-14.5 parent: 13329 +- proto: SignMaterials + entities: + - uid: 26692 + components: + - type: Transform + pos: 82.5,-21.5 + parent: 13329 - proto: SignMedical entities: - uid: 10600 @@ -183303,21 +183489,17 @@ entities: - type: Transform pos: 39.5,-12.5 parent: 13329 -- proto: SignScience1 - entities: - - uid: 20084 - components: - - type: Transform - pos: 26.5,-48.5 - parent: 13329 -- proto: SignScience2 - entities: - uid: 19938 components: - type: Transform rot: 1.5707963267948966 rad pos: 40.5,-40.5 parent: 13329 + - uid: 20084 + components: + - type: Transform + pos: 26.5,-48.5 + parent: 13329 - proto: SignSecurearea entities: - uid: 15808 diff --git a/Resources/Maps/marathon.yml b/Resources/Maps/marathon.yml index 0a5da0bd31..58136160e2 100644 --- a/Resources/Maps/marathon.yml +++ b/Resources/Maps/marathon.yml @@ -140,7 +140,7 @@ entities: version: 6 -4,2: ind: -4,2 - tiles: AAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbQAAAAAAegAAAAADegAAAAADegAAAAABegAAAAAAegAAAAACegAAAAACAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAHwAAAAABHwAAAAABHwAAAAAAHwAAAAADHwAAAAAAHwAAAAABAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAACXQAAAAAAXQAAAAACAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAABAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAXQAAAAABAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAZAAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAZAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAD + tiles: AAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbQAAAAAAegAAAAADegAAAAADegAAAAABegAAAAAAegAAAAACegAAAAACAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAHwAAAAABHwAAAAABHwAAAAAAHwAAAAADHwAAAAAAHwAAAAABAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAACXQAAAAAAXQAAAAACAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAACXQAAAAABAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAXQAAAAABAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAZAAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAZAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAD version: 6 -4,3: ind: -4,3 @@ -4400,6 +4400,12 @@ entities: 1037: 5,41 1386: 22,25 1387: 22,23 + - node: + angle: 1.5707963267948966 rad + color: '#FFFFFFFF' + id: StandClear + decals: + 3190: -53,36 - node: color: '#334E6DC8' id: ThreeQuarterTileOverlayGreyscale @@ -9735,6 +9741,12 @@ entities: - type: Transform pos: -82.5,-60.5 parent: 30 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 6606: + - DoorStatus: Close - uid: 17373 components: - type: Transform @@ -9763,11 +9775,23 @@ entities: - type: Transform pos: 15.5,30.5 parent: 30 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 1826: + - DoorStatus: DoorBolt - uid: 1826 components: - type: Transform pos: 17.5,30.5 parent: 30 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 1695: + - DoorStatus: DoorBolt - uid: 22631 components: - type: Transform @@ -9884,18 +9908,42 @@ entities: rot: 1.5707963267948966 rad pos: -8.5,-58.5 parent: 30 + - type: DeviceLinkSink + invokeCounter: 2 + - type: DeviceLinkSource + linkedPorts: + 6272: + - DoorStatus: DoorBolt + 7207: + - DoorStatus: DoorBolt - uid: 6272 components: - type: Transform rot: 1.5707963267948966 rad pos: -7.5,-56.5 parent: 30 + - type: DeviceLinkSink + invokeCounter: 2 + - type: DeviceLinkSource + linkedPorts: + 3531: + - DoorStatus: DoorBolt + 7207: + - DoorStatus: DoorBolt - uid: 7207 components: - type: Transform rot: 1.5707963267948966 rad pos: -6.5,-58.5 parent: 30 + - type: DeviceLinkSink + invokeCounter: 2 + - type: DeviceLinkSource + linkedPorts: + 6272: + - DoorStatus: DoorBolt + 3531: + - DoorStatus: DoorBolt - uid: 10135 components: - type: Transform @@ -9939,6 +9987,12 @@ entities: - type: Transform pos: -63.5,-18.5 parent: 30 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 17342: + - DoorStatus: DoorBolt - uid: 5391 components: - type: Transform @@ -9971,6 +10025,12 @@ entities: - type: Transform pos: -63.5,-20.5 parent: 30 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 386: + - DoorStatus: DoorBolt - uid: 18018 components: - type: Transform @@ -10065,6 +10125,12 @@ entities: rot: 3.141592653589793 rad pos: 25.5,43.5 parent: 30 + - uid: 11449 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -53.5,36.5 + parent: 30 - proto: AirlockExternalGlassShuttleLocked entities: - uid: 11864 @@ -10087,6 +10153,12 @@ entities: rot: 3.141592653589793 rad pos: -18.5,46.5 parent: 30 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 1696: + - DoorStatus: DoorBolt - uid: 5390 components: - type: Transform @@ -10101,11 +10173,23 @@ entities: - type: Transform pos: 45.5,16.5 parent: 30 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 15830: + - DoorStatus: DoorBolt - uid: 15830 components: - type: Transform pos: 48.5,16.5 parent: 30 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 15829: + - DoorStatus: DoorBolt - uid: 16278 components: - type: Transform @@ -10132,6 +10216,12 @@ entities: rot: -1.5707963267948966 rad pos: -85.5,-60.5 parent: 30 + - type: DeviceLinkSource + linkedPorts: + 841: + - DoorStatus: Close + - type: DeviceLinkSink + invokeCounter: 1 - proto: AirlockFreezerKitchenHydroLocked entities: - uid: 460 @@ -10516,6 +10606,18 @@ entities: - type: Transform pos: -69.5,-54.5 parent: 30 +- proto: AirlockGlassShuttle + entities: + - uid: 9121 + components: + - type: Transform + pos: -52.5,-10.5 + parent: 30 + - uid: 11452 + components: + - type: Transform + pos: -59.5,-10.5 + parent: 30 - proto: AirlockHatchMaintenance entities: - uid: 9957 @@ -11089,7 +11191,7 @@ entities: pos: -20.5,-5.5 parent: 30 - type: Door - secondsUntilStateChange: -537.51984 + secondsUntilStateChange: -1046.2256 state: Opening - type: DeviceLinkSource lastSignals: @@ -11276,6 +11378,12 @@ entities: rot: 3.141592653589793 rad pos: -21.5,46.5 parent: 30 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 5070: + - DoorStatus: DoorBolt - uid: 1756 components: - type: Transform @@ -12136,8 +12244,6 @@ entities: parent: 30 - type: Apc hasAccess: True - lastExternalState: Good - lastChargeState: Full - uid: 7079 components: - type: MetaData @@ -12163,8 +12269,6 @@ entities: parent: 30 - type: Apc hasAccess: True - lastExternalState: Good - lastChargeState: Full - uid: 7433 components: - type: MetaData @@ -12183,8 +12287,6 @@ entities: parent: 30 - type: Apc hasAccess: True - lastExternalState: Good - lastChargeState: Full - uid: 7610 components: - type: MetaData @@ -13115,28 +13217,68 @@ entities: - type: Transform pos: -73.5,-38.5 parent: 30 -- proto: AtmosDeviceFanTiny +- proto: AtmosDeviceFanDirectional entities: - uid: 380 components: - type: Transform - pos: -59.5,-7.5 + pos: -52.5,-10.5 + parent: 30 + - uid: 868 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 25.5,43.5 + parent: 30 + - uid: 1083 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 38.5,-3.5 + parent: 30 + - uid: 1475 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 38.5,-5.5 + parent: 30 + - uid: 1490 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -65.5,23.5 + parent: 30 + - uid: 1493 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -65.5,15.5 parent: 30 - uid: 3707 components: - type: Transform - pos: 25.5,43.5 + rot: -1.5707963267948966 rad + pos: -65.5,13.5 parent: 30 - - uid: 9121 + - uid: 11451 components: - type: Transform - pos: 38.5,-5.5 + pos: -59.5,-10.5 parent: 30 - - uid: 9122 + - uid: 11453 components: - type: Transform - pos: 38.5,-3.5 + rot: -1.5707963267948966 rad + pos: -53.5,36.5 parent: 30 + - uid: 11454 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -65.5,21.5 + parent: 30 +- proto: AtmosDeviceFanTiny + entities: - uid: 9123 components: - type: Transform @@ -13147,41 +13289,6 @@ entities: - type: Transform pos: -19.5,17.5 parent: 30 - - uid: 9798 - components: - - type: Transform - pos: -52.5,-7.5 - parent: 30 - - uid: 16402 - components: - - type: Transform - pos: -65.5,23.5 - parent: 30 - - uid: 16403 - components: - - type: Transform - pos: -65.5,21.5 - parent: 30 - - uid: 16404 - components: - - type: Transform - pos: -65.5,15.5 - parent: 30 - - uid: 16405 - components: - - type: Transform - pos: -65.5,13.5 - parent: 30 - - uid: 20590 - components: - - type: Transform - pos: -52.5,2.5 - parent: 30 - - uid: 20591 - components: - - type: Transform - pos: -59.5,2.5 - parent: 30 - proto: AtmosFixBlockerMarker entities: - uid: 16997 @@ -14242,7 +14349,7 @@ entities: - type: Transform pos: -60.353844,-63.575558 parent: 30 -- proto: BookChefGaming +- proto: BookHowToCookForFortySpaceman entities: - uid: 9948 components: @@ -49781,6 +49888,11 @@ entities: - 0 - 0 - 0 + - uid: 11456 + components: + - type: Transform + pos: -52.5,37.5 + parent: 30 - uid: 11750 components: - type: Transform @@ -54510,6 +54622,13 @@ entities: - type: Transform pos: 1.5,-33.5 parent: 30 +- proto: DefaultStationBeaconEscapePod + entities: + - uid: 11455 + components: + - type: Transform + pos: -52.5,36.5 + parent: 30 - proto: DefaultStationBeaconEVAStorage entities: - uid: 20552 @@ -89848,10 +89967,11 @@ entities: - type: Transform pos: -42.5,34.5 parent: 30 - - uid: 1493 + - uid: 1476 components: - type: Transform - pos: -53.5,34.5 + rot: -1.5707963267948966 rad + pos: -53.5,37.5 parent: 30 - uid: 1494 components: @@ -91782,6 +91902,12 @@ entities: - type: Transform pos: 24.5,-34.5 parent: 30 + - uid: 9122 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -53.5,35.5 + parent: 30 - uid: 9129 components: - type: Transform @@ -93351,11 +93477,6 @@ entities: - type: Transform pos: -58.5,36.5 parent: 30 - - uid: 16951 - components: - - type: Transform - pos: -51.5,36.5 - parent: 30 - uid: 17032 components: - type: Transform @@ -108641,21 +108762,11 @@ entities: - type: Transform pos: -42.5,34.5 parent: 30 - - uid: 1476 - components: - - type: Transform - pos: -51.5,36.5 - parent: 30 - uid: 1489 components: - type: Transform pos: -52.5,34.5 parent: 30 - - uid: 1490 - components: - - type: Transform - pos: -53.5,34.5 - parent: 30 - uid: 1491 components: - type: Transform @@ -110473,6 +110584,18 @@ entities: - type: Transform pos: -64.5,16.5 parent: 30 + - uid: 11448 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -53.5,37.5 + parent: 30 + - uid: 11450 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -53.5,35.5 + parent: 30 - uid: 11602 components: - type: Transform @@ -113375,6 +113498,11 @@ entities: parent: 30 - proto: SignAtmos entities: + - uid: 7012 + components: + - type: Transform + pos: 8.5,-21.5 + parent: 30 - uid: 9082 components: - type: Transform @@ -113385,13 +113513,6 @@ entities: - type: Transform pos: 4.5,-32.5 parent: 30 -- proto: SignAtmosMinsky - entities: - - uid: 7012 - components: - - type: Transform - pos: 8.5,-21.5 - parent: 30 - proto: SignBar entities: - uid: 1384 @@ -113447,8 +113568,6 @@ entities: - type: Transform pos: -10.5,-11.5 parent: 30 -- proto: SignChemistry1 - entities: - uid: 9032 components: - type: Transform @@ -113909,13 +114028,6 @@ entities: - type: Transform pos: 47.5,20.5 parent: 30 -- proto: SignDrones - entities: - - uid: 12263 - components: - - type: Transform - pos: -37.5,26.5 - parent: 30 - proto: SignElectricalMed entities: - uid: 3194 @@ -114041,20 +114153,16 @@ entities: - type: Transform pos: -20.5,13.5 parent: 30 -- proto: SignHydro2 - entities: - - uid: 1386 - components: - - type: Transform - pos: -29.5,4.5 - parent: 30 -- proto: SignHydro3 - entities: - uid: 1385 components: - type: Transform pos: -22.5,8.5 parent: 30 + - uid: 1386 + components: + - type: Transform + pos: -29.5,4.5 + parent: 30 - proto: SignInterrogation entities: - uid: 1774 @@ -114090,6 +114198,13 @@ entities: - type: Transform pos: 18.5,-0.5 parent: 30 +- proto: SignMaterials + entities: + - uid: 12263 + components: + - type: Transform + pos: -37.5,26.5 + parent: 30 - proto: SignMedical entities: - uid: 6763 @@ -114102,13 +114217,6 @@ entities: - type: Transform pos: -12.5,0.5 parent: 30 -- proto: SignMinerDock - entities: - - uid: 8445 - components: - - type: Transform - pos: 15.5,-9.5 - parent: 30 - proto: SignMorgue entities: - uid: 6903 @@ -114245,26 +114353,22 @@ entities: pos: 16.5,24.5 parent: 30 - proto: SignScience - entities: - - uid: 13389 - components: - - type: Transform - pos: 16.5,16.5 - parent: 30 -- proto: SignScience1 entities: - uid: 6576 components: - type: Transform pos: 11.5,19.5 parent: 30 -- proto: SignScience2 - entities: - uid: 13388 components: - type: Transform pos: 11.5,13.5 parent: 30 + - uid: 13389 + components: + - type: Transform + pos: 16.5,16.5 + parent: 30 - proto: SignSecurearea entities: - uid: 11895 @@ -114355,6 +114459,13 @@ entities: - type: Transform pos: -37.5,38.5 parent: 30 +- proto: SignShipDock + entities: + - uid: 8445 + components: + - type: Transform + pos: 15.5,-9.5 + parent: 30 - proto: SignSmoking entities: - uid: 9125 @@ -123118,11 +123229,6 @@ entities: - type: Transform pos: -50.5,11.5 parent: 30 - - uid: 868 - components: - - type: Transform - pos: -59.5,-10.5 - parent: 30 - uid: 882 components: - type: Transform @@ -123223,11 +123329,6 @@ entities: - type: Transform pos: -61.5,-10.5 parent: 30 - - uid: 1083 - components: - - type: Transform - pos: -52.5,-10.5 - parent: 30 - uid: 1140 components: - type: Transform @@ -123424,12 +123525,6 @@ entities: rot: -1.5707963267948966 rad pos: -51.5,34.5 parent: 30 - - uid: 1475 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -51.5,35.5 - parent: 30 - uid: 1477 components: - type: Transform @@ -127408,6 +127503,12 @@ entities: - type: Transform pos: -39.5,-22.5 parent: 30 + - uid: 9798 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -53.5,34.5 + parent: 30 - uid: 9855 components: - type: Transform diff --git a/Resources/Maps/meta.yml b/Resources/Maps/meta.yml index 8dd8e3a8a4..d51ffd3fb1 100644 --- a/Resources/Maps/meta.yml +++ b/Resources/Maps/meta.yml @@ -13679,6 +13679,12 @@ entities: - type: Transform pos: -70.5,6.5 parent: 5350 + - uid: 14913 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -44.5,32.5 + parent: 5350 - uid: 20063 components: - type: Transform @@ -13704,6 +13710,12 @@ entities: - type: Transform pos: -70.5,4.5 parent: 5350 + - uid: 24782 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -44.5,33.5 + parent: 5350 - proto: AtmosFixBlockerMarker entities: - uid: 11609 @@ -73877,18 +73889,20 @@ entities: - type: Transform pos: 68.5,-19.5 parent: 5350 -- proto: GasMinerNitrogen +- proto: GasMinerNitrogenStationLarge entities: - uid: 11574 components: - type: Transform + rot: -1.5707963267948966 rad pos: 52.5,-29.5 parent: 5350 -- proto: GasMinerOxygen +- proto: GasMinerOxygenStationLarge entities: - - uid: 11585 + - uid: 3116 components: - type: Transform + rot: -1.5707963267948966 rad pos: 56.5,-29.5 parent: 5350 - proto: GasMixer @@ -116098,12 +116112,24 @@ entities: rot: -1.5707963267948966 rad pos: -10.5,-28.5 parent: 5350 + - type: DeviceLinkSource + linkedPorts: + 23500: + - Pressed: Open + 24195: + - Pressed: Open - uid: 24780 components: - type: Transform rot: -1.5707963267948966 rad pos: -17.5,-31.5 parent: 5350 + - type: DeviceLinkSource + linkedPorts: + 24820: + - Pressed: Open + 26601: + - Pressed: Open - proto: LockableButtonSecurity entities: - uid: 6261 @@ -132903,23 +132929,6 @@ entities: linkedPorts: 10293: - Pressed: Toggle - - uid: 14913 - components: - - type: Transform - pos: -12.5,-38.5 - parent: 5350 - - type: DeviceLinkSource - linkedPorts: - 14916: - - Pressed: Toggle - 14915: - - Pressed: Toggle - 14914: - - Pressed: Toggle - 14918: - - Pressed: Toggle - 14917: - - Pressed: Toggle - uid: 15183 components: - type: Transform @@ -133156,6 +133165,24 @@ entities: - Pressed: Toggle 23565: - Pressed: Toggle + - uid: 11585 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -12.5,-38.5 + parent: 5350 + - type: DeviceLinkSource + linkedPorts: + 14917: + - Pressed: Toggle + 14918: + - Pressed: Toggle + 14914: + - Pressed: Toggle + 14915: + - Pressed: Toggle + 14916: + - Pressed: Toggle - uid: 12454 components: - type: Transform @@ -133246,8 +133273,6 @@ entities: - type: Transform pos: 44.5,-4.5 parent: 5350 -- proto: SignAtmosMinsky - entities: - uid: 11495 components: - type: Transform @@ -133292,26 +133317,22 @@ entities: pos: -13.5,-64.5 parent: 5350 - proto: SignChem - entities: - - uid: 15672 - components: - - type: Transform - pos: -17.5,-28.5 - parent: 5350 -- proto: SignChemistry1 entities: - uid: 14204 components: - type: Transform pos: -19.5,-21.5 parent: 5350 -- proto: SignChemistry2 - entities: - uid: 15671 components: - type: Transform pos: -13.5,-23.5 parent: 5350 + - uid: 15672 + components: + - type: Transform + pos: -17.5,-28.5 + parent: 5350 - proto: SignCloning entities: - uid: 15048 @@ -133735,13 +133756,6 @@ entities: rot: 1.5707963267948966 rad pos: -44.5,-5.5 parent: 5350 -- proto: SignDrones - entities: - - uid: 8902 - components: - - type: Transform - pos: 44.5,-0.5 - parent: 5350 - proto: SignElectricalMed entities: - uid: 1672 @@ -133919,19 +133933,17 @@ entities: pos: -11.5,-6.5 parent: 5350 - proto: SignHydro1 - entities: - - uid: 2335 - components: - - type: Transform - pos: 20.5,-21.5 - parent: 5350 -- proto: SignHydro2 entities: - uid: 2326 components: - type: Transform pos: 20.5,-15.5 parent: 5350 + - uid: 2335 + components: + - type: Transform + pos: 20.5,-21.5 + parent: 5350 - proto: SignInterrogation entities: - uid: 10009 @@ -133992,6 +134004,13 @@ entities: - type: Transform pos: -35.5,6.5 parent: 5350 +- proto: SignMaterials + entities: + - uid: 8902 + components: + - type: Transform + pos: 44.5,-0.5 + parent: 5350 - proto: SignMedical entities: - uid: 7333 @@ -134024,13 +134043,6 @@ entities: - type: Transform pos: 36.5,-30.5 parent: 5350 -- proto: SignMinerDock - entities: - - uid: 4097 - components: - - type: Transform - pos: -39.5,22.5 - parent: 5350 - proto: SignMorgue entities: - uid: 15028 @@ -134125,7 +134137,7 @@ entities: - type: Transform pos: -0.5,-33.5 parent: 5350 -- proto: SignScience1 +- proto: SignScience entities: - uid: 9789 components: @@ -134327,6 +134339,13 @@ entities: - type: Transform pos: -0.5,22.5 parent: 5350 +- proto: SignShipDock + entities: + - uid: 4097 + components: + - type: Transform + pos: -39.5,22.5 + parent: 5350 - proto: SignSmoking entities: - uid: 11369 @@ -134483,7 +134502,7 @@ entities: - type: Transform pos: 23.5,5.5 parent: 5350 -- proto: SignToxins2 +- proto: SignToxins entities: - uid: 22182 components: