From 7f5476b5551a44a2138038bd785f43d307bf8fbc Mon Sep 17 00:00:00 2001 From: Doomsdrayk Date: Thu, 13 Jun 2024 12:10:56 -0600 Subject: [PATCH 001/142] Fix Drozd and C-20r unwielding on use-in-hand (#28728) Make Drozd and C-20r not unwield on use --- .../Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml index dd1e3e21f4..b86356306c 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml @@ -94,6 +94,7 @@ - type: Clothing sprite: Objects/Weapons/Guns/SMGs/c20r.rsi - type: Wieldable + unwieldOnUse: false - type: GunWieldBonus minAngle: -19 maxAngle: -16 @@ -131,6 +132,7 @@ - type: Clothing sprite: Objects/Weapons/Guns/SMGs/drozd.rsi - type: Wieldable + unwieldOnUse: false - type: GunWieldBonus minAngle: -19 maxAngle: -16 From 1bffa2aee7d28bf0cea0be69adf5424a424ffb4a Mon Sep 17 00:00:00 2001 From: PJBot Date: Thu, 13 Jun 2024 18:12:03 +0000 Subject: [PATCH 002/142] 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 74de6c10c9..67ae17e0da 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: SoulFN - changes: - - message: The borg tool module now has an industrial welding tool. - type: Tweak - id: 6221 - time: '2024-03-24T22:35:55.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/26332 - author: IProduceWidgets changes: - message: Ammo techfab now accepts ingot and cloth material types. @@ -3847,3 +3840,10 @@ id: 6720 time: '2024-06-13T06:30:39.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/28756 +- author: Doomsdrayk + changes: + - message: The Drozd and C-20r do not unwield on use again. + type: Fix + id: 6721 + time: '2024-06-13T18:10:56.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/28728 From 221cb73d8c24fdfff79ba1ab1d5d1de7e2dc579f Mon Sep 17 00:00:00 2001 From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> Date: Thu, 13 Jun 2024 14:21:48 -0400 Subject: [PATCH 003/142] Fix construction rotation (#28427) --- Content.Server/Construction/ConstructionSystem.Initial.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Server/Construction/ConstructionSystem.Initial.cs b/Content.Server/Construction/ConstructionSystem.Initial.cs index 08dd139ef4..6cc430b74f 100644 --- a/Content.Server/Construction/ConstructionSystem.Initial.cs +++ b/Content.Server/Construction/ConstructionSystem.Initial.cs @@ -271,7 +271,7 @@ namespace Content.Server.Construction } var newEntityProto = graph.Nodes[edge.Target].Entity.GetId(null, user, new(EntityManager)); - var newEntity = Spawn(newEntityProto, _transformSystem.ToMapCoordinates(coords), rotation: angle); + var newEntity = EntityManager.SpawnAttachedTo(newEntityProto, coords, rotation: angle); if (!TryComp(newEntity, out ConstructionComponent? construction)) { From 1559b080e4c78b105e84e331f69b6e6781d5cbfc Mon Sep 17 00:00:00 2001 From: PJBot Date: Thu, 13 Jun 2024 18:22:55 +0000 Subject: [PATCH 004/142] 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 67ae17e0da..04f991f5da 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: IProduceWidgets - changes: - - message: Ammo techfab now accepts ingot and cloth material types. - type: Fix - id: 6222 - time: '2024-03-25T00:43:04.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/26413 - author: Luminight changes: - message: Wooden fence gate sprites are no longer swapped. @@ -3847,3 +3840,10 @@ id: 6721 time: '2024-06-13T18:10:56.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/28728 +- author: EmoGarbage404 + changes: + - message: Fixed constructed items rotating strangely. + type: Fix + id: 6722 + time: '2024-06-13T18:21:49.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/28427 From c3720f9fd9922c37c5434ad8e93b67734789db83 Mon Sep 17 00:00:00 2001 From: lzk <124214523+lzk228@users.noreply.github.com> Date: Thu, 13 Jun 2024 20:36:38 +0200 Subject: [PATCH 005/142] Add order quantity to cargo invoice label (#28821) --- Content.Server/Cargo/Systems/CargoSystem.Orders.cs | 1 + Resources/Locale/en-US/cargo/cargo-console-component.ftl | 1 + 2 files changed, 2 insertions(+) diff --git a/Content.Server/Cargo/Systems/CargoSystem.Orders.cs b/Content.Server/Cargo/Systems/CargoSystem.Orders.cs index c519362945..a288d7b07d 100644 --- a/Content.Server/Cargo/Systems/CargoSystem.Orders.cs +++ b/Content.Server/Cargo/Systems/CargoSystem.Orders.cs @@ -506,6 +506,7 @@ namespace Content.Server.Cargo.Systems "cargo-console-paper-print-text", ("orderNumber", order.OrderId), ("itemName", MetaData(item).EntityName), + ("orderQuantity", order.OrderQuantity), ("requester", order.Requester), ("reason", order.Reason), ("approver", order.Approver ?? string.Empty)), diff --git a/Resources/Locale/en-US/cargo/cargo-console-component.ftl b/Resources/Locale/en-US/cargo/cargo-console-component.ftl index 532481f4a2..3c032488b5 100644 --- a/Resources/Locale/en-US/cargo/cargo-console-component.ftl +++ b/Resources/Locale/en-US/cargo/cargo-console-component.ftl @@ -36,6 +36,7 @@ cargo-console-paper-print-name = Order #{$orderNumber} cargo-console-paper-print-text = Order #{$orderNumber} Item: {$itemName} + Quantity: {$orderQuantity} Requested by: {$requester} Reason: {$reason} Approved by: {$approver} From 29fa18418ec56b6f9db9264fc607bf329ee85a67 Mon Sep 17 00:00:00 2001 From: PJBot Date: Thu, 13 Jun 2024 18:37:44 +0000 Subject: [PATCH 006/142] 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 04f991f5da..1124ee7acf 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Luminight - changes: - - message: Wooden fence gate sprites are no longer swapped. - type: Fix - id: 6223 - time: '2024-03-25T00:55:02.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/26409 - author: Callmore changes: - message: Holoprojectors no longer come with a cell when made at a lathe. @@ -3847,3 +3840,10 @@ id: 6722 time: '2024-06-13T18:21:49.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/28427 +- author: lzk228 + changes: + - message: Added order quantity to cargo invoice label. + type: Tweak + id: 6723 + time: '2024-06-13T18:36:38.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/28821 From ccd402d8d1cbb715f431a6c05dc51f0fa9d68b92 Mon Sep 17 00:00:00 2001 From: lzk <124214523+lzk228@users.noreply.github.com> Date: Thu, 13 Jun 2024 22:21:24 +0200 Subject: [PATCH 007/142] Adjust softdrink restock crate name (#28934) These contain restocks for multiple vendors, so change the name and description to reflect this. --- Resources/Prototypes/Catalog/Fills/Crates/vending.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Catalog/Fills/Crates/vending.yml b/Resources/Prototypes/Catalog/Fills/Crates/vending.yml index d54e103a70..378f8cb758 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/vending.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/vending.yml @@ -132,8 +132,8 @@ - type: entity id: CrateVendingMachineRestockRobustSoftdrinksFilled parent: CratePlastic - name: Robust Softdrinks restock crate - description: Contains two restock boxes for the Robust Softdrinks LLC vending machine. + name: beverage vendor restock crate + description: Contains restock boxes for beverage vending machines. components: - type: StorageFill contents: From 4e8375e5f99e7ac4616f37bc3b497f9ef5924ee3 Mon Sep 17 00:00:00 2001 From: Emisse <99158783+Emisse@users.noreply.github.com> Date: Thu, 13 Jun 2024 16:03:01 -0600 Subject: [PATCH 008/142] bagel update (#28946) --- Resources/Maps/bagel.yml | 220 ++++++++++++++++++++++++--------------- 1 file changed, 137 insertions(+), 83 deletions(-) diff --git a/Resources/Maps/bagel.yml b/Resources/Maps/bagel.yml index 5700fc8296..3dfb5c154a 100644 --- a/Resources/Maps/bagel.yml +++ b/Resources/Maps/bagel.yml @@ -504,8 +504,8 @@ entities: 3339: -40,44 3341: -36,30 3762: -39,-8 - 3814: 8,43 - 3815: 8,51 + 3808: 8,43 + 3809: 8,51 - node: color: '#FFFFFFFF' id: Arrows @@ -527,8 +527,8 @@ entities: 3351: -26,38 3759: 47,-23 3763: -40,-4 - 3810: -8,51 - 3811: -8,43 + 3806: -8,51 + 3807: -8,43 - node: color: '#FFFFFFFF' id: ArrowsGreyscale @@ -557,12 +557,12 @@ entities: color: '#FFFFFFFF' id: Bot decals: - 3816: -7,46 - 3817: -7,47 - 3818: -7,48 - 3819: 7,46 - 3820: 7,47 - 3821: 7,48 + 3810: -7,46 + 3811: -7,47 + 3812: -7,48 + 3813: 7,46 + 3814: 7,47 + 3815: 7,48 - node: color: '#FFFFFFFF' id: Bot @@ -675,7 +675,7 @@ entities: 3493: 39,-13 3539: 45,-9 3672: -17,-54 - 3841: 2,27 + 3835: 2,27 - node: angle: 1.5707963267948966 rad color: '#FFFFFFFF' @@ -714,8 +714,8 @@ entities: 3254: 6,-36 3349: -19,46 3745: 50,-11 - 3834: -25,-1 - 3835: -25,0 + 3828: -25,-1 + 3829: -25,0 - node: color: '#FFFFFFFF' id: BotLeftGreyscale @@ -753,15 +753,15 @@ entities: color: '#FFFFFFFF' id: BotRightGreyscale decals: - 3837: -29,-1 - 3838: -29,0 - 3839: -29,1 - 3852: 7,34 - 3853: 7,35 - 3854: 7,36 - 3855: 8,36 - 3858: 8,34 - 3859: 8,35 + 3831: -29,-1 + 3832: -29,0 + 3833: -29,1 + 3846: 7,34 + 3847: 7,35 + 3848: 7,36 + 3849: 8,36 + 3850: 8,34 + 3851: 8,35 - node: color: '#79150096' id: Box @@ -884,7 +884,7 @@ entities: 2380: -14,11 3038: 21,1 3049: 23,1 - 3851: 6,37 + 3845: 6,37 - node: color: '#FFFFFFFF' id: BrickTileDarkInnerSw @@ -901,9 +901,9 @@ entities: 2989: -115,13 3041: 23,0 3325: 37,18 - 3848: 6,34 - 3849: 6,35 - 3850: 6,36 + 3842: 6,34 + 3843: 6,35 + 3844: 6,36 - node: color: '#FFFFFFFF' id: BrickTileDarkLineN @@ -5520,22 +5520,22 @@ entities: color: '#FFFFFFFF' id: WarnCornerNE decals: - 3832: -33,21 + 3826: -33,21 - node: color: '#FFFFFFFF' id: WarnCornerNW decals: - 3829: -31,21 + 3823: -31,21 - node: color: '#FFFFFFFF' id: WarnCornerSE decals: - 3833: -33,19 + 3827: -33,19 - node: color: '#FFFFFFFF' id: WarnCornerSW decals: - 3828: -31,19 + 3822: -31,19 - node: color: '#FFFFFFFF' id: WarnCornerSmallNE @@ -5545,7 +5545,7 @@ entities: 1366: -2,31 3332: -2,24 3392: -19,40 - 3827: -8,29 + 3821: -8,29 - node: color: '#FFFFFFFF' id: WarnCornerSmallNW @@ -5555,7 +5555,7 @@ entities: 2137: 2,24 3380: -27,38 3391: -15,40 - 3826: -5,29 + 3820: -5,29 - node: color: '#FFFFFFFF' id: WarnCornerSmallSE @@ -5563,7 +5563,7 @@ entities: 1053: -2,-78 1364: -2,36 3390: -19,42 - 3840: -29,-1 + 3834: -29,-1 - node: color: '#FFFFFFFF' id: WarnCornerSmallSW @@ -5574,7 +5574,7 @@ entities: 2568: 40,-35 3379: -27,40 3389: -15,42 - 3836: -25,-1 + 3830: -25,-1 - node: color: '#52B4E996' id: WarnFullGreyscale @@ -5649,7 +5649,7 @@ entities: 3201: 56,11 3388: -19,41 3440: 1,-13 - 3831: -33,20 + 3825: -33,20 - node: color: '#52B4E996' id: WarnLineGreyscaleE @@ -5944,8 +5944,8 @@ entities: 3381: -18,42 3382: -17,42 3383: -16,42 - 3822: -7,31 - 3823: -6,31 + 3816: -7,31 + 3817: -6,31 - node: color: '#DE3A3A96' id: WarnLineS @@ -5997,7 +5997,7 @@ entities: 3378: -27,39 3384: -15,41 3441: -1,-13 - 3830: -31,20 + 3824: -31,20 - node: color: '#DE3A3A96' id: WarnLineW @@ -6065,14 +6065,14 @@ entities: 3386: -17,40 3387: -18,40 3393: -43,-2 - 3824: -7,29 - 3825: -6,29 - 3842: 4,37 - 3843: 5,37 - 3844: 6,37 - 3845: -4,37 - 3846: -5,37 - 3847: -6,37 + 3818: -7,29 + 3819: -6,29 + 3836: 4,37 + 3837: 5,37 + 3838: 6,37 + 3839: -4,37 + 3840: -5,37 + 3841: -6,37 - node: angle: -3.141592653589793 rad color: '#FFFFFFFF' @@ -8110,7 +8110,7 @@ entities: 1: 39312 -12,8: 4: 12 - 6: 3072 + 5: 3072 -11,5: 0: 63351 -11,6: @@ -8119,7 +8119,7 @@ entities: -11,8: 4: 1 1: 17476 - 6: 256 + 5: 256 -11,7: 1: 17484 -10,5: @@ -8222,10 +8222,10 @@ entities: 0: 255 1: 57344 -8,11: - 5: 816 + 6: 816 1: 34952 -9,11: - 5: 2176 + 6: 2176 1: 8738 -8,12: 1: 34959 @@ -8245,7 +8245,7 @@ entities: -6,11: 0: 4095 -6,12: - 5: 61166 + 6: 61166 -5,9: 0: 65535 -5,10: @@ -8253,7 +8253,7 @@ entities: -5,11: 0: 36863 -5,12: - 5: 30515 + 6: 30515 0: 12 -4,9: 0: 65535 @@ -8263,7 +8263,7 @@ entities: 0: 4095 -4,12: 0: 1 - 5: 65518 + 6: 65518 -4,13: 1: 61680 -5,13: @@ -8277,7 +8277,7 @@ entities: -5,15: 1: 17487 -3,12: - 5: 13107 + 6: 13107 1: 34944 -3,13: 1: 47792 @@ -8343,7 +8343,7 @@ entities: 1: 61713 -12,9: 0: 16 - 5: 3084 + 6: 3084 -13,9: 1: 39305 -13,10: @@ -8353,18 +8353,18 @@ entities: 0: 12544 -12,10: 3: 12 - 5: 3072 + 6: 3072 -12,11: - 5: 12 + 6: 12 -11,9: - 5: 257 + 6: 257 1: 17476 -11,10: 3: 1 - 5: 256 + 6: 256 1: 17476 -11,11: - 5: 1 + 6: 1 1: 17476 -11,12: 1: 17487 @@ -8418,7 +8418,7 @@ entities: 1: 15 -13,12: 1: 34952 - 6: 48 + 5: 48 4: 12288 -12,13: 1: 61455 @@ -8452,11 +8452,11 @@ entities: 1: 62671 -7,14: 1: 244 - 5: 57344 + 6: 57344 0: 1024 -7,15: 1: 61440 - 5: 238 + 6: 238 0: 1024 -7,16: 1: 65524 @@ -8515,7 +8515,7 @@ entities: -14,12: 0: 1 1: 8738 - 6: 128 + 5: 128 4: 32768 -17,12: 0: 52232 @@ -9040,7 +9040,7 @@ entities: - volume: 2500 temperature: 293.15 moles: - - 0 + - 6666.982 - 0 - 0 - 0 @@ -9055,7 +9055,7 @@ entities: - volume: 2500 temperature: 293.15 moles: - - 6666.982 + - 0 - 0 - 0 - 0 @@ -9075,6 +9075,16 @@ entities: - type: GasTileOverlay - type: GridPathfinding - type: NavMap + - type: Joint + joints: + docking43669: !type:WeldJoint + bodyB: 60 + bodyA: 7536 + id: docking43669 + localAnchorB: -47.5,-40 + localAnchorA: 0.5,0 + damping: 1559.7855 + stiffness: 14000.604 - uid: 943 components: - type: MetaData @@ -9356,6 +9366,16 @@ entities: - type: GasTileOverlay - type: RadiationGridResistance - type: GridPathfinding + - type: Joint + joints: + docking43669: !type:WeldJoint + bodyB: 60 + bodyA: 7536 + id: docking43669 + localAnchorB: -47.5,-40 + localAnchorA: 0.5,0 + damping: 1559.7855 + stiffness: 14000.604 - proto: AcousticGuitarInstrument entities: - uid: 2133 @@ -12011,6 +12031,13 @@ entities: rot: 3.141592653589793 rad pos: 0.5,-0.5 parent: 7536 + - type: Docking + dockJointId: docking43669 + dockedWith: 7332 + - type: DeviceLinkSource + lastSignals: + DoorStatus: False + DockStatus: True - proto: AirlockExternalLocked entities: - uid: 1435 @@ -13331,10 +13358,16 @@ entities: - type: Transform pos: -47.5,-39.5 parent: 60 + - type: Docking + dockJointId: docking43669 + dockedWith: 8108 - type: DeviceLinkSource linkedPorts: 7316: - DoorStatus: DoorBolt + lastSignals: + DoorStatus: False + DockStatus: True - type: DeviceLinkSink links: - 7316 @@ -16567,7 +16600,7 @@ entities: - uid: 178 components: - type: Transform - pos: -26.404684,-13.628057 + pos: -26.426329,-14.112597 parent: 60 - proto: BoxLatexGloves entities: @@ -56281,18 +56314,6 @@ entities: - type: Transform pos: 45.485657,-24.447033 parent: 60 -- proto: chem_master - entities: - - uid: 2626 - components: - - type: Transform - pos: 41.5,-26.5 - parent: 60 - - uid: 2627 - components: - - type: Transform - pos: 41.5,-29.5 - parent: 60 - proto: ChemDispenser entities: - uid: 2520 @@ -56312,6 +56333,18 @@ entities: - type: Transform pos: 40.5,-28.5 parent: 60 +- proto: ChemMaster + entities: + - uid: 2626 + components: + - type: Transform + pos: 41.5,-26.5 + parent: 60 + - uid: 2627 + components: + - type: Transform + pos: 41.5,-29.5 + parent: 60 - proto: ChessBoard entities: - uid: 5198 @@ -67347,17 +67380,17 @@ entities: - uid: 14454 components: - type: Transform - pos: -26.766462,-13.446835 + pos: -27.223204,-13.440722 parent: 60 - uid: 14618 components: - type: Transform - pos: -26.953962,-13.46246 + pos: -27.098204,-13.175097 parent: 60 - uid: 14625 components: - type: Transform - pos: -26.860212,-13.30621 + pos: -27.035704,-13.425097 parent: 60 - uid: 20082 components: @@ -68112,6 +68145,8 @@ entities: - type: Transform pos: -40.5,5.5 parent: 60 + - type: FaxMachine + name: RD Office - uid: 11100 components: - type: Transform @@ -68168,6 +68203,13 @@ entities: parent: 60 - type: FaxMachine name: Library + - uid: 24176 + components: + - type: Transform + pos: -26.5,-13.5 + parent: 60 + - type: FaxMachine + name: Security Fax - proto: FaxMachineCaptain entities: - uid: 15836 @@ -75245,11 +75287,15 @@ entities: - 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 @@ -75277,11 +75323,15 @@ entities: - 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 @@ -82912,11 +82962,15 @@ entities: - uid: 8899 components: - type: Transform + anchored: False rot: 1.5707963267948966 rad pos: 22.5,-31.5 parent: 60 - type: AtmosPipeColor color: '#0335FCFF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 8918 components: - type: Transform @@ -125617,7 +125671,7 @@ entities: - type: Transform pos: -2.5112958,-11.444662 parent: 60 -- proto: soda_dispenser +- proto: SodaDispenser entities: - uid: 2257 components: From 222d3b532dddeab68b3b39ebd37af7c53d00b2ed Mon Sep 17 00:00:00 2001 From: MjrLandWhale Date: Thu, 13 Jun 2024 18:25:02 -0500 Subject: [PATCH 009/142] Override under-pressure lock-out in air alarm "Fill" mode (#28909) --- .../Unary/Components/GasVentPumpComponent.cs | 8 +++++++- .../Unary/EntitySystems/GasVentPumpSystem.cs | 5 +++-- .../Components/SharedVentPumpComponent.cs | 13 ++++++++---- .../Guidebook/Engineering/Fires.xml | 20 ++++++++++++++++--- 4 files changed, 36 insertions(+), 10 deletions(-) diff --git a/Content.Server/Atmos/Piping/Unary/Components/GasVentPumpComponent.cs b/Content.Server/Atmos/Piping/Unary/Components/GasVentPumpComponent.cs index 32cf1cac6f..2ba4603a9b 100644 --- a/Content.Server/Atmos/Piping/Unary/Components/GasVentPumpComponent.cs +++ b/Content.Server/Atmos/Piping/Unary/Components/GasVentPumpComponent.cs @@ -135,6 +135,10 @@ namespace Content.Server.Atmos.Piping.Unary.Components [ViewVariables(VVAccess.ReadWrite)] [DataField("depressurizePressure")] public float DepressurizePressure = 0; + + // When true, ignore under-pressure lockout. Used to re-fill rooms in air alarm "Fill" mode. + [DataField] + public bool PressureLockoutOverride = false; #endregion public GasVentPumpData ToAirAlarmData() @@ -146,7 +150,8 @@ namespace Content.Server.Atmos.Piping.Unary.Components PumpDirection = PumpDirection, PressureChecks = PressureChecks, ExternalPressureBound = ExternalPressureBound, - InternalPressureBound = InternalPressureBound + InternalPressureBound = InternalPressureBound, + PressureLockoutOverride = PressureLockoutOverride }; } @@ -158,6 +163,7 @@ namespace Content.Server.Atmos.Piping.Unary.Components PressureChecks = data.PressureChecks; ExternalPressureBound = data.ExternalPressureBound; InternalPressureBound = data.InternalPressureBound; + PressureLockoutOverride = data.PressureLockoutOverride; } } } diff --git a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentPumpSystem.cs b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentPumpSystem.cs index 7c12cf3f77..8951f8a947 100644 --- a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentPumpSystem.cs +++ b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentPumpSystem.cs @@ -108,7 +108,8 @@ namespace Content.Server.Atmos.Piping.Unary.EntitySystems // (ignoring temperature differences because I am lazy) var transferMoles = pressureDelta * environment.Volume / (pipe.Air.Temperature * Atmospherics.R); - if (vent.UnderPressureLockout) + // Only run if the device is under lockout and not being overriden + if (vent.UnderPressureLockout & !vent.PressureLockoutOverride) { // Leak only a small amount of gas as a proportion of supply pipe pressure. var pipeDelta = pipe.Air.Pressure - environment.Pressure; @@ -280,7 +281,7 @@ namespace Content.Server.Atmos.Piping.Unary.EntitySystems return; if (args.IsInDetailsRange) { - if (pumpComponent.UnderPressureLockout) + if (pumpComponent.UnderPressureLockout & !pumpComponent.PressureLockoutOverride) { args.PushMarkup(Loc.GetString("gas-vent-pump-uvlo")); } diff --git a/Content.Shared/Atmos/Piping/Unary/Components/SharedVentPumpComponent.cs b/Content.Shared/Atmos/Piping/Unary/Components/SharedVentPumpComponent.cs index 404c197868..15fece204d 100644 --- a/Content.Shared/Atmos/Piping/Unary/Components/SharedVentPumpComponent.cs +++ b/Content.Shared/Atmos/Piping/Unary/Components/SharedVentPumpComponent.cs @@ -13,6 +13,7 @@ namespace Content.Shared.Atmos.Piping.Unary.Components public VentPressureBound PressureChecks { get; set; } = VentPressureBound.ExternalBound; public float ExternalPressureBound { get; set; } = Atmospherics.OneAtmosphere; public float InternalPressureBound { get; set; } = 0f; + public bool PressureLockoutOverride { get; set; } = false; // Presets for 'dumb' air alarm modes @@ -22,7 +23,8 @@ namespace Content.Shared.Atmos.Piping.Unary.Components PumpDirection = VentPumpDirection.Releasing, PressureChecks = VentPressureBound.ExternalBound, ExternalPressureBound = Atmospherics.OneAtmosphere, - InternalPressureBound = 0f + InternalPressureBound = 0f, + PressureLockoutOverride = false }; public static GasVentPumpData FillModePreset = new GasVentPumpData @@ -32,7 +34,8 @@ namespace Content.Shared.Atmos.Piping.Unary.Components PumpDirection = VentPumpDirection.Releasing, PressureChecks = VentPressureBound.ExternalBound, ExternalPressureBound = Atmospherics.OneAtmosphere * 50, - InternalPressureBound = 0f + InternalPressureBound = 0f, + PressureLockoutOverride = true }; public static GasVentPumpData PanicModePreset = new GasVentPumpData @@ -42,7 +45,8 @@ namespace Content.Shared.Atmos.Piping.Unary.Components PumpDirection = VentPumpDirection.Releasing, PressureChecks = VentPressureBound.ExternalBound, ExternalPressureBound = Atmospherics.OneAtmosphere, - InternalPressureBound = 0f + InternalPressureBound = 0f, + PressureLockoutOverride = false }; public static GasVentPumpData ReplaceModePreset = new GasVentPumpData @@ -53,7 +57,8 @@ namespace Content.Shared.Atmos.Piping.Unary.Components PumpDirection = VentPumpDirection.Releasing, PressureChecks = VentPressureBound.ExternalBound, ExternalPressureBound = Atmospherics.OneAtmosphere, - InternalPressureBound = 0f + InternalPressureBound = 0f, + PressureLockoutOverride = false }; } diff --git a/Resources/ServerInfo/Guidebook/Engineering/Fires.xml b/Resources/ServerInfo/Guidebook/Engineering/Fires.xml index e2c83956cc..916a89444f 100644 --- a/Resources/ServerInfo/Guidebook/Engineering/Fires.xml +++ b/Resources/ServerInfo/Guidebook/Engineering/Fires.xml @@ -4,9 +4,23 @@ Fires and spacings are an inevitability due to the highly flammable plasma gas and the endless vacuum of space present in and around the station, so it's important to know how to manage them. ## Spacing - Space is arguably the easier of the two to handle. - While it does render an area uninhabitable, it can be trivially solved by simply sealing the hole that resulted in the vacuum. After that, assuming distro vents and pipes have not been destroyed in some unfortunate accident, the room will slowly begin to repressurize. - Be aware; active spacings will slowly siphon the air out of the station's air reserves. If you find it impossible to fix structural damage due to some other hazard, make sure to limit the airflow to that room. (Currently only half-valid due to the Gas Miners infinitely replenishing most of the useful gases) + Space is arguably the easier of the two to handle. Be aware; active spacings will slowly siphon the air out of the station's air reserves. If you find it impossible to fix structural damage due to some other hazard, make sure to limit the airflow to that room. (Currently only half-valid due to the Gas Miners infinitely replenishing most of the useful gases) + + While it does render an area uninhabitable, it can be trivially solved by simply following a two step process. Step one is to seal the hole that caused the vacuum. + + Step two is to repressurize the affected area. Note that the affected area will NOT fill from the station's distro network by default. Some atmospheric devices, specifically air vents, have built-in safeguards that cause the device to be disabled if pressure in a room drops too low. This features prevents spacings from venting the distro network unintentionally. + + As a result, there are three main options to repressurize the affected area: + + 1. Assuming distro vents and pipes have not been destroyed in some unfortunate accident, you may set surrounding air alarms to the "Fill" setting. This will cause connected air vents to override their safeguards and begin repressurizing the area. + - Be aware this setting also allows vents to OVERpressure a room, so this process must be monitored at all times. + + 2. Another option is to open any firelocks that were engaged in response to the original spacing. This will cause the pressure to equalize between both areas. + - This option generally causes more firelocks to engage in the surrounding area, potentially causing disruptions or making the second area unsafe for station crew. + + 3. The final option is to bring a canister into the spaced area and open its release valve. An air canister at 4500kpa can fully repressurize around 20-30 tiles before running out of gas. + - This option requires the canister be brought in from outisde (generally atmos) which can be slow and time consuming depending on the situation. + ## Fires Fires can be dealt with through a multitude of ways, but some of the most effective methods include: From 47bf64b883b26252df8873dd300defef2b610854 Mon Sep 17 00:00:00 2001 From: Ghagliiarghii <68826635+Ghagliiarghii@users.noreply.github.com> Date: Thu, 13 Jun 2024 21:10:17 -0400 Subject: [PATCH 010/142] Fix no combat knives in sec techfab (#28086) --- Resources/Prototypes/Entities/Structures/Machines/lathe.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index ab3cf20ac3..0ef76381f0 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -201,6 +201,7 @@ - BoxLethalshot - BoxShotgunFlare - BoxShotgunSlug + - CombatKnife - MagazineBoxLightRifle - MagazineBoxMagnum - MagazineBoxPistol @@ -709,6 +710,7 @@ - BoxShotgunPractice - BoxShotgunSlug - ClothingEyesHudSecurity + - CombatKnife - Flash - ForensicPad - Handcuffs From ad3f1f77b7ebd940b93f3966e3a49e79188703ae Mon Sep 17 00:00:00 2001 From: osjarw <62134478+osjarw@users.noreply.github.com> Date: Fri, 14 Jun 2024 05:01:32 +0300 Subject: [PATCH 011/142] Nodescanner now works with right click (#26873) --- .../Equipment/Systems/NodeScannerSystem.cs | 36 +++++++++++++++---- .../en-US/xenoarchaeology/node-scanner.ftl | 3 +- 2 files changed, 31 insertions(+), 8 deletions(-) diff --git a/Content.Server/Xenoarchaeology/Equipment/Systems/NodeScannerSystem.cs b/Content.Server/Xenoarchaeology/Equipment/Systems/NodeScannerSystem.cs index fc9ab28942..b388f3a6d4 100644 --- a/Content.Server/Xenoarchaeology/Equipment/Systems/NodeScannerSystem.cs +++ b/Content.Server/Xenoarchaeology/Equipment/Systems/NodeScannerSystem.cs @@ -3,6 +3,7 @@ using Content.Server.Xenoarchaeology.Equipment.Components; using Content.Server.Xenoarchaeology.XenoArtifacts; using Content.Shared.Interaction; using Content.Shared.Timing; +using Content.Shared.Verbs; namespace Content.Server.Xenoarchaeology.Equipment.Systems; @@ -14,23 +15,44 @@ public sealed class NodeScannerSystem : EntitySystem /// public override void Initialize() { - SubscribeLocalEvent(OnAfterInteract); + SubscribeLocalEvent(OnBeforeRangedInteract); + SubscribeLocalEvent>(AddScanVerb); } - private void OnAfterInteract(EntityUid uid, NodeScannerComponent component, AfterInteractEvent args) + private void OnBeforeRangedInteract(EntityUid uid, NodeScannerComponent component, BeforeRangedInteractEvent args) { - if (!args.CanReach || args.Target == null) + if (args.Handled || !args.CanReach || args.Target is not {} target) + return; + + if (!TryComp(target, out var artifact) || artifact.CurrentNodeId == null) + return; + + CreatePopup(uid, target, artifact); + args.Handled = true; + } + + private void AddScanVerb(EntityUid uid, NodeScannerComponent component, GetVerbsEvent args) + { + if (!args.CanAccess) return; if (!TryComp(args.Target, out var artifact) || artifact.CurrentNodeId == null) return; - if (args.Handled) - return; - args.Handled = true; + var verb = new UtilityVerb() + { + Act = () => + { + CreatePopup(uid, args.Target, artifact); + }, + Text = Loc.GetString("node-scan-tooltip") + }; - var target = args.Target.Value; + args.Verbs.Add(verb); + } + private void CreatePopup(EntityUid uid, EntityUid target, ArtifactComponent artifact) + { if (TryComp(uid, out UseDelayComponent? useDelay) && !_useDelay.TryResetDelay((uid, useDelay), true)) return; diff --git a/Resources/Locale/en-US/xenoarchaeology/node-scanner.ftl b/Resources/Locale/en-US/xenoarchaeology/node-scanner.ftl index 14b07941a6..4a05414c46 100644 --- a/Resources/Locale/en-US/xenoarchaeology/node-scanner.ftl +++ b/Resources/Locale/en-US/xenoarchaeology/node-scanner.ftl @@ -1 +1,2 @@ -node-scan-popup = The node ID is {$id} \ No newline at end of file +node-scan-popup = The node ID is {$id} +node-scan-tooltip = Scan artifact From e481925ea4e5d10e215c2e87faa17dd6cb8a8993 Mon Sep 17 00:00:00 2001 From: PJBot Date: Fri, 14 Jun 2024 02:02:39 +0000 Subject: [PATCH 012/142] 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 1124ee7acf..25b97beffe 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Callmore - changes: - - message: Holoprojectors no longer come with a cell when made at a lathe. - type: Tweak - id: 6224 - time: '2024-03-25T00:55:48.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/26405 - author: IProduceWidgets changes: - message: The captain can now return his laser to the glass display box. @@ -3847,3 +3840,10 @@ id: 6723 time: '2024-06-13T18:36:38.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/28821 +- author: osjarw + changes: + - message: Added context menu action for scanning artifacts. + type: Add + id: 6724 + time: '2024-06-14T02:01:32.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/26873 From 57858cd6a558399c0ec19ffce932ed5967144eff Mon Sep 17 00:00:00 2001 From: Cojoke <83733158+Cojoke-dot@users.noreply.github.com> Date: Thu, 13 Jun 2024 21:04:45 -0500 Subject: [PATCH 013/142] Lasers passover objects like projectiles unless the target is clicked on (#28768) * uh... * fix * alright, there we go * Revert "alright, there we go" This reverts commit 448180bfa58cc24c42a4d59ef34c017b9941f37b. * Make lasers not hit certain objects and lying mobs unless clicked on * comment * Update Content.Server/Weapons/Ranged/Systems/GunSystem.cs * an l vanished? --------- Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> --- .../Weapons/Ranged/Systems/GunSystem.cs | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/Content.Server/Weapons/Ranged/Systems/GunSystem.cs b/Content.Server/Weapons/Ranged/Systems/GunSystem.cs index cb893299a9..7f7c7ba855 100644 --- a/Content.Server/Weapons/Ranged/Systems/GunSystem.cs +++ b/Content.Server/Weapons/Ranged/Systems/GunSystem.cs @@ -17,6 +17,7 @@ using Content.Shared.Weapons.Ranged.Components; using Content.Shared.Weapons.Ranged.Events; using Content.Shared.Weapons.Ranged.Systems; using Content.Shared.Weapons.Reflect; +using Content.Shared.Damage.Components; using Robust.Shared.Audio; using Robust.Shared.Map; using Robust.Shared.Physics; @@ -202,6 +203,20 @@ public sealed partial class GunSystem : SharedGunSystem break; var result = rayCastResults[0]; + + // Checks if the laser should pass over unless targeted by its user + foreach (var collide in rayCastResults) + { + if (collide.HitEntity != gun.Target && + CompOrNull(collide.HitEntity)?.Active == true) + { + continue; + } + + result = collide; + break; + } + var hit = result.HitEntity; lastHit = hit; From af11bc3f51f3dfa3b278a813f7b4621c0cab97f2 Mon Sep 17 00:00:00 2001 From: PJBot Date: Fri, 14 Jun 2024 02:05:51 +0000 Subject: [PATCH 014/142] 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 25b97beffe..96a868d131 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: IProduceWidgets - changes: - - message: The captain can now return his laser to the glass display box. - type: Fix - id: 6225 - time: '2024-03-25T00:58:33.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/26398 - author: IProduceWidgets changes: - message: More varieties of astro-grass are now available. @@ -3847,3 +3840,10 @@ id: 6724 time: '2024-06-14T02:01:32.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/26873 +- author: Cojoke-dot + changes: + - message: Lasers now pass over things unless clicked like projectiles + type: Tweak + id: 6725 + time: '2024-06-14T02:04:45.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/28768 From f40267e68e7ac7891947546e4bbf480ea8ca4ba8 Mon Sep 17 00:00:00 2001 From: Repo <47093363+Titian3@users.noreply.github.com> Date: Fri, 14 Jun 2024 14:10:41 +1200 Subject: [PATCH 015/142] Add trailing comments on multiline lists - editorconfig. (#28922) Add trailing comments on multiline lists. --- .editorconfig | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/.editorconfig b/.editorconfig index 3e44d1a281..a5dfab07a5 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,4 +1,5 @@ root = true + [*] charset = utf-8 @@ -278,7 +279,7 @@ dotnet_naming_style.t_upper_camel_case_style.capitalization = pascal_case dotnet_naming_style.t_upper_camel_case_style.required_prefix = T dotnet_naming_style.upper_camel_case_style.capitalization = pascal_case -dotnet_naming_symbols.constants_symbols.applicable_accessibilities = public,internal,protected,protected_internal,private_protected +dotnet_naming_symbols.constants_symbols.applicable_accessibilities = public, internal, protected, protected_internal, private_protected dotnet_naming_symbols.constants_symbols.applicable_kinds = field dotnet_naming_symbols.constants_symbols.required_modifiers = const @@ -317,20 +318,20 @@ dotnet_naming_symbols.private_static_fields_symbols.required_modifiers = static dotnet_naming_symbols.private_static_readonly_symbols.applicable_accessibilities = private dotnet_naming_symbols.private_static_readonly_symbols.applicable_kinds = field -dotnet_naming_symbols.private_static_readonly_symbols.required_modifiers = static,readonly +dotnet_naming_symbols.private_static_readonly_symbols.required_modifiers = static, readonly dotnet_naming_symbols.property_symbols.applicable_accessibilities = * dotnet_naming_symbols.property_symbols.applicable_kinds = property -dotnet_naming_symbols.public_fields_symbols.applicable_accessibilities = public,internal,protected,protected_internal,private_protected +dotnet_naming_symbols.public_fields_symbols.applicable_accessibilities = public, internal, protected, protected_internal, private_protected dotnet_naming_symbols.public_fields_symbols.applicable_kinds = field -dotnet_naming_symbols.static_readonly_symbols.applicable_accessibilities = public,internal,protected,protected_internal,private_protected +dotnet_naming_symbols.static_readonly_symbols.applicable_accessibilities = public, internal, protected, protected_internal, private_protected dotnet_naming_symbols.static_readonly_symbols.applicable_kinds = field -dotnet_naming_symbols.static_readonly_symbols.required_modifiers = static,readonly +dotnet_naming_symbols.static_readonly_symbols.required_modifiers = static, readonly dotnet_naming_symbols.types_and_namespaces_symbols.applicable_accessibilities = * -dotnet_naming_symbols.types_and_namespaces_symbols.applicable_kinds = namespace,class,struct,enum,delegate +dotnet_naming_symbols.types_and_namespaces_symbols.applicable_kinds = namespace, class, struct, enum, delegate dotnet_naming_symbols.type_parameters_symbols.applicable_accessibilities = * dotnet_naming_symbols.type_parameters_symbols.applicable_kinds = type_parameter @@ -342,6 +343,7 @@ resharper_csharp_wrap_parameters_style = chop_if_long resharper_keep_existing_attribute_arrangement = true resharper_wrap_chained_binary_patterns = chop_if_long resharper_wrap_chained_method_calls = chop_if_long +resharper_csharp_trailing_comma_in_multiline_lists = true [*.{csproj,xml,yml,yaml,dll.config,msbuildproj,targets,props}] indent_size = 2 From c79849ae292690809e315b023ab95c33aaebbe56 Mon Sep 17 00:00:00 2001 From: crasg <109207982+Scruq445@users.noreply.github.com> Date: Thu, 13 Jun 2024 19:12:24 -0700 Subject: [PATCH 016/142] Remove Rat King from MouseMigration and add it to it's own Event (#28872) --- Resources/Prototypes/GameRules/events.yml | 24 +++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/Resources/Prototypes/GameRules/events.yml b/Resources/Prototypes/GameRules/events.yml index d3b0971be0..04918578fa 100644 --- a/Resources/Prototypes/GameRules/events.yml +++ b/Resources/Prototypes/GameRules/events.yml @@ -234,6 +234,30 @@ prob: 0.02 - id: MobMouseCancer prob: 0.001 +# Events always spawn a critter regardless of Probability https://github.com/space-wizards/space-station-14/issues/28480 I added the Rat King to their own event with a player cap. + +- type: entity + id: KingRatMigration + parent: BaseStationEventShortDelay + components: + - type: StationEvent + startAnnouncement: station-event-vent-creatures-start-announcement + startAudio: + path: /Audio/Announcements/attention.ogg + earliestStart: 15 + weight: 6 + duration: 50 + minimumPlayers: 15 # Hopefully this is enough for the Rat King's potential Army + - type: VentCrittersRule + entries: + - id: MobMouse + prob: 0.02 + - id: MobMouse1 + prob: 0.02 + - id: MobMouse2 + prob: 0.02 + - id: MobMouseCancer + prob: 0.001 specialEntries: - id: SpawnPointGhostRatKing prob: 0.001 From 6c343ddae2a57e95b05ceecaaab9121eeddf843a Mon Sep 17 00:00:00 2001 From: Tayrtahn Date: Thu, 13 Jun 2024 22:15:29 -0400 Subject: [PATCH 017/142] Move SleepingSystem to Shared & cleanup (#28672) * Move SleepingSystem to Shared & cleanup * Remove empty OnShutdown handler --- Content.Client/Bed/SleepingSystem.cs | 8 - Content.Server/Bed/BedSystem.cs | 1 - Content.Server/Bed/Sleep/SleepingSystem.cs | 254 -------------- .../Damage/ForceSay/DamageForceSaySystem.cs | 1 + .../Bed/Sleep/SharedSleepingSystem.cs | 92 ----- Content.Shared/Bed/Sleep/SleepingComponent.cs | 29 +- Content.Shared/Bed/Sleep/SleepingSystem.cs | 314 ++++++++++++++++++ .../Bed/Sleep}/SnoringComponent.cs | 6 +- 8 files changed, 339 insertions(+), 366 deletions(-) delete mode 100644 Content.Client/Bed/SleepingSystem.cs delete mode 100644 Content.Server/Bed/Sleep/SleepingSystem.cs delete mode 100644 Content.Shared/Bed/Sleep/SharedSleepingSystem.cs create mode 100644 Content.Shared/Bed/Sleep/SleepingSystem.cs rename {Content.Server/Bed/Components => Content.Shared/Bed/Sleep}/SnoringComponent.cs (54%) diff --git a/Content.Client/Bed/SleepingSystem.cs b/Content.Client/Bed/SleepingSystem.cs deleted file mode 100644 index addf855bf3..0000000000 --- a/Content.Client/Bed/SleepingSystem.cs +++ /dev/null @@ -1,8 +0,0 @@ -using Content.Server.Bed.Sleep; - -namespace Content.Client.Bed; - -public sealed class SleepingSystem : SharedSleepingSystem -{ - -} diff --git a/Content.Server/Bed/BedSystem.cs b/Content.Server/Bed/BedSystem.cs index 49021c142f..ee43cff26d 100644 --- a/Content.Server/Bed/BedSystem.cs +++ b/Content.Server/Bed/BedSystem.cs @@ -1,6 +1,5 @@ using Content.Server.Actions; using Content.Server.Bed.Components; -using Content.Server.Bed.Sleep; using Content.Server.Body.Systems; using Content.Server.Power.Components; using Content.Server.Power.EntitySystems; diff --git a/Content.Server/Bed/Sleep/SleepingSystem.cs b/Content.Server/Bed/Sleep/SleepingSystem.cs deleted file mode 100644 index 5e4f0eddb5..0000000000 --- a/Content.Server/Bed/Sleep/SleepingSystem.cs +++ /dev/null @@ -1,254 +0,0 @@ -using Content.Server.Popups; -using Content.Server.Sound; -using Content.Shared.Sound.Components; -using Content.Shared.Actions; -using Content.Shared.Audio; -using Content.Shared.Bed.Sleep; -using Content.Shared.Damage; -using Content.Shared.Examine; -using Content.Shared.IdentityManagement; -using Content.Shared.Interaction; -using Content.Shared.Interaction.Events; -using Content.Shared.Mobs; -using Content.Shared.Mobs.Components; -using Content.Shared.Slippery; -using Content.Shared.StatusEffect; -using Content.Shared.Stunnable; -using Content.Shared.Verbs; -using Robust.Shared.Audio; -using Robust.Shared.Audio.Systems; -using Robust.Shared.Player; -using Robust.Shared.Prototypes; -using Robust.Shared.Random; -using Robust.Shared.Timing; - -namespace Content.Server.Bed.Sleep -{ - public sealed class SleepingSystem : SharedSleepingSystem - { - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly IRobustRandom _robustRandom = default!; - [Dependency] private readonly PopupSystem _popupSystem = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly StatusEffectsSystem _statusEffectsSystem = default!; - [Dependency] private readonly EmitSoundSystem _emitSound = default!; - - [ValidatePrototypeId] public const string SleepActionId = "ActionSleep"; - - public override void Initialize() - { - base.Initialize(); - SubscribeLocalEvent(OnSleepStateChanged); - SubscribeLocalEvent(OnDamageChanged); - SubscribeLocalEvent(OnSleepAction); - SubscribeLocalEvent(OnBedSleepAction); - SubscribeLocalEvent(OnWakeAction); - SubscribeLocalEvent(OnMobStateChanged); - SubscribeLocalEvent>(AddWakeVerb); - SubscribeLocalEvent(OnInteractHand); - SubscribeLocalEvent(OnExamined); - SubscribeLocalEvent(OnSlip); - SubscribeLocalEvent(OnConsciousAttempt); - SubscribeLocalEvent(OnInit); - } - - /// - /// when sleeping component is added or removed, we do some stuff with other components. - /// - private void OnSleepStateChanged(EntityUid uid, MobStateComponent component, SleepStateChangedEvent args) - { - if (args.FellAsleep) - { - // Expiring status effects would remove the components needed for sleeping - _statusEffectsSystem.TryRemoveStatusEffect(uid, "Stun"); - _statusEffectsSystem.TryRemoveStatusEffect(uid, "KnockedDown"); - - EnsureComp(uid); - EnsureComp(uid); - - if (TryComp(uid, out var sleepSound)) - { - var emitSound = EnsureComp(uid); - if (HasComp(uid)) - { - emitSound.Sound = sleepSound.Snore; - } - emitSound.MinInterval = sleepSound.Interval; - emitSound.MaxInterval = sleepSound.MaxInterval; - emitSound.PopUp = sleepSound.PopUp; - } - - return; - } - - RemComp(uid); - RemComp(uid); - RemComp(uid); - } - - /// - /// Wake up on taking an instance of damage at least the value of WakeThreshold. - /// - private void OnDamageChanged(EntityUid uid, SleepingComponent component, DamageChangedEvent args) - { - if (!args.DamageIncreased || args.DamageDelta == null) - return; - - if (args.DamageDelta.GetTotal() >= component.WakeThreshold) - TryWaking(uid, component); - } - - private void OnSleepAction(EntityUid uid, MobStateComponent component, SleepActionEvent args) - { - TrySleeping(uid); - } - - private void OnBedSleepAction(EntityUid uid, ActionsContainerComponent component, SleepActionEvent args) - { - TrySleeping(args.Performer); - } - - private void OnWakeAction(EntityUid uid, MobStateComponent component, WakeActionEvent args) - { - if (!TryWakeCooldown(uid)) - return; - - if (TryWaking(uid)) - args.Handled = true; - } - - /// - /// In crit, we wake up if we are not being forced to sleep. - /// And, you can't sleep when dead... - /// - private void OnMobStateChanged(EntityUid uid, SleepingComponent component, MobStateChangedEvent args) - { - if (args.NewMobState == MobState.Dead) - { - RemComp(uid); - RemComp(uid); - return; - } - if (TryComp(uid, out var spam)) - _emitSound.SetEnabled((uid, spam), args.NewMobState == MobState.Alive); - } - - private void AddWakeVerb(EntityUid uid, SleepingComponent component, GetVerbsEvent args) - { - if (!args.CanInteract || !args.CanAccess) - return; - - AlternativeVerb verb = new() - { - Act = () => - { - if (!TryWakeCooldown(uid)) - return; - - TryWaking(args.Target, user: args.User); - }, - Text = Loc.GetString("action-name-wake"), - Priority = 2 - }; - - args.Verbs.Add(verb); - } - - /// - /// When you click on a sleeping person with an empty hand, try to wake them. - /// - private void OnInteractHand(EntityUid uid, SleepingComponent component, InteractHandEvent args) - { - args.Handled = true; - - if (!TryWakeCooldown(uid)) - return; - - TryWaking(args.Target, user: args.User); - } - - private void OnExamined(EntityUid uid, SleepingComponent component, ExaminedEvent args) - { - if (args.IsInDetailsRange) - { - args.PushMarkup(Loc.GetString("sleep-examined", ("target", Identity.Entity(uid, EntityManager)))); - } - } - - private void OnSlip(EntityUid uid, SleepingComponent component, SlipAttemptEvent args) - { - args.Cancel(); - } - - private void OnConsciousAttempt(EntityUid uid, SleepingComponent component, ConsciousAttemptEvent args) - { - args.Cancel(); - } - - - private void OnInit(EntityUid uid, ForcedSleepingComponent component, ComponentInit args) - { - TrySleeping(uid); - } - - /// - /// Try sleeping. Only mobs can sleep. - /// - public bool TrySleeping(EntityUid uid) - { - if (!HasComp(uid)) - return false; - - var tryingToSleepEvent = new TryingToSleepEvent(uid); - RaiseLocalEvent(uid, ref tryingToSleepEvent); - if (tryingToSleepEvent.Cancelled) - return false; - - EnsureComp(uid); - return true; - } - - private bool TryWakeCooldown(EntityUid uid, SleepingComponent? component = null) - { - if (!Resolve(uid, ref component, false)) - return false; - - var curTime = _gameTiming.CurTime; - - if (curTime < component.CoolDownEnd) - { - return false; - } - - component.CoolDownEnd = curTime + component.Cooldown; - return true; - } - - /// - /// Try to wake up. - /// - public bool TryWaking(EntityUid uid, SleepingComponent? component = null, bool force = false, EntityUid? user = null) - { - if (!Resolve(uid, ref component, false)) - return false; - - if (!force && HasComp(uid)) - { - if (user != null) - { - _audio.PlayPvs("/Audio/Effects/thudswoosh.ogg", uid, AudioHelpers.WithVariation(0.05f, _robustRandom)); - _popupSystem.PopupEntity(Loc.GetString("wake-other-failure", ("target", Identity.Entity(uid, EntityManager))), uid, Filter.Entities(user.Value), true, Shared.Popups.PopupType.SmallCaution); - } - return false; - } - - if (user != null) - { - _audio.PlayPvs("/Audio/Effects/thudswoosh.ogg", uid, AudioHelpers.WithVariation(0.05f, _robustRandom)); - _popupSystem.PopupEntity(Loc.GetString("wake-other-success", ("target", Identity.Entity(uid, EntityManager))), uid, Filter.Entities(user.Value), true); - } - RemComp(uid); - return true; - } - } -} diff --git a/Content.Server/Damage/ForceSay/DamageForceSaySystem.cs b/Content.Server/Damage/ForceSay/DamageForceSaySystem.cs index 186fc91c46..bc61c5d141 100644 --- a/Content.Server/Damage/ForceSay/DamageForceSaySystem.cs +++ b/Content.Server/Damage/ForceSay/DamageForceSaySystem.cs @@ -1,3 +1,4 @@ +using Content.Shared.Bed.Sleep; using Content.Shared.Damage; using Content.Shared.Damage.ForceSay; using Content.Shared.FixedPoint; diff --git a/Content.Shared/Bed/Sleep/SharedSleepingSystem.cs b/Content.Shared/Bed/Sleep/SharedSleepingSystem.cs deleted file mode 100644 index c6248c88f7..0000000000 --- a/Content.Shared/Bed/Sleep/SharedSleepingSystem.cs +++ /dev/null @@ -1,92 +0,0 @@ -using Content.Shared.Actions; -using Content.Shared.Bed.Sleep; -using Content.Shared.Damage.ForceSay; -using Content.Shared.Eye.Blinding.Systems; -using Content.Shared.Pointing; -using Content.Shared.Speech; -using Robust.Shared.Network; -using Robust.Shared.Prototypes; -using Robust.Shared.Timing; - -namespace Content.Server.Bed.Sleep -{ - public abstract class SharedSleepingSystem : EntitySystem - { - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly SharedActionsSystem _actionsSystem = default!; - [Dependency] private readonly BlindableSystem _blindableSystem = default!; - - [ValidatePrototypeId] private const string WakeActionId = "ActionWake"; - - public override void Initialize() - { - base.Initialize(); - SubscribeLocalEvent(OnMapInit); - SubscribeLocalEvent(OnShutdown); - SubscribeLocalEvent(OnSpeakAttempt); - SubscribeLocalEvent(OnSeeAttempt); - SubscribeLocalEvent(OnPointAttempt); - } - - - private void OnMapInit(EntityUid uid, SleepingComponent component, MapInitEvent args) - { - var ev = new SleepStateChangedEvent(true); - RaiseLocalEvent(uid, ev); - _blindableSystem.UpdateIsBlind(uid); - _actionsSystem.AddAction(uid, ref component.WakeAction, WakeActionId, uid); - - // TODO remove hardcoded time. - _actionsSystem.SetCooldown(component.WakeAction, _gameTiming.CurTime, _gameTiming.CurTime + TimeSpan.FromSeconds(2f)); - } - - private void OnShutdown(EntityUid uid, SleepingComponent component, ComponentShutdown args) - { - _actionsSystem.RemoveAction(uid, component.WakeAction); - var ev = new SleepStateChangedEvent(false); - RaiseLocalEvent(uid, ev); - _blindableSystem.UpdateIsBlind(uid); - } - - private void OnSpeakAttempt(EntityUid uid, SleepingComponent component, SpeakAttemptEvent args) - { - // TODO reduce duplication of this behavior with MobStateSystem somehow - if (HasComp(uid)) - { - RemCompDeferred(uid); - return; - } - - args.Cancel(); - } - - private void OnSeeAttempt(EntityUid uid, SleepingComponent component, CanSeeAttemptEvent args) - { - if (component.LifeStage <= ComponentLifeStage.Running) - args.Cancel(); - } - - private void OnPointAttempt(EntityUid uid, SleepingComponent component, PointAttemptEvent args) - { - args.Cancel(); - } - } -} - - -public sealed partial class SleepActionEvent : InstantActionEvent {} - -public sealed partial class WakeActionEvent : InstantActionEvent {} - -/// -/// Raised on an entity when they fall asleep or wake up. -/// -public sealed class SleepStateChangedEvent : EntityEventArgs -{ - public bool FellAsleep = false; - - public SleepStateChangedEvent(bool fellAsleep) - { - FellAsleep = fellAsleep; - } -} diff --git a/Content.Shared/Bed/Sleep/SleepingComponent.cs b/Content.Shared/Bed/Sleep/SleepingComponent.cs index cd468440f4..cbea0a0516 100644 --- a/Content.Shared/Bed/Sleep/SleepingComponent.cs +++ b/Content.Shared/Bed/Sleep/SleepingComponent.cs @@ -1,31 +1,42 @@ using Content.Shared.FixedPoint; +using Robust.Shared.Audio; using Robust.Shared.GameStates; -using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom; namespace Content.Shared.Bed.Sleep; /// /// Added to entities when they go to sleep. /// -[NetworkedComponent, RegisterComponent, AutoGenerateComponentPause(Dirty = true)] +[NetworkedComponent, RegisterComponent] +[AutoGenerateComponentState, AutoGenerateComponentPause(Dirty = true)] public sealed partial class SleepingComponent : Component { /// /// How much damage of any type it takes to wake this entity. /// - [DataField("wakeThreshold")] + [DataField] public FixedPoint2 WakeThreshold = FixedPoint2.New(2); /// /// Cooldown time between users hand interaction. /// - [DataField("cooldown")] - [ViewVariables(VVAccess.ReadWrite)] + [DataField] public TimeSpan Cooldown = TimeSpan.FromSeconds(1f); - [DataField("cooldownEnd", customTypeSerializer:typeof(TimeOffsetSerializer))] - [AutoPausedField] - public TimeSpan CoolDownEnd; + [DataField] + [AutoNetworkedField, AutoPausedField] + public TimeSpan CooldownEnd; - [DataField("wakeAction")] public EntityUid? WakeAction; + [DataField] + [AutoNetworkedField] + public EntityUid? WakeAction; + + /// + /// Sound to play when another player attempts to wake this entity. + /// + [DataField] + public SoundSpecifier WakeAttemptSound = new SoundPathSpecifier("/Audio/Effects/thudswoosh.ogg") + { + Params = AudioParams.Default.WithVariation(0.05f) + }; } diff --git a/Content.Shared/Bed/Sleep/SleepingSystem.cs b/Content.Shared/Bed/Sleep/SleepingSystem.cs new file mode 100644 index 0000000000..aac3e7bb18 --- /dev/null +++ b/Content.Shared/Bed/Sleep/SleepingSystem.cs @@ -0,0 +1,314 @@ +using Content.Shared.Actions; +using Content.Shared.Damage; +using Content.Shared.Damage.ForceSay; +using Content.Shared.Examine; +using Content.Shared.Eye.Blinding.Systems; +using Content.Shared.IdentityManagement; +using Content.Shared.Interaction; +using Content.Shared.Interaction.Events; +using Content.Shared.Mobs; +using Content.Shared.Mobs.Components; +using Content.Shared.Pointing; +using Content.Shared.Popups; +using Content.Shared.Slippery; +using Content.Shared.Sound; +using Content.Shared.Sound.Components; +using Content.Shared.Speech; +using Content.Shared.StatusEffect; +using Content.Shared.Stunnable; +using Content.Shared.Verbs; +using Robust.Shared.Audio.Systems; +using Robust.Shared.Prototypes; +using Robust.Shared.Timing; + +namespace Content.Shared.Bed.Sleep; + +public sealed partial class SleepingSystem : EntitySystem +{ + [Dependency] private readonly IGameTiming _gameTiming = default!; + [Dependency] private readonly SharedActionsSystem _actionsSystem = default!; + [Dependency] private readonly BlindableSystem _blindableSystem = default!; + [Dependency] private readonly SharedPopupSystem _popupSystem = default!; + [Dependency] private readonly SharedAudioSystem _audio = default!; + [Dependency] private readonly SharedEmitSoundSystem _emitSound = default!; + [Dependency] private readonly StatusEffectsSystem _statusEffectsSystem = default!; + + public static readonly ProtoId SleepActionId = "ActionSleep"; + public static readonly ProtoId WakeActionId = "ActionWake"; + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnBedSleepAction); + + SubscribeLocalEvent(OnSleepStateChanged); + SubscribeLocalEvent(OnWakeAction); + SubscribeLocalEvent(OnSleepAction); + + SubscribeLocalEvent(OnDamageChanged); + SubscribeLocalEvent(OnMobStateChanged); + SubscribeLocalEvent(OnMapInit); + SubscribeLocalEvent(OnSpeakAttempt); + SubscribeLocalEvent(OnSeeAttempt); + SubscribeLocalEvent(OnPointAttempt); + SubscribeLocalEvent(OnSlip); + SubscribeLocalEvent(OnConsciousAttempt); + SubscribeLocalEvent(OnExamined); + SubscribeLocalEvent>(AddWakeVerb); + SubscribeLocalEvent(OnInteractHand); + + SubscribeLocalEvent(OnInit); + } + + private void OnBedSleepAction(Entity ent, ref SleepActionEvent args) + { + TrySleeping(args.Performer); + } + + private void OnWakeAction(Entity ent, ref WakeActionEvent args) + { + if (TryWakeWithCooldown(ent.Owner)) + args.Handled = true; + } + + private void OnSleepAction(Entity ent, ref SleepActionEvent args) + { + TrySleeping((ent, ent.Comp)); + } + + /// + /// when sleeping component is added or removed, we do some stuff with other components. + /// + private void OnSleepStateChanged(Entity ent, ref SleepStateChangedEvent args) + { + if (args.FellAsleep) + { + // Expiring status effects would remove the components needed for sleeping + _statusEffectsSystem.TryRemoveStatusEffect(ent.Owner, "Stun"); + _statusEffectsSystem.TryRemoveStatusEffect(ent.Owner, "KnockedDown"); + + EnsureComp(ent); + EnsureComp(ent); + + if (TryComp(ent, out var sleepSound)) + { + var emitSound = EnsureComp(ent); + if (HasComp(ent)) + { + emitSound.Sound = sleepSound.Snore; + } + emitSound.MinInterval = sleepSound.Interval; + emitSound.MaxInterval = sleepSound.MaxInterval; + emitSound.PopUp = sleepSound.PopUp; + Dirty(ent.Owner, emitSound); + } + + return; + } + + RemComp(ent); + RemComp(ent); + RemComp(ent); + } + + private void OnMapInit(Entity ent, ref MapInitEvent args) + { + var ev = new SleepStateChangedEvent(true); + RaiseLocalEvent(ent, ref ev); + _blindableSystem.UpdateIsBlind(ent.Owner); + _actionsSystem.AddAction(ent, ref ent.Comp.WakeAction, WakeActionId, ent); + + // TODO remove hardcoded time. + _actionsSystem.SetCooldown(ent.Comp.WakeAction, _gameTiming.CurTime, _gameTiming.CurTime + TimeSpan.FromSeconds(2f)); + } + + private void OnSpeakAttempt(Entity ent, ref SpeakAttemptEvent args) + { + // TODO reduce duplication of this behavior with MobStateSystem somehow + if (HasComp(ent)) + { + RemCompDeferred(ent); + return; + } + + args.Cancel(); + } + + private void OnSeeAttempt(Entity ent, ref CanSeeAttemptEvent args) + { + if (ent.Comp.LifeStage <= ComponentLifeStage.Running) + args.Cancel(); + } + + private void OnPointAttempt(Entity ent, ref PointAttemptEvent args) + { + args.Cancel(); + } + + private void OnSlip(Entity ent, ref SlipAttemptEvent args) + { + args.Cancel(); + } + + private void OnConsciousAttempt(Entity ent, ref ConsciousAttemptEvent args) + { + args.Cancel(); + } + + private void OnExamined(Entity ent, ref ExaminedEvent args) + { + if (args.IsInDetailsRange) + { + args.PushMarkup(Loc.GetString("sleep-examined", ("target", Identity.Entity(ent, EntityManager)))); + } + } + + private void AddWakeVerb(Entity ent, ref GetVerbsEvent args) + { + if (!args.CanInteract || !args.CanAccess) + return; + + var target = args.Target; + var user = args.User; + AlternativeVerb verb = new() + { + Act = () => + { + TryWakeWithCooldown((ent, ent.Comp), user: user); + }, + Text = Loc.GetString("action-name-wake"), + Priority = 2 + }; + + args.Verbs.Add(verb); + } + + /// + /// When you click on a sleeping person with an empty hand, try to wake them. + /// + private void OnInteractHand(Entity ent, ref InteractHandEvent args) + { + args.Handled = true; + + TryWakeWithCooldown((ent, ent.Comp), args.User); + } + + /// + /// Wake up on taking an instance of damage at least the value of WakeThreshold. + /// + private void OnDamageChanged(Entity ent, ref DamageChangedEvent args) + { + if (!args.DamageIncreased || args.DamageDelta == null) + return; + + if (args.DamageDelta.GetTotal() >= ent.Comp.WakeThreshold) + TryWaking((ent, ent.Comp)); + } + + /// + /// In crit, we wake up if we are not being forced to sleep. + /// And, you can't sleep when dead... + /// + private void OnMobStateChanged(Entity ent, ref MobStateChangedEvent args) + { + if (args.NewMobState == MobState.Dead) + { + RemComp(ent); + RemComp(ent); + return; + } + if (TryComp(ent, out var spam)) + _emitSound.SetEnabled((ent, spam), args.NewMobState == MobState.Alive); + } + + private void OnInit(Entity ent, ref ComponentInit args) + { + TrySleeping(ent.Owner); + } + + private void Wake(Entity ent) + { + RemComp(ent); + _actionsSystem.RemoveAction(ent, ent.Comp.WakeAction); + + var ev = new SleepStateChangedEvent(false); + RaiseLocalEvent(ent, ref ev); + + _blindableSystem.UpdateIsBlind(ent.Owner); + } + + /// + /// Try sleeping. Only mobs can sleep. + /// + public bool TrySleeping(Entity ent) + { + if (!Resolve(ent, ref ent.Comp, logMissing: false)) + return false; + + var tryingToSleepEvent = new TryingToSleepEvent(ent); + RaiseLocalEvent(ent, ref tryingToSleepEvent); + if (tryingToSleepEvent.Cancelled) + return false; + + EnsureComp(ent); + return true; + } + + /// + /// Tries to wake up , with a cooldown between attempts to prevent spam. + /// + public bool TryWakeWithCooldown(Entity ent, EntityUid? user = null) + { + if (!Resolve(ent, ref ent.Comp, false)) + return false; + + var curTime = _gameTiming.CurTime; + + if (curTime < ent.Comp.CooldownEnd) + return false; + + ent.Comp.CooldownEnd = curTime + ent.Comp.Cooldown; + Dirty(ent, ent.Comp); + return TryWaking(ent, user: user); + } + + /// + /// Try to wake up . + /// + public bool TryWaking(Entity ent, bool force = false, EntityUid? user = null) + { + if (!Resolve(ent, ref ent.Comp, false)) + return false; + + if (!force && HasComp(ent)) + { + if (user != null) + { + _audio.PlayPredicted(ent.Comp.WakeAttemptSound, ent, user); + _popupSystem.PopupClient(Loc.GetString("wake-other-failure", ("target", Identity.Entity(ent, EntityManager))), ent, user, PopupType.SmallCaution); + } + return false; + } + + if (user != null) + { + _audio.PlayPredicted(ent.Comp.WakeAttemptSound, ent, user); + _popupSystem.PopupClient(Loc.GetString("wake-other-success", ("target", Identity.Entity(ent, EntityManager))), ent, user); + } + + Wake((ent, ent.Comp)); + return true; + } +} + + +public sealed partial class SleepActionEvent : InstantActionEvent; + +public sealed partial class WakeActionEvent : InstantActionEvent; + +/// +/// Raised on an entity when they fall asleep or wake up. +/// +[ByRefEvent] +public record struct SleepStateChangedEvent(bool FellAsleep); diff --git a/Content.Server/Bed/Components/SnoringComponent.cs b/Content.Shared/Bed/Sleep/SnoringComponent.cs similarity index 54% rename from Content.Server/Bed/Components/SnoringComponent.cs rename to Content.Shared/Bed/Sleep/SnoringComponent.cs index 09f80327ba..2fe92951f0 100644 --- a/Content.Server/Bed/Components/SnoringComponent.cs +++ b/Content.Shared/Bed/Sleep/SnoringComponent.cs @@ -1,9 +1,11 @@ -namespace Content.Server.Bed.Sleep; +using Robust.Shared.GameStates; + +namespace Content.Shared.Bed.Sleep; /// /// This is used for the snoring trait. /// -[RegisterComponent] +[RegisterComponent, NetworkedComponent] public sealed partial class SnoringComponent : Component { From 80590280158efd3094195c66a66ca52cb223ac65 Mon Sep 17 00:00:00 2001 From: Boaz1111 <149967078+Boaz1111@users.noreply.github.com> Date: Fri, 14 Jun 2024 04:40:23 +0200 Subject: [PATCH 018/142] makes PKA able to mine rocks in one hit (#27476) gives it gatheringprojectile --- .../Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index 825d3cc4a7..5601116009 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -400,6 +400,7 @@ # Short lifespan - type: TimedDespawn lifetime: 0.4 + - type: GatheringProjectile - type: entity id: BulletKineticShuttle From bcf85944318b8afd5d9b82176f3316e31cb959b2 Mon Sep 17 00:00:00 2001 From: PJBot Date: Fri, 14 Jun 2024 02:41:29 +0000 Subject: [PATCH 019/142] Automatic changelog update --- Resources/Changelog/Changelog.yml | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 96a868d131..92cab63ea2 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,13 +1,4 @@ Entries: -- author: IProduceWidgets - changes: - - message: More varieties of astro-grass are now available. - type: Add - - message: Astro-grass must now be cut instead of pried. - type: Tweak - id: 6226 - time: '2024-03-25T01:14:04.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/26381 - author: Tayrtahn changes: - message: Parrots now sound more like parrots when they talk. RAWWK! @@ -3847,3 +3838,10 @@ id: 6725 time: '2024-06-14T02:04:45.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/28768 +- author: Boaz1111 + changes: + - message: The PKA can now mine rocks in one hit again. + type: Tweak + id: 6726 + time: '2024-06-14T02:40:23.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/27476 From c52073f542a07f2e1b8380556a14995380336b49 Mon Sep 17 00:00:00 2001 From: Tabitha <64847293+KyuPolaris@users.noreply.github.com> Date: Fri, 14 Jun 2024 12:43:02 +1000 Subject: [PATCH 020/142] Add chicken speech sound (#28948) --- Resources/Prototypes/Entities/Mobs/NPCs/animals.yml | 3 +++ Resources/Prototypes/Voice/speech_sounds.yml | 9 +++++++++ 2 files changed, 12 insertions(+) diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index 971d05823a..f216e05cf9 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml @@ -181,6 +181,9 @@ - MobMask layer: - MobLayer + - type: Speech + speechVerb: SmallMob + speechSounds: Cluck - type: Tag tags: - DoorBumpOpener diff --git a/Resources/Prototypes/Voice/speech_sounds.yml b/Resources/Prototypes/Voice/speech_sounds.yml index a490c734d3..bc3cffb359 100644 --- a/Resources/Prototypes/Voice/speech_sounds.yml +++ b/Resources/Prototypes/Voice/speech_sounds.yml @@ -150,3 +150,12 @@ path: /Audio/Animals/dog_bark3.ogg exclaimSound: path: /Audio/Animals/dog_bark2.ogg + +- type: speechSounds + id: Cluck + saySound: + path: /Audio/Animals/chicken_cluck_happy.ogg + askSound: + path: /Audio/Animals/chicken_cluck_happy.ogg + exclaimSound: + path: /Audio/Animals/chicken_cluck_happy.ogg From 39d7afec2b52870e748cdd76f6de429f3ed71319 Mon Sep 17 00:00:00 2001 From: PJBot Date: Fri, 14 Jun 2024 02:44:08 +0000 Subject: [PATCH 021/142] 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 92cab63ea2..112dbfb313 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Tayrtahn - changes: - - message: Parrots now sound more like parrots when they talk. RAWWK! - type: Add - id: 6227 - time: '2024-03-25T01:26:41.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/26340 - author: DenisShvalov changes: - message: Added Cleaner Grenades that will help janitors in their work @@ -3845,3 +3838,10 @@ id: 6726 time: '2024-06-14T02:40:23.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/27476 +- author: KyuPolaris + changes: + - message: Chickens now make a clucking sound when they speak. + type: Add + id: 6727 + time: '2024-06-14T02:43:02.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/28948 From df2c3ec844da27056e27d0de44aade706b76e204 Mon Sep 17 00:00:00 2001 From: IProduceWidgets <107586145+IProduceWidgets@users.noreply.github.com> Date: Fri, 14 Jun 2024 01:26:39 -0400 Subject: [PATCH 022/142] Evac shuttle for Oasis (#27998) * Add robo control comp, also de-reinforce a lot of walls. * Add Accordia Evac shuttle for Oasis. * Revert "Add robo control comp, also de-reinforce a lot of walls." This reverts commit b6be6b616aa9732b81e02bed76e3c9ae103cf7cb. --- .../Maps/Shuttles/emergency_accordia.yml | 6531 +++++++++++++++++ Resources/Prototypes/Maps/oasis.yml | 2 +- 2 files changed, 6532 insertions(+), 1 deletion(-) create mode 100644 Resources/Maps/Shuttles/emergency_accordia.yml diff --git a/Resources/Maps/Shuttles/emergency_accordia.yml b/Resources/Maps/Shuttles/emergency_accordia.yml new file mode 100644 index 0000000000..8b5dac4d92 --- /dev/null +++ b/Resources/Maps/Shuttles/emergency_accordia.yml @@ -0,0 +1,6531 @@ +meta: + format: 6 + postmapinit: false +tilemap: + 0: Space + 32: FloorDark + 60: FloorHullReinforced + 96: FloorSteel + 112: FloorTechMaint2 + 113: FloorTechMaint3 + 115: FloorWhite + 125: FloorWood + 127: FloorWoodTile + 129: Plating + 135: TrainLattice +entities: +- proto: "" + entities: + - uid: 1 + components: + - type: MetaData + name: NT Evac Accordia + - type: Transform + pos: -0.5104167,-0.5 + parent: invalid + - type: MapGrid + chunks: + 0,0: + ind: 0,0 + tiles: PAAAAAAAgQAAAAAAgQAAAAAAcwAAAAADcwAAAAAAcwAAAAADgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAAAAAAAPAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAAAAAAAPAAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAAAAAAAPAAAAAAAhwAAAAAAAAAAAAAAhwAAAAAAhwAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAAAAAAAPAAAAAAAhwAAAAAAAAAAAAAAhwAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAABIAAAAAAAIAAAAAADIAAAAAABgQAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAABIAAAAAACIAAAAAACIAAAAAAAgQAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAIAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAIAAAAAAAIAAAAAADIAAAAAADIAAAAAABIAAAAAADgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAIAAAAAABIAAAAAAAIAAAAAABIAAAAAABIAAAAAABgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAIAAAAAABIAAAAAACIAAAAAABIAAAAAADIAAAAAACgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAACIAAAAAAAIAAAAAADIAAAAAADIAAAAAACIAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAIAAAAAABIAAAAAABIAAAAAABIAAAAAABgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAIAAAAAACIAAAAAACIAAAAAABgQAAAAAAgQAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAABIAAAAAACIAAAAAABIAAAAAACgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + 0,-1: + ind: 0,-1 + tiles: PAAAAAAAgQAAAAAAgQAAAAAAfQAAAAABfQAAAAABfQAAAAABgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAAAAAAAPAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAAAAAAAPAAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAAAAAAAPAAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAAAAAAAPAAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAAAAAAAPAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAAAAAAAgQAAAAAAgQAAAAAAIAAAAAAAIAAAAAACIAAAAAABgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAADIAAAAAAAgQAAAAAAIAAAAAABIAAAAAABIAAAAAABgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAADIAAAAAACIAAAAAACIAAAAAABIAAAAAADIAAAAAACgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAABIAAAAAABIAAAAAABIAAAAAACIAAAAAACIAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAADIAAAAAACgQAAAAAAIAAAAAABIAAAAAACIAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAABIAAAAAADgQAAAAAAgQAAAAAAIAAAAAABgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAABIAAAAAAAgQAAAAAAcwAAAAABcwAAAAAAcwAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAIAAAAAABcwAAAAACcwAAAAABcwAAAAADcwAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAADIAAAAAAAcwAAAAADcwAAAAABcwAAAAABcwAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAIAAAAAABgQAAAAAAcwAAAAABcwAAAAAAcwAAAAABgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + 0,-2: + ind: 0,-2 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAhwAAAAAAhwAAAAAAgQAAAAAAhwAAAAAAhwAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAhwAAAAAAhwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAACgQAAAAAAgQAAAAAAfQAAAAAAfQAAAAAAfQAAAAABgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAADIAAAAAABfwAAAAABfQAAAAADfQAAAAABfQAAAAADgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAIAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAABIAAAAAAAgQAAAAAAcQAAAAABcQAAAAACgQAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAIAAAAAABcAAAAAAAcAAAAAAAcQAAAAACgQAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAACIAAAAAACgQAAAAAAcQAAAAABcQAAAAADgQAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAADIAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAACIAAAAAADfwAAAAADfQAAAAADfQAAAAABfQAAAAADgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAIAAAAAAAgQAAAAAAfQAAAAADfQAAAAABfQAAAAABgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + -1,0: + ind: -1,0 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAADYAAAAAACYAAAAAADgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAhwAAAAAAhwAAAAAAAAAAAAAAhwAAAAAAPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAhwAAAAAAAAAAAAAAhwAAAAAAPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAgQAAAAAAIAAAAAACIAAAAAACIAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAgQAAAAAAIAAAAAAAIAAAAAABIAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAACYAAAAAABYAAAAAADYAAAAAABYAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAAAYAAAAAADYAAAAAAAYAAAAAACYAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAABYAAAAAADYAAAAAADYAAAAAACgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAADYAAAAAABYAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAYAAAAAADgQAAAAAAgQAAAAAAIAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAIAAAAAADIAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAIAAAAAACIAAAAAAAIAAAAAAD + version: 6 + -1,-1: + ind: -1,-1 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAAAYAAAAAABYAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAAAYAAAAAABYAAAAAAAYAAAAAADIAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAACYAAAAAABYAAAAAAAYAAAAAABIAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAADYAAAAAACYAAAAAACYAAAAAABIAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAADYAAAAAADYAAAAAAAYAAAAAABIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAAAYAAAAAADYAAAAAACYAAAAAAAIAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAADYAAAAAACYAAAAAABYAAAAAABIAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAACYAAAAAAAYAAAAAADYAAAAAADIAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAAAYAAAAAACYAAAAAACYAAAAAAAIAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAACYAAAAAACYAAAAAABYAAAAAACIAAAAAAB + version: 6 + -1,-2: + ind: -1,-2 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAhwAAAAAAhwAAAAAAgQAAAAAAhwAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAhwAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAABgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAABYAAAAAACYAAAAAACgQAAAAAAIAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAACYAAAAAADYAAAAAABgQAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAgQAAAAAAYAAAAAADYAAAAAABYAAAAAADIAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAgQAAAAAAYAAAAAACYAAAAAAAYAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAgQAAAAAAYAAAAAAAYAAAAAACgQAAAAAAIAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAABgQAAAAAAIAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAABYAAAAAACYAAAAAAAgQAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAADYAAAAAADYAAAAAADgQAAAAAAIAAAAAAB + version: 6 + 0,1: + ind: 0,1 + tiles: IAAAAAAAIAAAAAAAIAAAAAACgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAABIAAAAAADIAAAAAACgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + -1,1: + ind: -1,1 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAIAAAAAAAIAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAIAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + - type: Broadphase + - type: Physics + bodyStatus: InAir + angularDamping: 0.05 + linearDamping: 0.05 + fixedRotation: False + bodyType: Dynamic + - type: Fixtures + fixtures: {} + - type: OccluderTree + - type: SpreaderGrid + - type: Shuttle + - type: GridPathfinding + - type: Gravity + gravityShakeSound: !type:SoundPathSpecifier + path: /Audio/Effects/alert.ogg + - type: DecalGrid + chunkCollection: + version: 2 + nodes: + - node: + color: '#334E6DC8' + id: BrickTileWhiteCornerNe + decals: + 40: 5,12 + 41: 4,13 + 43: 3,15 + - node: + color: '#52B4E996' + id: BrickTileWhiteCornerNe + decals: + 116: 5,0 + - node: + color: '#DE3A3A96' + id: BrickTileWhiteCornerNe + decals: + 119: 5,-6 + - node: + color: '#52B4E996' + id: BrickTileWhiteCornerNw + decals: + 115: 3,0 + - node: + color: '#DE3A3A96' + id: BrickTileWhiteCornerNw + decals: + 120: 3,-6 + - node: + color: '#52B4E996' + id: BrickTileWhiteCornerSe + decals: + 117: 5,-4 + - node: + color: '#DE3A3A96' + id: BrickTileWhiteCornerSe + decals: + 118: 5,-10 + - node: + color: '#EFB34196' + id: BrickTileWhiteCornerSe + decals: + 206: -3,-25 + - node: + color: '#334E6DC8' + id: BrickTileWhiteCornerSw + decals: + 46: -2,14 + 47: -1,13 + 48: 0,12 + 89: 3,9 + - node: + color: '#52B4E996' + id: BrickTileWhiteCornerSw + decals: + 114: 3,-4 + - node: + color: '#DE3A3A96' + id: BrickTileWhiteCornerSw + decals: + 132: 3,-10 + - node: + color: '#334E6DC8' + id: BrickTileWhiteEndS + decals: + 82: 1,9 + - node: + color: '#334E6DC8' + id: BrickTileWhiteInnerNe + decals: + 70: 2,15 + 72: 4,12 + 97: 3,13 + 148: 1,7 + - node: + color: '#52B4E996' + id: BrickTileWhiteInnerNe + decals: + 137: 1,-4 + - node: + color: '#D4D4D496' + id: BrickTileWhiteInnerNe + decals: + 152: -3,7 + 177: 1,-19 + - node: + color: '#DE3A3A96' + id: BrickTileWhiteInnerNe + decals: + 145: 1,-9 + - node: + color: '#EFB34196' + id: BrickTileWhiteInnerNe + decals: + 183: 1,-22 + - node: + color: '#334E6DC8' + id: BrickTileWhiteInnerNw + decals: + 57: -2,15 + 149: 3,7 + - node: + color: '#D4D4D496' + id: BrickTileWhiteInnerNw + decals: + 151: -1,7 + 243: -5,-3 + - node: + color: '#EFB34196' + id: BrickTileWhiteInnerNw + decals: + 184: -1,-23 + - node: + color: '#334E6DC8' + id: BrickTileWhiteInnerSe + decals: + 104: 1,11 + - node: + color: '#52B4E996' + id: BrickTileWhiteInnerSe + decals: + 138: 1,-1 + - node: + color: '#D4D4D496' + id: BrickTileWhiteInnerSe + decals: + 175: 1,-17 + 176: 1,-23 + - node: + color: '#DE3A3A96' + id: BrickTileWhiteInnerSe + decals: + 146: 1,-6 + - node: + color: '#EFB34196' + id: BrickTileWhiteInnerSe + decals: + 181: 1,-20 + - node: + color: '#334E6DC8' + id: BrickTileWhiteInnerSw + decals: + 58: -2,15 + 79: 0,13 + 92: -1,14 + 102: 1,12 + 103: 3,11 + - node: + color: '#D4D4D496' + id: BrickTileWhiteInnerSw + decals: + 242: -5,-7 + - node: + color: '#EFB34196' + id: BrickTileWhiteInnerSw + decals: + 182: -1,-20 + - node: + color: '#334E6DC8' + id: BrickTileWhiteLineE + decals: + 36: 5,10 + 38: 5,11 + 53: 2,16 + 54: 3,14 + 83: 1,10 + - node: + color: '#52B4E996' + id: BrickTileWhiteLineE + decals: + 110: 5,-3 + 111: 5,-2 + 112: 5,-1 + 135: 1,-3 + 136: 1,-2 + - node: + color: '#D4D4D496' + id: BrickTileWhiteLineE + decals: + 173: 1,-24 + 174: 1,-18 + - node: + color: '#DE3A3A96' + id: BrickTileWhiteLineE + decals: + 127: 5,-9 + 128: 5,-8 + 129: 5,-7 + 133: 1,-8 + 134: 1,-7 + - node: + color: '#EFB34196' + id: BrickTileWhiteLineE + decals: + 180: 1,-21 + 190: -3,-17 + 191: -3,-18 + 192: -3,-19 + 193: -3,-20 + 197: -3,-23 + 205: -3,-24 + - node: + color: '#334E6DC8' + id: BrickTileWhiteLineN + decals: + 147: 2,7 + - node: + color: '#52B4E996' + id: BrickTileWhiteLineN + decals: + 113: 4,0 + - node: + color: '#D4D4D496' + id: BrickTileWhiteLineN + decals: + 153: -2,7 + - node: + color: '#DE3A3A96' + id: BrickTileWhiteLineN + decals: + 131: 4,-6 + - node: + color: '#334E6DC8' + id: BrickTileWhiteLineS + decals: + 35: 4,9 + - node: + color: '#52B4E996' + id: BrickTileWhiteLineS + decals: + 106: 4,-4 + - node: + color: '#DE3A3A96' + id: BrickTileWhiteLineS + decals: + 130: 4,-10 + - node: + color: '#EFB34196' + id: BrickTileWhiteLineS + decals: + 207: -4,-25 + - node: + color: '#334E6DC8' + id: BrickTileWhiteLineW + decals: + 50: 1,10 + 52: -2,16 + 86: 3,10 + 100: 1,11 + - node: + color: '#52B4E996' + id: BrickTileWhiteLineW + decals: + 109: 3,-1 + 141: 3,-3 + 142: 3,-2 + - node: + color: '#D4D4D428' + id: BrickTileWhiteLineW + decals: + 164: -1,-1 + 165: -1,-2 + 166: -1,-3 + 167: -1,-4 + 168: -1,-5 + 169: -1,-6 + 170: -1,-7 + 171: -1,-8 + 172: -1,-9 + - node: + color: '#D4D4D496' + id: BrickTileWhiteLineW + decals: + 236: -5,-8 + 237: -5,-10 + 238: -5,-2 + 239: -5,-1 + 240: -5,0 + 241: -5,-9 + - node: + color: '#DE3A3A96' + id: BrickTileWhiteLineW + decals: + 124: 3,-7 + 125: 3,-8 + 126: 3,-9 + - node: + color: '#EFB34196' + id: BrickTileWhiteLineW + decals: + 178: -1,-22 + 179: -1,-21 + 186: -5,-17 + 187: -5,-18 + - node: + color: '#334E6DC8' + id: FullTileOverlayGreyscale + decals: + 55: -3,15 + 62: 2,17 + 63: 1,17 + 64: 0,17 + 65: -1,17 + 66: -2,17 + 74: 2,10 + 245: 2,8 + - node: + color: '#52B4E996' + id: FullTileOverlayGreyscale + decals: + 143: 2,-3 + 144: 2,-2 + - node: + color: '#DE3A3A96' + id: FullTileOverlayGreyscale + decals: + 121: 4,-5 + 122: 2,-7 + 123: 2,-8 + - node: + color: '#EFB34196' + id: FullTileOverlayGreyscale + decals: + 212: -5,-25 + 213: -5,-24 + 217: -2,-22 + 218: -2,-21 + - node: + color: '#EFB34196' + id: HalfTileOverlayGreyscale + decals: + 188: -5,-17 + 189: -4,-17 + 194: -3,-17 + - node: + color: '#334E6DC8' + id: HalfTileOverlayGreyscale180 + decals: + 105: 2,11 + - node: + color: '#EFB34196' + id: HalfTileOverlayGreyscale270 + decals: + 214: -4,-25 + 215: -4,-24 + - node: + color: '#EFB34196' + id: HalfTileOverlayGreyscale90 + decals: + 219: -3,-22 + 220: -3,-21 + - node: + color: '#EFB34196' + id: MiniTileWhiteInnerSw + decals: + 216: -4,-23 + - node: + color: '#FFFFFFFF' + id: WoodTrimThinCornerNe + decals: + 221: 5,-24 + 222: 5,-16 + - node: + color: '#FFFFFFFF' + id: WoodTrimThinCornerNw + decals: + 223: 3,-16 + 224: 3,-24 + - node: + color: '#FFFFFFFF' + id: WoodTrimThinCornerSe + decals: + 227: 5,-25 + 228: 5,-18 + - node: + color: '#FFFFFFFF' + id: WoodTrimThinCornerSw + decals: + 225: 3,-25 + 226: 3,-18 + - node: + color: '#FFFFFFFF' + id: WoodTrimThinLineE + decals: + 229: 5,-17 + - node: + color: '#FFFFFFFF' + id: WoodTrimThinLineN + decals: + 233: 4,-16 + 234: 4,-24 + - node: + color: '#FFFFFFFF' + id: WoodTrimThinLineS + decals: + 231: 4,-25 + 232: 4,-18 + - node: + color: '#FFFFFFFF' + id: WoodTrimThinLineW + decals: + 230: 3,-17 + - type: GridAtmosphere + version: 2 + data: + tiles: + 0,0: + 0: 13113 + 1: 17408 + 0,-1: + 0: 49147 + -1,0: + 0: 34947 + 1: 21504 + 0,1: + 0: 65299 + 1: 4 + -1,1: + 0: 60936 + 1: 5 + 0,2: + 0: 61156 + -1,2: + 0: 32756 + 0,3: + 0: 65535 + -1,3: + 0: 60563 + 0,4: + 0: 119 + 1,0: + 0: 3 + 1: 30272 + 1,2: + 0: 13104 + 1: 4 + 1,3: + 0: 19 + 1: 1024 + 1,-1: + 0: 13107 + 1,1: + 1: 8739 + 0,-4: + 0: 13113 + 1: 17408 + 0,-5: + 0: 48955 + -1,-4: + 0: 34947 + 1: 17408 + 0,-3: + 0: 47411 + 1: 4 + -1,-3: + 0: 62344 + 1: 4 + 0,-2: + 0: 15359 + -1,-2: + 0: 65535 + -1,-1: + 0: 65535 + 1,-4: + 0: 3 + 1: 26176 + 1,-3: + 0: 13056 + 1: 70 + 1,-2: + 0: 4915 + 1,-5: + 0: 13057 + 1: 4 + 0,-7: + 1: 1904 + 0: 36864 + -1,-7: + 1: 3280 + 0: 12288 + 0,-6: + 0: 64319 + -1,-6: + 0: 65467 + -1,-5: + 0: 48059 + 1,-7: + 1: 112 + 0: 12288 + 1,-6: + 0: 4355 + 1: 17408 + -2,0: + 0: 12 + 1: 52288 + -2,2: + 1: 4 + 0: 34944 + -2,3: + 0: 8 + 1: 1024 + -2,-1: + 0: 35976 + -2,1: + 1: 34952 + -1,4: + 0: 204 + -2,-4: + 1: 52288 + 0: 8 + -2,-3: + 1: 76 + 0: 35840 + -2,-2: + 0: 34956 + -2,-5: + 0: 34944 + 1: 4 + -2,-7: + 1: 192 + 0: 32768 + -2,-6: + 0: 8 + 1: 17408 + uniqueMixes: + - volume: 2500 + temperature: 293.15 + moles: + - 21.824879 + - 82.10312 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - volume: 2500 + immutable: True + moles: + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + chunkSize: 4 + - type: GasTileOverlay + - type: RadiationGridResistance +- proto: Airlock + entities: + - uid: 377 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,-17.5 + parent: 1 + - uid: 394 + components: + - type: Transform + pos: 2.5,-23.5 + parent: 1 +- proto: AirlockCommandGlassLocked + entities: + - uid: 198 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 2.5,8.5 + parent: 1 +- proto: AirlockEngineeringLocked + entities: + - uid: 392 + components: + - type: Transform + pos: 2.5,-20.5 + parent: 1 + - uid: 406 + components: + - type: Transform + pos: -1.5,-21.5 + parent: 1 + - uid: 407 + components: + - type: Transform + pos: -1.5,-20.5 + parent: 1 +- proto: AirlockExternalGlass + entities: + - uid: 388 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 0.5,-24.5 + parent: 1 +- proto: AirlockGlass + entities: + - uid: 250 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,8.5 + parent: 1 +- proto: AirlockGlassShuttle + entities: + - uid: 2 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -5.5,0.5 + parent: 1 + - uid: 3 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -5.5,-9.5 + parent: 1 + - uid: 4 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -5.5,-7.5 + parent: 1 + - uid: 5 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -5.5,-1.5 + parent: 1 +- proto: AirlockHatch + entities: + - uid: 223 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 0.5,0.5 + parent: 1 + - uid: 224 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 0.5,5.5 + parent: 1 + - uid: 225 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 0.5,-9.5 + parent: 1 + - uid: 226 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 0.5,-15.5 + parent: 1 +- proto: AirlockMedicalGlassLocked + entities: + - uid: 287 + components: + - type: Transform + pos: 2.5,-2.5 + parent: 1 + - uid: 288 + components: + - type: Transform + pos: 2.5,-1.5 + parent: 1 +- proto: AirlockSecurityGlassLocked + entities: + - uid: 278 + components: + - type: Transform + pos: 2.5,-7.5 + parent: 1 + - uid: 285 + components: + - type: Transform + pos: 2.5,-6.5 + parent: 1 + - uid: 286 + components: + - type: Transform + pos: 4.5,-4.5 + parent: 1 +- proto: AltarNanotrasen + entities: + - uid: 253 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -3.5,11.5 + parent: 1 +- proto: APCHighCapacity + entities: + - uid: 615 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,-19.5 + parent: 1 + - uid: 616 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,-4.5 + parent: 1 + - uid: 617 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 0.5,11.5 + parent: 1 +- proto: AtmosDeviceFanTiny + entities: + - uid: 269 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,-12.5 + parent: 1 + - uid: 270 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 2.5,-12.5 + parent: 1 + - uid: 271 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,3.5 + parent: 1 + - uid: 272 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 2.5,3.5 + parent: 1 + - uid: 273 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -5.5,0.5 + parent: 1 + - uid: 274 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -5.5,-1.5 + parent: 1 + - uid: 275 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -5.5,-7.5 + parent: 1 + - uid: 276 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -5.5,-9.5 + parent: 1 + - uid: 389 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 0.5,-24.5 + parent: 1 +- proto: BaseComputer + entities: + - uid: 244 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,16.5 + parent: 1 + - uid: 302 + components: + - type: Transform + pos: 3.5,15.5 + parent: 1 +- proto: Bed + entities: + - uid: 381 + components: + - type: Transform + pos: 3.5,-15.5 + parent: 1 + - uid: 382 + components: + - type: Transform + pos: 5.5,-15.5 + parent: 1 + - uid: 390 + components: + - type: Transform + pos: 3.5,-24.5 + parent: 1 + - uid: 660 + components: + - type: Transform + pos: 5.5,-24.5 + parent: 1 +- proto: BedsheetMedical + entities: + - uid: 310 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 5.5,-2.5 + parent: 1 + - uid: 311 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 5.5,-1.5 + parent: 1 + - uid: 312 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 5.5,-0.5 + parent: 1 +- proto: BedsheetSpawner + entities: + - uid: 384 + components: + - type: Transform + pos: 3.5,-15.5 + parent: 1 + - uid: 385 + components: + - type: Transform + pos: 5.5,-15.5 + parent: 1 + - uid: 658 + components: + - type: Transform + pos: 3.5,-24.5 + parent: 1 + - uid: 659 + components: + - type: Transform + pos: 5.5,-24.5 + parent: 1 +- proto: BorgCharger + entities: + - uid: 814 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 4.5,-17.5 + parent: 1 +- proto: BoxInflatable + entities: + - uid: 360 + components: + - type: Transform + parent: 359 + - type: Physics + canCollide: False + - type: InsideEntityStorage + - uid: 370 + components: + - type: Transform + parent: 369 + - type: Physics + canCollide: False + - type: InsideEntityStorage +- proto: CableApcExtension + entities: + - uid: 534 + components: + - type: Transform + pos: -3.5,-20.5 + parent: 1 + - uid: 594 + components: + - type: Transform + pos: -3.5,-18.5 + parent: 1 + - uid: 597 + components: + - type: Transform + pos: -3.5,-24.5 + parent: 1 + - uid: 598 + components: + - type: Transform + pos: 0.5,-21.5 + parent: 1 + - uid: 599 + components: + - type: Transform + pos: 0.5,-20.5 + parent: 1 + - uid: 606 + components: + - type: Transform + pos: -3.5,-23.5 + parent: 1 + - uid: 607 + components: + - type: Transform + pos: -3.5,-22.5 + parent: 1 + - uid: 608 + components: + - type: Transform + pos: -3.5,-21.5 + parent: 1 + - uid: 610 + components: + - type: Transform + pos: 0.5,-19.5 + parent: 1 + - uid: 611 + components: + - type: Transform + pos: -1.5,-19.5 + parent: 1 + - uid: 662 + components: + - type: Transform + pos: -0.5,-19.5 + parent: 1 + - uid: 663 + components: + - type: Transform + pos: -3.5,-15.5 + parent: 1 + - uid: 664 + components: + - type: Transform + pos: -3.5,-16.5 + parent: 1 + - uid: 665 + components: + - type: Transform + pos: -3.5,-17.5 + parent: 1 + - uid: 669 + components: + - type: Transform + pos: -2.5,-19.5 + parent: 1 + - uid: 670 + components: + - type: Transform + pos: -3.5,-19.5 + parent: 1 + - uid: 671 + components: + - type: Transform + pos: 0.5,-22.5 + parent: 1 + - uid: 672 + components: + - type: Transform + pos: 0.5,-23.5 + parent: 1 + - uid: 673 + components: + - type: Transform + pos: 0.5,-24.5 + parent: 1 + - uid: 674 + components: + - type: Transform + pos: 0.5,-25.5 + parent: 1 + - uid: 675 + components: + - type: Transform + pos: 1.5,-23.5 + parent: 1 + - uid: 676 + components: + - type: Transform + pos: 2.5,-23.5 + parent: 1 + - uid: 677 + components: + - type: Transform + pos: 3.5,-23.5 + parent: 1 + - uid: 678 + components: + - type: Transform + pos: 4.5,-23.5 + parent: 1 + - uid: 679 + components: + - type: Transform + pos: 4.5,-24.5 + parent: 1 + - uid: 680 + components: + - type: Transform + pos: 5.5,-24.5 + parent: 1 + - uid: 681 + components: + - type: Transform + pos: 1.5,-20.5 + parent: 1 + - uid: 682 + components: + - type: Transform + pos: 2.5,-20.5 + parent: 1 + - uid: 683 + components: + - type: Transform + pos: 3.5,-20.5 + parent: 1 + - uid: 684 + components: + - type: Transform + pos: 0.5,-18.5 + parent: 1 + - uid: 685 + components: + - type: Transform + pos: 0.5,-17.5 + parent: 1 + - uid: 686 + components: + - type: Transform + pos: 1.5,-17.5 + parent: 1 + - uid: 687 + components: + - type: Transform + pos: 2.5,-17.5 + parent: 1 + - uid: 688 + components: + - type: Transform + pos: 3.5,-17.5 + parent: 1 + - uid: 689 + components: + - type: Transform + pos: 4.5,-17.5 + parent: 1 + - uid: 690 + components: + - type: Transform + pos: 4.5,-16.5 + parent: 1 + - uid: 691 + components: + - type: Transform + pos: 0.5,-16.5 + parent: 1 + - uid: 692 + components: + - type: Transform + pos: 0.5,-15.5 + parent: 1 + - uid: 693 + components: + - type: Transform + pos: 0.5,-14.5 + parent: 1 + - uid: 694 + components: + - type: Transform + pos: 0.5,-10.5 + parent: 1 + - uid: 695 + components: + - type: Transform + pos: 0.5,-9.5 + parent: 1 + - uid: 696 + components: + - type: Transform + pos: 0.5,-8.5 + parent: 1 + - uid: 697 + components: + - type: Transform + pos: 0.5,-7.5 + parent: 1 + - uid: 698 + components: + - type: Transform + pos: 0.5,-6.5 + parent: 1 + - uid: 699 + components: + - type: Transform + pos: 0.5,-5.5 + parent: 1 + - uid: 700 + components: + - type: Transform + pos: 0.5,-4.5 + parent: 1 + - uid: 701 + components: + - type: Transform + pos: 1.5,-4.5 + parent: 1 + - uid: 702 + components: + - type: Transform + pos: 2.5,-4.5 + parent: 1 + - uid: 703 + components: + - type: Transform + pos: 1.5,-6.5 + parent: 1 + - uid: 704 + components: + - type: Transform + pos: 2.5,-6.5 + parent: 1 + - uid: 705 + components: + - type: Transform + pos: 3.5,-6.5 + parent: 1 + - uid: 706 + components: + - type: Transform + pos: 4.5,-6.5 + parent: 1 + - uid: 707 + components: + - type: Transform + pos: 4.5,-7.5 + parent: 1 + - uid: 708 + components: + - type: Transform + pos: 4.5,-8.5 + parent: 1 + - uid: 709 + components: + - type: Transform + pos: 4.5,-9.5 + parent: 1 + - uid: 710 + components: + - type: Transform + pos: 4.5,-5.5 + parent: 1 + - uid: 711 + components: + - type: Transform + pos: 0.5,-3.5 + parent: 1 + - uid: 712 + components: + - type: Transform + pos: 0.5,-2.5 + parent: 1 + - uid: 713 + components: + - type: Transform + pos: 0.5,-1.5 + parent: 1 + - uid: 714 + components: + - type: Transform + pos: 0.5,-0.5 + parent: 1 + - uid: 715 + components: + - type: Transform + pos: 0.5,0.5 + parent: 1 + - uid: 716 + components: + - type: Transform + pos: 0.5,1.5 + parent: 1 + - uid: 717 + components: + - type: Transform + pos: 1.5,-2.5 + parent: 1 + - uid: 718 + components: + - type: Transform + pos: 2.5,-2.5 + parent: 1 + - uid: 719 + components: + - type: Transform + pos: 3.5,-2.5 + parent: 1 + - uid: 720 + components: + - type: Transform + pos: 4.5,-2.5 + parent: 1 + - uid: 721 + components: + - type: Transform + pos: 4.5,-3.5 + parent: 1 + - uid: 722 + components: + - type: Transform + pos: 4.5,-3.5 + parent: 1 + - uid: 723 + components: + - type: Transform + pos: 4.5,-1.5 + parent: 1 + - uid: 724 + components: + - type: Transform + pos: 4.5,-0.5 + parent: 1 + - uid: 725 + components: + - type: Transform + pos: 4.5,0.5 + parent: 1 + - uid: 726 + components: + - type: Transform + pos: -0.5,-2.5 + parent: 1 + - uid: 727 + components: + - type: Transform + pos: -1.5,-2.5 + parent: 1 + - uid: 728 + components: + - type: Transform + pos: -2.5,-2.5 + parent: 1 + - uid: 729 + components: + - type: Transform + pos: -3.5,-2.5 + parent: 1 + - uid: 730 + components: + - type: Transform + pos: -3.5,-1.5 + parent: 1 + - uid: 731 + components: + - type: Transform + pos: -3.5,-0.5 + parent: 1 + - uid: 732 + components: + - type: Transform + pos: -4.5,-0.5 + parent: 1 + - uid: 733 + components: + - type: Transform + pos: -3.5,-3.5 + parent: 1 + - uid: 734 + components: + - type: Transform + pos: -3.5,-4.5 + parent: 1 + - uid: 735 + components: + - type: Transform + pos: -3.5,-5.5 + parent: 1 + - uid: 736 + components: + - type: Transform + pos: -3.5,-6.5 + parent: 1 + - uid: 737 + components: + - type: Transform + pos: -3.5,-7.5 + parent: 1 + - uid: 738 + components: + - type: Transform + pos: -3.5,-8.5 + parent: 1 + - uid: 739 + components: + - type: Transform + pos: -4.5,-8.5 + parent: 1 + - uid: 740 + components: + - type: Transform + pos: -0.5,-6.5 + parent: 1 + - uid: 741 + components: + - type: Transform + pos: -1.5,-6.5 + parent: 1 + - uid: 742 + components: + - type: Transform + pos: -2.5,-6.5 + parent: 1 + - uid: 743 + components: + - type: Transform + pos: 0.5,4.5 + parent: 1 + - uid: 744 + components: + - type: Transform + pos: 0.5,5.5 + parent: 1 + - uid: 745 + components: + - type: Transform + pos: 0.5,6.5 + parent: 1 + - uid: 746 + components: + - type: Transform + pos: 0.5,7.5 + parent: 1 + - uid: 747 + components: + - type: Transform + pos: 1.5,7.5 + parent: 1 + - uid: 748 + components: + - type: Transform + pos: 2.5,7.5 + parent: 1 + - uid: 749 + components: + - type: Transform + pos: 2.5,8.5 + parent: 1 + - uid: 750 + components: + - type: Transform + pos: 2.5,9.5 + parent: 1 + - uid: 751 + components: + - type: Transform + pos: 2.5,10.5 + parent: 1 + - uid: 752 + components: + - type: Transform + pos: 2.5,11.5 + parent: 1 + - uid: 753 + components: + - type: Transform + pos: 1.5,11.5 + parent: 1 + - uid: 754 + components: + - type: Transform + pos: 0.5,11.5 + parent: 1 + - uid: 755 + components: + - type: Transform + pos: -0.5,7.5 + parent: 1 + - uid: 756 + components: + - type: Transform + pos: -1.5,7.5 + parent: 1 + - uid: 757 + components: + - type: Transform + pos: -1.5,8.5 + parent: 1 + - uid: 758 + components: + - type: Transform + pos: -1.5,9.5 + parent: 1 + - uid: 759 + components: + - type: Transform + pos: -1.5,10.5 + parent: 1 + - uid: 760 + components: + - type: Transform + pos: -2.5,10.5 + parent: 1 + - uid: 761 + components: + - type: Transform + pos: -2.5,11.5 + parent: 1 + - uid: 762 + components: + - type: Transform + pos: -3.5,11.5 + parent: 1 + - uid: 763 + components: + - type: Transform + pos: 2.5,12.5 + parent: 1 + - uid: 764 + components: + - type: Transform + pos: 2.5,13.5 + parent: 1 + - uid: 765 + components: + - type: Transform + pos: 2.5,14.5 + parent: 1 + - uid: 766 + components: + - type: Transform + pos: 1.5,14.5 + parent: 1 + - uid: 767 + components: + - type: Transform + pos: 0.5,14.5 + parent: 1 + - uid: 768 + components: + - type: Transform + pos: -0.5,14.5 + parent: 1 + - uid: 769 + components: + - type: Transform + pos: -0.5,15.5 + parent: 1 + - uid: 770 + components: + - type: Transform + pos: -0.5,16.5 + parent: 1 + - uid: 771 + components: + - type: Transform + pos: 0.5,16.5 + parent: 1 + - uid: 772 + components: + - type: Transform + pos: 1.5,16.5 + parent: 1 + - uid: 773 + components: + - type: Transform + pos: 2.5,16.5 + parent: 1 + - uid: 774 + components: + - type: Transform + pos: 2.5,15.5 + parent: 1 + - uid: 775 + components: + - type: Transform + pos: 3.5,12.5 + parent: 1 + - uid: 776 + components: + - type: Transform + pos: 4.5,12.5 + parent: 1 + - uid: 777 + components: + - type: Transform + pos: 5.5,12.5 + parent: 1 + - uid: 778 + components: + - type: Transform + pos: 5.5,11.5 + parent: 1 + - uid: 779 + components: + - type: Transform + pos: 5.5,10.5 + parent: 1 + - uid: 780 + components: + - type: Transform + pos: 4.5,10.5 + parent: 1 + - uid: 781 + components: + - type: Transform + pos: 3.5,10.5 + parent: 1 +- proto: CableHV + entities: + - uid: 376 + components: + - type: Transform + pos: 4.5,-20.5 + parent: 1 + - uid: 391 + components: + - type: Transform + pos: 3.5,-21.5 + parent: 1 + - uid: 395 + components: + - type: Transform + pos: 4.5,-21.5 + parent: 1 + - uid: 613 + components: + - type: Transform + pos: 3.5,-19.5 + parent: 1 + - uid: 614 + components: + - type: Transform + pos: 4.5,-19.5 + parent: 1 +- proto: CableMV + entities: + - uid: 609 + components: + - type: Transform + pos: 4.5,-20.5 + parent: 1 + - uid: 612 + components: + - type: Transform + pos: 0.5,-20.5 + parent: 1 + - uid: 618 + components: + - type: Transform + pos: 0.5,11.5 + parent: 1 + - uid: 619 + components: + - type: Transform + pos: 1.5,11.5 + parent: 1 + - uid: 620 + components: + - type: Transform + pos: 2.5,11.5 + parent: 1 + - uid: 621 + components: + - type: Transform + pos: 2.5,10.5 + parent: 1 + - uid: 622 + components: + - type: Transform + pos: 2.5,9.5 + parent: 1 + - uid: 623 + components: + - type: Transform + pos: 2.5,8.5 + parent: 1 + - uid: 624 + components: + - type: Transform + pos: 2.5,7.5 + parent: 1 + - uid: 625 + components: + - type: Transform + pos: 0.5,7.5 + parent: 1 + - uid: 626 + components: + - type: Transform + pos: 1.5,7.5 + parent: 1 + - uid: 627 + components: + - type: Transform + pos: 0.5,6.5 + parent: 1 + - uid: 628 + components: + - type: Transform + pos: 0.5,5.5 + parent: 1 + - uid: 629 + components: + - type: Transform + pos: 0.5,4.5 + parent: 1 + - uid: 630 + components: + - type: Transform + pos: 0.5,3.5 + parent: 1 + - uid: 631 + components: + - type: Transform + pos: 0.5,2.5 + parent: 1 + - uid: 632 + components: + - type: Transform + pos: 0.5,1.5 + parent: 1 + - uid: 633 + components: + - type: Transform + pos: 0.5,0.5 + parent: 1 + - uid: 634 + components: + - type: Transform + pos: 0.5,-0.5 + parent: 1 + - uid: 635 + components: + - type: Transform + pos: 0.5,-1.5 + parent: 1 + - uid: 636 + components: + - type: Transform + pos: 0.5,-2.5 + parent: 1 + - uid: 637 + components: + - type: Transform + pos: 0.5,-3.5 + parent: 1 + - uid: 638 + components: + - type: Transform + pos: 0.5,-4.5 + parent: 1 + - uid: 639 + components: + - type: Transform + pos: 0.5,-5.5 + parent: 1 + - uid: 640 + components: + - type: Transform + pos: 0.5,-6.5 + parent: 1 + - uid: 641 + components: + - type: Transform + pos: 0.5,-7.5 + parent: 1 + - uid: 642 + components: + - type: Transform + pos: 0.5,-8.5 + parent: 1 + - uid: 643 + components: + - type: Transform + pos: 0.5,-9.5 + parent: 1 + - uid: 644 + components: + - type: Transform + pos: 0.5,-10.5 + parent: 1 + - uid: 645 + components: + - type: Transform + pos: 0.5,-11.5 + parent: 1 + - uid: 646 + components: + - type: Transform + pos: 0.5,-12.5 + parent: 1 + - uid: 647 + components: + - type: Transform + pos: 0.5,-13.5 + parent: 1 + - uid: 648 + components: + - type: Transform + pos: 0.5,-14.5 + parent: 1 + - uid: 649 + components: + - type: Transform + pos: 0.5,-15.5 + parent: 1 + - uid: 650 + components: + - type: Transform + pos: 0.5,-16.5 + parent: 1 + - uid: 651 + components: + - type: Transform + pos: 0.5,-17.5 + parent: 1 + - uid: 652 + components: + - type: Transform + pos: 0.5,-18.5 + parent: 1 + - uid: 653 + components: + - type: Transform + pos: 0.5,-19.5 + parent: 1 + - uid: 654 + components: + - type: Transform + pos: -0.5,-19.5 + parent: 1 + - uid: 655 + components: + - type: Transform + pos: -1.5,-19.5 + parent: 1 + - uid: 656 + components: + - type: Transform + pos: 1.5,-4.5 + parent: 1 + - uid: 657 + components: + - type: Transform + pos: 2.5,-4.5 + parent: 1 + - uid: 666 + components: + - type: Transform + pos: 1.5,-20.5 + parent: 1 + - uid: 667 + components: + - type: Transform + pos: 2.5,-20.5 + parent: 1 + - uid: 668 + components: + - type: Transform + pos: 3.5,-20.5 + parent: 1 +- proto: CarpetBlack + entities: + - uid: 868 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -4.5,9.5 + parent: 1 + - uid: 869 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -4.5,12.5 + parent: 1 + - uid: 870 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -4.5,10.5 + parent: 1 + - uid: 871 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -4.5,11.5 + parent: 1 + - uid: 872 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -3.5,9.5 + parent: 1 + - uid: 873 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -2.5,9.5 + parent: 1 + - uid: 874 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,9.5 + parent: 1 + - uid: 875 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,9.5 + parent: 1 + - uid: 876 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,10.5 + parent: 1 + - uid: 877 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,10.5 + parent: 1 + - uid: 878 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,11.5 + parent: 1 + - uid: 879 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -2.5,11.5 + parent: 1 + - uid: 880 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -2.5,12.5 + parent: 1 + - uid: 881 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -3.5,12.5 + parent: 1 + - uid: 882 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -3.5,13.5 + parent: 1 + - uid: 883 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -3.5,11.5 + parent: 1 + - uid: 884 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -3.5,10.5 + parent: 1 + - uid: 885 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -2.5,10.5 + parent: 1 +- proto: CarpetCyan + entities: + - uid: 864 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 0.5,13.5 + parent: 1 + - uid: 865 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,13.5 + parent: 1 + - uid: 866 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 0.5,14.5 + parent: 1 + - uid: 867 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,14.5 + parent: 1 +- proto: CarpetGreen + entities: + - uid: 916 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -4.5,-3.5 + parent: 1 + - uid: 917 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -4.5,-4.5 + parent: 1 + - uid: 918 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -4.5,-5.5 + parent: 1 + - uid: 922 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -3.5,-4.5 + parent: 1 + - uid: 923 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -3.5,-3.5 + parent: 1 + - uid: 927 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -3.5,-5.5 + parent: 1 +- proto: ChairOfficeDark + entities: + - uid: 320 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 3.551079,-9.396126 + parent: 1 +- proto: ChairPilotSeat + entities: + - uid: 247 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,15.5 + parent: 1 + - uid: 249 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,16.5 + parent: 1 + - uid: 303 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,14.5 + parent: 1 + - uid: 314 + components: + - type: Transform + pos: 3.5,-5.5 + parent: 1 + - uid: 316 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 5.5,-6.5 + parent: 1 + - uid: 317 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 5.5,-8.5 + parent: 1 + - uid: 318 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 5.5,-9.5 + parent: 1 + - uid: 319 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 5.5,-5.5 + parent: 1 + - uid: 340 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -2.5,-5.5 + parent: 1 + - uid: 341 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -2.5,-4.5 + parent: 1 + - uid: 342 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -2.5,-3.5 + parent: 1 + - uid: 343 + components: + - type: Transform + pos: -1.5,-0.5 + parent: 1 + - uid: 344 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,-8.5 + parent: 1 + - uid: 345 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -2.5,-9.5 + parent: 1 + - uid: 346 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -2.5,0.5 + parent: 1 + - uid: 347 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,-5.5 + parent: 1 + - uid: 348 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,-4.5 + parent: 1 + - uid: 349 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,-3.5 + parent: 1 + - uid: 361 + components: + - type: Transform + pos: -0.5,-0.5 + parent: 1 + - uid: 362 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,-8.5 + parent: 1 + - uid: 811 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,-22.5 + parent: 1 + - uid: 812 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,-18.5 + parent: 1 + - uid: 813 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,-17.5 + parent: 1 + - uid: 815 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -2.5,-24.5 + parent: 1 + - uid: 817 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -4.5,-17.5 + parent: 1 + - uid: 818 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -4.5,-16.5 + parent: 1 + - uid: 819 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,-3.5 + parent: 1 + - uid: 820 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,-4.5 + parent: 1 + - uid: 821 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,-5.5 + parent: 1 + - uid: 822 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,-19.5 + parent: 1 + - uid: 829 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,13.5 + parent: 1 + - uid: 848 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -4.5,-3.5 + parent: 1 + - uid: 849 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -4.5,-5.5 + parent: 1 + - uid: 858 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -2.5,-23.5 + parent: 1 + - uid: 859 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -2.5,-22.5 + parent: 1 +- proto: ChurchBell + entities: + - uid: 254 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -3.5,13.5 + parent: 1 +- proto: ChurchOrganInstrument + entities: + - uid: 258 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -4.5,12.5 + parent: 1 +- proto: ClosetEmergencyFilledRandom + entities: + - uid: 352 + components: + - type: Transform + pos: 1.5,-0.5 + parent: 1 + - uid: 353 + components: + - type: Transform + pos: -1.5,11.5 + parent: 1 + - uid: 354 + components: + - type: Transform + pos: 1.5,-8.5 + parent: 1 + - uid: 355 + components: + - type: Transform + pos: -0.5,-10.5 + parent: 1 + - uid: 357 + components: + - type: Transform + pos: 1.5,-14.5 + parent: 1 + - uid: 358 + components: + - type: Transform + pos: -0.5,1.5 + parent: 1 + - uid: 368 + components: + - type: Transform + pos: 3.5,6.5 + parent: 1 + - uid: 397 + components: + - type: Transform + pos: -0.5,-16.5 + parent: 1 + - uid: 831 + components: + - type: Transform + pos: 1.3731825,9.5 + parent: 1 +- proto: ClosetEmergencyN2FilledRandom + entities: + - uid: 356 + components: + - type: Transform + pos: 1.5,-10.5 + parent: 1 +- proto: ClosetFireFilled + entities: + - uid: 359 + components: + - type: Transform + pos: 1.5,1.5 + parent: 1 + - type: ContainerContainer + containers: + entity_storage: !type:Container + showEnts: False + occludes: True + ents: + - 360 + paper_label: !type:ContainerSlot + showEnts: False + occludes: True + ent: null + - uid: 363 + components: + - type: Transform + pos: -0.5,-14.5 + parent: 1 + - uid: 369 + components: + - type: Transform + pos: -2.5,6.5 + parent: 1 + - type: ContainerContainer + containers: + entity_storage: !type:Container + showEnts: False + occludes: True + ents: + - 370 + paper_label: !type:ContainerSlot + showEnts: False + occludes: True + ent: null + - uid: 396 + components: + - type: Transform + pos: 1.5,-16.5 + parent: 1 + - uid: 828 + components: + - type: Transform + pos: 3.6023493,9.5 + parent: 1 +- proto: ComfyChair + entities: + - uid: 259 + components: + - type: Transform + pos: -3.5,12.5 + parent: 1 + - uid: 838 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 5.5,12.5 + parent: 1 + - uid: 841 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 5.5,11.5 + parent: 1 + - uid: 842 + components: + - type: Transform + pos: 4.5,13.5 + parent: 1 + - uid: 843 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 4.5,10.5 + parent: 1 + - uid: 844 + components: + - type: Transform + pos: 3.5,13.5 + parent: 1 + - uid: 847 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 5.5,-17.5 + parent: 1 +- proto: ComputerComms + entities: + - uid: 243 + components: + - type: Transform + pos: -1.5,16.5 + parent: 1 +- proto: ComputerEmergencyShuttle + entities: + - uid: 246 + components: + - type: Transform + pos: 0.5,17.5 + parent: 1 +- proto: ComputerId + entities: + - uid: 296 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,15.5 + parent: 1 +- proto: ComputerRadar + entities: + - uid: 245 + components: + - type: Transform + pos: 1.5,17.5 + parent: 1 +- proto: CrateEmergencyInflatablewall + entities: + - uid: 592 + components: + - type: Transform + pos: -0.5,-23.5 + parent: 1 + - uid: 602 + components: + - type: Transform + pos: -2.5,-19.5 + parent: 1 +- proto: CrowbarRed + entities: + - uid: 943 + components: + - type: Transform + pos: -2.4281309,-17.42973 + parent: 1 + - uid: 944 + components: + - type: Transform + pos: -2.6107843,-0.41439295 + parent: 1 +- proto: DefibrillatorCabinetFilled + entities: + - uid: 313 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 5.5,-4.5 + parent: 1 +- proto: ExtinguisherCabinetFilled + entities: + - uid: 886 + components: + - type: Transform + pos: -1.5,0.5 + parent: 1 + - uid: 887 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,-9.5 + parent: 1 +- proto: FloorDrain + entities: + - uid: 806 + components: + - type: Transform + pos: 4.5,0.5 + parent: 1 + - type: Fixtures + fixtures: {} +- proto: FolderSpawner + entities: + - uid: 826 + components: + - type: Transform + pos: -0.46709335,14.534386 + parent: 1 + - uid: 835 + components: + - type: Transform + pos: -0.6129268,14.659386 + parent: 1 +- proto: GasMinerNitrogen + entities: + - uid: 268 + components: + - type: Transform + pos: -4.5,-15.5 + parent: 1 +- proto: GasMinerOxygen + entities: + - uid: 409 + components: + - type: Transform + pos: -2.5,-15.5 + parent: 1 +- proto: GasPassiveVent + entities: + - uid: 413 + components: + - type: Transform + pos: -3.5,-15.5 + parent: 1 + - uid: 545 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,-25.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' +- proto: GasPipeBend + entities: + - uid: 449 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,-23.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 459 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -3.5,-20.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 472 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,-17.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 477 + components: + - type: Transform + pos: 2.5,14.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 505 + components: + - type: Transform + pos: -0.5,9.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 506 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -2.5,9.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 518 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,12.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 543 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,-24.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 548 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,-21.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 557 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 3.5,-16.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 558 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 3.5,-15.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' +- proto: GasPipeFourway + entities: + - uid: 419 + components: + - type: Transform + pos: 0.5,-17.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 430 + components: + - type: Transform + pos: 0.5,-6.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 434 + components: + - type: Transform + pos: 0.5,-2.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 446 + components: + - type: Transform + pos: 0.5,-20.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 503 + components: + - type: Transform + pos: -0.5,6.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 514 + components: + - type: Transform + pos: -0.5,-7.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 546 + components: + - type: Transform + pos: -0.5,-21.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 581 + components: + - type: Transform + pos: -0.5,-1.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' +- proto: GasPipeStraight + entities: + - uid: 416 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -2.5,-17.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 417 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,-17.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 418 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,-17.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 420 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,-16.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 421 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,-15.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 422 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,-14.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 423 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,-13.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 424 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,-12.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 425 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,-11.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 426 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,-10.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 427 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,-9.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 428 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,-8.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 429 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,-7.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 431 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,-5.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 432 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,-4.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 433 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,-3.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 435 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,-1.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 436 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,-0.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 437 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,0.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 438 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,1.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 439 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,2.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 440 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,3.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 441 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,4.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 442 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,5.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 443 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,6.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 444 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,-18.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 445 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,-19.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 447 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,-21.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 448 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,-22.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 453 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,8.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 455 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,7.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 456 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,7.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 457 + components: + - type: Transform + pos: -3.5,-18.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 458 + components: + - type: Transform + pos: -3.5,-19.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 464 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 3.5,-23.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 465 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,-23.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 466 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,-23.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 467 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,-20.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 468 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,-20.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 469 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,-17.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 470 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,-17.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 471 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 3.5,-17.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 474 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,9.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 478 + components: + - type: Transform + pos: 2.5,8.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 479 + components: + - type: Transform + pos: 2.5,9.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 480 + components: + - type: Transform + pos: 2.5,10.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 481 + components: + - type: Transform + pos: 2.5,12.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 484 + components: + - type: Transform + pos: 2.5,13.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 485 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 3.5,11.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 491 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,6.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 492 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 2.5,6.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 493 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 0.5,6.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 494 + components: + - type: Transform + pos: -2.5,10.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 495 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,9.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 496 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,7.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 497 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,7.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 498 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,8.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 499 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,9.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 500 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,10.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 501 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,11.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 507 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,8.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 508 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,4.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 509 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,3.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 510 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,2.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 511 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,1.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 512 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,0.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 513 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,-0.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 515 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,5.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 516 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 2.5,12.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 517 + components: + - type: Transform + pos: 0.5,13.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 523 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,-2.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 524 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,-2.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 525 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,-2.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 526 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,-2.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 527 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 3.5,-2.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 528 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 3.5,-6.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 529 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,-6.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 530 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,-6.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 531 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,-6.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 532 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,-6.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 539 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,-21.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 540 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 0.5,-21.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 541 + components: + - type: Transform + pos: -0.5,-22.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 542 + components: + - type: Transform + pos: -0.5,-23.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 547 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 3.5,-21.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 549 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,-21.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 551 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,-24.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 552 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,-24.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 553 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 3.5,-24.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 554 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,-16.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 555 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,-16.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 556 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,-16.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 560 + components: + - type: Transform + pos: -0.5,-20.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 561 + components: + - type: Transform + pos: -0.5,-19.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 562 + components: + - type: Transform + pos: -0.5,-18.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 563 + components: + - type: Transform + pos: -0.5,-17.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 564 + components: + - type: Transform + pos: -0.5,-15.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 565 + components: + - type: Transform + pos: -0.5,-14.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 566 + components: + - type: Transform + pos: -0.5,-13.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 567 + components: + - type: Transform + pos: -0.5,-12.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 568 + components: + - type: Transform + pos: -0.5,-11.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 569 + components: + - type: Transform + pos: -0.5,-10.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 570 + components: + - type: Transform + pos: -0.5,-9.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 571 + components: + - type: Transform + pos: -0.5,-8.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 576 + components: + - type: Transform + pos: -0.5,-6.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 577 + components: + - type: Transform + pos: -0.5,-5.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 578 + components: + - type: Transform + pos: -0.5,-4.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 579 + components: + - type: Transform + pos: -0.5,-3.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 580 + components: + - type: Transform + pos: -0.5,-2.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 582 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,-1.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 583 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,-1.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 584 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,-1.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 585 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,-1.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 586 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 3.5,-1.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 587 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 3.5,-7.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 588 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,-7.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 589 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,-7.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 590 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,-7.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 591 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,-7.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' +- proto: GasPipeTJunction + entities: + - uid: 415 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -3.5,-17.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 450 + components: + - type: Transform + pos: 0.5,7.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 451 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,7.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 473 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,7.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 482 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 2.5,11.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 502 + components: + - type: Transform + pos: 1.5,12.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 504 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,6.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 544 + components: + - type: Transform + pos: 0.5,-24.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 550 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,-21.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 559 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,-16.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' +- proto: GasPressurePump + entities: + - uid: 412 + components: + - type: Transform + pos: -3.5,-16.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' +- proto: GasVentPump + entities: + - uid: 452 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,7.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 454 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 3.5,7.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 460 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -2.5,-20.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 461 + components: + - type: Transform + pos: 4.5,-16.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 462 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 3.5,-20.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 463 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,-23.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 475 + components: + - type: Transform + pos: -1.5,10.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 476 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,11.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 483 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,14.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 519 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,-2.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 520 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,-6.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 521 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,-6.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 522 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,-2.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 533 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,-20.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' +- proto: GasVentScrubber + entities: + - uid: 486 + components: + - type: Transform + pos: -2.5,11.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 487 + components: + - type: Transform + pos: 0.5,14.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 488 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 3.5,12.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 489 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 3.5,6.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 490 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,6.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 535 + components: + - type: Transform + pos: 4.5,-20.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 536 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,-15.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 537 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,-21.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 538 + components: + - type: Transform + pos: 1.5,-20.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 572 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,-7.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 573 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,-7.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 574 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,-1.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 575 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,-1.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 661 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,-24.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' +- proto: GeneratorBasic15kW + entities: + - uid: 373 + components: + - type: Transform + pos: 3.5,-19.5 + parent: 1 + - uid: 374 + components: + - type: Transform + pos: 4.5,-21.5 + parent: 1 + - uid: 379 + components: + - type: Transform + pos: 3.5,-21.5 + parent: 1 + - uid: 383 + components: + - type: Transform + pos: 4.5,-19.5 + parent: 1 +- proto: GravityGeneratorMini + entities: + - uid: 595 + components: + - type: Transform + pos: -4.5,-23.5 + parent: 1 +- proto: Grille + entities: + - uid: 21 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,-24.5 + parent: 1 + - uid: 163 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -5.5,-5.5 + parent: 1 + - uid: 164 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -5.5,-4.5 + parent: 1 + - uid: 165 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -5.5,-3.5 + parent: 1 + - uid: 166 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -5.5,-15.5 + parent: 1 + - uid: 167 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -5.5,-16.5 + parent: 1 + - uid: 168 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -5.5,-17.5 + parent: 1 + - uid: 169 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 6.5,-15.5 + parent: 1 + - uid: 170 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 6.5,-16.5 + parent: 1 + - uid: 171 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 6.5,-17.5 + parent: 1 + - uid: 172 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -5.5,-23.5 + parent: 1 + - uid: 173 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -5.5,-24.5 + parent: 1 + - uid: 175 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 6.5,-23.5 + parent: 1 + - uid: 176 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 6.5,-24.5 + parent: 1 + - uid: 178 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -2.5,17.5 + parent: 1 + - uid: 179 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -2.5,18.5 + parent: 1 + - uid: 180 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,18.5 + parent: 1 + - uid: 181 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,18.5 + parent: 1 + - uid: 182 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,18.5 + parent: 1 + - uid: 183 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,18.5 + parent: 1 + - uid: 184 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,18.5 + parent: 1 + - uid: 185 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 3.5,18.5 + parent: 1 + - uid: 186 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 3.5,17.5 + parent: 1 + - uid: 187 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -5.5,10.5 + parent: 1 + - uid: 188 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -5.5,11.5 + parent: 1 + - uid: 189 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -5.5,12.5 + parent: 1 + - uid: 190 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 6.5,10.5 + parent: 1 + - uid: 191 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 6.5,11.5 + parent: 1 + - uid: 192 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 6.5,12.5 + parent: 1 + - uid: 193 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,15.5 + parent: 1 + - uid: 194 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -3.5,15.5 + parent: 1 + - uid: 199 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,8.5 + parent: 1 + - uid: 203 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,8.5 + parent: 1 + - uid: 235 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,-15.5 + parent: 1 + - uid: 236 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,-15.5 + parent: 1 + - uid: 237 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,-9.5 + parent: 1 + - uid: 238 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,-9.5 + parent: 1 + - uid: 239 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,0.5 + parent: 1 + - uid: 240 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,0.5 + parent: 1 + - uid: 241 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,5.5 + parent: 1 + - uid: 242 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,5.5 + parent: 1 + - uid: 289 + components: + - type: Transform + pos: 2.5,-0.5 + parent: 1 + - uid: 290 + components: + - type: Transform + pos: 2.5,-3.5 + parent: 1 + - uid: 291 + components: + - type: Transform + pos: 2.5,-5.5 + parent: 1 + - uid: 292 + components: + - type: Transform + pos: 2.5,-8.5 + parent: 1 + - uid: 324 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 6.5,-0.5 + parent: 1 + - uid: 325 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 6.5,-1.5 + parent: 1 + - uid: 326 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 6.5,-2.5 + parent: 1 + - uid: 327 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 6.5,-5.5 + parent: 1 + - uid: 328 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 6.5,-6.5 + parent: 1 + - uid: 329 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 6.5,-8.5 + parent: 1 + - uid: 330 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 6.5,-9.5 + parent: 1 + - uid: 364 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,8.5 + parent: 1 + - uid: 367 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -2.5,8.5 + parent: 1 + - uid: 386 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,-24.5 + parent: 1 + - uid: 404 + components: + - type: Transform + pos: -1.5,-16.5 + parent: 1 + - uid: 405 + components: + - type: Transform + pos: -1.5,-17.5 + parent: 1 +- proto: Gyroscope + entities: + - uid: 596 + components: + - type: Transform + pos: -4.5,-24.5 + parent: 1 +- proto: Handcuffs + entities: + - uid: 338 + components: + - type: Transform + pos: -1.3004267,14.607303 + parent: 1 + - uid: 339 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 5.8206716,-7.4019303 + parent: 1 +- proto: InflatableWallStack + entities: + - uid: 603 + components: + - type: Transform + pos: -2.386464,-16.39848 + parent: 1 + - uid: 604 + components: + - type: Transform + pos: -2.5218809,-16.700562 + parent: 1 +- proto: LampGold + entities: + - uid: 255 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -4.4493566,11.8694725 + parent: 1 + - uid: 862 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 4.584395,-15.1845875 + parent: 1 + - uid: 863 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 4.553145,-24.282356 + parent: 1 +- proto: LockerMedicineFilled + entities: + - uid: 261 + components: + - type: Transform + pos: 3.5,-3.5 + parent: 1 + - uid: 262 + components: + - type: Transform + pos: 3.5,-0.5 + parent: 1 +- proto: MedicalBed + entities: + - uid: 307 + components: + - type: Transform + pos: 5.5,-2.5 + parent: 1 + - uid: 308 + components: + - type: Transform + pos: 5.5,-1.5 + parent: 1 + - uid: 309 + components: + - type: Transform + pos: 5.5,-0.5 + parent: 1 +- proto: MedkitBruteFilled + entities: + - uid: 809 + components: + - type: Transform + pos: 5.390535,0.48565245 + parent: 1 +- proto: MedkitBurnFilled + entities: + - uid: 808 + components: + - type: Transform + pos: 3.7342849,0.48565245 + parent: 1 +- proto: MedkitFilled + entities: + - uid: 807 + components: + - type: Transform + pos: 5.723868,0.67315245 + parent: 1 + - uid: 857 + components: + - type: Transform + pos: -1.0117843,17.526836 + parent: 1 +- proto: MedkitOxygenFilled + entities: + - uid: 810 + components: + - type: Transform + pos: 3.3176181,0.6835692 + parent: 1 +- proto: Pen + entities: + - uid: 825 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.13376004,14.659386 + parent: 1 +- proto: PhoneInstrument + entities: + - uid: 845 + components: + - type: Transform + pos: 3.96624,12.203929 + parent: 1 +- proto: PlasmaReinforcedWindowDirectional + entities: + - uid: 410 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -2.5,-16.5 + parent: 1 + - uid: 411 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -4.5,-16.5 + parent: 1 + - uid: 414 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -3.5,-16.5 + parent: 1 +- proto: PlasmaWindoorSecureCommandLocked + entities: + - uid: 408 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -3.5,-23.5 + parent: 1 + - uid: 816 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -3.5,-24.5 + parent: 1 +- proto: PosterContrabandMissingGloves + entities: + - uid: 913 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,-22.5 + parent: 1 +- proto: PosterContrabandMissingSpacepen + entities: + - uid: 914 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,-19.5 + parent: 1 +- proto: PosterLegitBlessThisSpess + entities: + - uid: 908 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -2.5,13.5 + parent: 1 +- proto: PosterLegitDoNotQuestion + entities: + - uid: 909 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,-9.5 + parent: 1 +- proto: PosterLegitJustAWeekAway + entities: + - uid: 910 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,0.5 + parent: 1 +- proto: PosterLegitNanotrasenLogo + entities: + - uid: 889 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 3.5,16.5 + parent: 1 + - uid: 890 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,16.5 + parent: 1 + - uid: 891 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,-26.5 + parent: 1 + - uid: 892 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 3.5,-26.5 + parent: 1 +- proto: PosterLegitSafetyMothPiping + entities: + - uid: 911 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,-15.5 + parent: 1 +- proto: PosterLegitVacation + entities: + - uid: 912 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 4.5,-22.5 + parent: 1 +- proto: PosterLegitWorkForAFuture + entities: + - uid: 915 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,-16.5 + parent: 1 +- proto: PottedPlantRandom + entities: + - uid: 850 + components: + - type: Transform + pos: -2.5,-6.5 + parent: 1 + - uid: 851 + components: + - type: Transform + pos: -2.5,-2.5 + parent: 1 + - uid: 852 + components: + - type: Transform + pos: -4.5,10.5 + parent: 1 + - uid: 853 + components: + - type: Transform + pos: 0.5,12.5 + parent: 1 + - uid: 854 + components: + - type: Transform + pos: -1.5,-6.5 + parent: 1 + - uid: 855 + components: + - type: Transform + pos: -1.5,-2.5 + parent: 1 +- proto: PowerCellRecharger + entities: + - uid: 323 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 3.5,-8.5 + parent: 1 + - uid: 846 + components: + - type: Transform + pos: 2.5,17.5 + parent: 1 +- proto: Poweredlight + entities: + - uid: 782 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,-4.5 + parent: 1 + - uid: 783 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -4.5,-6.5 + parent: 1 + - uid: 784 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -4.5,-2.5 + parent: 1 + - uid: 785 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,-3.5 + parent: 1 + - uid: 786 + components: + - type: Transform + pos: 3.5,-5.5 + parent: 1 + - uid: 787 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 3.5,-9.5 + parent: 1 + - uid: 788 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 3.5,0.5 + parent: 1 + - uid: 789 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 5.5,-7.5 + parent: 1 + - uid: 790 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 5.5,0.5 + parent: 1 + - uid: 791 + components: + - type: Transform + pos: 4.5,-15.5 + parent: 1 + - uid: 792 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 4.5,-24.5 + parent: 1 + - uid: 793 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -2.5,-18.5 + parent: 1 + - uid: 794 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -2.5,-23.5 + parent: 1 + - uid: 795 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,-18.5 + parent: 1 + - uid: 796 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,-22.5 + parent: 1 + - uid: 797 + components: + - type: Transform + pos: 0.5,7.5 + parent: 1 + - uid: 798 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -3.5,9.5 + parent: 1 + - uid: 799 + components: + - type: Transform + pos: 3.5,15.5 + parent: 1 + - uid: 800 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,16.5 + parent: 1 + - uid: 802 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 4.5,9.5 + parent: 1 + - uid: 830 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,12.5 + parent: 1 + - uid: 860 + components: + - type: Transform + pos: -3.5,0.5 + parent: 1 + - uid: 861 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -3.5,-9.5 + parent: 1 +- proto: PoweredSmallLight + entities: + - uid: 803 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,1.5 + parent: 1 + - uid: 804 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,-10.5 + parent: 1 + - uid: 805 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,-20.5 + parent: 1 +- proto: Rack + entities: + - uid: 371 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -2.5,7.5 + parent: 1 + - uid: 372 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,7.5 + parent: 1 +- proto: Railing + entities: + - uid: 107 + components: + - type: Transform + pos: -0.5,-26.5 + parent: 1 + - uid: 111 + components: + - type: Transform + pos: -1.5,-26.5 + parent: 1 + - uid: 112 + components: + - type: Transform + pos: 0.5,-26.5 + parent: 1 + - uid: 140 + components: + - type: Transform + pos: 1.5,-26.5 + parent: 1 + - uid: 141 + components: + - type: Transform + pos: 2.5,-26.5 + parent: 1 + - uid: 801 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 3.5,9.5 + parent: 1 + - uid: 823 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,9.5 + parent: 1 + - uid: 919 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,-10.5 + parent: 1 + - uid: 920 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,-14.5 + parent: 1 + - uid: 921 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,-14.5 + parent: 1 + - uid: 924 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,-10.5 + parent: 1 + - uid: 933 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,1.5 + parent: 1 + - uid: 934 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,1.5 + parent: 1 + - uid: 937 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,4.5 + parent: 1 + - uid: 938 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,4.5 + parent: 1 +- proto: RailingCornerSmall + entities: + - uid: 350 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,-11.5 + parent: 1 + - uid: 824 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,10.5 + parent: 1 + - uid: 834 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 3.5,10.5 + parent: 1 + - uid: 925 + components: + - type: Transform + pos: 1.5,-11.5 + parent: 1 + - uid: 928 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,-13.5 + parent: 1 + - uid: 929 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,-13.5 + parent: 1 + - uid: 935 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,2.5 + parent: 1 + - uid: 936 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,2.5 + parent: 1 +- proto: RandomDrinkGlass + entities: + - uid: 939 + components: + - type: Transform + pos: -2.5,-0.5 + parent: 1 + - uid: 940 + components: + - type: Transform + pos: -2.5,-8.5 + parent: 1 +- proto: RandomFoodSingle + entities: + - uid: 941 + components: + - type: Transform + pos: -4.5,-4.5 + parent: 1 +- proto: RandomPosterLegit + entities: + - uid: 893 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,-18.5 + parent: 1 + - uid: 894 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,-23.5 + parent: 1 + - uid: 895 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -2.5,-10.5 + parent: 1 + - uid: 896 + components: + - type: Transform + pos: -2.5,1.5 + parent: 1 + - uid: 897 + components: + - type: Transform + pos: -4.5,1.5 + parent: 1 + - uid: 898 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -4.5,-10.5 + parent: 1 +- proto: ReinforcedWindow + entities: + - uid: 197 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,8.5 + parent: 1 + - uid: 200 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -2.5,8.5 + parent: 1 + - uid: 201 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,8.5 + parent: 1 + - uid: 256 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,8.5 + parent: 1 + - uid: 277 + components: + - type: Transform + pos: 2.5,-8.5 + parent: 1 + - uid: 279 + components: + - type: Transform + pos: 2.5,-0.5 + parent: 1 + - uid: 280 + components: + - type: Transform + pos: 2.5,-3.5 + parent: 1 + - uid: 282 + components: + - type: Transform + pos: 2.5,-5.5 + parent: 1 + - uid: 402 + components: + - type: Transform + pos: -1.5,-16.5 + parent: 1 + - uid: 403 + components: + - type: Transform + pos: -1.5,-17.5 + parent: 1 +- proto: ShotGunCabinetFilled + entities: + - uid: 605 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 4.5,8.5 + parent: 1 +- proto: ShuttleWindow + entities: + - uid: 11 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 6.5,-23.5 + parent: 1 + - uid: 12 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 6.5,-24.5 + parent: 1 + - uid: 19 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -5.5,-23.5 + parent: 1 + - uid: 20 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -5.5,-24.5 + parent: 1 + - uid: 23 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -5.5,-3.5 + parent: 1 + - uid: 27 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -5.5,-5.5 + parent: 1 + - uid: 29 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -5.5,-4.5 + parent: 1 + - uid: 39 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,15.5 + parent: 1 + - uid: 40 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -3.5,15.5 + parent: 1 + - uid: 41 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -5.5,12.5 + parent: 1 + - uid: 45 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -5.5,10.5 + parent: 1 + - uid: 47 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,18.5 + parent: 1 + - uid: 50 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -2.5,17.5 + parent: 1 + - uid: 51 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,18.5 + parent: 1 + - uid: 52 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,18.5 + parent: 1 + - uid: 53 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 3.5,17.5 + parent: 1 + - uid: 54 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,18.5 + parent: 1 + - uid: 55 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 3.5,18.5 + parent: 1 + - uid: 56 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,18.5 + parent: 1 + - uid: 59 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -5.5,11.5 + parent: 1 + - uid: 63 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -2.5,18.5 + parent: 1 + - uid: 65 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 6.5,12.5 + parent: 1 + - uid: 66 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 6.5,11.5 + parent: 1 + - uid: 67 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 6.5,10.5 + parent: 1 + - uid: 78 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 6.5,-0.5 + parent: 1 + - uid: 79 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 6.5,-1.5 + parent: 1 + - uid: 80 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 6.5,-2.5 + parent: 1 + - uid: 83 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 6.5,-8.5 + parent: 1 + - uid: 84 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 6.5,-9.5 + parent: 1 + - uid: 86 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 6.5,-5.5 + parent: 1 + - uid: 87 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 6.5,-6.5 + parent: 1 + - uid: 93 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 6.5,-17.5 + parent: 1 + - uid: 94 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 6.5,-16.5 + parent: 1 + - uid: 95 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 6.5,-15.5 + parent: 1 + - uid: 101 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -5.5,-15.5 + parent: 1 + - uid: 102 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -5.5,-16.5 + parent: 1 + - uid: 103 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -5.5,-17.5 + parent: 1 + - uid: 174 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,-24.5 + parent: 1 + - uid: 227 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,5.5 + parent: 1 + - uid: 228 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,5.5 + parent: 1 + - uid: 229 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,0.5 + parent: 1 + - uid: 230 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,0.5 + parent: 1 + - uid: 231 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,-9.5 + parent: 1 + - uid: 232 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,-9.5 + parent: 1 + - uid: 233 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,-15.5 + parent: 1 + - uid: 234 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,-15.5 + parent: 1 + - uid: 387 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,-24.5 + parent: 1 +- proto: SignBridge + entities: + - uid: 899 + components: + - type: Transform + pos: 0.5,8.5 + parent: 1 +- proto: SignRedOne + entities: + - uid: 900 + components: + - type: Transform + pos: 2.5,5.5 + parent: 1 + - uid: 901 + components: + - type: Transform + pos: -1.5,5.5 + parent: 1 +- proto: SignRedThree + entities: + - uid: 906 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,-14.5 + parent: 1 + - uid: 907 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,-14.5 + parent: 1 +- proto: SignRedTwo + entities: + - uid: 902 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,1.5 + parent: 1 + - uid: 903 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,1.5 + parent: 1 + - uid: 904 + components: + - type: Transform + pos: -1.5,-10.5 + parent: 1 + - uid: 905 + components: + - type: Transform + pos: 2.5,-10.5 + parent: 1 +- proto: Sink + entities: + - uid: 264 + components: + - type: Transform + pos: 4.5,0.5 + parent: 1 +- proto: StairStageDark + entities: + - uid: 832 + components: + - type: Transform + pos: 2.5,9.5 + parent: 1 + - uid: 930 + components: + - type: Transform + pos: 0.5,-10.5 + parent: 1 + - uid: 931 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,-14.5 + parent: 1 + - uid: 932 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,1.5 + parent: 1 +- proto: StasisBed + entities: + - uid: 306 + components: + - type: Transform + pos: 5.5,-3.5 + parent: 1 +- proto: SubstationBasic + entities: + - uid: 375 + components: + - type: Transform + pos: 4.5,-20.5 + parent: 1 +- proto: Table + entities: + - uid: 248 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,17.5 + parent: 1 + - uid: 263 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 3.5,0.5 + parent: 1 + - uid: 265 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 5.5,0.5 + parent: 1 + - uid: 304 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,17.5 + parent: 1 + - uid: 305 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,17.5 + parent: 1 + - uid: 315 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 5.5,-7.5 + parent: 1 + - uid: 321 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 3.5,-8.5 + parent: 1 +- proto: TableCounterMetal + entities: + - uid: 593 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,-16.5 + parent: 1 + - uid: 600 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,-17.5 + parent: 1 +- proto: TableFancyBlue + entities: + - uid: 366 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 3.5,11.5 + parent: 1 + - uid: 827 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 4.5,11.5 + parent: 1 + - uid: 839 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 4.5,12.5 + parent: 1 + - uid: 840 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 3.5,12.5 + parent: 1 +- proto: TableFancyGreen + entities: + - uid: 365 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,14.5 + parent: 1 + - uid: 836 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,14.5 + parent: 1 + - uid: 837 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 0.5,14.5 + parent: 1 +- proto: TableWood + entities: + - uid: 260 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -4.5,11.5 + parent: 1 + - uid: 351 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,-8.5 + parent: 1 + - uid: 380 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 4.5,-15.5 + parent: 1 + - uid: 393 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,-24.5 + parent: 1 + - uid: 856 + components: + - type: Transform + pos: -4.5,-4.5 + parent: 1 + - uid: 926 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -2.5,-0.5 + parent: 1 +- proto: Thruster + entities: + - uid: 13 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 5.5,-26.5 + parent: 1 + - uid: 35 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 5.5,6.5 + parent: 1 + - uid: 36 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 5.5,7.5 + parent: 1 + - uid: 37 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 6.5,8.5 + parent: 1 + - uid: 69 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -5.5,8.5 + parent: 1 + - uid: 70 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -4.5,7.5 + parent: 1 + - uid: 71 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -4.5,6.5 + parent: 1 + - uid: 105 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -4.5,-26.5 + parent: 1 + - uid: 148 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -5.5,-21.5 + parent: 1 + - uid: 150 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -5.5,-20.5 + parent: 1 + - uid: 151 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -5.5,-19.5 + parent: 1 + - uid: 152 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 6.5,-21.5 + parent: 1 + - uid: 153 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 6.5,-20.5 + parent: 1 + - uid: 154 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 6.5,-19.5 + parent: 1 + - uid: 177 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 4.5,-26.5 + parent: 1 + - uid: 195 + components: + - type: Transform + pos: -5.5,14.5 + parent: 1 + - uid: 196 + components: + - type: Transform + pos: 6.5,14.5 + parent: 1 + - uid: 378 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -3.5,-26.5 + parent: 1 +- proto: VendingMachineTankDispenserEVA + entities: + - uid: 601 + components: + - type: Transform + pos: -2.5,-18.5 + parent: 1 +- proto: VendingMachineWallMedical + entities: + - uid: 888 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,-4.5 + parent: 1 +- proto: WallShuttle + entities: + - uid: 7 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 5.5,-10.5 + parent: 1 + - uid: 8 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -4.5,-10.5 + parent: 1 + - uid: 9 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -3.5,-10.5 + parent: 1 + - uid: 14 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -5.5,-18.5 + parent: 1 + - uid: 15 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 5.5,-21.5 + parent: 1 + - uid: 16 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 5.5,-20.5 + parent: 1 + - uid: 17 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 5.5,-19.5 + parent: 1 + - uid: 18 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -5.5,-22.5 + parent: 1 + - uid: 22 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,-25.5 + parent: 1 + - uid: 24 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -5.5,-6.5 + parent: 1 + - uid: 25 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -5.5,-8.5 + parent: 1 + - uid: 26 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -5.5,-0.5 + parent: 1 + - uid: 28 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -5.5,-2.5 + parent: 1 + - uid: 31 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,-10.5 + parent: 1 + - uid: 33 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,1.5 + parent: 1 + - uid: 38 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -5.5,9.5 + parent: 1 + - uid: 42 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -5.5,13.5 + parent: 1 + - uid: 43 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -2.5,16.5 + parent: 1 + - uid: 44 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -3.5,16.5 + parent: 1 + - uid: 46 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -3.5,14.5 + parent: 1 + - uid: 48 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 3.5,16.5 + parent: 1 + - uid: 49 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,16.5 + parent: 1 + - uid: 57 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 5.5,14.5 + parent: 1 + - uid: 58 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,14.5 + parent: 1 + - uid: 60 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 5.5,13.5 + parent: 1 + - uid: 61 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -4.5,13.5 + parent: 1 + - uid: 62 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -4.5,14.5 + parent: 1 + - uid: 64 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 6.5,13.5 + parent: 1 + - uid: 68 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 6.5,9.5 + parent: 1 + - uid: 72 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -3.5,6.5 + parent: 1 + - uid: 73 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 5.5,1.5 + parent: 1 + - uid: 74 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -3.5,1.5 + parent: 1 + - uid: 75 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -4.5,1.5 + parent: 1 + - uid: 77 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 6.5,0.5 + parent: 1 + - uid: 81 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 6.5,-3.5 + parent: 1 + - uid: 82 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 6.5,-4.5 + parent: 1 + - uid: 85 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 6.5,-7.5 + parent: 1 + - uid: 89 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -3.5,5.5 + parent: 1 + - uid: 90 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -4.5,8.5 + parent: 1 + - uid: 91 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,5.5 + parent: 1 + - uid: 96 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 6.5,-18.5 + parent: 1 + - uid: 97 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -4.5,-19.5 + parent: 1 + - uid: 98 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -4.5,-20.5 + parent: 1 + - uid: 99 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -4.5,-21.5 + parent: 1 + - uid: 100 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 6.5,-22.5 + parent: 1 + - uid: 106 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 4.5,-25.5 + parent: 1 + - uid: 108 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 3.5,-25.5 + parent: 1 + - uid: 109 + components: + - type: Transform + pos: 3.5,-26.5 + parent: 1 + - uid: 110 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 2.5,-24.5 + parent: 1 + - uid: 113 + components: + - type: Transform + pos: -2.5,-26.5 + parent: 1 + - uid: 114 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 5.5,-25.5 + parent: 1 + - uid: 115 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 6.5,-25.5 + parent: 1 + - uid: 116 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -4.5,-14.5 + parent: 1 + - uid: 117 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -3.5,-14.5 + parent: 1 + - uid: 118 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 5.5,-14.5 + parent: 1 + - uid: 119 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,-14.5 + parent: 1 + - uid: 120 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -2.5,1.5 + parent: 1 + - uid: 121 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 3.5,1.5 + parent: 1 + - uid: 122 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -2.5,-10.5 + parent: 1 + - uid: 123 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 3.5,-10.5 + parent: 1 + - uid: 124 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 3.5,-14.5 + parent: 1 + - uid: 125 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,-14.5 + parent: 1 + - uid: 126 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -2.5,-14.5 + parent: 1 + - uid: 127 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,-14.5 + parent: 1 + - uid: 128 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,-10.5 + parent: 1 + - uid: 129 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,-10.5 + parent: 1 + - uid: 130 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,1.5 + parent: 1 + - uid: 131 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,1.5 + parent: 1 + - uid: 132 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 3.5,5.5 + parent: 1 + - uid: 133 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -2.5,5.5 + parent: 1 + - uid: 134 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,5.5 + parent: 1 + - uid: 135 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,5.5 + parent: 1 + - uid: 138 + components: + - type: Transform + pos: -4.5,-22.5 + parent: 1 + - uid: 139 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -3.5,-25.5 + parent: 1 + - uid: 142 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -5.5,-25.5 + parent: 1 + - uid: 143 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -4.5,-25.5 + parent: 1 + - uid: 146 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 5.5,-18.5 + parent: 1 + - uid: 147 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,-24.5 + parent: 1 + - uid: 155 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -3.5,7.5 + parent: 1 + - uid: 156 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 4.5,6.5 + parent: 1 + - uid: 157 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 4.5,7.5 + parent: 1 + - uid: 158 + components: + - type: Transform + pos: 4.5,8.5 + parent: 1 + - uid: 160 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 5.5,8.5 + parent: 1 + - uid: 161 + components: + - type: Transform + pos: -3.5,8.5 + parent: 1 + - uid: 217 + components: + - type: Transform + pos: 2.5,0.5 + parent: 1 + - uid: 218 + components: + - type: Transform + pos: 2.5,-9.5 + parent: 1 + - uid: 219 + components: + - type: Transform + pos: -1.5,0.5 + parent: 1 + - uid: 220 + components: + - type: Transform + pos: -1.5,-9.5 + parent: 1 + - uid: 221 + components: + - type: Transform + pos: -1.5,-15.5 + parent: 1 + - uid: 222 + components: + - type: Transform + pos: 2.5,-15.5 + parent: 1 +- proto: WallShuttleDiagonal + entities: + - uid: 6 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 6.5,-10.5 + parent: 1 + - uid: 10 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -4.5,5.5 + parent: 1 + - uid: 30 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 6.5,1.5 + parent: 1 + - uid: 32 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 5.5,5.5 + parent: 1 + - uid: 34 + components: + - type: Transform + pos: -5.5,-14.5 + parent: 1 + - uid: 76 + components: + - type: Transform + pos: -5.5,1.5 + parent: 1 + - uid: 88 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -5.5,-10.5 + parent: 1 + - uid: 92 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,-25.5 + parent: 1 + - uid: 104 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -5.5,-26.5 + parent: 1 + - uid: 136 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 6.5,-14.5 + parent: 1 + - uid: 137 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 2.5,-25.5 + parent: 1 + - uid: 144 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 6.5,-26.5 + parent: 1 + - uid: 149 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -4.5,-18.5 + parent: 1 + - uid: 159 + components: + - type: Transform + pos: 5.5,9.5 + parent: 1 + - uid: 162 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -4.5,9.5 + parent: 1 +- proto: WallShuttleInterior + entities: + - uid: 145 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 5.5,-22.5 + parent: 1 + - uid: 202 + components: + - type: Transform + pos: 0.5,9.5 + parent: 1 + - uid: 204 + components: + - type: Transform + pos: 0.5,8.5 + parent: 1 + - uid: 266 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 2.5,-21.5 + parent: 1 + - uid: 267 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 2.5,-19.5 + parent: 1 + - uid: 281 + components: + - type: Transform + pos: 5.5,-4.5 + parent: 1 + - uid: 283 + components: + - type: Transform + pos: 3.5,-4.5 + parent: 1 + - uid: 284 + components: + - type: Transform + pos: 2.5,-4.5 + parent: 1 + - uid: 293 + components: + - type: Transform + pos: 0.5,10.5 + parent: 1 + - uid: 294 + components: + - type: Transform + pos: 0.5,11.5 + parent: 1 + - uid: 295 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,11.5 + parent: 1 + - uid: 297 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,12.5 + parent: 1 + - uid: 298 + components: + - type: Transform + pos: -1.5,13.5 + parent: 1 + - uid: 299 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,13.5 + parent: 1 + - uid: 300 + components: + - type: Transform + pos: -2.5,14.5 + parent: 1 + - uid: 301 + components: + - type: Transform + pos: -0.5,12.5 + parent: 1 + - uid: 331 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 2.5,-16.5 + parent: 1 + - uid: 332 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 2.5,-18.5 + parent: 1 + - uid: 333 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 3.5,-18.5 + parent: 1 + - uid: 334 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 4.5,-18.5 + parent: 1 + - uid: 335 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 4.5,-22.5 + parent: 1 + - uid: 336 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 3.5,-22.5 + parent: 1 + - uid: 337 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 2.5,-22.5 + parent: 1 + - uid: 398 + components: + - type: Transform + pos: -1.5,-18.5 + parent: 1 + - uid: 399 + components: + - type: Transform + pos: -1.5,-19.5 + parent: 1 + - uid: 400 + components: + - type: Transform + pos: -1.5,-22.5 + parent: 1 + - uid: 401 + components: + - type: Transform + pos: -1.5,-23.5 + parent: 1 +- proto: WeaponCapacitorRecharger + entities: + - uid: 322 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 5.5,-7.5 + parent: 1 + - uid: 833 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,14.5 + parent: 1 +- proto: WindoorSecure + entities: + - uid: 205 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,-12.5 + parent: 1 + - uid: 206 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,-12.5 + parent: 1 + - uid: 211 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,3.5 + parent: 1 + - uid: 212 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,3.5 + parent: 1 +- proto: WindowReinforcedDirectional + entities: + - uid: 207 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,-13.5 + parent: 1 + - uid: 208 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,-11.5 + parent: 1 + - uid: 209 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,-11.5 + parent: 1 + - uid: 210 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,-13.5 + parent: 1 + - uid: 213 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,4.5 + parent: 1 + - uid: 214 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,2.5 + parent: 1 + - uid: 215 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,2.5 + parent: 1 + - uid: 216 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,4.5 + parent: 1 +- proto: WoodenBench + entities: + - uid: 251 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,10.5 + parent: 1 + - uid: 252 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,9.5 + parent: 1 + - uid: 257 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -3.5,9.5 + parent: 1 +- proto: Wrench + entities: + - uid: 942 + components: + - type: Transform + pos: -2.5010476,-17.356812 + parent: 1 +... diff --git a/Resources/Prototypes/Maps/oasis.yml b/Resources/Prototypes/Maps/oasis.yml index a4cc6eb43d..dd6990ac8c 100644 --- a/Resources/Prototypes/Maps/oasis.yml +++ b/Resources/Prototypes/Maps/oasis.yml @@ -13,7 +13,7 @@ !type:NanotrasenNameGenerator prefixCreator: 'B' - type: StationEmergencyShuttle - emergencyShuttlePath: /Maps/Shuttles/emergency_delta.yml + emergencyShuttlePath: /Maps/Shuttles/emergency_accordia.yml - type: StationJobs availableJobs: #service From 4c182298cc7bbc37ac818fe7c0f7e1e25f6f679c Mon Sep 17 00:00:00 2001 From: Killerqu00 <47712032+Killerqu00@users.noreply.github.com> Date: Fri, 14 Jun 2024 08:19:47 +0200 Subject: [PATCH 023/142] uncuffCooldown *= 5 (#28095) --- Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml b/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml index 5f970da184..f703886127 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml @@ -27,7 +27,7 @@ guides: - Security - type: UseDelay - delay: 6 + delay: 30 - type: entity name: makeshift handcuffs From e7a3fd5285ba5d61a7f16f487ec630220fd2d15d Mon Sep 17 00:00:00 2001 From: PJBot Date: Fri, 14 Jun 2024 06:20:53 +0000 Subject: [PATCH 024/142] 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 112dbfb313..083f857537 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: DenisShvalov - changes: - - message: Added Cleaner Grenades that will help janitors in their work - type: Add - id: 6228 - time: '2024-03-25T06:46:21.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/25444 - author: Weax changes: - message: Harmonicas can now be equipped (and played) in the neck slot. @@ -3845,3 +3838,10 @@ id: 6727 time: '2024-06-14T02:43:02.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/28948 +- author: Killerqu00 + changes: + - message: Time between uncuff attempts is now 30 seconds instead of 6. + type: Tweak + id: 6728 + time: '2024-06-14T06:19:47.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/28095 From adad6b2b0434416327337b57816dc412b97d4963 Mon Sep 17 00:00:00 2001 From: Moomoobeef <62638182+Moomoobeef@users.noreply.github.com> Date: Thu, 13 Jun 2024 23:24:18 -0700 Subject: [PATCH 025/142] cargo can now order fax machines (#28968) * cargo can now order fax machines * removed fax manual --- .../Prototypes/Catalog/Cargo/cargo_service.yml | 10 ++++++++++ .../Prototypes/Catalog/Fills/Crates/service.yml | 11 +++++++++++ .../Entities/Objects/Devices/flatpack.yml | 12 ++++++++++++ .../Objects/Devices/flatpack.rsi/fax-machine.png | Bin 0 -> 429 bytes .../Objects/Devices/flatpack.rsi/meta.json | 5 ++++- 5 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/Objects/Devices/flatpack.rsi/fax-machine.png diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_service.yml b/Resources/Prototypes/Catalog/Cargo/cargo_service.yml index d2ca08e116..0f930ddfd6 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_service.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_service.yml @@ -68,6 +68,16 @@ category: cargoproduct-category-name-service group: market +- type: cargoProduct + id: ServiceFaxMachine + icon: + sprite: Structures/Machines/fax_machine.rsi + state: icon + product: CrateServiceFaxMachine + cost: 2000 + category: cargoproduct-category-name-service + group: market + - type: cargoProduct id: ServicePersonnel icon: diff --git a/Resources/Prototypes/Catalog/Fills/Crates/service.yml b/Resources/Prototypes/Catalog/Fills/Crates/service.yml index 5b16b91f8b..1876de6a53 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/service.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/service.yml @@ -129,6 +129,17 @@ - id: BoxFolderYellow - id: NewtonCradle +- type: entity + id: CrateServiceFaxMachine + parent: CrateGenericSteel + name: fax machine crate + description: A fax machine and a screwdriver to set the name with. + components: + - type: StorageFill + contents: + - id: Screwdriver + - id: FaxMachineFlatpack + - type: entity id: CrateServicePersonnel parent: CrateCommandSecure diff --git a/Resources/Prototypes/Entities/Objects/Devices/flatpack.yml b/Resources/Prototypes/Entities/Objects/Devices/flatpack.yml index b9c2b752db..5fb81aa6d4 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/flatpack.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/flatpack.yml @@ -204,3 +204,15 @@ components: - type: Flatpack entity: SpaceHeaterAnchored + +- type: entity + parent: BaseFlatpack + id: FaxMachineFlatpack + name: fax machine flatpack + description: A flatpack used for constructing a fax machine. + components: + - type: Sprite + layers: + - state: fax-machine + - type: Flatpack + entity: FaxMachineBase \ No newline at end of file diff --git a/Resources/Textures/Objects/Devices/flatpack.rsi/fax-machine.png b/Resources/Textures/Objects/Devices/flatpack.rsi/fax-machine.png new file mode 100644 index 0000000000000000000000000000000000000000..428918e73103bb12c6fd84ed3cbd52c18847456a GIT binary patch literal 429 zcmV;e0aE^nP)Px$XGugsR9J=Wm9b01Kop06ic8a*n@L*elt5{yrE7aAs2QBZwQK&Ztm1S-M8rYd zLMtsoG8LR!(_A!MGH(`-!f|) zi4<4WTJFL@u!P9IOaY_QTK9S^*{?Fio>?!BPVA`5cbpY{kPc{2PIUZnv90k4B@y z#etmv0Ap;c+b|5l7~8Sq7X${h56oVQMT5eUmnxq znyziEW!;>@0&&ElR0#lJHhbThms~z^!~p=)$#m}^0tBYv`Q>S$N%(O8Bs6Iy5{cv! X-JEd&LsJ*g00000NkvXXu0mjfyehg_ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Devices/flatpack.rsi/meta.json b/Resources/Textures/Objects/Devices/flatpack.rsi/meta.json index 8f46a0ca53..bb5b49e185 100644 --- a/Resources/Textures/Objects/Devices/flatpack.rsi/meta.json +++ b/Resources/Textures/Objects/Devices/flatpack.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC0-1.0", - "copyright": "Created by EmoGarbage404 (github) for SS14, solar-assembly-part taken from tgstation and modified at https://tgstation13.org/wiki/Guide_to_construction#Solar_Panels_and_Trackers, ame-part taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/1b7952787c06c21ef1623e494dcfe7cb1f46e041; singularity-generator, tesla-generator, radiation-collector, containment-field-generator, tesla-coil, grounding-rod inner icons made by lzk228; emitter made by pigeonpeas", + "copyright": "Created by EmoGarbage404 (github) for SS14, solar-assembly-part taken from tgstation and modified at https://tgstation13.org/wiki/Guide_to_construction#Solar_Panels_and_Trackers, ame-part taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/1b7952787c06c21ef1623e494dcfe7cb1f46e041; singularity-generator, tesla-generator, radiation-collector, containment-field-generator, tesla-coil, grounding-rod inner icons made by lzk228; emitter made by pigeonpeas. fax-machine made by moomoobeef", "size": { "x": 32, "y": 32 @@ -42,6 +42,9 @@ }, { "name": "emitter" + }, + { + "name": "fax-machine" } ] } From 0d869a317f311a600b9801f35c794a70f1231e85 Mon Sep 17 00:00:00 2001 From: PJBot Date: Fri, 14 Jun 2024 06:25:24 +0000 Subject: [PATCH 026/142] Automatic changelog update --- Resources/Changelog/Changelog.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 083f857537..d2c819747f 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Weax - changes: - - message: Harmonicas can now be equipped (and played) in the neck slot. - type: Tweak - id: 6229 - time: '2024-03-25T07:05:01.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/26261 - author: nikthechampiongr changes: - message: Mailing units no longer spontaneously turn into disposal units when flushed. @@ -3845,3 +3838,11 @@ id: 6728 time: '2024-06-14T06:19:47.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/28095 +- author: Moomoobeef + changes: + - message: Fax machines can now be purchased at cargo, for when you need more paper + pushing on your station! + type: Add + id: 6729 + time: '2024-06-14T06:24:18.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/28968 From e70131e5b4cf0f36352d5f352d75df49181a4718 Mon Sep 17 00:00:00 2001 From: Ubaser <134914314+UbaserB@users.noreply.github.com> Date: Fri, 14 Jun 2024 17:55:30 +1000 Subject: [PATCH 027/142] Lighten throwing knive's border (#28977) add --- .../Weapons/Melee/throwing_knife.rsi/icon.png | Bin 1593 -> 1622 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/Resources/Textures/Objects/Weapons/Melee/throwing_knife.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/throwing_knife.rsi/icon.png index 2c61755b52c35b9138c5aa7f93ec6e71bffa7871..5817fac2becace1878ee853b6264dd66a98f17dd 100644 GIT binary patch delta 651 zcmV;60(AYk4Au;=*aLrQNkl6V+DwBT>bnCJ z`K6?RNccEz&CFq9d<@lU)y`}g`zoMrdmK?cj7$SwtJP2_zQ?ntPg;sksPIhy*-nuU zN9#GK$f*^I?<{}#t-~K*c$(z47xTSU56Wn$xxbd;`JgQv2=n77YJs(V6*Fi$)SS5`(ulC8w zSQB2iU7mBU(Dv{ofFd_d6C~pGtLG?{mJo}@as5V`Z|Q#~=Qj54hlh_GV}_An+zIQV zx%XgRdeJyhq{l<{;TctB1Kr&)`wn3A+z38={A8u%AWDm$J?}*fPp9CtqHy>?e?Qpz zFAfidLMWHZGQE!PT?;q~ut813TBX7_{b}{9l?p}8NCfq(E8jf3;7Y(LYx6@rJ)p>` zt!-^#5#WEY2DI%T4PWf=*ikVRTi1{8ING%r6!D-Xg5XOHxWnGArrSC|;D)W(+*pU! z+Y3ceQ1%%vRd{w}l#vKpK;t1z<3H&KeoqLv*w-#dyz{G<-h@Jg=yy}$ZbV9pP=Lib l4@!U=k)1Ui2Lg5A4=97+Rjf<`6951J07*qoM6LruV1hLLJPH5+ delta 621 zcmV-z0+RjK47m)j*aLq|Nkl{+Tx&gwC79$}-lkN`pjGa={YdUb-4ZX?q%-o)t z?=ffQ0_EqtJD`=q0HZxfjN^8@k%)gO38v7+z`l;#w7IoI%kO{JsomQph~$gDkUwy; z&%o0&Gw^v^G5YKU?%%r$qQCH+ggjo$>$^p7mR5xF=)=bpn_DEg4aZr(d#*oUoORsk z@21(@k`a!VCDSm9v)%?5MWu*+|d*X3P1m4%*9sm{Tr@UTm&m_ zu}Cm@JPT#6fMc8bPX`z{Yby@+_n_C+iLY78VQ^bk-8~^<5}d&OHeDCZc7oG?NN~As zJ|X$esc3r>N)j@jrosy$X Date: Fri, 14 Jun 2024 12:15:42 +0100 Subject: [PATCH 028/142] SS-28662 Add cvars to support forcing people to departures and making those at departures invincible (#28765) * SS-28662 Add cvar to force spawn everyone at departures This cvar means everyone must spawn at departures. This could be handy for an admin event? But mostly it's so the tutorial departures terminal can be seen by all newbies on gateway servers. * Small fix to ArrivalsSystem flow * Remove incorrect todo * Add godmode arrivals cvar --- .../Shuttles/Systems/ArrivalsSystem.cs | 75 ++++++++++++------- .../Station/Systems/StationSpawningSystem.cs | 12 ++- Content.Shared/CCVar/CCVars.cs | 12 +++ 3 files changed, 71 insertions(+), 28 deletions(-) diff --git a/Content.Server/Shuttles/Systems/ArrivalsSystem.cs b/Content.Server/Shuttles/Systems/ArrivalsSystem.cs index eb1f9796b2..47ccc3c3c4 100644 --- a/Content.Server/Shuttles/Systems/ArrivalsSystem.cs +++ b/Content.Server/Shuttles/Systems/ArrivalsSystem.cs @@ -15,6 +15,7 @@ using Content.Server.Station.Events; using Content.Server.Station.Systems; using Content.Shared.Administration; using Content.Shared.CCVar; +using Content.Shared.Damage.Components; using Content.Shared.DeviceNetwork; using Content.Shared.Mobs.Components; using Content.Shared.Movement.Components; @@ -63,6 +64,16 @@ public sealed class ArrivalsSystem : EntitySystem /// public bool Enabled { get; private set; } + /// + /// Flags if all players must arrive via the Arrivals system, or if they can spawn in other ways. + /// + public bool Forced { get; private set; } + + /// + /// Flags if all players spawning at the departure terminal have godmode until they leave the terminal. + /// + public bool ArrivalsGodmode { get; private set; } + /// /// The first arrival is a little early, to save everyone 10s /// @@ -94,7 +105,12 @@ public sealed class ArrivalsSystem : EntitySystem // Don't invoke immediately as it will get set in the natural course of things. Enabled = _cfgManager.GetCVar(CCVars.ArrivalsShuttles); - Subs.CVar(_cfgManager, CCVars.ArrivalsShuttles, SetArrivals); + Forced = _cfgManager.GetCVar(CCVars.ForceArrivals); + ArrivalsGodmode = _cfgManager.GetCVar(CCVars.GodmodeArrivals); + + _cfgManager.OnValueChanged(CCVars.ArrivalsShuttles, SetArrivals); + _cfgManager.OnValueChanged(CCVars.ForceArrivals, b => Forced = b); + _cfgManager.OnValueChanged(CCVars.GodmodeArrivals, b => ArrivalsGodmode = b); // Command so admins can set these for funsies _console.RegisterCommand("arrivals", ArrivalsCommand, ArrivalsCompletion); @@ -250,6 +266,9 @@ public sealed class ArrivalsSystem : EntitySystem // The player has successfully left arrivals and is also not on the shuttle. Remove their warp coupon. RemCompDeferred(pUid); RemCompDeferred(pUid); + + if (ArrivalsGodmode) + RemCompDeferred(pUid); } } @@ -309,7 +328,7 @@ public sealed class ArrivalsSystem : EntitySystem return; // Only works on latejoin even if enabled. - if (!Enabled || _ticker.RunLevel != GameRunLevel.InRound) + if (!Enabled || !Forced && _ticker.RunLevel != GameRunLevel.InRound) return; if (!HasComp(ev.Station)) @@ -317,33 +336,37 @@ public sealed class ArrivalsSystem : EntitySystem TryGetArrivals(out var arrivals); - if (TryComp(arrivals, out TransformComponent? arrivalsXform)) + if (!TryComp(arrivals, out TransformComponent? arrivalsXform)) + return; + + var mapId = arrivalsXform.MapID; + + var points = EntityQueryEnumerator(); + var possiblePositions = new List(); + while (points.MoveNext(out var uid, out var spawnPoint, out var xform)) { - var mapId = arrivalsXform.MapID; + if (spawnPoint.SpawnType != SpawnPointType.LateJoin || xform.MapID != mapId) + continue; - var points = EntityQueryEnumerator(); - var possiblePositions = new List(); - while (points.MoveNext(out var uid, out var spawnPoint, out var xform)) - { - if (spawnPoint.SpawnType != SpawnPointType.LateJoin || xform.MapID != mapId) - continue; - - possiblePositions.Add(xform.Coordinates); - } - - if (possiblePositions.Count > 0) - { - var spawnLoc = _random.Pick(possiblePositions); - ev.SpawnResult = _stationSpawning.SpawnPlayerMob( - spawnLoc, - ev.Job, - ev.HumanoidCharacterProfile, - ev.Station); - - EnsureComp(ev.SpawnResult.Value); - EnsureComp(ev.SpawnResult.Value); - } + possiblePositions.Add(xform.Coordinates); } + + if (possiblePositions.Count <= 0) + return; + + var spawnLoc = _random.Pick(possiblePositions); + ev.SpawnResult = _stationSpawning.SpawnPlayerMob( + spawnLoc, + ev.Job, + ev.HumanoidCharacterProfile, + ev.Station); + + EnsureComp(ev.SpawnResult.Value); + EnsureComp(ev.SpawnResult.Value); + + // If you're forced to spawn, you're invincible until you leave wherever you were forced to spawn. + if (ArrivalsGodmode) + EnsureComp(ev.SpawnResult.Value); } private bool TryTeleportToMapSpawn(EntityUid player, EntityUid stationId, TransformComponent? transform = null) diff --git a/Content.Server/Station/Systems/StationSpawningSystem.cs b/Content.Server/Station/Systems/StationSpawningSystem.cs index b91082ff26..d30c9fc111 100644 --- a/Content.Server/Station/Systems/StationSpawningSystem.cs +++ b/Content.Server/Station/Systems/StationSpawningSystem.cs @@ -65,7 +65,15 @@ public sealed class StationSpawningSystem : SharedStationSpawningSystem _spawnerCallbacks = new Dictionary>() { { SpawnPriorityPreference.Arrivals, _arrivalsSystem.HandlePlayerSpawning }, - { SpawnPriorityPreference.Cryosleep, _containerSpawnPointSystem.HandlePlayerSpawning } + { + SpawnPriorityPreference.Cryosleep, ev => + { + if (_arrivalsSystem.Forced) + _arrivalsSystem.HandlePlayerSpawning(ev); + else + _containerSpawnPointSystem.HandlePlayerSpawning(ev); + } + } }; } @@ -308,4 +316,4 @@ public sealed class PlayerSpawningEvent : EntityEventArgs HumanoidCharacterProfile = humanoidCharacterProfile; Station = station; } -} \ No newline at end of file +} diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs index f3025f326a..e3f0f65438 100644 --- a/Content.Shared/CCVar/CCVars.cs +++ b/Content.Shared/CCVar/CCVars.cs @@ -1425,6 +1425,18 @@ namespace Content.Shared.CCVar public static readonly CVarDef ArrivalsReturns = CVarDef.Create("shuttle.arrivals_returns", false, CVar.SERVERONLY); + /// + /// Should all players be forced to spawn at departures, even on roundstart, even if their loadout says they spawn in cryo? + /// + public static readonly CVarDef ForceArrivals = + CVarDef.Create("shuttle.force_arrivals", false, CVar.SERVERONLY); + + /// + /// Should all players who spawn at arrivals have godmode until they leave the map? + /// + public static readonly CVarDef GodmodeArrivals = + CVarDef.Create("shuttle.godmode_arrivals", false, CVar.SERVERONLY); + /// /// Whether to automatically spawn escape shuttles. /// From 24e7653c984da133283457da2089e629161a7ff2 Mon Sep 17 00:00:00 2001 From: Verm <32827189+Vermidia@users.noreply.github.com> Date: Fri, 14 Jun 2024 08:45:01 -0500 Subject: [PATCH 029/142] Resprite rodent inhands + add hamlet inhands (#28955) * Resprite rodent inhands + add hamlet inhands * Small ham adjustment --- .../Animals/hamster.rsi/0-inhand-left.png | Bin 15202 -> 0 bytes .../Animals/hamster.rsi/0-inhand-right.png | Bin 15185 -> 0 bytes .../Mobs/Animals/hamster.rsi/icon-0.png | Bin 18686 -> 751 bytes .../Mobs/Animals/hamster.rsi/inhand-left.png | Bin 0 -> 903 bytes .../Mobs/Animals/hamster.rsi/inhand-right.png | Bin 0 -> 906 bytes .../Mobs/Animals/hamster.rsi/meta.json | 6 +++--- .../Mobs/Animals/mouse.rsi/0-inhand-left.png | Bin 482 -> 807 bytes .../Mobs/Animals/mouse.rsi/0-inhand-right.png | Bin 492 -> 792 bytes .../Mobs/Animals/mouse.rsi/1-inhand-left.png | Bin 508 -> 805 bytes .../Mobs/Animals/mouse.rsi/1-inhand-right.png | Bin 510 -> 811 bytes .../Mobs/Animals/mouse.rsi/2-inhand-left.png | Bin 491 -> 805 bytes .../Mobs/Animals/mouse.rsi/2-inhand-right.png | Bin 499 -> 801 bytes .../Textures/Mobs/Animals/mouse.rsi/meta.json | 2 +- .../Mobs/Pets/hamlet.rsi/inhand-left.png | Bin 0 -> 897 bytes .../Mobs/Pets/hamlet.rsi/inhand-right.png | Bin 0 -> 898 bytes .../Textures/Mobs/Pets/hamlet.rsi/meta.json | 10 +++++++++- 16 files changed, 13 insertions(+), 5 deletions(-) delete mode 100644 Resources/Textures/Mobs/Animals/hamster.rsi/0-inhand-left.png delete mode 100644 Resources/Textures/Mobs/Animals/hamster.rsi/0-inhand-right.png create mode 100644 Resources/Textures/Mobs/Animals/hamster.rsi/inhand-left.png create mode 100644 Resources/Textures/Mobs/Animals/hamster.rsi/inhand-right.png create mode 100644 Resources/Textures/Mobs/Pets/hamlet.rsi/inhand-left.png create mode 100644 Resources/Textures/Mobs/Pets/hamlet.rsi/inhand-right.png diff --git a/Resources/Textures/Mobs/Animals/hamster.rsi/0-inhand-left.png b/Resources/Textures/Mobs/Animals/hamster.rsi/0-inhand-left.png deleted file mode 100644 index c8a6e78f16aff80ab8f662c08b691bea1475969a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15202 zcmeI3du$X%9LJ|Xpp@_^_#j1+%@vb^-0i&|o4W(rYi)sprqs}C8rkm7wJUeG*W10` zwM0M+3N$K$Qi3F!0P<3lNJN7v35W_3!XH3HgBUfU4GK0vMKN{u?s|{ubri#&bIINA zZ+`Rr{boM%o4NgGH`XtCbYe+a2>@VXU9GPHUFU1x;<4!WfYk9dx{Qz1HY)&3n5KP; zz>b~M0dQ4HjZJEke=#S>ApM5t50*bgvX#qHdnI#GT+!fDlx9CJ_pT6)xe?CF64FUTbD`OtOo* z(xY3TC1jfX^-Pr5tA^ zg6`Z=F~BwWYSQVD<1TMTlvjWxMkF4kyf&1OC7p;x-XDxc7YmGV@O zp*TLM2vI4bN^+Rd;_|I>O!eq=TB6J+J+DwClPIjD*&&K-f{(B!gOM#H5`~N=5{m|t zLlXrS24M(>RR!rx1$B{jS(TM`d4!Z1_lSwnn)v;h+y%!Q3KdMPsMVbaK^kd6rPA0H zfoua*&jIodTMuk!yEAh%mi2vOhyax}!NUMa-4K{gU@ zbFU>_*V35$H1xu?nz`LA!hskEw zJDt{mzSZau^v-~2cDam#U9{Mf#g;G6PC6ZWD0@1zc$cAbMvGUt4%F4EPJJlr^5&<=dB zpq&{|bhCM_*@c!kkppU+kHQ6QXkY%9lQ0!E zUxtS-yxUT(`AaiYtizYmtsVIsDg!hwK8fGtW{0(9GpG7DY0DXmCHp(fM)YA#+HYE# z>&B(cWNEG&mu8iZg(cN%PG`fKb5z>@QtAv{h904y*KV^}Y;G2B#ufEa0tTCW5;{W_ ztsw2_TuW+jM?qopNWvUPT9{g@oQIv{Zc4SHM=A6a$7UYmhHbRWHn^8J*%{r-s8}qT z1Oq}gDK0V}%u8`$K*%P=MdpKfDJ~2M*`&D0d@wJ?g#jU(6c?Ef=B2nWAY_x`BJ;t# z6c+}BY*JigKA4x{!hn!Xii^w#^HN+G5VA>ek@;X=iVFimHYqMLAIwW}VL-?x#YN_W zc_}Uo2-&2#$b2v_#f1SOn-mwB59Xz~Fd$@;;v)0Gyc8D(gltk=WImXe;=+KCO^S=m z2lG-~7!a~aagq68UWy9?LN+NbG9S!KabZBnCdEbOgLx?~3<%kzxX64kFU5rcA)7>8 zCD|7vVHmv)8Aq=@zPoq=gI<|rgxUr_0NoD*u=ZI1ZV#gCPXNS>0Q9c_fZGnhgYuRq zPt^cWw4=_qpfT~~^~=W>o~*xb?9Chf_s7mm6DulO9*ULrZitVTPx4ko$kD@ z>n{HBi&OirjM`W<_sCZj*S8gc$wv>CU#vM?bFP2&j78Jd4!krFUGw|pqSdy^;Hg*s zthm%VrMqYO{(b=F?Avy>Z)V%ToK3f8-8$)+wg32uAJ)es`q8(Ktp8T-SY2G2GaT%8 zerM(0(24c%h1e70L2PPY;Na*JHPs6rksA(<1I(wdDbuc6Y~#xLUAl9hlyRM~p-Fc=5Sw?Vr83;adAgM|TKUd!OHRXNoQd)_nVS0*DnGevVeXz6h--sHd?lQfsp^e7IGCo{?J zcfRxgzH@%(J16_HYiefA99sNjF#up_b(OakU8fq~f&J0%4yE}bx(td`&C>uFJj(bM zfvxY40l+m)@z?A1zE=cE4OvB5ZGhHzD1v$e;4Y6xL}>}sO%1S73746#A3kC>DRP;4 zF7LDXB9*X7scMbFy4G2Ksdb6ulFj9wVs~6X0YXq0P4Q4LtO@Zlb26@g?u}-~Y)W>~ zmz0?+jD)6oUyZ3!jY1P|byy^u!)bE5tSs+zmN;K9aW0FY&H^QKIwUdBAG;CEzJ&5Wa46kVXZc%kVuv?nn)}f zOb$(!7#M^h7}hnUV+-mcO{%VHO=>SGGwxm!qc!pQGPw(mHxw$ETGOX5MF`SJ3o12# zA_AFOsHw521g9@WQ<+$3_PP?tE>2z~!_({7VO;4&W_VJvWGSRp$c^SIR7Rnwt5LtI z20f`NtLa8)s;o>_m1)XcB`m8g+H-COmt@yF8x49z9eOw$Dj}A&a85t#6u45M#PwQ^ zKGg}6`&3y8B=Y2To1b+ct-zM1jIodU{sEhv=Ah%mi2w4&WYBVJ39wj6;LM9S! zbTiq;oSvC75-Qc88bu?59=n?<)Lc;IRi&6w#}#1-YKXp;vnpt9k~?*p*qGni?FcHK z)Hxxmk|GP)q^u1#IQf8RaX_9&=%H*8CEjUqiFRIcl}H>EOWcgHTTzJYxYEUtZZ8}f z21=d0%sEi#(vk-Xol2NLnOssN6h=w;d_r|t(?vw8+Ur3LRs~I34)6g8MY{!ZT!V#2 zle4(El7I!;oDCA|a@a+wG+Au<^6aG3p}VuEL(2~sI!E3k^z5jD{tU!mP9J0R51OJt zm>#LB6r+d|`D>aiqB_`|-~&OdnDt` zfU=v(Yt0TTqjaY_DF1f>d&qmw(b5FNy_`9zD9H}J>oql?w}??#(TMite>n+LQS)VZ z_`rI&BNDEU-mGiKZ+)b%g^eBa%;+V{1T#t>G*#-~uCOe~t85N5~lVCu| zCdEbOgLx?~3<%kzxX64kFU5rcA)6EznGfcrxG*4Olj0)t!Mqd~283)J zkWGq<%m?#QTo@3tNpX?+U|xy~141?_E;1j?OL1X9$R@=_=7V`DE({3Sq`1g@FfYZ0 z0U?_d7nu*{rMNI4WRv0|^TE6n7Y2lEQe0#{n3v+hfRIg!i_8b}Qd}4ivPp4~`Cwj( z3j;znDK0V}%u8`$K*%P=MdpKfDJ~2M*`&D0d@wJ?g#jU(6c?Ef=B2nWAY_w>t2p~& zBn+dsAzRREkCzhTcB5A&O;S~@4}jKZ0BCy~fUf)KdKG|}4S;Kl0T8wTFk0QXsC@#K{;Tv=SVqL!^#x#ZrX!`6)-fBUV(fTw5sA5X076Md?m z2^0;S3i=Fh1Kqcij_rJ>bG-`<9VfQ0s`zB} zh(7&4Jb!xO@-;xa>pANf2ih)P-p3DmWW&*8f8V&U{{Z-D!sc6duI=yhWne5gKCo`3)V diff --git a/Resources/Textures/Mobs/Animals/hamster.rsi/icon-0.png b/Resources/Textures/Mobs/Animals/hamster.rsi/icon-0.png index de09d6311da69d5aecdb2ba7213ba49a66a7effe..5c5c8a891b3c8bc945caefbeb740a3600ab24de9 100644 GIT binary patch delta 714 zcmV;*0yX{qkpb@okRyKqZfQe9P-$ah001bFb&;&hEa6dRGy9N1M) zPr8BQ4XkC1obZ^iHaV7IhVX1?%hcF2dz>kMGCDzGO#3wZ`nKk!K{Q4Ft zh)0vRP8mZSX)=G}9T&AEU6WE%q9^6aQdYVD&(lmzP1d@*{LubvS??p@+=Xhzvc8Wk zt9k;CC%DYl{RPQs=2P@aUGpA-dkfC5>RNmcF1BIdQI8q1U&$fco=U;n8T3S<_ZGTV zYgzrBbNT?0P5DJPuzvufa^Jo71K_G>`;hGe`2YX_32>1n5`O_FNkl7Dj6y(Eyx0e2&AHV>|AU;SO*-=z? z1js^|n*7#}1LQb&sAOvEa_|B;2EVdg@xa-hXvdjC2J6h25Eq>dCov;#o# z{PM*!xY_%UoMvzgdcgpqVE`l#Qb!74BvvsfenE-Pqo|ufTtW&%8_4nl+X8e>;+*69|?oR wLGnOMlDVUbM?+vV1V%$(Gz3ONV8BBF0G4m8FQ?~THvj+t07*qoM6N<$f~p8i8UO$Q literal 18686 zcmeI42{e@L`^O*gW?w2&N$;RVGG;TwOk*r#P4*E|@tDnInK3i6RH70sFG(dtw8>gg zN+_YUSfbsM3Tb)ieW|qJKSM=NHUIaV-}^uR^E+ppV`i@Vy1&=`+@JfpulsqNGqyWB z+9=A+kplog(azS=RqzfI{>n@hyz(L=-w57hIksLr0Fa*{{FMOG4$cAqIVTpG?Ck8% z=CgVJY!1whOonl|Yz8Zk4gle;8E#C9+l!edLyz8A*vCijwP(Ak$-rDKc1EivE!5MJ zRaq9VmHkl7JduDZ z!@d>|Jb(j8I}e5}aOxaT)uL+Zx!P$0}qk*@GzLC+i0i0L=^{40n^M3sv}Zoqhkz}9}m_8Kvt5PV77z9 z;f+c~jg7d3QY9bw%S%&7wf+3MMtYj^Ic5Oxgdf#BqK_z<6TNh5bkNA*1^rU~Yvi*+ zhjucGmCeoqSua{W2021DR@uAD9zN{p?tZYW*1{XS;jwXqS?yEhF&y|Iiuifx?cr~W5NQYRKTwU#8YJ_&weHC6JR{UQ}le$~?<02nA|U%sO&BN^?# zCLHCDpiJgv z-HI4lDf4SGGeE7@cnQB9o;nFK>Z!5swJzIAP2V{mc0FFzMcY0JYm0K-L4mp3Y7Uri zr{LpOSzkz6dJRBt{=BWi2DLY)*u~_I!dY_J38Oh%tq;rJqVZ8_i8Hg(Z*kAeG1-O7 z?!A@ouiTnQBG)0Sp3joT)CM9AuGUzbHrAI-rrtcQU7(PEb>F8yQkQlK1yks-eTPn?5guZKR4abc8*T+^;TLyu{3_K zK5WUg*zSz(nr=+DMz_|0w_JvwS;*1%ZclYxZ>(K5yGNzRuxBd$0NULBNSbTMiEPR= zY~o6b!t7GllP+;5W*CO1;TyKhw6i}}czECKIsWSYL#&g}`4^^j?3?G9a?7LT<_nwW zDbFR}gefR)Q`=G(&(xirK1+HQb9UIQlLwX`pM87h>^ch42=(efZ>n-C+uc*IRBwY? z(ha$N%l0kYr=f?S3ZDWzOJI1XmSN6{SeD}Nz=T~kTZp_@J zC*ty$C)gCzqfuVN+oyWfEU$4QA9cw(?bB6p6(&!eT@tRZ6`+{EEi?vOyYO_w!wu{7 z$`1@{mhUvl%gx4C9Z>e8K%-*2SVN-gJ>jM(uc{`g-xx#Tv&AmzSaF zs{-=&r|kF4x6OCSw|P~GE9%S1I9_R0?)51~$-HjaqE(A*n2C+QW%Rl|bnD2G%bDq5 zLU>zbkQZ=FBfH!(>{4(}|AEYlYoarkvvVFrRQ7(HyAd%=84miG^VUYeb83mg{HbjU zjkAbXupw-sCZewGZx{0F8Z+`Sa37fRWNT7cGx5k>>p!fOcd@Rn>YCpbbT#Pek%dzi zYAv*Pc_J%MK%4&mB||~Z2V)`L|QTKp;Er)O3f(V8Llc}1>sRzsNV3<;!H0L?^ew<@?)2tW>fh?`;Y;h1yN39 zrx@nhUL6D#k>pW$|J1o-VR=K~Yjx5)68BISsf%dz2>r;*r{1XQ+_iHzood*bKCzwT zO**5r(a6zeASZf(1XFT*jCqXrluz#?H)vf-FeS9n-xWXXGvAd}X0B$QxVdn1&*efb z|7(BlF4P+8J;cPBSV68`j)T=5<gM!|IXp4Av4`jV>5oFuiKP@T$M-nc-;{Xg?QkpjU(o4!qd;xo-*MX4*Pf5ZZ)L ziQ2L!X?KW4o|Z#$Df1=s8Drhe0(xxm$d%xo=MeMuNnZ~r*HG@{P@x&q@Tml6RNuiQV|B{eItS zCr^Y|=UMRMwhRrD+V&kqs%`2iYMUPDwukp<#IbK&N^ReJCO5yfjMl_xVZ3;BTiPdYKko}p^`z!|FCRsIwrTra`Jf@u zD`MFos|8T&FeMj3o)_iZ~|y1tj%*tu4j{rZ9m|4ED0=+54y6-yge z4V>o>6u0%v@Hp?0c9P%|^pgLQIFfwZsjmEBd0J7~s(`Zo$jYICQQSqtjW^35hArwZtZ=IEd1KaR{*c@ech}T=r2WC` z_DyT6!m8O#Uq~HSy*)#ci)LjY)X?Q&aBni_baaCR)?NO!bk& zBR7lGXCk8B-+gtzvH3uAcFI6X@}-~+$A({4y_$Wp?P~Sac^9vTV^C|}toYP-IjlWQ z^YxKVWvA{9uuZz7{vS@ib-R`GDS38s@~D*Lfx*vI47?2hh(}lyPrj$aasrhdWB}6G zesqKIAdcWhRNylW=YZ4zIv?goXR?A#v|pEB(uT2UCfXiY2c!dsO!sHmMsn$Hk&YB< zWB?UU(>5i^5yJ_B06}y<2n!Di4CWESO|-}25(J-x%?NGSSQmbPiMF|LK$xe4GmOmU z(qUKw9Gr^88NrP31}LnNk)e@342?u#5l9RIgM_0o1Vbdj5DokCqfL?%d?Ipb41%kr z^_SrUmWj4MpU)v65Mg0q24NTjHkXM&;qiC`5{*Ek;esA;UPLe-42K8vbjE{xjblmY zQMoJ*pT!P_3FCr(>`=amwzhDfZ$Dq=6~y^AP%!TcI{`&RILJYu43LOlh#VY5%YuS_ zs^syl)(NiU%glZ{AdeEkp(9-BJa#CTO1D}^59aIq>>_B?Z*e%G+`utDG%A7~NDmT7 zc!G;Z{qzzzU!Op}$-lddZ|+~tp3h=TEY5dYq34$}dN}JBGNET&HkJzGD?}9JAA!uJ zgM2oZ!e$4O#{}y1P)Aw=*2ZCKN zj}Hb@>2{VR!DJ0sEE>UxhV{c3@Z8*5TKB9-F}r z1G#i_rXV@~$u1m^`n?Pqo`?|Ellfz8v_tQ9E4;OR6VJSQVc;8o=u`|E| zWPaZ&#QUW#{rm_-A?bcbSOzFO0NCZmw`b9d~4V8L{mQHp2W*{xTY*d6G(a z^G6uV6*s|i3Y{dF8ng-8+nE(k5A?KT3GP;S!c!L`7-dWYb^KK5^()~d#~0!FqD^|5 z7)zJ&R>8B1;4umD?K$a(O!{`#|C=8sX7q1Hg~SpM0s$i06yp-j2jUguf&dY1igAhN z1M!M+L4b%h#kfTCfq2EZAV5T$VqBv6K)hmH5FnyWF)q=3AYL&p2oTYx7?)^15U&^) z1c+!;j7u~hh*yjY0z|Ya#wD5$#4E-H0V3KI;}XpW;uYh901<79af#*w@rrRlfQUB5 zxJ2`Tc*VFNKt!8jT%!3vykcAsAfin%F424-UNJ5R5YeU>muNl^uNW5uh-g!cOEe#d zSBwh+M6@Z!C7KV!E5-!@BH9$=63qwV72|>c5p9ZbiRJ_Gig7`Jh&IKzMDu}o#ke3q zM4KXU$xVFom>w+nx^bA`d&QdN3kClP2Y^v+T^#@*asdEDZvlW0qk{Jr01%1g+u}SF8a*BGS&%oD$yp=YEuZjhSlQCgzlc1h~@7E5@M($p)K4oK={ThkrNY zxN=rdepIa z+7m=jv?)%~7f^_nxF+?OPdbV??skAEQ~etx!vL;Iqd_#KEaz?u~qOo z#rEX=8D@v85^Y)z9UOHJp4N=0z7d+L``7FZ#6@zS&&g%}1-Onx!9Ook*InGa@n!8( zm&bJ~9XU$NmVI8S4#cnBeN(y4Cu762ff|`V>H(j1F|Qr~Pt|;8dA0j8A_r>9&ZZNT zQ{vu-?O&(Y-xA)-y zkz@61{c9d9Xzp-skCM^qXtMHRjlHsPZNk;1otfGyhANs$>zcZoA1LhlA@zs9L^MW} z#Zk~jW^S#n(#II(5SRB)pZ)n!wEyr)@s7UPyPk&fH>dv2tI`pjeeUd$S8^+-@;0k{ z+V$Kg#clJS-S^gYuBf`Yxax2H`}0>V@++)dUbV899RJ#yDs^mnjr+%41+(K$o#%ef zsU9mC@FV7B)CvBsZpHl?Wt(3LcC4DW@e%*Ex(#tfx)1Xn?ns^X^?l`)=_ZojLfo?2 z=lI!N>Y1q2<~Ebnr>1Jjtw}fU@4KgeU#0ue#iuVf^l0}fseV**)%6Z{&T=eq-ga`+ zslVm(;uh}Le{*k2)2!bL74MpM`Tn@U(e(YV!VimvRn`_;wg0)E%zP30rMFA$e(SVQ z3%k`Bx5VbGas0h@a{1@@ps8~*7Bcv|UzpQ;%{yZT@8(~1=O6N>gg+6FJ@AcBRtvY3H^TL^?1FWs&C1B{G=o-U3d6>)EG?e_x4!|{*7ott-b zWPfC>Vg1NDC&p#fTp5>=qTts{{FL~1Z4o*7NTF%n*7XlodCxz%^Juoehu%iF6Z02q z)G#aFne^w}+2!V!ZIxs=6dD+qkcj}d2ML-5RmtqglI-A@6vto#m(Ct zUKuOjw2(dZ@Y)v78maF)>{rcfiE2MGx#a!&h3i`MwHM{=-FoyuY1onZR(i9ie!Vlr zb%x)E7rV3{PoMtpZcWM6jsN0I>l4FV!b2bH^sKYmW^-oRn;Z|(kfWuxmvmGn7pUq?Kd)QIX_G}i;US6S6&tFBV7 zn=fFV)Uo+y*BZOfxfAj-qH=ou&$-1LS(Yk?WoN9t&vIT>WdEMmbHDhMb*Oh|pOjU-}Kqf zm;HSC{?E$I&%?ua^{s2LzwJKdwZ3M-Y-xA)-y zkz@61{c9d9Xzp-skCM^qXtMHRjlHsPZNk;1otfGyhANs$>zcZoA1LhlA@zs9L^MW} z#Zk~jW^S#n(#II(5SRB)pZ)n!wEyr)@s7UPyPk&fH>dv2tI`pjeeUd$S8^+-@;0k{ z+V$Kg#clJS-S^gYuBf`Yxax2H`}0>V@++)dUbV899RJ#yDs^mnjr+%41+(K$o#%ef zsU9mC@FV7B)CvBsZpHl?Wt(3LcC4DW@e%*Ex(#tfx)1Xn?ns^X^?l`)=_ZojLfo?2 z=lI!N>Y1q2<~Ebnr>1Jjtw}fU@4KgeU#0ue#iuVf^l0}fseV**)%6Z{&T=eq-ga`+ zslVm(;uh}Le{*k2)2!bL74MpM`Tn@U(e(YV!VimvRn`_;wg0)E%zP30rMFA$e(SVQ z3%k`Bx5VbGas0h@a{1@@ps8~*7Bcv|UzpQ;%{yZT@8(~1=O6N>gg+6FJ@AcBRtvY3H^TL^?1FWs&C1B{F#o-U3d6>)EG83N-$;K0Z3Batyj zw*Fv^xf9bBf8eC+l3OPokDT>gJ=v<$;zf|=Ek}0265ZH4F)^ht(+lzppUL@FXqf0v zx*qn&o$8gw^=^C{bI+V}f(R$|y^cJWxvw`_sWm8V<^ z@xRu;d((c)nWZ;9>bA>YOWZ9ka>>O$^UKeBS3G|h3bu-9Dx7>(BN40XUG-w8_pMGx z$5|W7Zcg~|Y-z21w%ym5{pFr^XJ+io6r6kMl;`D|S36Iik`bP|XJ7V`o!7#&F4gE} z?1`}|>A7gP`gU|?$=^43R-SJZUT`xnZ}+9TI!}IE`QumLYisE1y>R9|w$=ZA+1g)y z-=#zx7#LXua1uYtneLnW|6q|w(_Q}iLffM4C-(IB-#=bi8@tYQ%e51NZ`dZC<=8mw zrp-mGtV+ih&rL7*`KzS|JbV37W&XV-c@sUa9c!MkmvvX>p*1s)&si#a`0<`h-s9e% zT2k{SY?%C#n~U+Q<~=(#b@|C9edndl{e4k?k?);N>7Jft#m+2Bh@kzT-KcLc XX;E~+8{;>?NM`VK^>bP0l+XkK57DMt literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Animals/hamster.rsi/meta.json b/Resources/Textures/Mobs/Animals/hamster.rsi/meta.json index 85616627ce..4a59c01d09 100644 --- a/Resources/Textures/Mobs/Animals/hamster.rsi/meta.json +++ b/Resources/Textures/Mobs/Animals/hamster.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Created by brainfood# 7460, hamster-0 resprite by RamZ (discord)", + "copyright": "Created by brainfood# 7460, hamster-0 resprite by RamZ (discord), inhands resprited by Vermidia.", "size": { "x": 32, "y": 32 @@ -59,11 +59,11 @@ "name": "splat-0" }, { - "name": "0-inhand-left", + "name": "inhand-left", "directions": 4 }, { - "name": "0-inhand-right", + "name": "inhand-right", "directions": 4 } ] diff --git a/Resources/Textures/Mobs/Animals/mouse.rsi/0-inhand-left.png b/Resources/Textures/Mobs/Animals/mouse.rsi/0-inhand-left.png index 4e5244ab3a66091c99b8e85fd8f25807670d93a0..63b009dffdd33dc751169ec6169978d8cfdef085 100644 GIT binary patch delta 784 zcmaFFyqs-CQzmfp;PBCY#X@^*+tbwv0Gx+*qlbS!l-@ZI8} zw8M1fNi~(i88a0QhHcm=pyMLF{ZRdawF#>gIJy*)GT&bFka+Li!eaRTesHD|iBzofslZsG( z-PprbywZ}|>NYBG&Zlx8dvEi~`_|;2KUZ9_v;2F*g+tKAdHDgYNEx>!&r~=6uU(va zUncvJ;giguBSP-8dMcO~)r&334$AWSvgD19>(t-(ZQfq_5wWzoT0m-k?DtxRS>+42 zJl=Kx__}B-#{0rC&sP64J(>9__{-c?&+J>)`C9B>mGw(5CdcvpV#)1~QctQMpY3(< zwq%Kp(|6r1df}UX)t-OJe8lXD_}v5l7Djui4z|be5}W!MQCHub-2+$)|g|$S`hw%Fj<)k<;$ZcqZ<; zu|UTCk;OgB^QEyTKi?_gJRG;ay#9vhg+6qr)T2ACp7Vt@Q|+l4-y&=69nAlI+%j!l z-=^CeZY{30KfdnnHHJwlf`4PqJpWqtZu#`NcAUO-m#-`2^gl_xAe?&tyY=0Q-&Z`~t;_P=|u!IayQ`ZPV~K_WhPjcX@dnH{=fx5fKp) z5fRa?4Fz;2!gpkAj>kOX^MKijwDIEF{Y3b3ONA) z;GDzF*(scJ3xBUS#;CXFlH<+%$xCn^c`w1jPC!|(0OnoK6jIYEaY2vnodSjy4j_#MNC%L{0;B^-V*%0uq`d+?%XUJn*LCQzmfp;PBCY#X@^*+tbwv0Gx+*qlbS!l-@ZI8} zw8M1fNi~(i88a0QhHcm=pyMLF{ZRdawF#>gIJy*)GT&bFka+Li!eaRTesHD|iBzofslZsG( z-PprbywZ}|>NYBG&Zlx8dvEi~`_|;2KUZ9_v;2F*g+tKAdHDgYNEx>!&r~=6uU(va zUncvJ;giguBSP-8dMcO~)r&334$AWSvgD19>(t-(ZQfq_5wWzoT0m-k?DtxRS>+42 zJl=Kx__}B-#{0rC&sP64J(>9__{-c?&+J>)`C9B>mGw(5CdcvpV#)1~QctQMpY3(< zwq%Kp(|6r1df}UX)t-OJe8lXD_}v5l7{}dTgkLAc$%F<+a;T(6$#rfX;v{w&Po#ca4+cOf4%A6dFPI=zw74`!J*K=z=T3L z9B0vc^()rK=kvt}^-=eJZ!g+>`pMg3?eG2Px4!>lzW?;Drma8Ep7x5lu3Kh1|2NlR z1OLk=*YA3)EtC;wEHxLpP$aPS>i55ko|&zz@}0g&W76)2Q}@)pnZ0h_(a#DTM+#*w z?w#yi|JTpV?=p(LXwCp~BSb1Myl2;Gv**fHj(_`|@haCU<>%|4M&0UL_@8TOrOEu4 zSEU@5uZx@}`$Ycy^P@jA%{Kn>*LXbrr;oD9F>UvA^PbC^{3_0?x&EXzt8Vhf`rfH3 qod(7BoTi=v4h)PeV8T!918-?+5{u&h?+bvT&fw|l=d#Wzp$Pzyv|io- delta 466 zcmbQi_J(x33{|32wYVhT!N zu*i4uufP9-%vW50T`!apSo!nz+im=Z1+GP1eOdA+!^CNG{mqcd>-o=ReX6hT3(|X7 z`J7>QzT~{PxIkOG(|Zrri?k^&(l}IL@g-2Cw(?!ry@OsmTiS0kKC(D=_$|ZKqLm$U zS~p%><+ixdqR()yU*g)izdsd)I~0^G+8|!dV3D&`faTz+J%4BFoSv{ubJbO?Nh%+Y z&A5|(B9@Wi!JNZ)pR&%WFFv|dXF@UGF$vS(bIb2Vt?Mkm8=er_jsl z!9L*_(-LNn+dr5(ARyy&jrEs5Szo?XzL@cC-QVYiyS}`5W6fPJILmg=wOiS1|5n(1 zoBTvBD*OL*#_nwejK?IVs&t;;#B(=K{J?PySq8cMbz#d|mhR&`cg*|z)+k?A#|3kW zXZWaP{r^&v`p*}K`-aAR>rGUFx2C3~6oq*NX14Cypy00K`}KbLh*2~7a8 C$lL<} diff --git a/Resources/Textures/Mobs/Animals/mouse.rsi/1-inhand-left.png b/Resources/Textures/Mobs/Animals/mouse.rsi/1-inhand-left.png index 634ba7254cb1e0bfb1541839d5dc1c8794b78284..55d5e5f39cdbd5baee38aa1fa5e109cc8c979c88 100644 GIT binary patch delta 782 zcmeyvyp(N%N_|eIvvWXZaxw#h#>CQzmfp;PBCY#X@^*+tbwv0Gx+*qlbS!l-@ZI8} zw8M1fNi~(i88a0QhHcm=pyMLF{ZRdawF#>gIJy*)GT&bFka+Li!eaRTesHD|iBzofslZsG( z-PprbywZ}|>NYBG&Zlx8dvEi~`_|;2KUZ9_v;2F*g+tKAdHDgYNEx>!&r~=6uU(va zUncvJ;giguBSP-8dMcO~)r&334$AWSvgD19>(t-(ZQfq_5wWzoT0m-k?DtxRS>+42 zJl=Kx__}B-#{0rC&sP64J(>9__{-c?&+J>)`C9B>mGw(5CdcvpV#)1~QctQMpY3(< zwq%Kp(|6r1df}UX)t-OJe8lXD_}v5l7xGL;tHr*^>oJ`z%>Mg*ucpJ&sPnQvs}tqVR>_vXINYRu_j&onIW9ApUNrb0 z?%Y%RuI;AMti9Ja^qdaN`n6B~>DRM0-~VlzapKzjGgpm7p^m9Xa}u0;TY15MjwP14 zcj}%kKYaOKz!w{PUY56u|JJ!*x%Z6W-T#JTzN&#N;rG85bHv|Ij(pwu>FZC=Mcn^) zZx;JIEpO+)Y*&xu-|JsZtZWE%uyJQ#WD#%x5=Qz4?85DSrz?~n=L4gF!IRz9&t;uc GLK6VD#cAFE delta 482 zcmZ3=_J?_bO8sF^7srr_Id5<6_hw3zVf*mB*F%cu;Nf#pzZ@^5I680P@Z(#1F{#*j zfr+_^b-R;u@jq6@7mK_FI2v0*LPDHX!$eF>_VNB*uxQttcTaCW{2ZBA^?qJ;MP>VM zIR_UAnCrH4ujAIJuL{T9pT zH}rE3Z*$6B+rM;ER>cLkBby2;el|pCy{=kbcie;V@8!=~D)+b687^7vV^D&CS2oAe^5TBlRIL^_|MEMq+H(3e`?Gv= z-O}Cu@f*0lUGsAHC(U#6;a@&1;AQYg`*dn$%lseDCf|7YY!_SfyyI^f0#?aBe6#4~ z4(2&OmNk5ARb84sEp+L{Ll2s~Z=T-G@yGywoSVc`A% diff --git a/Resources/Textures/Mobs/Animals/mouse.rsi/1-inhand-right.png b/Resources/Textures/Mobs/Animals/mouse.rsi/1-inhand-right.png index 2af0144edb4326ba5a4131b3a63ac0879899edc0..44386b1d5fb515ebf1a39a4d587bbfa97fd33963 100644 GIT binary patch delta 788 zcmeyzyqax-N_|eIvvWXZaxw#h#>CQzmfp;PBCY#X@^*+tbwv0Gx+*qlbS!l-@ZI8} zw8M1fNi~(i88a0QhHcm=pyMLF{ZRdawF#>gIJy*)GT&bFka+Li!eaRTesHD|iBzofslZsG( z-PprbywZ}|>NYBG&Zlx8dvEi~`_|;2KUZ9_v;2F*g+tKAdHDgYNEx>!&r~=6uU(va zUncvJ;giguBSP-8dMcO~)r&334$AWSvgD19>(t-(ZQfq_5wWzoT0m-k?DtxRS>+42 zJl=Kx__}B-#{0rC&sP64J(>9__{-c?&+J>)`C9B>mGw(5CdcvpV#)1~QctQMpY3(< zwq%Kp(|6r1df}UX)t-OJe8lXD_}v5l7~5^H)>Jz28$77bzTGFTZogp6&aBP4!34zr3u@^)f_uL_LP17+J((9RACn_}mrw#d|KF ze|*66cb8wk-=P2b{3fQ0cDK%#TQI-4^0nAt&ddCNvO6r-r~Xo%@oU-q{FWtDnm{ Hr-UW|+X7^7 delta 484 zcmV$_oLC|DDgR}%r4z1B* zb3>psH#9qoLW6Vu1tD~cLIgn&L`X#iEtOnFfkWfl5JJRVT6TQ3dp?VBydICw9q;gd z1&D}6|(%Z-42B=O$9wqH_BFpwq?E zN=chW1org_VlxY9JiTImdEM~_y=XKVLO1|C?rrOE06;Y4x^}?nqG?2MUOvR!w2AZb zAxtCUQB-fl(>XOcZX#wFxVp3b>GJjVh?602%zDF^_VS_)z$vD!CJzvcF>f&Jqv z%#MX%6*AgwoquBi08p*lxVRZYwQhTp&|}rQja0U%TAyy~{^ch46RvN7U$6k_0Mb~1 zbO32AKstal79br!n(qrBA|fIpA|fLHX*=}%ZuDdoGWzq}?X*(TU&rXuqqBA#{~yqa z){j?5c@2C_V_y#5poa5WFK+hDH2K#@VySFVS%r*lja{LEk5M`RT<-3;j-z``S7(Bs z$IlZhIaRIO(2JXDc5S0?-hi(5fKK%K9^m^^VHO}AKpG2>4j_#MNC%L{0;B^-V*%0u aq`d=JlzS#A%(b-u0000CQzmfp;PBCY#X@^*+tbwv0Gx+*qlbS!l-@ZI8} zw8M1fNi~(i88a0QhHcm=pyMLF{ZRdawF#>gIJy*)GT&bFka+Li!eaRTesHD|iBzofslZsG( z-PprbywZ}|>NYBG&Zlx8dvEi~`_|;2KUZ9_v;2F*g+tKAdHDgYNEx>!&r~=6uU(va zUncvJ;giguBSP-8dMcO~)r&334$AWSvgD19>(t-(ZQfq_5wWzoT0m-k?DtxRS>+42 zJl=Kx__}B-#{0rC&sP64J(>9__{-c?&+J>)`C9B>mGw(5CdcvpV#)1~QctQMpY3(< zwq%Kp(|6r1df}UX)t-OJe8lXD_}v5l7?{^ZBN)4mb48VRd|+vG-chs<*NS?(tXbm}hPJ=*#UhX|wNN+kAg|s;0GVVBew@ z*ALzfSaxrI__lw3f-(Qoosvy_PFZ(tNKc(S|txvXuA&cQ#ZsIex;Yv}V^GF|fI;kY4h03sqH zA|fIpS~jZa4Mw9;2{AtE_xnz34P%T-)6~u9bM$(>FSEAW?SDegS}nBt8&_w?uC8l1 zzkS3`a}9U%du;6<{JLzdHG&|(U@&k&5I}3~BPIY~#m7zSx`vz6OGHtGo6}3wb#0;b z#uycbA;K`kWHNyh)T3yf^>y5L`sjL(tm}s0tP!9Y7ijkPaY?1xN>w#sZ`R zNL%^>h=_=Yh=_=2`FNYTmF4s3?dt5F%Wyb!>lfEZZR(;Z z0stgQqVh`kNo78X-JTpd;Cb8*0MqFdS(fGQfIO8cph~%as5+gFvev>Fqq^O0DWmhs zodJu=I|C}S1AJit(gCEg0OxA1wqlzq@X00000NkvXX Hu0mjf0m|Bb diff --git a/Resources/Textures/Mobs/Animals/mouse.rsi/2-inhand-right.png b/Resources/Textures/Mobs/Animals/mouse.rsi/2-inhand-right.png index 23b4e08a3ec4f7a33c7f6f4ef5f31d1e04abf693..0cdf92945956755f84208b5caaccdc83072ab636 100644 GIT binary patch delta 778 zcmey&ypU~zN_|eIvvWXZaxw#h#>CQzmfp;PBCY#X@^*+tbwv0Gx+*qlbS!l-@ZI8} zw8M1fNi~(i88a0QhHcm=pyMLF{ZRdawF#>gIJy*)GT&bFka+Li!eaRTesHD|iBzofslZsG( z-PprbywZ}|>NYBG&Zlx8dvEi~`_|;2KUZ9_v;2F*g+tKAdHDgYNEx>!&r~=6uU(va zUncvJ;giguBSP-8dMcO~)r&334$AWSvgD19>(t-(ZQfq_5wWzoT0m-k?DtxRS>+42 zJl=Kx__}B-#{0rC&sP64J(>9__{-c?&+J>)`C9B>mGw(5CdcvpV#)1~QctQMpY3(< zwq%Kp(|6r1df}UX)t-OJe8lXD_}v5l7(nMM+IRBB z!*@?U|J*m#r-UCN(0ii@wfCWx2rSIqAgP zyx?ngYb^Rs=Vq10Zs(8Qw)?nJN#1tly8;djj4a4RJsRI(zx<1!g}s%%%MaHxvpEKE z&sk^xUFIHyHTDJA))$Poye{Q*2?{szltaRyx8{j}zR27d{F66Vie{KmB081Q`4bp00i_>zJJqngIXGU~>Qf delta 473 zcmV;~0Ve*T2J-`uB!9X|L_t(|obB2_OT$1I2Jq)Zf{>+!gLZMW9UThJog5@aM5Cj+u20jP^XsvVCZe?Ap>JsiRu2C+Raer}*sxGZ6 z>q;17R2YT`!w}=~7{-{~hnHDE<)EdejRpW<+GwD1(At=%zmTRWMxzmGwHmCoK5t!S z0RZ5f!`|~0&VRYpBwR7)9O5`ui_g4u|8f)jiQG4!C|H1W0BI~hI)F45ARRy&3y=;V zt?&g95fKp)5fM@Gd^z;|Z1iNU_3!6yx0gNtaf~iKI{QlI{{y~b@#B*u@xXi%IpR{#2L+NC%L{0;B^-V*%0uq_F_$0Mb~1bO32@|J;Cv9p!-j P00000NkvXXu0mjfR=?p6 diff --git a/Resources/Textures/Mobs/Animals/mouse.rsi/meta.json b/Resources/Textures/Mobs/Animals/mouse.rsi/meta.json index 8fcbe50997..87c0bd4d34 100644 --- a/Resources/Textures/Mobs/Animals/mouse.rsi/meta.json +++ b/Resources/Textures/Mobs/Animals/mouse.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/tgstation/tgstation/commit/e15c63d100db65eaaa5231133b8a2662ff439131#diff-8dd94e19fdb2ff341b57e31bce101298", + "copyright": "Taken from https://github.com/tgstation/tgstation/commit/e15c63d100db65eaaa5231133b8a2662ff439131#diff-8dd94e19fdb2ff341b57e31bce101298, modified by Vermidia.", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Mobs/Pets/hamlet.rsi/inhand-left.png b/Resources/Textures/Mobs/Pets/hamlet.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..ea3393a679986d564e1902dab4e6c73f06615a7f GIT binary patch literal 897 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV9d#Mb`Ho)PG(@xm{>Y-xA)-y zkz@61{c9d9Xzp-skCM^qXtMHRjlHsPZNk;1otfGyhANs$>zcZoA1LhlA@zs9L^MW} z#Zk~jW^S#n(#II(5SRB)pZ)n!wEyr)@s7UPyPk&fH>dv2tI`pjeeUd$S8^+-@;0k{ z+V$Kg#clJS-S^gYuBf`Yxax2H`}0>V@++)dUbV899RJ#yDs^mnjr+%41+(K$o#%ef zsU9mC@FV7B)CvBsZpHl?Wt(3LcC4DW@e%*Ex(#tfx)1Xn?ns^X^?l`)=_ZojLfo?2 z=lI!N>Y1q2<~Ebnr>1Jjtw}fU@4KgeU#0ue#iuVf^l0}fseV**)%6Z{&T=eq-ga`+ zslVm(;uh}Le{*k2)2!bL74MpM`Tn@U(e(YV!VimvRn`_;wg0)E%zP30rMFA$e(SVQ z3%k`Bx5VbGas0h@a{1@@ps8~*7Bcv|UzpQ;%{yZT@8(~1=O6N>gg+6FJ@AcBRtvY3H^TL^?1FWs&C1B{H_o-U3d6>)EGZS(@g!$)CGi>~e+ zUHT6mJqx-!C#FPD^IGT;^@0~Fey(%07sHy00&HTuEgC#e%x?Ua8Z$RO9R z>5#p^A>NbadG$L>cDlDPGqMOcFd!4l1T9v!_?>_MzHhg=Z`sB7XCg#beE%i&RPjzh zj?jBU_ldrT);c}1D7)Ru{Qc)GuXR@2PTY&-y!&+8lI4B6MYU}wxh`;?+gG||?@qnF z=aP!9ZoGHi`sUNhi7#xYyo%J``Rc|ejx~qAoQ}C4x3sX@IyBSvd-3z^ytgk5&gRaG zpYdeYItJd|ne`s;KWf^R<`nW2H=Vk*Dv2#@r&zJJ>EhcqdRyg=qPZBIdqN@LnO)t? ztww)J1m{kuF5IO%uR8nB^d?W*k3+o^ke@YPNYcAK9V5 z)K_Rz!TijtK7TGK0Ht2+{#`!lo1)Iyudcg8Hl;nwOOOc9*f4djPr~AB8Y=OdYkMzR z?P6m4>)CqsELZfY;)~8-9((iuul8E$D+mwN#{YUBSh*aRYY-xA)-y zkz@61{c9d9Xzp-skCM^qXtMHRjlHsPZNk;1otfGyhANs$>zcZoA1LhlA@zs9L^MW} z#Zk~jW^S#n(#II(5SRB)pZ)n!wEyr)@s7UPyPk&fH>dv2tI`pjeeUd$S8^+-@;0k{ z+V$Kg#clJS-S^gYuBf`Yxax2H`}0>V@++)dUbV899RJ#yDs^mnjr+%41+(K$o#%ef zsU9mC@FV7B)CvBsZpHl?Wt(3LcC4DW@e%*Ex(#tfx)1Xn?ns^X^?l`)=_ZojLfo?2 z=lI!N>Y1q2<~Ebnr>1Jjtw}fU@4KgeU#0ue#iuVf^l0}fseV**)%6Z{&T=eq-ga`+ zslVm(;uh}Le{*k2)2!bL74MpM`Tn@U(e(YV!VimvRn`_;wg0)E%zP30rMFA$e(SVQ z3%k`Bx5VbGas0h@a{1@@ps8~*7Bcv|UzpQ;%{yZT@8(~1=O6N>gg+6FJ@AcBRtvY3H^TL^?1FWs&C1B{G4o-U3d6>)EG8G17tiX8YD!Y6ao zHRh=PgGbMT?#_uR5!AdEdc^<10~J5lIogZNuPo%)HBB#1Z{4nv55g9u8zkPhdTa2h z?KR6iTCX6pQ%!&U{+Qi&g1g!nm^c&~kcq!c>Q7y~zu*0RI?H(96aU+`Gm{ic?7r#F zKJon9fjYTc0Vhj#$L@`_z7U_ka_6av6%7-`-mg>nmF2xt@9~7Sb+t??58hMp4)1#geHtlU+VNdw0wC_U)A`zASwn`@Gxw)p^zP zuP!d+j^4k6=hWrj@&&hlguGpzem&KuSNHttkhtinhc$h(=Usdo_4VJ5zO&PMUY zf&Ib~FRLs1?^%53vhwis*q>GDn^%2dSJUJ(al-B|{11pJ-(c#x7OCxZw&BRsLp>3u zocFFj{&r-EQ%dH!DW_*_t6%Ta+n~E3fSaF{|N3T~ZtYgdjkg?H`986vm^$V8e$%=& z_m|sNvw$^@`zG8~ebP0l+XkK$~T|% literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Pets/hamlet.rsi/meta.json b/Resources/Textures/Mobs/Pets/hamlet.rsi/meta.json index 7fa6edb9ec..3eb8229d24 100644 --- a/Resources/Textures/Mobs/Pets/hamlet.rsi/meta.json +++ b/Resources/Textures/Mobs/Pets/hamlet.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Created by brainfood# 7460, hamlet resprite by RamZ (discord)", + "copyright": "Created by brainfood# 7460, hamlet resprite by RamZ (discord), inhands made by Vermidia", "size": { "x": 32, "y": 32 @@ -54,6 +54,14 @@ }, { "name": "splat-0" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 } ] } From 6d71ec1b140e48effbc4b6964b809e5244da0f8f Mon Sep 17 00:00:00 2001 From: Zonespace <41448081+Zonespace27@users.noreply.github.com> Date: Fri, 14 Jun 2024 17:24:40 +0200 Subject: [PATCH 030/142] Non-uplink PDAs no longer can have TC inserted into them (#28985) * PDAs no longer can have TC inserted into them * far better way of doing this --------- Co-authored-by: John Doe --- Content.Server/PDA/Ringer/RingerSystem.cs | 10 ++++++++-- Content.Server/Store/Systems/StoreSystem.cs | 4 ++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Content.Server/PDA/Ringer/RingerSystem.cs b/Content.Server/PDA/Ringer/RingerSystem.cs index e15dcfaa2b..0cc4ea86c2 100644 --- a/Content.Server/PDA/Ringer/RingerSystem.cs +++ b/Content.Server/PDA/Ringer/RingerSystem.cs @@ -43,13 +43,19 @@ namespace Content.Server.PDA.Ringer SubscribeLocalEvent(RingerPlayRingtone); SubscribeLocalEvent(UpdateRingerUserInterfaceDriver); - SubscribeLocalEvent(OnCurrencyInsert); + SubscribeLocalEvent(OnCurrencyInsert); } //Event Functions - private void OnCurrencyInsert(EntityUid uid, RingerUplinkComponent uplink, CurrencyInsertAttemptEvent args) + private void OnCurrencyInsert(EntityUid uid, RingerComponent ringer, CurrencyInsertAttemptEvent args) { + if (!TryComp(uid, out var uplink)) + { + args.Cancel(); + return; + } + // if the store can be locked, it must be unlocked first before inserting currency. Stops traitor checking. if (!uplink.Unlocked) args.Cancel(); diff --git a/Content.Server/Store/Systems/StoreSystem.cs b/Content.Server/Store/Systems/StoreSystem.cs index 0fd92cfb96..c13a9583be 100644 --- a/Content.Server/Store/Systems/StoreSystem.cs +++ b/Content.Server/Store/Systems/StoreSystem.cs @@ -5,11 +5,11 @@ 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 Robust.Shared.Prototypes; -using System.Linq; -using Content.Shared.Store.Components; using Robust.Shared.Utility; +using System.Linq; namespace Content.Server.Store.Systems; From 795196c9647c2f40df8ec8c9380a049efe600ed9 Mon Sep 17 00:00:00 2001 From: PJBot Date: Fri, 14 Jun 2024 15:25:46 +0000 Subject: [PATCH 031/142] 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 d2c819747f..ede76750a4 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: nikthechampiongr - changes: - - message: Mailing units no longer spontaneously turn into disposal units when flushed. - type: Fix - id: 6230 - time: '2024-03-25T13:20:39.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/26383 - author: Simyon changes: - message: All implants are now unable to be implanted more than once. @@ -3846,3 +3839,10 @@ id: 6729 time: '2024-06-14T06:24:18.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/28968 +- author: Zonespace27 + changes: + - message: Non-uplink PDAs can no longer have telecrystals inserted into them. + type: Fix + id: 6730 + time: '2024-06-14T15:24:40.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/28985 From 05cc7541ddf547f5ede3af5d17cc3ba486f4ba60 Mon Sep 17 00:00:00 2001 From: dffdff2423 Date: Fri, 14 Jun 2024 11:53:48 -0500 Subject: [PATCH 032/142] Rename generic drugs (#28989) * Rename generic drugs Space Drugs and Stimulents cause quite a bit of confusion. * Ensure everything is updated to the new names. --- Resources/Locale/en-US/reagents/meta/narcotics.ftl | 6 +++--- Resources/Locale/en-US/store/uplink-catalog.ftl | 6 +++--- .../Entities/Objects/Specific/Medical/healing.yml | 4 ++-- .../Entities/Objects/Specific/Medical/hypospray.yml | 8 ++++---- .../ServerRules/SpaceLaw/SLControlledSubstances.xml | 4 ++-- .../Guidebook/ServerRules/SpaceLaw/SLCrimeList.xml | 4 ++-- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Resources/Locale/en-US/reagents/meta/narcotics.ftl b/Resources/Locale/en-US/reagents/meta/narcotics.ftl index d6da259501..b48eb03b7d 100644 --- a/Resources/Locale/en-US/reagents/meta/narcotics.ftl +++ b/Resources/Locale/en-US/reagents/meta/narcotics.ftl @@ -4,11 +4,11 @@ reagent-desc-desoxyephedrine = A more effective ephedrine, with more active down reagent-name-ephedrine = ephedrine reagent-desc-ephedrine = A caffeinated adrenaline stimulator chemical that makes you faster and harder to knock down. Also helps combat narcolepsy at dosages over thirty, at the cost of severe nerval stress. -reagent-name-stimulants = stimulants +reagent-name-stimulants = hyperzine reagent-desc-stimulants = A chemical cocktail developed by Donk Co. that allows agents to recover from stuns faster, move more quickly, and grants a small heal while close to critical condition. Due to the complex nature of the chemical, it is much harder for the body to purge naturally. reagent-name-experimental-stimulants = experimental stimulants -reagent-desc-experimental-stimulants = A prototype version of the stimulant chemical mixture. Usage grants virtual immunity to stun weaponry, rapid tissue regeneration, extreme running speed by reducing lactic acid buildup, and a general feeling of euphoria. Side effects may include extreme levels of anticoagulation, tunnel vision, extreme toxin buildup in the bloodstream, and rapid liver death. Do not give to animals. +reagent-desc-experimental-stimulants = A prototype version of hyperzine. Usage grants virtual immunity to stun weaponry, rapid tissue regeneration, extreme running speed by reducing lactic acid buildup, and a general feeling of euphoria. Side effects may include extreme levels of anticoagulation, tunnel vision, extreme toxin buildup in the bloodstream, and rapid liver death. Do not give to animals. reagent-name-thc = THC reagent-desc-thc = The main psychoactive compound in cannabis. @@ -22,7 +22,7 @@ reagent-desc-nicotine = Dangerous and highly addictive, but that's what the prop reagent-name-impedrezene = impedrezene reagent-desc-impedrezene = A narcotic that impedes one's ability by slowing down the higher brain cell functions. -reagent-name-space-drugs = space drugs +reagent-name-space-drugs = space mirage reagent-desc-space-drugs = An illegal compound which induces a number of effects such as loss of balance and visual artefacts. reagent-name-nocturine = nocturine diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl index f4a32004c6..78c094926f 100644 --- a/Resources/Locale/en-US/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/store/uplink-catalog.ftl @@ -355,11 +355,11 @@ uplink-combat-medipen-desc = A single-use medipen containing chemicals that rege uplink-nocturine-chemistry-bottle-name = Nocturine Bottle uplink-nocturine-chemistry-bottle-desc = A chemical that makes it very hard for your target to stand up. -uplink-stimpack-name = Stimpack +uplink-stimpack-name = Hyperzine Injector uplink-stimpack-desc = The legendary chemical produced by Donk Co. for the Syndicate. Injecting yourself with this will increase your run speed and let you recover from stuns faster for 30 seconds. -uplink-stimkit-name = Stimkit -uplink-stimkit-desc = A medkit containing 6 stimulant microinjectors, which each inject you with enough stimulants to last for 15 seconds. +uplink-stimkit-name = Hyperzine Injector Kit +uplink-stimkit-desc = A medkit containing 6 hyperzine microinjectors, which each inject you with enough hyperzine to last for 15 seconds. uplink-syndicate-segway-crate-name = Syndicate Segway uplink-syndicate-segway-crate-desc = Be an enemy of the corporation, in style! diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml index 71e0cf6450..13ebe4b8f4 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml @@ -571,7 +571,7 @@ amount: 5 - type: entity - name: space drugs + name: space mirage parent: Pill id: PillSpaceDrugs components: @@ -958,7 +958,7 @@ Quantity: 15 - type: entity - name: stimulants syringe + name: hyperzine syringe parent: PrefilledSyringe id: SyringeStimulants components: diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml index d6f3ee75fa..ddaf20351c 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml @@ -318,10 +318,10 @@ tags: [] - type: entity - name: stimulant injector + name: hyperzine injector parent: ChemicalMedipen id: Stimpack - description: Contains enough stimulants for you to have the chemical's effect for 30 seconds. Use it when you're sure you're ready to throw down. + description: Contains enough hyperzine for you to have the chemical's effect for 30 seconds. Use it when you're sure you're ready to throw down. components: - type: Sprite sprite: Objects/Specific/Medical/medipen.rsi @@ -350,10 +350,10 @@ tags: [] - type: entity - name: stimulant microinjector + name: hyperzine microinjector parent: ChemicalMedipen id: StimpackMini - description: A microinjector of stimulants that give you about fifteen seconds of the chemical's effects. + description: A microinjector of hyperzine that give you about fifteen seconds of the chemical's effects. components: - type: Sprite sprite: Objects/Specific/Medical/medipen.rsi diff --git a/Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SLControlledSubstances.xml b/Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SLControlledSubstances.xml index 14f0f46de1..40b9ee946f 100644 --- a/Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SLControlledSubstances.xml +++ b/Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SLControlledSubstances.xml @@ -1,4 +1,4 @@ - + # Space Law: Controlled Substances - \[Chemists/Science\] Explosive and pyrotechnic compounds excluding welding fuel contained in welders or welding fuel storage vessels - \[Science\] Toxins @@ -9,6 +9,6 @@ - \[None\] Nocturine - \[None\] Norepinephirc acid - \[None\] Romerol - - \[None\] Space drugs + - \[None\] Space Mirage - \[None\] Stimulants, excluding Desoxyephedrine and Ephedrine diff --git a/Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SLCrimeList.xml b/Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SLCrimeList.xml index 04e7139a48..4ece9150e0 100644 --- a/Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SLCrimeList.xml +++ b/Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SLCrimeList.xml @@ -1,4 +1,4 @@ - + # Space Law: Crime Listing Crime codes are organized by a Category Code (_-xx) which is a collection of non-stackable crimes on a row, prefixed by the Severity Number (X-__). @@ -321,7 +321,7 @@ Combat enhancing drugs are those that benefit stun times, or movement speed, and are restricted. Poisons are - restricted. Substances such as Ephedrine, Desoxyephedrine, and stimulants are restricted. The captain or highest + restricted. Substances such as Ephedrine, Desoxyephedrine, and Hyperzine are restricted. The captain or highest standing command staff may publicly restrict other harmful substances. From 9efa5de340f0a9b518840e4b9ecf99fc628bb0b3 Mon Sep 17 00:00:00 2001 From: PJBot Date: Fri, 14 Jun 2024 16:54:55 +0000 Subject: [PATCH 033/142] Automatic changelog update --- Resources/Changelog/Changelog.yml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index ede76750a4..b0f8885e1f 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Simyon - changes: - - message: All implants are now unable to be implanted more than once. - type: Tweak - id: 6231 - time: '2024-03-26T00:16:19.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/26250 - author: EmoGarbage404 changes: - message: Ninjas no longer wipe all technologies when using their gloves on a research @@ -3846,3 +3839,12 @@ id: 6730 time: '2024-06-14T15:24:40.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/28985 +- author: Aquif + changes: + - message: '"Space Drugs" have been renamed to "Space Mirage"' + type: Tweak + - message: '"Stimulants" have been renamed to "Hyperzine"' + type: Tweak + id: 6731 + time: '2024-06-14T16:53:49.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/28989 From ba6853d386e392560c528c6fba93bda97a32cd02 Mon Sep 17 00:00:00 2001 From: Pieter-Jan Briers Date: Fri, 14 Jun 2024 19:22:01 +0200 Subject: [PATCH 034/142] It is pride month, nukies. You know what that means. (#28992) * Make the nuke gay * I forgot to commit the gay * Add pride month * Use holiday visualizer for nuke * Fix pride month * Trans too --- .../Locale/en-US/holiday/greet/holiday-greet.ftl | 1 + .../Entities/Structures/Machines/nuke.yml | 14 ++++++++++++++ Resources/Prototypes/holidays.yml | 7 +++++++ .../Textures/Objects/Devices/nuke.rsi/meta.json | 5 ++++- .../Objects/Devices/nuke.rsi/nuclearbomb_gay.png | Bin 0 -> 1396 bytes 5 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_gay.png diff --git a/Resources/Locale/en-US/holiday/greet/holiday-greet.ftl b/Resources/Locale/en-US/holiday/greet/holiday-greet.ftl index fde896df39..2080f42c63 100644 --- a/Resources/Locale/en-US/holiday/greet/holiday-greet.ftl +++ b/Resources/Locale/en-US/holiday/greet/holiday-greet.ftl @@ -69,6 +69,7 @@ holiday-name-festive-season = Festive Season holiday-name-boxing-day = Boxing Day holiday-name-friday-thirteenth = Friday the 13th holiday-name-national-coming-out-day = National Coming Out Day +holiday-name-pride-month = Pride Month ## Custom congrats diff --git a/Resources/Prototypes/Entities/Structures/Machines/nuke.yml b/Resources/Prototypes/Entities/Structures/Machines/nuke.yml index bc4581d7b6..1cf9ceaeab 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/nuke.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/nuke.yml @@ -16,6 +16,9 @@ map: ["enum.NukeVisualLayers.Unlit"] shader: unshaded visible: false + - state: nuclearbomb_gay + map: ["pride"] + visible: false - state: nukefestive map: ["christmas"] visible: false @@ -24,11 +27,15 @@ holidays: festive: - FestiveSeason + pride: + - PrideMonth - type: GenericVisualizer visuals: enum.HolidayVisuals.Holiday: christmas: festive: { visible: true } + pride: + pride: { visible: true } enum.NukeVisuals.Deployed: enum.NukeVisualLayers.Base: False: { state: nuclearbomb_base } @@ -129,16 +136,23 @@ - state: nukefestive map: ["christmas"] visible: false + - state: nuclearbomb_gay + map: [ "pride" ] + visible: false - type: Appearance - type: HolidayVisuals holidays: festive: - FestiveSeason + pride: + - PrideMonth - type: GenericVisualizer visuals: enum.HolidayVisuals.Holiday: christmas: festive: { visible: true } + pride: + pride: { visible: true } - type: Physics bodyType: Dynamic - type: Fixtures diff --git a/Resources/Prototypes/holidays.yml b/Resources/Prototypes/holidays.yml index 235584dd63..173999d156 100644 --- a/Resources/Prototypes/holidays.yml +++ b/Resources/Prototypes/holidays.yml @@ -437,3 +437,10 @@ name: holiday-name-friday-thirteenth shouldCelebrate: !type:FridayThirteenth { } + +- type: holiday + id: PrideMonth + name: holiday-name-pride-month + beginDay: 1 + endDay: 31 + beginMonth: June diff --git a/Resources/Textures/Objects/Devices/nuke.rsi/meta.json b/Resources/Textures/Objects/Devices/nuke.rsi/meta.json index 4bc62a96b2..5ba8a2d753 100644 --- a/Resources/Textures/Objects/Devices/nuke.rsi/meta.json +++ b/Resources/Textures/Objects/Devices/nuke.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/835fd60545178a19064f5df9981dac6e1b220775/icons/obj/stationobjs.dmi, nukefestive by Alekshhh (Github)", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/835fd60545178a19064f5df9981dac6e1b220775/icons/obj/stationobjs.dmi, nukefestive by Alekshhh (Github), nuclearbomb_gay by PJB3005", "size": { "x": 32, "y": 32 @@ -13,6 +13,9 @@ { "name": "nuclearbomb_deployed_unlit" }, + { + "name": "nuclearbomb_gay" + }, { "name": "nukefestive", "delays": [ diff --git a/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_gay.png b/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_gay.png new file mode 100644 index 0000000000000000000000000000000000000000..7cc17bc3a264a251d35ccabaa02477d51c6f6765 GIT binary patch literal 1396 zcmV-)1&jKLP)Px)E=fc|R9J=WmTOE?XBfwSMPNGRIw};A>P7=iqg!J%ZlD;KnW$lq>Ac5eq%kpB zh8gjeDT>P`nqAcBn3rJY4Hr;w%^-7`QDTp%gFs z;1~Z%)AzjZbNN62=gD~wyuvHIWT*liXh;x-?%8M$X#b)J4wQT~pVCV=0Ou$kF-YR% z7y%$O#G#DiL-%sS@WuKOkdjL{M=_Z!_al)wIYv->9@8~$H0tqT0PNl)66ov@Z5~xX z%sAOa7>q z4HvP^C}h{7E|wjh55W6>h-dS56|ryMR%XnK2kwnny);#qfxnMd!6&l;2=XeMVS1K* zH^8*!&lqipmu(6*hfq}5N%q<}0E!Ab$;vQLTTw4p@9=nJ`<(G^78pb1XGIH!qAWIn zlHlXCJpK~gR&ZNoIROqG7|W{cCQ8e?akls2Z11DAteaKYP3YDbad^c3OK9|oU9-Co zBn3>ST;bOvKl>4g&nzHsHdw#fP09VeOb@-!B8Nc!)(wNzel6RUo1F^ZqQXw}g9==4 z_A1bSrIwmot=L_neUQnNE9i8FVHFS#CE!|>fc}dOd>o#`frv=*f85FXEk96R*+N!E zG$)F5oG8-CJ{9K;RGc@Ey*7^P%}NCTe%rYPyUWS;om;2_Rgm4@fmW+wp=qfffr(5W zd;y6#)%65`)YJu3S63)(OUt?yt#G#Y0VrDLOF}}B*<7qTdGZ)Koq;z@u?oXBn$fsA z=&b^5rL0hkBU4>nL2Bv(*5y3}l=4gKQ@g|=9I61oU%;eTJuo-}W^=I$5Yo~<02ACi za#c27Xj%$Sz&@*kJG@1@j{>iU!@9hO?AZ}bRz|c}slns`ouLtcM@|foF+K*%;Chr~ z=x%gv9~d)$(KwTkNue~|sORvRjil%zNzp~}rZ${e?~1)n(M2+E?sQ7Z&hzj=9}Z6| znhD4F{^0L4wAAxjuNd=}h6$`t2T}S@7*4mF+z*q8=?TKsAI$wxW4QCck*|0UTr*z= zVCBly^4_)`d;KKL&_vV}~S=w4Y3HP!Q(Gdq`yRkzTnU`=uo?@bf!rzQf^l4z`P z;pz{jEz~;~G6Csp$80V}YDalxJ^6V#062SkiH?e(>dG}hoCD&bNOr>A#!eN$-NtVL zxC_kbaru2wNy(=OU076VV1!SyjEv<%TG|IRHPw^;@3}x`0pY0kD4w0}0W2ytq3Khw zSS%zvq1f9sTE`VB*lkZBv*(7zV!>*)s?h5N>`%E1=HC8OUWZ2q)6)8w=&+~W z;3N82tyWoeyV%OxcY-3)O+qrBp~#9y&(M`Ja|x8vSf)M z?LCXHuTNI2{+WIK2uSPa4KUQ_x%^)w;me5mzwsY9q7jp%If9-50000 Date: Fri, 14 Jun 2024 17:23:07 +0000 Subject: [PATCH 035/142] Automatic changelog update --- Resources/Changelog/Changelog.yml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index b0f8885e1f..1f4117595c 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,12 +1,4 @@ Entries: -- author: EmoGarbage404 - changes: - - message: Ninjas no longer wipe all technologies when using their gloves on a research - server. - type: Tweak - id: 6232 - time: '2024-03-26T00:52:27.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/26421 - author: Dutch-VanDerLinde changes: - message: The chest rig is now available for purchase in the syndicate uplink. @@ -3848,3 +3840,12 @@ id: 6731 time: '2024-06-14T16:53:49.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/28989 +- author: PJB3005 + changes: + - message: Added pride month. + type: Add + - message: Made the nuke gay. + type: Add + id: 6732 + time: '2024-06-14T17:22:01.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/28992 From 9ebfb1d64fd5e2d8594897e557bf6c4ff7f33c4e Mon Sep 17 00:00:00 2001 From: Thomas <87614336+Aeshus@users.noreply.github.com> Date: Fri, 14 Jun 2024 15:32:39 -0500 Subject: [PATCH 036/142] Fix Loadout Requirements Only Displaying One Requirement (#28994) Collect all group effects failed instead of only first one failed --- .../Loadouts/Effects/GroupLoadoutEffect.cs | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/Content.Shared/Preferences/Loadouts/Effects/GroupLoadoutEffect.cs b/Content.Shared/Preferences/Loadouts/Effects/GroupLoadoutEffect.cs index 1be75f7dbc..258d9a4dbb 100644 --- a/Content.Shared/Preferences/Loadouts/Effects/GroupLoadoutEffect.cs +++ b/Content.Shared/Preferences/Loadouts/Effects/GroupLoadoutEffect.cs @@ -17,13 +17,16 @@ public sealed partial class GroupLoadoutEffect : LoadoutEffect { var effectsProto = collection.Resolve().Index(Proto); + var reasons = new List(); foreach (var effect in effectsProto.Effects) { - if (!effect.Validate(profile, loadout, session, collection, out reason)) - return false; + if (effect.Validate(profile, loadout, session, collection, out reason)) + continue; + + reasons.Add(reason.ToMarkup()); } - reason = null; - return true; + reason = reasons.Count == 0 ? null : FormattedMessage.FromMarkup(string.Join('\n', reasons)); + return reason == null; } } From e8dd5d4312ef7e1376aafb4e3ef63b549dc71dcc Mon Sep 17 00:00:00 2001 From: PJBot Date: Fri, 14 Jun 2024 20:33:46 +0000 Subject: [PATCH 037/142] 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 1f4117595c..370d629670 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Dutch-VanDerLinde - changes: - - message: The chest rig is now available for purchase in the syndicate uplink. - type: Add - id: 6233 - time: '2024-03-26T04:05:35.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/26427 - author: ElectroJr changes: - message: Fixed an atmos bug, which was (probably) causing atmospherics on the @@ -3849,3 +3842,10 @@ id: 6732 time: '2024-06-14T17:22:01.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/28992 +- author: Aeshus + changes: + - message: Loadouts now display all requirements. + type: Fix + id: 6733 + time: '2024-06-14T20:32:39.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/28994 From a4ade6964055f7949c09f692edd886d9ba164c6c Mon Sep 17 00:00:00 2001 From: Verm <32827189+Vermidia@users.noreply.github.com> Date: Fri, 14 Jun 2024 16:42:58 -0500 Subject: [PATCH 038/142] Move secure crate labels to the left (#28952) Move secure label to the left --- .../Entities/Structures/Storage/Crates/base_structurecrates.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml b/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml index 01c226cb0f..2666e8261d 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml @@ -124,6 +124,7 @@ shader: unshaded - state: paper sprite: Structures/Storage/Crates/labels.rsi + offset: "-0.5,0" map: ["enum.PaperLabelVisuals.Layer"] - type: Damageable damageContainer: StructuralInorganic From 68807cb25e167425091035eb0d2be5f3c935758e Mon Sep 17 00:00:00 2001 From: Verm <32827189+Vermidia@users.noreply.github.com> Date: Fri, 14 Jun 2024 16:44:23 -0500 Subject: [PATCH 039/142] Changes all the uplink ally icons to be a combination of the mob + radio (#28954) * New Icons! * Better meta info --- Resources/Prototypes/Catalog/uplink_catalog.yml | 12 ++++++------ .../Objects/Devices/communication.rsi/meta.json | 16 ++++++++++++++-- .../communication.rsi/old-radio-ancestor.png | Bin 0 -> 1346 bytes .../old-radio-borg-assault.png | Bin 0 -> 1475 bytes .../communication.rsi/old-radio-syndicat.png | Bin 0 -> 1234 bytes .../communication.rsi/old-radio-urist.png | Bin 0 -> 1496 bytes 6 files changed, 20 insertions(+), 8 deletions(-) create mode 100644 Resources/Textures/Objects/Devices/communication.rsi/old-radio-ancestor.png create mode 100644 Resources/Textures/Objects/Devices/communication.rsi/old-radio-borg-assault.png create mode 100644 Resources/Textures/Objects/Devices/communication.rsi/old-radio-syndicat.png create mode 100644 Resources/Textures/Objects/Devices/communication.rsi/old-radio-urist.png diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index efec2417d0..d39f900357 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -904,7 +904,7 @@ name: uplink-reinforcement-radio-name description: uplink-reinforcement-radio-desc productEntity: ReinforcementRadioSyndicate - icon: { sprite: Objects/Devices/communication.rsi, state: old-radio } + icon: { sprite: Objects/Devices/communication.rsi, state: old-radio-urist } cost: Telecrystal: 16 categories: @@ -920,7 +920,7 @@ name: uplink-reinforcement-radio-name description: uplink-reinforcement-radio-desc productEntity: ReinforcementRadioSyndicateNukeops - icon: { sprite: Objects/Devices/communication.rsi, state: old-radio } + icon: { sprite: Objects/Devices/communication.rsi, state: old-radio-urist } cost: Telecrystal: 16 categories: @@ -936,7 +936,7 @@ name: uplink-reinforcement-radio-cyborg-assault-name description: uplink-reinforcement-radio-cyborg-assault-desc productEntity: ReinforcementRadioSyndicateCyborgAssault - icon: { sprite: Mobs/Silicon/chassis.rsi, state: synd_sec } + icon: { sprite: Objects/Devices/communication.rsi, state: old-radio-borg-assault } cost: Telecrystal: 65 categories: @@ -952,7 +952,7 @@ name: uplink-reinforcement-radio-ancestor-name description: uplink-reinforcement-radio-ancestor-desc productEntity: ReinforcementRadioSyndicateAncestor - icon: { sprite: Objects/Devices/communication.rsi, state: old-radio } + icon: { sprite: Objects/Devices/communication.rsi, state: old-radio-ancestor } cost: Telecrystal: 6 categories: @@ -968,7 +968,7 @@ name: uplink-reinforcement-radio-ancestor-name description: uplink-reinforcement-radio-ancestor-desc productEntity: ReinforcementRadioSyndicateAncestorNukeops - icon: { sprite: Objects/Devices/communication.rsi, state: old-radio } + icon: { sprite: Objects/Devices/communication.rsi, state: old-radio-ancestor } cost: Telecrystal: 6 categories: @@ -998,7 +998,7 @@ id: UplinkMobCatMicrobomb name: uplink-mobcat-microbomb-name description: uplink-mobcat-microbomb-desc - icon: { sprite: /Textures/Mobs/Pets/cat.rsi, state: syndicat } + icon: { sprite: Objects/Devices/communication.rsi, state: old-radio-syndicat } productEntity: ReinforcementRadioSyndicateSyndiCat cost: Telecrystal: 6 diff --git a/Resources/Textures/Objects/Devices/communication.rsi/meta.json b/Resources/Textures/Objects/Devices/communication.rsi/meta.json index bfd0e069f3..328747df09 100644 --- a/Resources/Textures/Objects/Devices/communication.rsi/meta.json +++ b/Resources/Textures/Objects/Devices/communication.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris and modified by Swept at https://github.com/discordia-space/CEV-Eris/commit/efce5b6c3be75458ce238dcc01510e8f8a653ca6", + "copyright": "Taken from cev-eris and modified by Swept at https://github.com/discordia-space/CEV-Eris/commit/efce5b6c3be75458ce238dcc01510e8f8a653ca6. Uplink radio sprites by Vermidia, derivative of other lisenced sprites in the repo", "size": { "x": 32, "y": 32 @@ -69,7 +69,7 @@ "name": "off-walkietalkie-inhand-left", "directions": 4 }, - { + { "name": "old-radio" }, { @@ -79,6 +79,18 @@ { "name": "old-radio-inhand-right", "directions": 4 + }, + { + "name": "old-radio-syndicat" + }, + { + "name": "old-radio-urist" + }, + { + "name": "old-radio-ancestor" + }, + { + "name": "old-radio-borg-assault" } ] } diff --git a/Resources/Textures/Objects/Devices/communication.rsi/old-radio-ancestor.png b/Resources/Textures/Objects/Devices/communication.rsi/old-radio-ancestor.png new file mode 100644 index 0000000000000000000000000000000000000000..65ecc4c0d6ea427de5f5a2f024f3b9d79f0c9362 GIT binary patch literal 1346 zcmV-I1-<%-P)+Oqm+kx`n4T-6#snG=w&by5e2oK`k3k z3Lgvm3>i@PM(K$FuoRIx zEPDi#FhK%%NKj&(97X(63zAuD-$c!~$cA_{dFzxh#E~H@UZ1EX>6((77Cj|Tjzl6@bnc%la4v=N?ommi2RDS=Cc;Ji}F?;op#)X1+wPG&JuKxVPcrx}hcZ z;c^Ftp7gj8uSpKs_H-KF&!H~{19#A~TF>h5oU=!WZpkmYg@Z#Fll$(qU!j3#-j$j| z761SM32;bRa{vGf5&!@T5&_cPe*6Fc1A9qCK~z{r?N&`lR8bWE)SU6J937|3nNcS& zD#-kqFsy_YF+z~GaN$($5(23fK~Qd@%xG7*$riS7XVD@kL0lMAiZhWF1S2u&jHXUb z;~(af-sarrd%owqXO0qWJn%U8oqNyyzVqFm_kb$k(b;UU480*f3_4@Qj z#-sqJ8Ddi4!<$ZyT3B8Qd7I9AU0od~@#5)Y>@VCErP9!-9uwDuI9*DYg{ia&s3}0e zqRHFw@xnK)yStnFJo8Q!0wE53=}f7jPgQ~Wxfx`dviU&r^iDQ7@S6LALq`?u;o)Jl zx3@!|VZ}no$HxqfOmHHir&y%w$gy`b!3(B(52RA3(+7y&QCCG$f78 z%Q0{=ulhZB_t~$&R4A}~zcZ3QRy%gYjxXav7J)me&% zOCs`Lz?`*C+`92rN|AxDInAa%#{`_1n27T7a`g1{fJl%v-)#nM%--JKIQkEun7H|t zPk{O!h^1lz_INy+DK3{wQJhF*Wizf9ZEM_?0{>WnKhO(+TN9`Ib^rhX07*qoM6N<$ Eg1e1|bpQYW literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Devices/communication.rsi/old-radio-borg-assault.png b/Resources/Textures/Objects/Devices/communication.rsi/old-radio-borg-assault.png new file mode 100644 index 0000000000000000000000000000000000000000..d7908a149206d7d43b0b4dbe2292196d6cdbd3c3 GIT binary patch literal 1475 zcmV;!1w8tRP)Q4oz`kc%~#K~{@izXG+(y-G-H(9$3@L@j*{ z{Rg!Mtp!0)1QCtReJvrk_o$$Rp3AxKkLR4{<-N}Zdnl{r%+6WJk*#TbfX|F(-7J!=!*A*2enKr zA$%h2Gh{&FTcyWq{H8cv<1fWVBs>Rp)zg!1;&>Bl86zh=ChW~+i&}ji^(D?^etAi% zTlO#}VS)tk5U0onSqk{2<|VV%zKN=DkxlVv^42L~h$Br#ygpHj(lseHC3;exEG3ou z|2)mq)MTx@GXPz$mi0LTj(w<g+gSIqp4oT0jCSOisPgcdQ=Z7-Pd6FA}~9(AmZ57y8=O)uGQjm(R=DnTSNIQu^y# zjmyohV>TPkaSKbq1jde^l>WX;5{*u&zm@tXInvW36PthBSGBZCJW#9euz@Y+c(sDJ zAyzY%_6C^&5I!1~x9!~`>EGZ?%)-GKY-Zzgf;p2?>B=FCz`@35TUj+{?QCx8YFgV` zWbVU)0@SZ8NaM#@3CCWmY2-kY%mnLXB0Yv}2wM=AbdI<+8v%fSUYhr;<47c|W;hMb zh7g3-Ry72@6(Y&faw`O|86STpx4tiXDqw--S~fM#?}P$r%}*G$KAVBm(t4EfD5 z*d*50b(gr6WhDUcK&V#ET)5(yEEpKQe^+joq-1#iA+_UnL%dmhPy?_-K!Vj03Jm_N z%uk@b^OP%rL@FvjYD#qM-RO)yaS&nOvk}ZJK&kvN*bG0|PjZVZ1wmsSru95IKot)d7Oz$+q}%)dHhKDnJ#`Z>j)7v}Hf$I4fcn z0j!)P%y?X1ey=3xm$0%c{zy2W_R!f_!A02FiKBX0=Y6xiPW zCHInl%LBpj^rHY*4Ij=B*phH-GbN$gIT4VaC%&QU_NYVm-9ay+2VBL4F}FCGo8TB>zyYf=3xQ!MY4Hw z0E_{SC&96D00P(qr&F_^cLR($eWA}Y1eBif8X6j+T2>}=)y}*z`!gZZIcXnO4lop6 d+y1}x{{{lWpDlfW*scHo002ovPDHLkV1n)7p5p)j literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Devices/communication.rsi/old-radio-syndicat.png b/Resources/Textures/Objects/Devices/communication.rsi/old-radio-syndicat.png new file mode 100644 index 0000000000000000000000000000000000000000..702f32fc59962a1bc94423835b05cc203093c448 GIT binary patch literal 1234 zcmV;@1TFiCP)+Oqm+kx`n4T-6#snG=w&by5e2oK`k3k z3Lgvm3>i@PM(K$FuoRIx zEPDi#FhK%%NKj&(97X(63zAuD-$c!~$cA_{dFzxh#E~H@UZ1EX>6((77Cj|Tjzl6@bnc%la4v=N?ommi2RDS=Cc;Ji}F?;op#)X1+wPG&JuKxVPcrx}hcZ z;c^Ftp7gj8uSpKs_H-KF&!H~{19#A~TF>h5oU=!WZpkmYg@Z#Fll$(qU!j3#-j$j| z761SM32;bRa{vGf5&!@T5&_cPe*6Fc0}Dw+K~z{r?N&WZQ&AK?wM41VLaPvgwpIgy z6su`Mo7A11(2EB?be0EVd0`fb`$k2pLD^L#jI?GwX1hm6#-np z=ksw%Ajqq34`{(e?Nt*Hkr*}DAeqb4Cf$WCaHiJDqhUMtt4$|5>^9r6lEIdUeNpCy zLZPDH@25JRd0!zWj3Fd2I5R24rHSRhd1HdXAQ48X*#||SGV@Biir#Nb_5xn&iagh? zk<5eBlQ4AD1jpOkV179P-mh5*^z;I%<6X=uxVs1-c$1|CE_$z5b#0SxU&7(W2Dmaa zqReLmSOW$q#zJ^xn6T@3NXc(;E`gLZ23v>p+`j#5KfvO2L+fw^5CrXxv;dFB=HUL> zPIzi`P+RL_9Gu9qd-;wV+bzWG;9DuvLEzA9)!$mQGc4KLR{B|my zRQPa%u*v*OcJXQRd(7!&+V#WYDh;@|aS$HYf2Z<*u7%Wyd>B`7cPX%w--{S{)tcSf zLAxHv0X;;KnQ@(44m^C8nHtruy{CB?<(Tt*o(sDkGpu8~_BZX1o?{*(cExb_YGZY6 w9{B47SfF7dQXAH_{{nlGv^J=wz`s`DCq@flV$z0S#Q*>R07*qoM6N<$g8T+N5C8xG literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Devices/communication.rsi/old-radio-urist.png b/Resources/Textures/Objects/Devices/communication.rsi/old-radio-urist.png new file mode 100644 index 0000000000000000000000000000000000000000..3cdf1c61bf02dbef927e6823b658db870070b0a8 GIT binary patch literal 1496 zcmV;}1t+Oqm+kx`n4T-6#snG=w&by5e2oK`k3k z3Lgvm3>i@PM(K$FuoRIx zEPDi#FhK%%NKj&(97X(63zAuD-$c!~$cA_{dFzxh#E~H@UZ1EX>6((77Cj|Tjzl6@bnc%la4v=N?ommi2RDS=Cc;Ji}F?;op#)X1+wPG&JuKxVPcrx}hcZ z;c^Ftp7gj8uSpKs_H-KF&!H~{19#A~TF>h5oU=!WZpkmYg@Z#Fll$(qU!j3#-j$j| z761SM32;bRa{vGf5&!@T5&_cPe*6Fc1QAI@K~z{r%~nfjV^tXb)5fOe{hYLUK&uVu zV{l$dhfydl1VL~ibRjNuIWQX+#f9ji2rk^X9S~&p6&KE83bPnGFR8`HSQ}}BRGY-M zNt>A5rp?3VdcVItcW#=S^p&bV9R73e{qO&M|KprV&d#b0rgexESL4%6qPCSLTDr{|YdmjOf)n)sNQ{n->VAtUCKHv*Whxen)Y;id4u^v>nGAob zXcf09f!=VxZpsAsYGT^rAWD8vy1xKJqY=<4cXdyxs)Hh>%!xgZ5_M4ruNx%LnMpa-<25GBys zfG9G7EYuMIxWnzESKoO1&>iyC7oRd9{2x~+KLMQ=9pbRJr01-6+gTbKMuvqJs zU}HV0OCT%FQN`1#MvI9gN%TwZ8`T~Sm(S-3oi9jeox$E_v#I2D2}t=IrGAeSvXReb zDA*TaAK7xA-v4Nl=U>J?r%)q|<3KD9Iih8za!4fANoLf^;!q_ Date: Fri, 14 Jun 2024 21:45:29 +0000 Subject: [PATCH 040/142] 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 370d629670..63e76d415d 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,12 +1,4 @@ Entries: -- author: ElectroJr - changes: - - message: Fixed an atmos bug, which was (probably) causing atmospherics on the - station to behave incorrectly. - type: Fix - id: 6234 - time: '2024-03-26T04:44:56.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/26441 - author: nikthechampiongr changes: - message: Handcuffs will no longer try to uncuff themselves when they stop being @@ -3849,3 +3841,10 @@ id: 6733 time: '2024-06-14T20:32:39.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/28994 +- author: Vermidia + changes: + - message: allies callable by radio in the uplink now have unique icons + type: Tweak + id: 6734 + time: '2024-06-14T21:44:23.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/28954 From e803871172f3ad5aca65afb58e2ff373d516aab3 Mon Sep 17 00:00:00 2001 From: K-Dynamic <20566341+K-Dynamic@users.noreply.github.com> Date: Sat, 15 Jun 2024 14:19:08 +1200 Subject: [PATCH 041/142] Adds witch robes (#28965) * ze * autodrobe entry * autodrobe crate cost adjust --- .../Catalog/Cargo/cargo_vending.yml | 2 +- .../VendingMachines/Inventories/theater.yml | 2 ++ .../Entities/Clothing/OuterClothing/suits.yml | 11 ++++++++ .../witchrobe.rsi/equipped-OUTERCLOTHING.png | Bin 0 -> 612 bytes .../Suits/witchrobe.rsi/icon.png | Bin 0 -> 330 bytes .../Suits/witchrobe.rsi/inhand-left.png | Bin 0 -> 725 bytes .../Suits/witchrobe.rsi/inhand-right.png | Bin 0 -> 730 bytes .../Suits/witchrobe.rsi/meta.json | 26 ++++++++++++++++++ 8 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/Clothing/OuterClothing/Suits/witchrobe.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Suits/witchrobe.rsi/icon.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Suits/witchrobe.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Suits/witchrobe.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Suits/witchrobe.rsi/meta.json diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml index dd43ec4094..e202d2482b 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml @@ -43,7 +43,7 @@ sprite: Objects/Specific/Service/vending_machine_restock.rsi state: base product: CrateVendingMachineRestockAutoDrobeFilled - cost: 1200 + cost: 1300 category: cargoproduct-category-name-service group: market diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml index 5e3c7d9401..8ef72f557c 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml @@ -29,6 +29,8 @@ ClothingHeadHatShrineMaidenWig: 2 ClothingOuterSuitShrineMaiden: 2 Gohei: 2 + ClothingOuterSuitWitchRobes: 2 + ClothingHeadHatWitch1: 2 ClothingHeadHatRedRacoon: 2 ClothingOuterRedRacoon: 2 ClothingHeadPaperSack: 2 diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml index 08bbd83c48..ccf6f09b19 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml @@ -190,6 +190,17 @@ - type: Clothing sprite: Clothing/OuterClothing/Suits/shrine-maiden.rsi +- type: entity + parent: ClothingOuterBase + id: ClothingOuterSuitWitchRobes + name: witch robes + description: Magic is all about the spell power, ZE! + components: + - type: Sprite + sprite: Clothing/OuterClothing/Suits/witchrobe.rsi + - type: Clothing + sprite: Clothing/OuterClothing/Suits/witchrobe.rsi + - type: entity parent: ClothingOuterBase id: ClothingOuterSuitMonkey diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/witchrobe.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Suits/witchrobe.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..b797c8dce44d41c7f83ad86b3593e43a8f83ec88 GIT binary patch literal 612 zcmV-q0-ODbP)Px#1ZP1_K>z@;j|==^1poj55>QN3MGg)Q=ib-MxTqKy7#kZK00021PX_D&000Jb zQchF<|NsC00JFcOzW@LL32;bRa{vGi!vFvd!vV){sAK>D0m(^3K~z{r?N#lPgdhy# z%lCifOWJ~ht=!Gc+};l}yGltdA%Ldi!*~U}0$u^HfPW<*rA(wq)Q&%nl1s5>fPxfj zDlWxJN(J?Kvz{3{o(e^yMGi#%Jb^PP| zQJo&e0%#y|0s+__2KSV2`K>@V;RgbE$`ru}@_rz1@eSmd;0rj%_Z8?F$q(C*N3gMs z#W%1rpTCwrOYsyN+-)QRG8F^@Ql+{F3#2rQT%R9JZV)`oAGXnb1UZ8oAya^-053VS zAlM^X8!zK3XF)M4@iPmSaKE?Us|vvI-ViW=$CQX1Qj$W?gtG;Cx<#=T)-_?rcb0H1 y@DnDjT%&LWfoEPg{aeohH^DXQFY#dk$MFTU2}JDU2kWf>0000I-;4gq%n_--Ahy0yuYEURpFEzTpeMQsa(O zs`{1RFYIuxs5quk`%ZAZ<+;wXl@m3L^`E*rER~X+w&ELa#U*Zo=ls6{1(t^{e!~rP OI)kUHpUXO@geCyvk9&~- literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/witchrobe.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Suits/witchrobe.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..a93d4a5af0340300aefd324a724d1df5fbecea1e GIT binary patch literal 725 zcmV;`0xJE9P)4Tx04UFukxeK>Q5?m8Geabz%tEqw3#=$1DI128qNXuw1`F@KF+- zctlGiXSJGVLR8a4D?_^J=0~E@Nh*$yTLNmm=~h|%Z#1M9T@wPD@UWS83c?G*1FMC+ z;vM0zxumCrPldZ2xuEd9(v2d&D9-pCRGDEX9vc-73u~D&Hp zj*-RaABAHxdRw{7k#s& zweLgYI-FgWG-DgiH=yMquRFRgg=7ZPX?Q)6Z%RV*HPp=&d;8hv_zvRI)#MfI?m=fp zvga$jySBWyKhOC65%~suiE^us=7`$>000tDOjJb<4i3z?sOR3-8yg!K7#IKm0GAGk z5dZ)H26R$RQ~&?}|Nj89zofqa000SaNLh0L01FcU01FcV0GgZ_0002UNkl*3CvrllgQmc=A+UoC*F=f)XetD1lOfR|45-ty1Cw{l8DM;sWHB69A_Z zEVJGuXgPsw{JB>kV##n37U=nDUWRxAIq=P=m$=|YQqcPc_lHfk>b3l(00000NkvXX Hu0mjfUGYjr literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/witchrobe.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Suits/witchrobe.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..0ee8f62362720f49506bdce053ff5ddc7e26e144 GIT binary patch literal 730 zcmV<00ww*4P)4Tx04UFukxeK>Q5?m8Geabz%tEqw3#=$1DI128qNXuw1`F@KF+- zctlGiXSJGVLR8a4D?_^J=0~E@Nh*$yTLNmm=~h|%Z#1M9T@wPD@UWS83c?G*1FMC+ z;vM0zxumCrPldZ2xuEd9(v2d&D9-pCRGDEX9vc-73u~D&Hp zj*-RaABAHxdRw{7k#s& zweLgYI-FgWG-DgiH=yMquRFRgg=7ZPX?Q)6Z%RV*HPp=&d;8hv_zvRI)#MfI?m=fp zvga$jySBWyKhOC65%~suiE^us=7`$>000tDOjJb<4i3z?sOR3-8yg!K7#IKm0GAGk z5dZ)H26R$RQ~&?}|Nj89zofqa000SaNLh0L01FcU01FcV0GgZ_0002ZNklBo&1SL>PumymG-&|uAfkGBXaQW@h;G4=ZwQzPiNpUOJ4UO7 zG0LHU9F4^RnyjZoki_TvB=D4=1WE}?pp@VgWcu^Q38dLUzMwehy>Xx{qEYcaDTnc*s0p7?>wmd(FW&i*H M07*qoM6N<$f-oIP5dZ)H literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/witchrobe.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Suits/witchrobe.rsi/meta.json new file mode 100644 index 0000000000..7651332179 --- /dev/null +++ b/Resources/Textures/Clothing/OuterClothing/Suits/witchrobe.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/pull/36039/commits/b3bd70ae925ecbe7c625f70c4c3d09d3ed2ed32a . Inhands were made for SS14 and available under the same license", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} From 8eb85a08b60e6e0c24d8050265119ca2b3752257 Mon Sep 17 00:00:00 2001 From: PJBot Date: Sat, 15 Jun 2024 02:20:14 +0000 Subject: [PATCH 042/142] 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 63e76d415d..91fcf9f40f 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,12 +1,4 @@ Entries: -- author: nikthechampiongr - changes: - - message: Handcuffs will no longer try to uncuff themselves when they stop being - dragged. - type: Fix - id: 6235 - time: '2024-03-26T19:15:08.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/26434 - author: Nairodian changes: - message: Added disablers to every security officer locker. @@ -3848,3 +3840,10 @@ id: 6734 time: '2024-06-14T21:44:23.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/28954 +- author: K-Dynamic + changes: + - message: Added witch robes and witch hat to the AutoDrobe. + type: Add + id: 6735 + time: '2024-06-15T02:19:08.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/28965 From 9e4d19118900d31270f2c725da684a95137fb9cb Mon Sep 17 00:00:00 2001 From: deltanedas <39013340+deltanedas@users.noreply.github.com> Date: Sat, 15 Jun 2024 02:42:40 +0000 Subject: [PATCH 043/142] make RefillableSolution optional for SolutionTransfer (#28830) Co-authored-by: deltanedas <@deltanedas:kde.org> --- .../Chemistry/EntitySystems/SolutionTransferSystem.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Shared/Chemistry/EntitySystems/SolutionTransferSystem.cs b/Content.Shared/Chemistry/EntitySystems/SolutionTransferSystem.cs index b12778262c..93e9765b16 100644 --- a/Content.Shared/Chemistry/EntitySystems/SolutionTransferSystem.cs +++ b/Content.Shared/Chemistry/EntitySystems/SolutionTransferSystem.cs @@ -193,7 +193,7 @@ public sealed class SolutionTransferSystem : EntitySystem var actualAmount = FixedPoint2.Min(amount, FixedPoint2.Min(sourceSolution.Volume, targetSolution.AvailableVolume)); var solution = _solution.SplitSolution(source, actualAmount); - _solution.Refill(targetEntity, target, solution); + _solution.AddSolution(target, solution); _adminLogger.Add(LogType.Action, LogImpact.Medium, $"{ToPrettyString(user):player} transferred {SharedSolutionContainerSystem.ToPrettyString(solution)} to {ToPrettyString(targetEntity):target}, which now contains {SharedSolutionContainerSystem.ToPrettyString(targetSolution)}"); From 3cd740c32bb1db33f21de5ee34cb54ef7cdd6821 Mon Sep 17 00:00:00 2001 From: Zonespace <41448081+Zonespace27@users.noreply.github.com> Date: Sat, 15 Jun 2024 04:43:36 +0200 Subject: [PATCH 044/142] Replaces reagent-effect-guidebook-missing with more descriptive guidebook entries (#28817) removes `reagent-effect-guidebook-missing` Co-authored-by: John Doe --- .../Chemistry/ReactionEffects/AreaReactionEffect.cs | 4 +++- .../ReagentEffects/AddToSolutionReaction.cs | 2 +- Content.Shared/Chemistry/Reagent/ReagentEffect.cs | 4 ++-- .../Locale/en-US/guidebook/chemistry/effects.ftl | 12 +++++++++--- 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/Content.Server/Chemistry/ReactionEffects/AreaReactionEffect.cs b/Content.Server/Chemistry/ReactionEffects/AreaReactionEffect.cs index ebbf4e0341..56509a0953 100644 --- a/Content.Server/Chemistry/ReactionEffects/AreaReactionEffect.cs +++ b/Content.Server/Chemistry/ReactionEffects/AreaReactionEffect.cs @@ -46,7 +46,9 @@ namespace Content.Server.Chemistry.ReactionEffects public override bool ShouldLog => true; protected override string ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) - => Loc.GetString("reagent-effect-guidebook-missing"); + => Loc.GetString("reagent-effect-guidebook-area-reaction", + ("duration", _duration) + ); public override LogImpact LogImpact => LogImpact.High; diff --git a/Content.Server/Chemistry/ReagentEffects/AddToSolutionReaction.cs b/Content.Server/Chemistry/ReagentEffects/AddToSolutionReaction.cs index 6a43739b0e..2447814f94 100644 --- a/Content.Server/Chemistry/ReagentEffects/AddToSolutionReaction.cs +++ b/Content.Server/Chemistry/ReagentEffects/AddToSolutionReaction.cs @@ -26,6 +26,6 @@ namespace Content.Server.Chemistry.ReagentEffects } protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) => - Loc.GetString("reagent-effect-guidebook-missing", ("chance", Probability)); + Loc.GetString("reagent-effect-guidebook-add-to-solution-reaction", ("chance", Probability)); } } diff --git a/Content.Shared/Chemistry/Reagent/ReagentEffect.cs b/Content.Shared/Chemistry/Reagent/ReagentEffect.cs index 5bcb21fedb..6d0e85df37 100644 --- a/Content.Shared/Chemistry/Reagent/ReagentEffect.cs +++ b/Content.Shared/Chemistry/Reagent/ReagentEffect.cs @@ -1,4 +1,4 @@ -using System.Linq; +using System.Linq; using System.Text.Json.Serialization; using Content.Shared.Chemistry.Components; using Content.Shared.Database; @@ -28,7 +28,7 @@ namespace Content.Shared.Chemistry.Reagent public virtual string ReagentEffectFormat => "guidebook-reagent-effect-description"; - protected abstract string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys); // => Loc.GetString("reagent-effect-guidebook-missing", ("chance", Probability)); + protected abstract string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys); /// /// What's the chance, from 0 to 1, that this effect will occur? diff --git a/Resources/Locale/en-US/guidebook/chemistry/effects.ftl b/Resources/Locale/en-US/guidebook/chemistry/effects.ftl index ba005e6bf9..c60e690d26 100644 --- a/Resources/Locale/en-US/guidebook/chemistry/effects.ftl +++ b/Resources/Locale/en-US/guidebook/chemistry/effects.ftl @@ -1,4 +1,4 @@ --create-3rd-person = +-create-3rd-person = { $chance -> [1] Creates *[other] create @@ -345,11 +345,17 @@ reagent-effect-guidebook-reduce-rotting = *[other] regenerate } {NATURALFIXED($time, 3)} {MANY("second", $time)} of rotting -reagent-effect-guidebook-missing = +reagent-effect-guidebook-area-reaction = { $chance -> [1] Causes *[other] cause - } an unknown effect as nobody has written this effect yet + } a smoke or foam reaction for {NATURALFIXED($duration, 3)} {MANY("second", $duration)} + +reagent-effect-guidebook-add-to-solution-reaction = + { $chance -> + [1] Causes + *[other] cause + } chemicals applied to an object to be added to its internal solution container reagent-effect-guidebook-plant-attribute = { $chance -> From 835d1dd15383b62802eb6d89f9b6f12fa8ce9a63 Mon Sep 17 00:00:00 2001 From: Plykiya <58439124+Plykiya@users.noreply.github.com> Date: Fri, 14 Jun 2024 19:58:30 -0700 Subject: [PATCH 045/142] Prevent borgs from getting duplicate modules (#28943) * Prevent borgs from getting duplicate modules * outta the loop --------- Co-authored-by: plykiya --- .../Silicons/Borgs/BorgSystem.Modules.cs | 19 +++++++++++++++++++ Resources/Locale/en-US/borg/borg.ftl | 3 ++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/Content.Server/Silicons/Borgs/BorgSystem.Modules.cs b/Content.Server/Silicons/Borgs/BorgSystem.Modules.cs index 5c600be3f6..f372f7df1a 100644 --- a/Content.Server/Silicons/Borgs/BorgSystem.Modules.cs +++ b/Content.Server/Silicons/Borgs/BorgSystem.Modules.cs @@ -274,6 +274,25 @@ public sealed partial class BorgSystem return false; } + if (TryComp(module, out var itemModuleComp)) + { + foreach (var containedModuleUid in component.ModuleContainer.ContainedEntities) + { + if (!TryComp(containedModuleUid, out var containedItemModuleComp)) + continue; + + for (int i = 0; i < itemModuleComp.Items.Count; i++) + { + if (itemModuleComp.Items[i] != containedItemModuleComp.Items[i]) + continue; + } + + if (user != null) + Popup.PopupEntity(Loc.GetString("borg-module-duplicate"), uid, user.Value); + return false; + } + } + return true; } diff --git a/Resources/Locale/en-US/borg/borg.ftl b/Resources/Locale/en-US/borg/borg.ftl index c9005eb796..72667f318e 100644 --- a/Resources/Locale/en-US/borg/borg.ftl +++ b/Resources/Locale/en-US/borg/borg.ftl @@ -1,4 +1,4 @@ -borg-player-not-allowed = The brain doesn't fit! +borg-player-not-allowed = The brain doesn't fit! borg-player-not-allowed-eject = The brain was expelled from the chassis! borg-panel-not-open = The cyborg's panel isn't open... @@ -7,6 +7,7 @@ borg-mind-added = {CAPITALIZE($name)} powered on! borg-mind-removed = {CAPITALIZE($name)} shut off! borg-module-too-many = There's not enough room for another module... +borg-module-duplicate = This module is already installed in this cyborg. borg-module-whitelist-deny = This module doesn't fit in this type of cyborg... borg-construction-guide-string = The cyborg limbs and torso must be attached to the endoskeleton. From 7d0798cea5cfb19665076cb745e2882fcd102c7f Mon Sep 17 00:00:00 2001 From: PJBot Date: Sat, 15 Jun 2024 02:59:36 +0000 Subject: [PATCH 046/142] Automatic changelog update --- Resources/Changelog/Changelog.yml | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 91fcf9f40f..29002d3509 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,13 +1,4 @@ Entries: -- author: Nairodian - changes: - - message: Added disablers to every security officer locker. - type: Add - - message: Any way to obtain rubber bullets has been removed. - type: Remove - id: 6236 - time: '2024-03-27T15:11:13.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/26470 - author: Ghagliiarghii changes: - message: Removed Donk Pocket Bounty from Cargo @@ -3847,3 +3838,10 @@ id: 6735 time: '2024-06-15T02:19:08.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/28965 +- author: Plykiya + changes: + - message: You can no longer insert duplicates of the same module into a cyborg. + type: Tweak + id: 6736 + time: '2024-06-15T02:58:30.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/28943 From 41a081d5efa0050b44f3200cdaecde16eab2bc78 Mon Sep 17 00:00:00 2001 From: Verm <32827189+Vermidia@users.noreply.github.com> Date: Fri, 14 Jun 2024 22:00:00 -0500 Subject: [PATCH 047/142] Donk co. microwave + microwave tweaks (#28951) * THE syndie microwave * Always burn to explode microwave when copying * Make it so copying ids stop when the microwave is goign to explode * Made explosion destroy the board and spit out the machine parts * Move logic is MicrowaveSystem, make metal cooking use the same logic * Fix passing the wrong malfunction time * Shuttle cannot escape aggressive branding * Always make it explode with an id * Forgot to invert bool, move it after fry chance --- Content.Server/Access/Systems/IdCardSystem.cs | 16 +++++++- .../Kitchen/Components/MicrowaveComponent.cs | 6 +++ .../Kitchen/EntitySystems/MicrowaveSystem.cs | 26 ++++++++++++- Resources/Maps/Nonstations/nukieplanet.yml | 2 +- Resources/Maps/Shuttles/infiltrator.yml | 2 +- .../Structures/Machines/microwave.yml | 18 +++++++++ .../Machines/microwave_syndie.rsi/meta.json | 35 ++++++++++++++++++ .../Machines/microwave_syndie.rsi/mw.png | Bin 0 -> 836 bytes .../Machines/microwave_syndie.rsi/mw0.png | Bin 0 -> 825 bytes .../microwave_syndie.rsi/mw_running_unlit.png | Bin 0 -> 617 bytes .../microwave_syndie.rsi/mw_unlit.png | Bin 0 -> 1772 bytes .../Machines/microwave_syndie.rsi/mwb.png | Bin 0 -> 1193 bytes .../microwave_syndie.rsi/mwbloody0.png | Bin 0 -> 268 bytes .../microwave_syndie.rsi/mwbloody1.png | Bin 0 -> 230 bytes .../Machines/microwave_syndie.rsi/mwo.png | Bin 0 -> 947 bytes 15 files changed, 99 insertions(+), 6 deletions(-) create mode 100644 Resources/Textures/Structures/Machines/microwave_syndie.rsi/meta.json create mode 100644 Resources/Textures/Structures/Machines/microwave_syndie.rsi/mw.png create mode 100644 Resources/Textures/Structures/Machines/microwave_syndie.rsi/mw0.png create mode 100644 Resources/Textures/Structures/Machines/microwave_syndie.rsi/mw_running_unlit.png create mode 100644 Resources/Textures/Structures/Machines/microwave_syndie.rsi/mw_unlit.png create mode 100644 Resources/Textures/Structures/Machines/microwave_syndie.rsi/mwb.png create mode 100644 Resources/Textures/Structures/Machines/microwave_syndie.rsi/mwbloody0.png create mode 100644 Resources/Textures/Structures/Machines/microwave_syndie.rsi/mwbloody1.png create mode 100644 Resources/Textures/Structures/Machines/microwave_syndie.rsi/mwo.png diff --git a/Content.Server/Access/Systems/IdCardSystem.cs b/Content.Server/Access/Systems/IdCardSystem.cs index 47388d1a6f..b49bc55d1b 100644 --- a/Content.Server/Access/Systems/IdCardSystem.cs +++ b/Content.Server/Access/Systems/IdCardSystem.cs @@ -9,6 +9,7 @@ using Content.Shared.Database; using Content.Shared.Popups; using Robust.Shared.Prototypes; using Robust.Shared.Random; +using Content.Server.Kitchen.EntitySystems; namespace Content.Server.Access.Systems; @@ -18,6 +19,7 @@ public sealed class IdCardSystem : SharedIdCardSystem [Dependency] private readonly IRobustRandom _random = default!; [Dependency] private readonly IPrototypeManager _prototypeManager = default!; [Dependency] private readonly IAdminLogManager _adminLogger = default!; + [Dependency] private readonly MicrowaveSystem _microwave = default!; public override void Initialize() { @@ -27,12 +29,13 @@ public sealed class IdCardSystem : SharedIdCardSystem private void OnMicrowaved(EntityUid uid, IdCardComponent component, BeingMicrowavedEvent args) { - if (!component.CanMicrowave) - return; + if (!component.CanMicrowave || !TryComp(args.Microwave, out var micro) || micro.Broken) + return; if (TryComp(uid, out var access)) { float randomPick = _random.NextFloat(); + // if really unlucky, burn card if (randomPick <= 0.15f) { @@ -49,6 +52,14 @@ public sealed class IdCardSystem : SharedIdCardSystem EntityManager.QueueDeleteEntity(uid); return; } + + //Explode if the microwave can't handle it + if (!micro.CanMicrowaveIdsSafely) + { + _microwave.Explode((args.Microwave, micro)); + return; + } + // If they're unlucky, brick their ID if (randomPick <= 0.25f) { @@ -73,6 +84,7 @@ public sealed class IdCardSystem : SharedIdCardSystem _adminLogger.Add(LogType.Action, LogImpact.Medium, $"{ToPrettyString(args.Microwave)} added {random.ID} access to {ToPrettyString(uid):entity}"); + } } } diff --git a/Content.Server/Kitchen/Components/MicrowaveComponent.cs b/Content.Server/Kitchen/Components/MicrowaveComponent.cs index 815ba8f521..1d26f68cae 100644 --- a/Content.Server/Kitchen/Components/MicrowaveComponent.cs +++ b/Content.Server/Kitchen/Components/MicrowaveComponent.cs @@ -101,6 +101,12 @@ namespace Content.Server.Kitchen.Components /// Chance of lightning occurring when we microwave a metallic object [DataField, ViewVariables(VVAccess.ReadWrite)] public float LightningChance = .75f; + + /// + /// If this microwave can give ids accesses without exploding + /// + [DataField, ViewVariables(VVAccess.ReadWrite)] + public bool CanMicrowaveIdsSafely = true; } public sealed class BeingMicrowavedEvent : HandledEntityEventArgs diff --git a/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs b/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs index c69ed49d50..eefa539149 100644 --- a/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs +++ b/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs @@ -1,3 +1,4 @@ +using Content.Server.Administration.Logs; using Content.Server.Body.Systems; using Content.Server.Chemistry.Containers.EntitySystems; using Content.Server.Construction; @@ -15,6 +16,7 @@ using Content.Shared.Body.Part; using Content.Shared.Chemistry.Components.SolutionManager; using Content.Shared.Chemistry.EntitySystems; using Content.Shared.Construction.EntitySystems; +using Content.Shared.Database; using Content.Shared.Destructible; using Content.Shared.FixedPoint; using Content.Shared.Interaction; @@ -36,6 +38,7 @@ using System.Linq; using Robust.Shared.Prototypes; using Robust.Shared.Timing; using Content.Shared.Stacks; +using Content.Server.Construction.Components; namespace Content.Server.Kitchen.EntitySystems { @@ -61,6 +64,7 @@ namespace Content.Server.Kitchen.EntitySystems [Dependency] private readonly SharedItemSystem _item = default!; [Dependency] private readonly SharedStackSystem _stack = default!; [Dependency] private readonly IPrototypeManager _prototype = default!; + [Dependency] private readonly IAdminLogManager _adminLogger = default!; [ValidatePrototypeId] private const string MalfunctionSpark = "Spark"; @@ -408,6 +412,23 @@ namespace Content.Server.Kitchen.EntitySystems return component.Storage.ContainedEntities.Any(); } + /// + /// Explodes the microwave internally, turning it into a broken state, destroying its board, and spitting out its machine parts + /// + /// + public void Explode(Entity ent) + { + ent.Comp.Broken = true; // Make broken so we stop processing stuff + _explosion.TriggerExplosive(ent); + if (TryComp(ent, out var machine)) + { + _container.CleanContainer(machine.BoardContainer); + _container.EmptyContainer(machine.PartContainer); + } + + _adminLogger.Add(LogType.Action, LogImpact.Medium, + $"{ToPrettyString(ent)} exploded from unsafe cooking!"); + } /// /// Handles the attempted cooking of unsafe objects /// @@ -425,7 +446,7 @@ namespace Content.Server.Kitchen.EntitySystems ent.Comp1.MalfunctionTime = _gameTiming.CurTime + TimeSpan.FromSeconds(ent.Comp2.MalfunctionInterval); if (_random.Prob(ent.Comp2.ExplosionChance)) { - _explosion.TriggerExplosive(ent); + Explode((ent, ent.Comp2)); return; // microwave is fucked, stop the cooking. } @@ -532,7 +553,8 @@ namespace Content.Server.Kitchen.EntitySystems activeComp.CookTimeRemaining = component.CurrentCookTimerTime * component.CookTimeMultiplier; activeComp.TotalTime = component.CurrentCookTimerTime; //this doesn't scale so that we can have the "actual" time activeComp.PortionedRecipe = portionedRecipe; - component.CurrentCookTimeEnd = _gameTiming.CurTime + TimeSpan.FromSeconds(component.CurrentCookTimerTime); + //Scale tiems with cook times + component.CurrentCookTimeEnd = _gameTiming.CurTime + TimeSpan.FromSeconds(component.CurrentCookTimerTime * component.CookTimeMultiplier); if (malfunctioning) activeComp.MalfunctionTime = _gameTiming.CurTime + TimeSpan.FromSeconds(component.MalfunctionInterval); UpdateUserInterfaceState(uid, component); diff --git a/Resources/Maps/Nonstations/nukieplanet.yml b/Resources/Maps/Nonstations/nukieplanet.yml index 4d1172198c..35e00358ec 100644 --- a/Resources/Maps/Nonstations/nukieplanet.yml +++ b/Resources/Maps/Nonstations/nukieplanet.yml @@ -10994,7 +10994,7 @@ entities: - type: Transform pos: 18.918644,6.663283 parent: 104 -- proto: KitchenMicrowave +- proto: SyndicateMicrowave entities: - uid: 10 components: diff --git a/Resources/Maps/Shuttles/infiltrator.yml b/Resources/Maps/Shuttles/infiltrator.yml index 55955bfeea..fb2045d701 100644 --- a/Resources/Maps/Shuttles/infiltrator.yml +++ b/Resources/Maps/Shuttles/infiltrator.yml @@ -3607,7 +3607,7 @@ entities: - type: Transform pos: 3.5,-3.5 parent: 1 -- proto: KitchenMicrowave +- proto: SyndicateMicrowave entities: - uid: 497 components: diff --git a/Resources/Prototypes/Entities/Structures/Machines/microwave.yml b/Resources/Prototypes/Entities/Structures/Machines/microwave.yml index 994269f71b..3b6fbf7f5f 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/microwave.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/microwave.yml @@ -105,3 +105,21 @@ - type: GuideHelp guides: - Chef + +- type: entity + id: SyndicateMicrowave + parent: KitchenMicrowave + name: donk co. microwave + description: So advanced, it can cook donk-pockets in a mere 2.5 seconds! + components: + - type: Microwave + cookTimeMultiplier: 0.5 + capacity: 10 + canMicrowaveIdsSafely: false + explosionChance: 0.3 + - type: Sprite + sprite: Structures/Machines/microwave_syndie.rsi + drawdepth: SmallObjects + snapCardinals: true + + diff --git a/Resources/Textures/Structures/Machines/microwave_syndie.rsi/meta.json b/Resources/Textures/Structures/Machines/microwave_syndie.rsi/meta.json new file mode 100644 index 0000000000..932ea0c482 --- /dev/null +++ b/Resources/Textures/Structures/Machines/microwave_syndie.rsi/meta.json @@ -0,0 +1,35 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from /tg/station at commit 9065b811726ae52be5d1889f436c01a24efbf47a, edited by github user @Flareguy for Space Station 14, modified by Vermidia", + "states": [ + { + "name": "mw" + }, + { + "name": "mw_unlit" + }, + { + "name": "mw0" + }, + { + "name": "mw_running_unlit" + }, + { + "name": "mwb" + }, + { + "name": "mwbloody0" + }, + { + "name": "mwbloody1" + }, + { + "name": "mwo" + } + ] + } \ No newline at end of file diff --git a/Resources/Textures/Structures/Machines/microwave_syndie.rsi/mw.png b/Resources/Textures/Structures/Machines/microwave_syndie.rsi/mw.png new file mode 100644 index 0000000000000000000000000000000000000000..cdad6aaf282a2970b7ff66daf56f7a1fee299a94 GIT binary patch literal 836 zcmV-K1H1f*P)DHIg3NTFg8!3D%pBA6yx#0W-hk}->rWtf>D!B()b2v~?V zZiW9qTftUA5EMbg(%P+&Fy5C05+uIiz58+Ioy(mw;0$H7tl2UH*_>sBg8|=ibj9a> zqYV$ea*oF|Q=ea)i}3IIe!!vX{iy2o|GlQGb3I{d;Aj_~(saWTmT3rWTDsz0;T|m= zTNgeS_8T&w@Qu>rRen{Rs`95|BNCnkr|RiTHE_IvwX~5H9uXeQW(rzu9`z-jL~dzO zYQO9OOu_^S;3H0f4Ki4aO3g`T&3$7P-vW8@XmaWlF~pG~EndH<1?ifQniM@DPllq( z{coOTa&n^D-4lS;7u)_A0{0%2OSb)UV%z0Ya6Q9SuI|rEPSanam+IQ!5qP)Z;<~QI z_u+B}`kwTd5vxcp+0JAV-p`>c3f*_mv0BZl_MWpxh-}F(x`l&77?%6qwO=8DXc>h9 zjxqoM010qNS#tmY4#EHc4#EKyC`y0;00DeSL_t(oN9|OxPJ}=ZoikR@SP%+I0|^Nx zhRTB4KhR(BH;kV^>o4FJcr^)D#DatfF(KCx3L82TW$^ZLyV+&%j%c&f4D8O#d;4Z~ zS0Gpr1YhFX(*H$KtXR!cS@FknA3k2!OXI@X!MA!m0U>T{3;s;U~n+qRwb7^k#B0hN)RX5hAMk0ewc<3ticvXwnKQUMAa_Yu5l z8V<>IU2q%+(5sAW0XrE*0>R@rhOX;&SYa4K6h(mk;1=x9z!V7tC`FpTnqMJHL8+jS&(HJpoi^~Th}#} z2GSO6>JqNVR7JpW3pT@+EFagw_qjwVffpg@P%b)8E1(t73TOr9DDVx4p2fh*v9~b* O0000DHIg3NTFg8!3D%pBA6yx#0W-hk}->rWtf>D!B()b2v~?V zZiW9qTftUA5EMbg(%P+&Fy5C05+uIiz58+Ioy(mw;0$H7tl2UH*_>sBg8|=ibj9a> zqYV$ea*oF|Q=ea)i}3IIe!!vX{iy2o|GlQGb3I{d;Aj_~(saWTmT3rWTDsz0;T|m= zTNgeS_8T&w@Qu>rRen{Rs`95|BNCnkr|RiTHE_IvwX~5H9uXeQW(rzu9`z-jL~dzO zYQO9OOu_^S;3H0f4Ki4aO3g`T&3$7P-vW8@XmaWlF~pG~EndH<1?ifQniM@DPllq( z{coOTa&n^D-4lS;7u)_A0{0%2OSb)UV%z0Ya6Q9SuI|rEPSanam+IQ!5qP)Z;<~QI z_u+B}`kwTd5vxcp+0JAV-p`>c3f*_mv0BZl_MWpxh-}F(x`l&77?%6qwO=8DXc>h9 zjxqoM010qNS#tmY4#EHc4#EKyC`y0;00D7HL_t(oN9|OxYJ@-#oeQb7Ng)=NK|$Ce zSf#MeALJYIKeqV=^94yQm`YLz5+xwliA5T_Kyo8lahF}kyOX5ZX+~#f<~`qxy93D> zW8ZRY>-VxOcf9ANs`=w}2%m2+TjRpj%^f^^R6^g2%~6hQXbAkf0?H-CG2+7fg((R< zzl)o?DG>=#tH6`?gr;-<1)!?OxNM6swr$gBQpPY0Q>27)dS<|sy~rgDf?zCM>yKqj z5~%BX1n;_T(PQ2zMoyZ8yRJKu(0R<0N$6ys6J4bM1&-$k-nOkEg75p_c^;tG8A*VD z8ASrYlO%z@?L6<3OJ0fF6FY+@@)$GEk0S-&Al*mTD3X zf5HB6q^id_grQKVB=9OFoyx`383l|2MggP18U=m;@65t#CE#KB00000NkvXXu0mjf D88&(m literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Machines/microwave_syndie.rsi/mw_running_unlit.png b/Resources/Textures/Structures/Machines/microwave_syndie.rsi/mw_running_unlit.png new file mode 100644 index 0000000000000000000000000000000000000000..b751f308a6a25c0884e8c5f8bd83b64e50b7f121 GIT binary patch literal 617 zcmV-v0+#)WP)DHIg3NTFg8!3D%pBA6yx#0W-hk}->rWtf>D!B()b2v~?V zZiW9qTftUA5EMbg(%P+&Fy5C05+uIiz58+Ioy(mw;0$H7tl2UH*_>sBg8|=ibj9a> zqYV$ea*oF|Q=ea)i}3IIe!!vX{iy2o|GlQGb3I{d;Aj_~(saWTmT3rWTDsz0;T|m= zTNgeS_8T&w@Qu>rRen{Rs`95|BNCnkr|RiTHE_IvwX~5H9uXeQW(rzu9`z-jL~dzO zYQO9OOu_^S;3H0f4Ki4aO3g`T&3$7P-vW8@XmaWlF~pG~EndH<1?ifQniM@DPllq( z{coOTa&n^D-4lS;7u)_A0{0%2OSb)UV%z0Ya6Q9SuI|rEPSanam+IQ!5qP)Z;<~QI z_u+B}`kwTd5vxcp+0JAV-p`>c3f*_mv0BZl_MWpxh-}F(x`l&77?%6qwO=8DXc>h9 zjxqoM010qNS#tmY3ljhU3ljkVnw%H_005y$L_t(oN9~ls4S*mFMd4srg7Mr#25}!( zaR&}aRbq^R+QtMAA3}QIxBWZ<#$bQ|2!KFm0=CtEn1>|w7sq(j4Cct6^0IkK2N?)? zy4Agk55r`jENOGnQ^C^QFMc;si=?X>NGA!Yi9&#DUiLLt*7PJLAUz3gp#UKYk(+we>mi$CDCl^*Y37w-J<>~FBRJZiZuLHOeQ>fhusSU(;g zyp;;V)hF|NOZeo|rv+iV5%dSyziwV77q$w*dg8)#HnRS_UidKP75j-vEhNwTEru#_f2 zoCQ1*b6PUw)2u0h#ic7@yylM5WxODA@|?u7Qp34x1<<2wTs%!Cg#{j!*@T5G%2L28 zYivB`8BfRjKd9Hg|D^yz?7C|m8*K^0wTd+Bo`M_8sBA>1{j-?K$1LU3gtG1_n0YPt zCU)8hBNJ6f46s^GQw!p$J^_$+;~BEUK%V@*lLDn?jGs@+%Wj$%3*q|tCN zE}<^>0{^TEH6Y7-3^DBN1i2PE&&5)Plfse9JP4su5&+ zd65#`Mubog>CCe<4>MCY%$0nH(`jA;xqR6b9;d+Zz&z^vielIp*@o>S+tM)_VqzeQ zbxpTz)6gtq#r8%LKxdLkl{L4@14gQ$f%|KY|Mc4 zAq7-wPr0AXNWxkp2CDLH+(8yCxXXR3b0 zhgUUg4S7?7OI&5>l>@bqhKUL*kXw!Oe6>CjSOi)V82IOJ?)?mhh2874`h)%ZKPpea zk#zan@6K<_PZ=M7IllYRhv>O0!n=3JAAC0b>94`px4S3z#=qR#`t=fsz4BV}{QXPY U-+%t++xd~x>mGLQT)*|+KbGbdxc~qF literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Machines/microwave_syndie.rsi/mwb.png b/Resources/Textures/Structures/Machines/microwave_syndie.rsi/mwb.png new file mode 100644 index 0000000000000000000000000000000000000000..8d6462c92e22f0817b4e4a119758369f5022933a GIT binary patch literal 1193 zcmV;a1XlZrP)DHIg3NTFg8!3D%pBA6yx#0W-hk}->rWtf>D!B()b2v~?V zZiW9qTftUA5EMbg(%P+&Fy5C05+uIiz58+Ioy(mw;0$H7tl2UH*_>sBg8|=ibj9a> zqYV$ea*oF|Q=ea)i}3IIe!!vX{iy2o|GlQGb3I{d;Aj_~(saWTmT3rWTDsz0;T|m= zTNgeS_8T&w@Qu>rRen{Rs`95|BNCnkr|RiTHE_IvwX~5H9uXeQW(rzu9`z-jL~dzO zYQO9OOu_^S;3H0f4Ki4aO3g`T&3$7P-vW8@XmaWlF~pG~EndH<1?ifQniM@DPllq( z{coOTa&n^D-4lS;7u)_A0{0%2OSb)UV%z0Ya6Q9SuI|rEPSanam+IQ!5qP)Z;<~QI z_u+B}`kwTd5vxcp+0JAV-p`>c3f*_mv0BZl_MWpxh-}F(x`l&77?%6qwO=8DXc>h9 zjxqoM010qNS#tmY4#EHc4#EKyC`y0;00QAjL_t(oN9|V6i&9Y(J~qw9&}tO?F$-fx zP!I!KG=br+g{`6)|AJcN%D=_k5cC&Vk&7~#U1U&;qD0WpNQTi7behy6hGM$kozCO> z-u0;v&BgNOsIq&iuWU^Q+c5GhzSMzGM>M;8{t8;#TElP(UcC@@Zzc12_ zrLUH~kLTCv^0%gCo$(k+Bxerd%(U#_SRVdsOpbLJ?=!i&j(y;9-nX(sNX)FTRskk^ zwD+AhNo2J|Mi6kw*<$P-98hzwMYI}{B$xxQs)6;B`I;qPTLm^(&k=&)OgMWu1NrO9 zdr7`7$gu}T|2k+S+F zOe_J&A78yrx8J@ZuXny6kN}9x#)+xxQ+oj5e!o9cnjVj54A*YAsaU*5#k);%gj5_bZU{EfD96{*JQi5KuN82{(fK&}eg@!^Q z8jVKAQaBu@;Ey0V!%k{68q*c<`FzLue4et|>=+nLi28yYBdk)X$OrRuIxR=u&z~D;4KP7qfyFa#&346H`ku)t!8YlKd{^b zPN#D=1-jj?BbUore#y+2%S3Oc4RpTC<(l{f0B&hQ-1{4%5uYmeKj!n;t^jXn4q%;x z!m4Sn;x_<^`(U>rh(#cBej0{*;WT&`oC^gO3M>@(uL}GD)IdW%E4V=z00000NkvXX Hu0mjf{IoPg literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Machines/microwave_syndie.rsi/mwbloody0.png b/Resources/Textures/Structures/Machines/microwave_syndie.rsi/mwbloody0.png new file mode 100644 index 0000000000000000000000000000000000000000..a51302a2537666447aab9729ffd9e99629aed1ba GIT binary patch literal 268 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|3<7*YT(z~e z5ANE!baHbw14CnRW*h^9nVA`bHiIPtgR85nxVX5#zyFFAD;gRaQX&I^n)GFge*-Cj zk|4j}|EPfBfpV-QP%h8Y#WBR9_vr+0t^)=fF3imj&i%f>?b&6wPDhXMrFtqH1 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Machines/microwave_syndie.rsi/mwbloody1.png b/Resources/Textures/Structures/Machines/microwave_syndie.rsi/mwbloody1.png new file mode 100644 index 0000000000000000000000000000000000000000..8cfdf34281a32ce8dd087a52b77d1284ec461e3c GIT binary patch literal 230 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}3p`yMLn2z= zPBP?TG8Ax)f0L4*xbjAoXs&If&h^ztjE-E2jyQgZlTFZ!rRi+FK%JW8Gycg90!|&Q zHYp7$QVQxP4kqRQo@Cw{oFi(NvR-f&DXP8ng^Zl zHO|)h%w51Pm$vU^VP5V7o^>|PCXY?$Yra`KF_BkgwgXGw)R$LHX7D||?ygg~)`>&0 c<;6qR_z=%p$19>CK({h@y85}Sb4q9e0Qr+vJOBUy literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Machines/microwave_syndie.rsi/mwo.png b/Resources/Textures/Structures/Machines/microwave_syndie.rsi/mwo.png new file mode 100644 index 0000000000000000000000000000000000000000..7545ff0035ab035f67ba083c11411ca94b5b8bcc GIT binary patch literal 947 zcmV;k15EshP)DHIg3NTFg8!3D%pBA6yx#0W-hk}->rWtf>D!B()b2v~?V zZiW9qTftUA5EMbg(%P+&Fy5C05+uIiz58+Ioy(mw;0$H7tl2UH*_>sBg8|=ibj9a> zqYV$ea*oF|Q=ea)i}3IIe!!vX{iy2o|GlQGb3I{d;Aj_~(saWTmT3rWTDsz0;T|m= zTNgeS_8T&w@Qu>rRen{Rs`95|BNCnkr|RiTHE_IvwX~5H9uXeQW(rzu9`z-jL~dzO zYQO9OOu_^S;3H0f4Ki4aO3g`T&3$7P-vW8@XmaWlF~pG~EndH<1?ifQniM@DPllq( z{coOTa&n^D-4lS;7u)_A0{0%2OSb)UV%z0Ya6Q9SuI|rEPSanam+IQ!5qP)Z;<~QI z_u+B}`kwTd5vxcp+0JAV-p`>c3f*_mv0BZl_MWpxh-}F(x`l&77?%6qwO=8DXc>h9 zjxqoM010qNS#tmY4#EHc4#EKyC`y0;00HYsL_t(oN9|TIYr;SjewI!yItbZCN+5;e zQU$yA50vH?L`pYz9ZH9|7AK{cUy#zROS@LE-8uw95tmMZ47xZK?7i5Fm-AwhHt3Qs z%iX(o@B8xI%aI&#P!wg!$I_l#mX)J54@JfA%QDP9Uee};;>kH&P3=J4gVb3P7R&_f z-2q_};xS^w>;ggo&!4MK9n4&~E|${O!7+w9faH&-XK?ZU3Z+sq5trWp4}!`V=MgG^ zO`H$sv0W%M3x2MpTC4F5fO4z|Yit!jj{rG*SGL-#zd)yWay$#p@@2_AA(`a{y z17V1D1W^nqf^~xCE9S55WO>%t(4QLrv@qEe~AVzGdHJ`a=0B)SJANm}-LJ+N&X z`u)DY!Lc0BEgd990vz*T;{{kZVYOQIQ)3ChY$P|$pl2Pe;}sf?hd{?@Ielw3Zr-i; zjz*(MFJtw9Zs=fWhW8~P8INwg>xDE!gCp`#G#U+m%)b;}h$R3m#^MMR!k;%?!#oy$ zazK`4P*pY116Y(6r(`ShtJT{0C1Yu0UTLs|a8zzza;A=vNi4bqT58%D958jM3b0Bjdb6}?q`~YNO VkNCdzgV_K8002ovPDHLkV1mPAuDAdI literal 0 HcmV?d00001 From 6132b5e07a4185ce9e2a643906466beac5f0d05e Mon Sep 17 00:00:00 2001 From: PJBot Date: Sat, 15 Jun 2024 03:01:06 +0000 Subject: [PATCH 048/142] Automatic changelog update --- Resources/Changelog/Changelog.yml | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 29002d3509..0b0cbc7d55 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,13 +1,4 @@ Entries: -- author: Ghagliiarghii - changes: - - message: Removed Donk Pocket Bounty from Cargo - type: Remove - - message: Removed Box of Hugs Bounty from Cargo - type: Remove - id: 6237 - time: '2024-03-27T21:50:35.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/26481 - author: Vermidia changes: - message: Artifact node IDs are now only 3-digits long @@ -3845,3 +3836,14 @@ id: 6736 time: '2024-06-15T02:58:30.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/28943 +- author: Vermidia + changes: + - message: Nukie planet now has an improved Donk co. microwave, which cooks twice + as fast but is more likely to explode. It can't handle id cards without exploding. + type: Add + - message: Made microwave explosions destroy the machine board and spit out the + machine parts. + type: Tweak + id: 6737 + time: '2024-06-15T03:00:00.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/28951 From 48f90322f274cb5524c816a2f88ede8bc779cd64 Mon Sep 17 00:00:00 2001 From: Robert V Date: Fri, 14 Jun 2024 20:13:52 -0700 Subject: [PATCH 049/142] Allow vending machines to be repaired (#28920) Vending machines can be repaired --- .../VendingMachines/VendingMachineSystem.cs | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/Content.Server/VendingMachines/VendingMachineSystem.cs b/Content.Server/VendingMachines/VendingMachineSystem.cs index 63ec8f2c24..2866b14a83 100644 --- a/Content.Server/VendingMachines/VendingMachineSystem.cs +++ b/Content.Server/VendingMachines/VendingMachineSystem.cs @@ -50,7 +50,7 @@ namespace Content.Server.VendingMachines SubscribeLocalEvent(OnPowerChanged); SubscribeLocalEvent(OnBreak); SubscribeLocalEvent(OnEmagged); - SubscribeLocalEvent(OnDamage); + SubscribeLocalEvent(OnDamageChanged); SubscribeLocalEvent(OnVendingPrice); SubscribeLocalEvent(OnEmpPulse); @@ -149,8 +149,15 @@ namespace Content.Server.VendingMachines args.Handled = component.EmaggedInventory.Count > 0; } - private void OnDamage(EntityUid uid, VendingMachineComponent component, DamageChangedEvent args) + private void OnDamageChanged(EntityUid uid, VendingMachineComponent component, DamageChangedEvent args) { + if (!args.DamageIncreased && component.Broken) + { + component.Broken = false; + TryUpdateVisualState(uid, component); + return; + } + if (component.Broken || component.DispenseOnHitCoolingDown || component.DispenseOnHitChance == null || args.DamageDelta == null) return; From 97695cfa62fe3291fe7abfe8d35668987f2fd79b Mon Sep 17 00:00:00 2001 From: PJBot Date: Sat, 15 Jun 2024 03:14:58 +0000 Subject: [PATCH 050/142] Automatic changelog update --- Resources/Changelog/Changelog.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 0b0cbc7d55..2ac82f740c 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Vermidia - changes: - - message: Artifact node IDs are now only 3-digits long - type: Tweak - id: 6238 - time: '2024-03-27T23:26:26.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/26482 - author: Jake Huxell changes: - message: Fixed late join menu scrolling to the top whenever a new player joins @@ -3847,3 +3840,11 @@ id: 6737 time: '2024-06-15T03:00:00.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/28951 +- author: robertGN + changes: + - message: Using a welder on vending machines now correctly repairs the vending + machine. + type: Fix + id: 6738 + time: '2024-06-15T03:13:53.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/28920 From 298de1ba39279a3e10ce978802a356987589a07a Mon Sep 17 00:00:00 2001 From: Brandon Hu <103440971+Brandon-Huu@users.noreply.github.com> Date: Sat, 15 Jun 2024 03:23:42 +0000 Subject: [PATCH 051/142] fix(uplink): Remove useless gps from death rattle box (#28999) --- Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml b/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml index 2bfca8362a..b350b0b1cf 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml +++ b/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml @@ -54,7 +54,7 @@ name: deathrattle implant box parent: BoxCardboard id: BoxDeathRattleImplants - description: Six deathrattle implants and handheld GPS devices for the whole squad. + description: Six deathrattle implants for the whole squad. components: - type: Sprite layers: @@ -67,5 +67,3 @@ contents: - id: DeathRattleImplanter amount: 6 - - id: HandheldGPSBasic - amount: 6 From 1d5840c279a48486c8a4668b10c5af3f40f5fa63 Mon Sep 17 00:00:00 2001 From: PJBot Date: Sat, 15 Jun 2024 03:24:48 +0000 Subject: [PATCH 052/142] Automatic changelog update --- Resources/Changelog/Changelog.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 2ac82f740c..51fcaa28a0 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,12 +1,4 @@ Entries: -- author: Jake Huxell - changes: - - message: Fixed late join menu scrolling to the top whenever a new player joins - the round. - type: Fix - id: 6239 - time: '2024-03-28T01:43:55.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/26483 - author: blueDev2 changes: - message: Generalized bounties to allow selling them off-station @@ -3848,3 +3840,11 @@ id: 6738 time: '2024-06-15T03:13:53.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/28920 +- author: Brandon-Huu + changes: + - message: Removed the six Handheld GPS devices from the syndicate deathrattle implant + box. + type: Remove + id: 6739 + time: '2024-06-15T03:23:42.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/28999 From f136657b388b6d90b63fa338cc7295b1fd39d00c Mon Sep 17 00:00:00 2001 From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> Date: Fri, 14 Jun 2024 23:38:43 -0400 Subject: [PATCH 053/142] Revamped Meteor Swarm (#28974) * meteor code and balanced values * Meteor Swarms * Update meteors.yml * Update meteors.yml * HOO! (fix overkill bug and buff space dust) * undo BloodstreamComponent.cs changes * DamageDistribution -> DamageTypes * part 2. --- .../Destructible/DestructibleSystem.cs | 11 + Content.Server/Mining/MeteorComponent.cs | 25 ++ Content.Server/Mining/MeteorSystem.cs | 65 +++++ .../Components/MeteorSchedulerComponent.cs | 35 +++ .../Components/MeteorSwarmComponent.cs | 58 ++++ .../Components/MeteorSwarmRuleComponent.cs | 40 --- .../StationEvents/Events/MeteorSwarmRule.cs | 85 ------ .../StationEvents/Events/MeteorSwarmSystem.cs | 82 ++++++ .../StationEvents/MeteorSchedulerSystem.cs | 39 +++ .../Mobs/Systems/MobThresholdSystem.cs | 2 +- .../station-events/events/meteor-swarm.ftl | 5 +- .../Weapons/Guns/Launchers/launchers.yml | 2 +- .../Weapons/Guns/Projectiles/meteors.yml | 204 +++++++++++-- Resources/Prototypes/GameRules/events.yml | 17 -- .../Prototypes/GameRules/meteorswarms.yml | 104 +++++++ Resources/Prototypes/game_presets.yml | 6 + .../Textures/Objects/Misc/meteor.rsi/big.png | Bin 0 -> 4562 bytes .../Objects/Misc/meteor.rsi/big_cluster.png | Bin 0 -> 4473 bytes .../Misc/meteor.rsi/big_cluster_pixel.png | Bin 0 -> 4473 bytes .../Objects/Misc/meteor.rsi/big_pixel.png | Bin 0 -> 4562 bytes .../Objects/Misc/meteor.rsi/firework.png | Bin 0 -> 367 bytes .../Misc/meteor.rsi/firework_pixel.png | Bin 0 -> 430 bytes .../Objects/Misc/meteor.rsi/human.png | Bin 0 -> 5045 bytes .../Objects/Misc/meteor.rsi/human_pixel.png | Bin 0 -> 1844 bytes .../Objects/Misc/meteor.rsi/medium.png | Bin 0 -> 2921 bytes .../Misc/meteor.rsi/medium_piercing.png | Bin 0 -> 3594 bytes .../Misc/meteor.rsi/medium_piercing_pixel.png | Bin 0 -> 3594 bytes .../Objects/Misc/meteor.rsi/medium_pixel.png | Bin 0 -> 2921 bytes .../Misc/meteor.rsi/medium_radioactive.png | Bin 0 -> 2088 bytes .../meteor.rsi/medium_radioactive_pixel.png | Bin 0 -> 2088 bytes .../Objects/Misc/meteor.rsi/meta.json | 271 ++++++++++++++++++ .../Objects/Misc/meteor.rsi/small.png | Bin 0 -> 2458 bytes .../Objects/Misc/meteor.rsi/small_flash.png | Bin 0 -> 2484 bytes .../Misc/meteor.rsi/small_flash_pixel.png | Bin 0 -> 2484 bytes .../Objects/Misc/meteor.rsi/small_pixel.png | Bin 0 -> 2458 bytes .../Objects/Misc/meteor.rsi/space_dust.png | Bin 0 -> 328 bytes 36 files changed, 887 insertions(+), 164 deletions(-) create mode 100644 Content.Server/Mining/MeteorComponent.cs create mode 100644 Content.Server/Mining/MeteorSystem.cs create mode 100644 Content.Server/StationEvents/Components/MeteorSchedulerComponent.cs create mode 100644 Content.Server/StationEvents/Components/MeteorSwarmComponent.cs delete mode 100644 Content.Server/StationEvents/Components/MeteorSwarmRuleComponent.cs delete mode 100644 Content.Server/StationEvents/Events/MeteorSwarmRule.cs create mode 100644 Content.Server/StationEvents/Events/MeteorSwarmSystem.cs create mode 100644 Content.Server/StationEvents/MeteorSchedulerSystem.cs create mode 100644 Resources/Prototypes/GameRules/meteorswarms.yml create mode 100644 Resources/Textures/Objects/Misc/meteor.rsi/big.png create mode 100644 Resources/Textures/Objects/Misc/meteor.rsi/big_cluster.png create mode 100644 Resources/Textures/Objects/Misc/meteor.rsi/big_cluster_pixel.png create mode 100644 Resources/Textures/Objects/Misc/meteor.rsi/big_pixel.png create mode 100644 Resources/Textures/Objects/Misc/meteor.rsi/firework.png create mode 100644 Resources/Textures/Objects/Misc/meteor.rsi/firework_pixel.png create mode 100644 Resources/Textures/Objects/Misc/meteor.rsi/human.png create mode 100644 Resources/Textures/Objects/Misc/meteor.rsi/human_pixel.png create mode 100644 Resources/Textures/Objects/Misc/meteor.rsi/medium.png create mode 100644 Resources/Textures/Objects/Misc/meteor.rsi/medium_piercing.png create mode 100644 Resources/Textures/Objects/Misc/meteor.rsi/medium_piercing_pixel.png create mode 100644 Resources/Textures/Objects/Misc/meteor.rsi/medium_pixel.png create mode 100644 Resources/Textures/Objects/Misc/meteor.rsi/medium_radioactive.png create mode 100644 Resources/Textures/Objects/Misc/meteor.rsi/medium_radioactive_pixel.png create mode 100644 Resources/Textures/Objects/Misc/meteor.rsi/meta.json create mode 100644 Resources/Textures/Objects/Misc/meteor.rsi/small.png create mode 100644 Resources/Textures/Objects/Misc/meteor.rsi/small_flash.png create mode 100644 Resources/Textures/Objects/Misc/meteor.rsi/small_flash_pixel.png create mode 100644 Resources/Textures/Objects/Misc/meteor.rsi/small_pixel.png create mode 100644 Resources/Textures/Objects/Misc/meteor.rsi/space_dust.png diff --git a/Content.Server/Destructible/DestructibleSystem.cs b/Content.Server/Destructible/DestructibleSystem.cs index 16c54fd3b0..e0183a037d 100644 --- a/Content.Server/Destructible/DestructibleSystem.cs +++ b/Content.Server/Destructible/DestructibleSystem.cs @@ -1,3 +1,4 @@ +using System.Diagnostics.CodeAnalysis; using Content.Server.Administration.Logs; using Content.Server.Atmos.EntitySystems; using Content.Server.Body.Systems; @@ -90,6 +91,16 @@ namespace Content.Server.Destructible } } + public bool TryGetDestroyedAt(Entity ent, [NotNullWhen(true)] out FixedPoint2? destroyedAt) + { + destroyedAt = null; + if (!Resolve(ent, ref ent.Comp, false)) + return false; + + destroyedAt = DestroyedAt(ent, ent.Comp); + return true; + } + // FFS this shouldn't be this hard. Maybe this should just be a field of the destructible component. Its not // like there is currently any entity that is NOT just destroyed upon reaching a total-damage value. /// diff --git a/Content.Server/Mining/MeteorComponent.cs b/Content.Server/Mining/MeteorComponent.cs new file mode 100644 index 0000000000..059c450a8a --- /dev/null +++ b/Content.Server/Mining/MeteorComponent.cs @@ -0,0 +1,25 @@ +using Content.Shared.Damage; + +namespace Content.Server.Mining; + +/// +/// This is used for meteors which hit objects, dealing damage to destroy/kill the object and dealing equal damage back to itself. +/// +[RegisterComponent, Access(typeof(MeteorSystem))] +public sealed partial class MeteorComponent : Component +{ + /// + /// Damage specifier that is multiplied against the calculated damage amount to determine what damage is applied to the colliding entity. + /// + /// + /// The values of this should add up to 1 or else the damage will be scaled. + /// + [DataField] + public DamageSpecifier DamageTypes = new(); + + /// + /// A list of entities that this meteor has collided with. used to ensure no double collisions occur. + /// + [DataField] + public HashSet HitList = new(); +} diff --git a/Content.Server/Mining/MeteorSystem.cs b/Content.Server/Mining/MeteorSystem.cs new file mode 100644 index 0000000000..fc00147f70 --- /dev/null +++ b/Content.Server/Mining/MeteorSystem.cs @@ -0,0 +1,65 @@ +using Content.Server.Administration.Logs; +using Content.Server.Destructible; +using Content.Shared.Damage; +using Content.Shared.Database; +using Content.Shared.FixedPoint; +using Content.Shared.Mobs.Systems; +using Robust.Shared.Physics.Events; +using Robust.Shared.Player; + +namespace Content.Server.Mining; + +public sealed class MeteorSystem : EntitySystem +{ + [Dependency] private readonly IAdminLogManager _adminLog = default!; + [Dependency] private readonly DamageableSystem _damageable = default!; + [Dependency] private readonly DestructibleSystem _destructible = default!; + [Dependency] private readonly MobThresholdSystem _mobThreshold = default!; + + /// + public override void Initialize() + { + SubscribeLocalEvent(OnCollide); + } + + private void OnCollide(EntityUid uid, MeteorComponent component, ref StartCollideEvent args) + { + if (TerminatingOrDeleted(args.OtherEntity) || TerminatingOrDeleted(uid)) + return; + + if (component.HitList.Contains(args.OtherEntity)) + return; + + FixedPoint2 threshold; + if (_mobThreshold.TryGetDeadThreshold(args.OtherEntity, out var mobThreshold)) + { + threshold = mobThreshold.Value; + if (HasComp(args.OtherEntity)) + _adminLog.Add(LogType.Action, LogImpact.Extreme, $"{ToPrettyString(args.OtherEntity):player} was struck by meteor {ToPrettyString(uid):ent} and killed instantly."); + } + else if (_destructible.TryGetDestroyedAt(args.OtherEntity, out var destroyThreshold)) + { + threshold = destroyThreshold.Value; + } + else + { + threshold = FixedPoint2.MaxValue; + } + var otherEntDamage = CompOrNull(args.OtherEntity)?.TotalDamage ?? FixedPoint2.Zero; + // account for the damage that the other entity has already taken: don't overkill + threshold -= otherEntDamage; + + // The max amount of damage our meteor can take before breaking. + var maxMeteorDamage = _destructible.DestroyedAt(uid) - CompOrNull(uid)?.TotalDamage ?? FixedPoint2.Zero; + + // Cap damage so we don't overkill the meteor + var trueDamage = FixedPoint2.Min(maxMeteorDamage, threshold); + + var damage = component.DamageTypes * trueDamage; + _damageable.TryChangeDamage(args.OtherEntity, damage, true, origin: uid); + _damageable.TryChangeDamage(uid, damage); + + if (!TerminatingOrDeleted(args.OtherEntity)) + component.HitList.Add(args.OtherEntity); + } +} diff --git a/Content.Server/StationEvents/Components/MeteorSchedulerComponent.cs b/Content.Server/StationEvents/Components/MeteorSchedulerComponent.cs new file mode 100644 index 0000000000..e71a284a89 --- /dev/null +++ b/Content.Server/StationEvents/Components/MeteorSchedulerComponent.cs @@ -0,0 +1,35 @@ +using Content.Shared.Random; +using Robust.Shared.Prototypes; + +namespace Content.Server.StationEvents.Components; + +/// +/// This is used for running meteor swarm events at regular intervals. +/// +[RegisterComponent, Access(typeof(MeteorSchedulerSystem)), AutoGenerateComponentPause] +public sealed partial class MeteorSchedulerComponent : Component +{ + /// + /// The weights for which swarms will be selected. + /// + [DataField] + public ProtoId Config = "DefaultConfig"; + + /// + /// The time at which the next swarm occurs. + /// + [DataField, AutoPausedField] + public TimeSpan NextSwarmTime = TimeSpan.Zero; + + /// + /// The minimum time between swarms + /// + [DataField] + public TimeSpan MinSwarmDelay = TimeSpan.FromMinutes(7.5f); + + /// + /// The maximum time between swarms + /// + [DataField] + public TimeSpan MaxSwarmDelay = TimeSpan.FromMinutes(12.5f); +} diff --git a/Content.Server/StationEvents/Components/MeteorSwarmComponent.cs b/Content.Server/StationEvents/Components/MeteorSwarmComponent.cs new file mode 100644 index 0000000000..1cde2ac8fa --- /dev/null +++ b/Content.Server/StationEvents/Components/MeteorSwarmComponent.cs @@ -0,0 +1,58 @@ +using Content.Server.StationEvents.Events; +using Content.Shared.Destructible.Thresholds; +using Robust.Shared.Audio; +using Robust.Shared.Prototypes; + +namespace Content.Server.StationEvents.Components; + +[RegisterComponent, Access(typeof(MeteorSwarmSystem)), AutoGenerateComponentPause] +public sealed partial class MeteorSwarmComponent : Component +{ + [DataField, AutoPausedField] + public TimeSpan NextWaveTime; + + /// + /// We'll send a specific amount of waves of meteors towards the station per ending rather than using a timer. + /// + [DataField] + public int WaveCounter; + + [DataField] + public float MeteorVelocity = 10f; + + /// + /// If true, meteors will be thrown from all angles instead of from a singular source + /// + [DataField] + public bool NonDirectional; + + /// + /// The announcement played when a meteor swarm begins. + /// + [DataField] + public LocId? Announcement = "station-event-meteor-swarm-start-announcement"; + + [DataField] + public SoundSpecifier? AnnouncementSound = new SoundPathSpecifier("/Audio/Announcements/meteors.ogg") + { + Params = new() + { + Volume = -4 + } + }; + + /// + /// Each meteor entity prototype and their corresponding weight in being picked. + /// + [DataField] + public Dictionary Meteors = new(); + + [DataField] + public MinMax Waves = new(3, 3); + + [DataField] + public MinMax MeteorsPerWave = new(3, 4); + + [DataField] + public MinMax WaveCooldown = new (10, 60); +} diff --git a/Content.Server/StationEvents/Components/MeteorSwarmRuleComponent.cs b/Content.Server/StationEvents/Components/MeteorSwarmRuleComponent.cs deleted file mode 100644 index 3927f94319..0000000000 --- a/Content.Server/StationEvents/Components/MeteorSwarmRuleComponent.cs +++ /dev/null @@ -1,40 +0,0 @@ -using Content.Server.StationEvents.Events; - -namespace Content.Server.StationEvents.Components; - -[RegisterComponent, Access(typeof(MeteorSwarmRule))] -public sealed partial class MeteorSwarmRuleComponent : Component -{ - [DataField("cooldown")] - public float Cooldown; - - /// - /// We'll send a specific amount of waves of meteors towards the station per ending rather than using a timer. - /// - [DataField("waveCounter")] - public int WaveCounter; - - [DataField("minimumWaves")] - public int MinimumWaves = 3; - - [DataField("maximumWaves")] - public int MaximumWaves = 8; - - [DataField("minimumCooldown")] - public float MinimumCooldown = 10f; - - [DataField("maximumCooldown")] - public float MaximumCooldown = 60f; - - [DataField("meteorsPerWave")] - public int MeteorsPerWave = 5; - - [DataField("meteorVelocity")] - public float MeteorVelocity = 10f; - - [DataField("maxAngularVelocity")] - public float MaxAngularVelocity = 0.25f; - - [DataField("minAngularVelocity")] - public float MinAngularVelocity = -0.25f; -} diff --git a/Content.Server/StationEvents/Events/MeteorSwarmRule.cs b/Content.Server/StationEvents/Events/MeteorSwarmRule.cs deleted file mode 100644 index b97cde86a0..0000000000 --- a/Content.Server/StationEvents/Events/MeteorSwarmRule.cs +++ /dev/null @@ -1,85 +0,0 @@ -using System.Numerics; -using Content.Server.GameTicking.Rules.Components; -using Content.Server.StationEvents.Components; -using Content.Shared.GameTicking.Components; -using Robust.Shared.Map; -using Robust.Shared.Map.Components; -using Robust.Shared.Physics.Components; -using Robust.Shared.Physics.Systems; -using Robust.Shared.Spawners; - -namespace Content.Server.StationEvents.Events -{ - public sealed class MeteorSwarmRule : StationEventSystem - { - [Dependency] private readonly SharedPhysicsSystem _physics = default!; - - protected override void Started(EntityUid uid, MeteorSwarmRuleComponent component, GameRuleComponent gameRule, GameRuleStartedEvent args) - { - base.Started(uid, component, gameRule, args); - - component.WaveCounter = RobustRandom.Next(component.MinimumWaves, component.MaximumWaves); - } - - protected override void ActiveTick(EntityUid uid, MeteorSwarmRuleComponent component, GameRuleComponent gameRule, float frameTime) - { - if (component.WaveCounter <= 0) - { - ForceEndSelf(uid, gameRule); - return; - } - - component.Cooldown -= frameTime; - - if (component.Cooldown > 0f) - return; - - component.WaveCounter--; - - component.Cooldown += (component.MaximumCooldown - component.MinimumCooldown) * RobustRandom.NextFloat() + component.MinimumCooldown; - - Box2? playableArea = null; - var mapId = GameTicker.DefaultMap; - - var query = AllEntityQuery(); - while (query.MoveNext(out var gridId, out _, out var xform)) - { - if (xform.MapID != mapId) - continue; - - var aabb = _physics.GetWorldAABB(gridId); - playableArea = playableArea?.Union(aabb) ?? aabb; - } - - if (playableArea == null) - { - ForceEndSelf(uid, gameRule); - return; - } - - var minimumDistance = (playableArea.Value.TopRight - playableArea.Value.Center).Length() + 50f; - var maximumDistance = minimumDistance + 100f; - - var center = playableArea.Value.Center; - - for (var i = 0; i < component.MeteorsPerWave; i++) - { - var angle = new Angle(RobustRandom.NextFloat() * MathF.Tau); - var offset = angle.RotateVec(new Vector2((maximumDistance - minimumDistance) * RobustRandom.NextFloat() + minimumDistance, 0)); - var spawnPosition = new MapCoordinates(center + offset, mapId); - var meteor = Spawn("MeteorLarge", spawnPosition); - var physics = EntityManager.GetComponent(meteor); - _physics.SetBodyStatus(meteor, physics, BodyStatus.InAir); - _physics.SetLinearDamping(meteor, physics, 0f); - _physics.SetAngularDamping(meteor, physics, 0f); - _physics.ApplyLinearImpulse(meteor, -offset.Normalized() * component.MeteorVelocity * physics.Mass, body: physics); - _physics.ApplyAngularImpulse( - meteor, - physics.Mass * ((component.MaxAngularVelocity - component.MinAngularVelocity) * RobustRandom.NextFloat() + component.MinAngularVelocity), - body: physics); - - EnsureComp(meteor).Lifetime = 120f; - } - } - } -} diff --git a/Content.Server/StationEvents/Events/MeteorSwarmSystem.cs b/Content.Server/StationEvents/Events/MeteorSwarmSystem.cs new file mode 100644 index 0000000000..e085a2e159 --- /dev/null +++ b/Content.Server/StationEvents/Events/MeteorSwarmSystem.cs @@ -0,0 +1,82 @@ +using System.Numerics; +using Content.Server.Chat.Systems; +using Content.Server.GameTicking.Rules; +using Content.Server.Station.Components; +using Content.Server.Station.Systems; +using Content.Server.StationEvents.Components; +using Content.Shared.GameTicking.Components; +using Content.Shared.Random.Helpers; +using Robust.Server.Audio; +using Robust.Shared.Map; +using Robust.Shared.Physics.Components; +using Robust.Shared.Physics.Systems; +using Robust.Shared.Player; +using Robust.Shared.Random; + +namespace Content.Server.StationEvents.Events; + +public sealed class MeteorSwarmSystem : GameRuleSystem +{ + [Dependency] private readonly SharedPhysicsSystem _physics = default!; + [Dependency] private readonly AudioSystem _audio = default!; + [Dependency] private readonly ChatSystem _chat = default!; + [Dependency] private readonly StationSystem _station = default!; + + protected override void Added(EntityUid uid, MeteorSwarmComponent component, GameRuleComponent gameRule, GameRuleAddedEvent args) + { + base.Added(uid, component, gameRule, args); + + component.WaveCounter = component.Waves.Next(RobustRandom); + + if (component.Announcement is { } locId) + _chat.DispatchGlobalAnnouncement(Loc.GetString(locId), playSound: false, colorOverride: Color.Yellow); + _audio.PlayGlobal(component.AnnouncementSound, Filter.Broadcast(), true); + } + + protected override void ActiveTick(EntityUid uid, MeteorSwarmComponent component, GameRuleComponent gameRule, float frameTime) + { + if (Timing.CurTime < component.NextWaveTime) + return; + + component.NextWaveTime += TimeSpan.FromSeconds(component.WaveCooldown.Next(RobustRandom)); + + + if (_station.GetStations().Count == 0) + return; + + var station = RobustRandom.Pick(_station.GetStations()); + if (_station.GetLargestGrid(Comp(station)) is not { } grid) + return; + + var mapId = Transform(grid).MapID; + var playableArea = _physics.GetWorldAABB(grid); + + var minimumDistance = (playableArea.TopRight - playableArea.Center).Length() + 50f; + var maximumDistance = minimumDistance + 100f; + + var center = playableArea.Center; + + var meteorsToSpawn = component.MeteorsPerWave.Next(RobustRandom); + for (var i = 0; i < meteorsToSpawn; i++) + { + var spawnProto = RobustRandom.Pick(component.Meteors); + + var angle = component.NonDirectional + ? RobustRandom.NextAngle() + : new Random(uid.Id).NextAngle(); + + var offset = angle.RotateVec(new Vector2((maximumDistance - minimumDistance) * RobustRandom.NextFloat() + minimumDistance, 0)); + var subOffset = RobustRandom.NextAngle().RotateVec(new Vector2( (playableArea.TopRight - playableArea.Center).Length() / 2 * RobustRandom.NextFloat(), 0)); + var spawnPosition = new MapCoordinates(center + offset + subOffset, mapId); + var meteor = Spawn(spawnProto, spawnPosition); + var physics = Comp(meteor); + _physics.ApplyLinearImpulse(meteor, -offset.Normalized() * component.MeteorVelocity * physics.Mass, body: physics); + } + + component.WaveCounter--; + if (component.WaveCounter <= 0) + { + ForceEndSelf(uid, gameRule); + } + } +} diff --git a/Content.Server/StationEvents/MeteorSchedulerSystem.cs b/Content.Server/StationEvents/MeteorSchedulerSystem.cs new file mode 100644 index 0000000000..3ad88a7d89 --- /dev/null +++ b/Content.Server/StationEvents/MeteorSchedulerSystem.cs @@ -0,0 +1,39 @@ +using Content.Server.GameTicking.Rules; +using Content.Server.StationEvents.Components; +using Content.Shared.GameTicking.Components; +using Content.Shared.Random.Helpers; +using Robust.Shared.Prototypes; + +namespace Content.Server.StationEvents; + +/// +/// This handles scheduling and launching meteors at a station at regular intervals. +/// TODO: there is 100% a world in which this is genericized and can be used for lots of basic event scheduling +/// +public sealed class MeteorSchedulerSystem : GameRuleSystem +{ + [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + + protected override void Started(EntityUid uid, MeteorSchedulerComponent component, GameRuleComponent gameRule, GameRuleStartedEvent args) + { + base.Started(uid, component, gameRule, args); + + component.NextSwarmTime = Timing.CurTime + RobustRandom.Next(component.MinSwarmDelay, component.MaxSwarmDelay); + } + + protected override void ActiveTick(EntityUid uid, MeteorSchedulerComponent component, GameRuleComponent gameRule, float frameTime) + { + base.ActiveTick(uid, component, gameRule, frameTime); + + if (Timing.CurTime < component.NextSwarmTime) + return; + RunSwarm((uid, component)); + component.NextSwarmTime += RobustRandom.Next(component.MinSwarmDelay, component.MaxSwarmDelay); + } + + private void RunSwarm(Entity ent) + { + var swarmWeights = _prototypeManager.Index(ent.Comp.Config); + GameTicker.StartGameRule(swarmWeights.Pick(RobustRandom)); + } +} diff --git a/Content.Shared/Mobs/Systems/MobThresholdSystem.cs b/Content.Shared/Mobs/Systems/MobThresholdSystem.cs index b11de9eac5..eeaecc24d8 100644 --- a/Content.Shared/Mobs/Systems/MobThresholdSystem.cs +++ b/Content.Shared/Mobs/Systems/MobThresholdSystem.cs @@ -212,7 +212,7 @@ public sealed class MobThresholdSystem : EntitySystem MobThresholdsComponent? thresholdComponent = null) { threshold = null; - if (!Resolve(target, ref thresholdComponent)) + if (!Resolve(target, ref thresholdComponent, false)) return false; return TryGetThresholdForState(target, MobState.Dead, out threshold, thresholdComponent); diff --git a/Resources/Locale/en-US/station-events/events/meteor-swarm.ftl b/Resources/Locale/en-US/station-events/events/meteor-swarm.ftl index 6a96c56048..0090c170ca 100644 --- a/Resources/Locale/en-US/station-events/events/meteor-swarm.ftl +++ b/Resources/Locale/en-US/station-events/events/meteor-swarm.ftl @@ -1,2 +1,5 @@ -station-event-meteor-swarm-start-announcement = Meteors are on a collision course with the station. Brace for impact. +station-event-meteor-swarm-start-announcement = Meteors have been detected on collision course with the station. station-event-meteor-swarm-end-announcement = The meteor swarm has passed. Please return to your stations. + +station-event-space-dust-start-announcement = The station is passing through a debris cloud, expect minor damage to external fittings and fixtures. +station-event-meteor-urist-start-announcement = The station is colliding with an unidentified swarm of debris. Please stay calm and do not listen to them. diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml index 728783fb3e..0d10411cfb 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml @@ -361,7 +361,7 @@ whitelist: tags: - CartridgeRocket - proto: MeteorLarge + proto: MeteorMedium - type: entity name: immovable rod launcher diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/meteors.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/meteors.yml index 6bdac1e85f..3468cade76 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/meteors.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/meteors.yml @@ -1,40 +1,206 @@ - type: entity - id: MeteorLarge + id: BaseMeteor name: meteor - noSpawn: true + description: You prefer them when they're burning up in the atmosphere. + abstract: true components: - type: Sprite noRot: false - sprite: Objects/Weapons/Guns/Projectiles/meteor.rsi - scale: 4,4 - layers: - - state: large - shader: unshaded - - type: ExplodeOnTrigger - - type: DeleteOnTrigger - - type: TriggerOnCollide - fixtureID: projectile + sprite: Objects/Misc/meteor.rsi - type: Projectile damage: {} deleteOnCollide: false - - type: Explosive - explosionType: Default - totalIntensity: 600.0 - intensitySlope: 30 - maxIntensity: 45 + - type: Meteor + damageTypes: + types: + Blunt: 1 + - type: TimedDespawn + lifetime: 120 + - type: Clickable - type: Physics bodyType: Dynamic + bodyStatus: InAir + angularDamping: 0 + linearDamping: 0 - type: Fixtures fixtures: projectile: shape: !type:PhysShapeCircle - radius: 0.8 + radius: 0.4 density: 100 - hard: true - # Didn't use MapGridComponent for now as the bounds are stuffed. + hard: false layer: - LargeMobLayer mask: - Impassable - BulletImpassable + - type: Damageable + damageContainer: Inorganic + - type: Explosive + explosionType: Default + intensitySlope: 4 + maxIntensity: 100 + +- type: entity + parent: BaseMeteor + id: MeteorSpaceDust + name: space dust + description: Makes a station sneeze. + components: + - type: Sprite + state: space_dust + - type: Fixtures + fixtures: + projectile: + shape: + !type:PhysShapeCircle + radius: 0.45 + density: 100 + hard: false + layer: + - LargeMobLayer + mask: + - Impassable + - BulletImpassable + - type: Explosive + totalIntensity: 25 + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 100 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - !type:PlaySoundBehavior + sound: + collection: MetalBreak + - !type:ExplodeBehavior + +- type: entity + parent: BaseMeteor + id: MeteorSmall + suffix: Small + components: + - type: Sprite + state: small + - type: Fixtures + fixtures: + projectile: + shape: + !type:PhysShapeCircle + radius: 0.25 + density: 100 + hard: false + layer: + - LargeMobLayer + mask: + - Impassable + - BulletImpassable + - type: Explosive + totalIntensity: 100 + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 1250 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - !type:PlaySoundBehavior + sound: + collection: MetalBreak + - !type:ExplodeBehavior + +- type: entity + parent: BaseMeteor + id: MeteorMedium + suffix: Medium + components: + - type: Sprite + state: medium + - type: Fixtures + fixtures: + projectile: + shape: + !type:PhysShapeCircle + radius: 0.3 + density: 100 + hard: false + layer: + - LargeMobLayer + mask: + - Impassable + - BulletImpassable + - type: Explosive + totalIntensity: 200 + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 1750 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - !type:PlaySoundBehavior + sound: + collection: MetalBreak + - !type:ExplodeBehavior + +- type: entity + parent: BaseMeteor + id: MeteorLarge + suffix: Large + components: + - type: Sprite + state: big + - type: Explosive + totalIntensity: 300 + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 2500 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - !type:PlaySoundBehavior + sound: + collection: MetalBreak + - !type:ExplodeBehavior + +- type: entity + parent: BaseMeteor + id: MeteorUrist + name: Urist McMeteor + description: As a successful member of society with a stable unflinching psyche and limitless drive, natural affinity for finance and domination, you have been selected, no, you have been effortlessly guided by divine (biological) trauma towards this moment. The gates of destiny fling open, and once again you're left standing on pulsating nothingness. A strobing headache of the soul. + suffix: Meteor + components: + - type: Sprite + state: human_pixel + - type: SolutionContainerManager + solutions: + blood: + maxVol: 1000 + reagents: + - ReagentId: Blood + Quantity: 1000 + - type: Explosive + totalIntensity: 25 + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 3000 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - !type:PlaySoundBehavior + sound: + collection: MaleScreams + params: + volume: 10 + - !type:SpillBehavior + solution: blood + - !type:ExplodeBehavior diff --git a/Resources/Prototypes/GameRules/events.yml b/Resources/Prototypes/GameRules/events.yml index 04918578fa..853853fb22 100644 --- a/Resources/Prototypes/GameRules/events.yml +++ b/Resources/Prototypes/GameRules/events.yml @@ -196,23 +196,6 @@ duration: 240 - type: KudzuGrowthRule -- type: entity - id: MeteorSwarm - parent: BaseStationEventLongDelay - components: - - type: StationEvent - earliestStart: 30 - weight: 7.5 - minimumPlayers: 10 #Enough to hopefully have at least one engineering guy - startAnnouncement: station-event-meteor-swarm-start-announcement - endAnnouncement: station-event-meteor-swarm-end-announcement - startAudio: - path: /Audio/Announcements/meteors.ogg - params: - volume: -4 - duration: null #ending is handled by MeteorSwarmRule - - type: MeteorSwarmRule - - type: entity id: MouseMigration parent: BaseStationEventShortDelay diff --git a/Resources/Prototypes/GameRules/meteorswarms.yml b/Resources/Prototypes/GameRules/meteorswarms.yml new file mode 100644 index 0000000000..70dd5265b0 --- /dev/null +++ b/Resources/Prototypes/GameRules/meteorswarms.yml @@ -0,0 +1,104 @@ +- type: entity + parent: BaseGameRule + id: GameRuleMeteorScheduler + components: + - type: GameRule + minPlayers: 25 + - type: MeteorScheduler + +- type: weightedRandomEntity + id: DefaultConfig + weights: + GameRuleSpaceDustMinor: 44 + GameRuleSpaceDustMajor: 22 + GameRuleMeteorSwarmSmall: 18 + GameRuleMeteorSwarmMedium: 10 + GameRuleMeteorSwarmLarge: 5 + GameRuleUristSwarm: 0.05 + +- type: entity + parent: BaseGameRule + id: GameRuleMeteorSwarm + abstract: true + components: + - type: GameRule + - type: MeteorSwarm + +- type: entity + parent: GameRuleMeteorSwarm + id: GameRuleSpaceDustMinor + components: + - type: MeteorSwarm + announcement: null + announcementSound: null + nonDirectional: true + meteors: + MeteorSpaceDust: 1 + waves: + min: 2 + max: 3 + meteorsPerWave: + min: 3 + max: 5 + +- type: entity + parent: GameRuleMeteorSwarm + id: GameRuleSpaceDustMajor + components: + - type: MeteorSwarm + announcement: station-event-space-dust-start-announcement + announcementSound: /Audio/Announcements/attention.ogg + nonDirectional: true + meteors: + MeteorSpaceDust: 1 + waves: + min: 2 + max: 3 + meteorsPerWave: + min: 8 + max: 12 + +- type: entity + parent: GameRuleMeteorSwarm + id: GameRuleMeteorSwarmSmall + components: + - type: MeteorSwarm + meteors: + MeteorSmall: 7 + MeteorMedium: 3 + +- type: entity + parent: GameRuleMeteorSwarm + id: GameRuleMeteorSwarmMedium + components: + - type: MeteorSwarm + meteors: + MeteorSmall: 3 + MeteorMedium: 6 + MeteorLarge: 1 + +- type: entity + parent: GameRuleMeteorSwarm + id: GameRuleMeteorSwarmLarge + components: + - type: MeteorSwarm + meteors: + MeteorSmall: 2 + MeteorMedium: 4 + MeteorLarge: 4 + +- type: entity + parent: GameRuleMeteorSwarm + id: GameRuleUristSwarm + components: + - type: MeteorSwarm + announcement: station-event-meteor-urist-start-announcement + announcementSound: /Audio/Announcements/attention.ogg + meteors: + MeteorUrist: 1 + waves: + min: 3 + max: 3 + meteorsPerWave: + min: 10 + max: 10 diff --git a/Resources/Prototypes/game_presets.yml b/Resources/Prototypes/game_presets.yml index 3bc6ae6208..8876468bbd 100644 --- a/Resources/Prototypes/game_presets.yml +++ b/Resources/Prototypes/game_presets.yml @@ -31,6 +31,7 @@ description: extended-description rules: - BasicStationEventScheduler + - GameRuleMeteorScheduler - BasicRoundstartVariation - type: gamePreset @@ -64,6 +65,7 @@ description: secret-description rules: - BasicStationEventScheduler + - GameRuleMeteorScheduler - type: gamePreset id: SecretGreenshift #For Admin Use: Runs Greenshift but shows "Secret" in lobby. @@ -95,6 +97,7 @@ - Traitor - SubGamemodesRule - BasicStationEventScheduler + - GameRuleMeteorScheduler - BasicRoundstartVariation - type: gamePreset @@ -121,6 +124,7 @@ - Nukeops - SubGamemodesRule - BasicStationEventScheduler + - GameRuleMeteorScheduler - BasicRoundstartVariation - type: gamePreset @@ -136,6 +140,7 @@ - Revolutionary - SubGamemodesRule - BasicStationEventScheduler + - GameRuleMeteorScheduler - BasicRoundstartVariation - type: gamePreset @@ -152,4 +157,5 @@ rules: - Zombie - BasicStationEventScheduler + - GameRuleMeteorScheduler - BasicRoundstartVariation diff --git a/Resources/Textures/Objects/Misc/meteor.rsi/big.png b/Resources/Textures/Objects/Misc/meteor.rsi/big.png new file mode 100644 index 0000000000000000000000000000000000000000..34062b9a4354a34427a60a87b5a2267a2a3a6608 GIT binary patch literal 4562 zcmV;@5iRbCP)k#TJJ9=*AI6Q5;d!8(+aoAKlCS6e@~1pePDX zIGpnp=PUkRwIZj=>Rm1V&{S4dbwXzlJYt;1fDb?X@bA%QzyA8` z@%rJzhyS_R8C}~See}`p?OYn086W|kfByNy`)8hc=H}<0e?ETx)KgC#UVr%Ehno*R z_~7q7m{5ss+u+9^e>{ACDJDz_TViedlMI+^6aqkak=MWf{`=weg%@5pFkvsy=1VWV zbbSBIFTWfZ&;3g8GDQyaKN!{JF%h zLXhnWwQp}GR2tCEx8Hty)by8Me)-n-JB{ResxO;N5JX4hsnxrT%{GVpB?+iJzn|T!TWz;i)JL_KmYvmTf_&vmkFI_VhvI&y7q?} zz`%W=0|rTK1}uY+c%+|BCDXR}fFwTc`#c6@A0&9~R}w%?rBAQD_S(%?UwyTR37z)j zxMe($32(ji)-77`efwS+mpEZSHlBl#u-O2BC|`d0<>C6b-+sG!_0?Ao*IS)$5+A9n zV4!MUXAZKj`X{l*M^tB@NTR;|_S=VRv`vAKDWLj^idF+sZM1tnTs3!aN&Ey-Lg!!t z%vfTE(&l$64>T)AS+!5Tmmw)cK6?*GU8BG3tM9A%?y$%SC-H%U`sSN&ZXSR9@tYT4 zeDUUwKmIt}OLHX=)@XvEZ9b>=MdCBaC!c)s*e9i(>y$iAg#W`Fg^A)4q0sN7CM97t zyJ>!x694f3`KH=F8qIUSR_N`^6Vu z95n+Fneo4=iBnpcG*I9eAFov)A-+WRd(g~#{D0E0VrYVNVoGDGK48!e4(aE6T?o1b zbXekplqA(%A}ItgjP{Xu0)el;{`&B0|2yJWZS0~S+QZD!r!;XD2mqk{Y65wWFn7M^ zgaPTyly)E1Ng#yaI}Bb1(FxU%KL)&nIdqWcseL)S<`2hgUucW(>Qn(H0V(9W5Diox zG)H_)ljHEYwg+B+{q?r*Y9Z~T?KxMHZe0K{)PS7zAzf-gU7p|`#FfarrxBS@v1U@1 zj;~4;ZE60}&f<^!KgUq}JZc}}YeE?h|L6OR{b2$=CHn(|U;?I@&-jjW5Uq*yNXE7d zs8j9)&aXxoG?wa#Bqo%)DL;TjD1|wbP*+FFtmfx0O%l{Q0kBhqYyCXgoT7p=-iYp!M#e@I(JD-X`h-b z@m<&QGsh^@dbCdS$LG8!2=G}T=O~jJP`!0J!}RV-JOs%H>N6m|16fJ{kk8T&Kzw}( zpZgt{oazqH(3~gmou!h`bJbpj24sK%fn|bzkJlOj%7i*2u9l_M0Au;i4Dp$cE{RWv z=}0=`#FB}Lj!9FL!a#ozhHQ^(o=e2z+@Q88Q9k|j)7iH1Ph6+u+LnYi;7FUEYhv`% z>^Gc@uU8KNT9mH3*WZvAWY%o7Hr7S#B8M0^O55?VX4 zbRyP4!pl&ZomwU`;#y1mL~Wz)zEw#0ZZ~kG1)|jenUE1lhg`c!$xHibgKNw{!vB|{ z)x6oxIg+1H3vAmt0LaM54XB)~Wq<3IY-(2aX=s8nBB_i>&5)}}@Y>Pr$ju61E4##i zN_dbAGU7QW6^3Uq=>tYTJiBwa-b*2?ZIAjgI}xj!7ReBEe`JDc%XNl*TL@9Lkip>` zWwwk?yDXu$wwe7!Vyo8DzV}A6`nBz@&WcFQKth#pL%}^W;*$9gq>JT~@pG~M8gzaC z-@RjBwwkz#&6#mZs08=*5^0F}+_a@iKT^LJLDuwT51f@7`Y3WSJ4V#c?i229cJzHD zc87b*fPV`9Wxz%_R}fn@a`*axOZ$aKT^Epq&k#88uVKa}1|$)f3%Ja%G$VK|sQ0sKCNpu9jxXI5>w19pT;6&G!zvGCrTRrw}+3uRDFNg*ij#d(Oz`=rCEJ zQSa3}{Y=R=bHZ1WYt4;cLj(t0S36nhbbxu?^-r8@5|j8!J{YY`rYK$yA#_sQYe$^-`M8h@^a9y|U23_Z6c{cM!Ye6C5fKS1V-yjD1JW2$bGRt(eA zYmSUeFw1KR`0f@a#I=ice!t78P&3x_A#HvV-<4hk!+X^<`uQdeFv>_3 zPa@=spqtI3%?b#T*=tLH2AR^*Ntj!N3ARZ=S0*&d%N$`ue9fNw(5B&3)Qzac44`4Y z%;t9H*z+Jw4Da0+HbLr~4fhc$fhE2vATr2+zzpV^ec%}E<5Dev_-dkl&1Yd&%r`ab zfxi?CX(dMOo@jucJ_jz`XlB4l9JW49MlwU@j1p5vaB$Vxnsp)Z6J553{i)H}5@ec* z&&liyQ)03<4>EjD zJm?zE$%T$DlWtAMH3u}SL;xMuMsq)tw?-Laf&s_``{A=te+JEYZ>XZG6&zzRMqD*ONFvDNMyz0R5X$)AwCz#P{UKR zm}{mnNONfPvV{1Z^w$z8$Ckn+3`f%sWr0cdug#9GDS3&^KG69HCn8pe)Xt>@d2h+Q zfc7N1%=cL^0b*3mOJY>h;d3gwQvRyq$zl`-E*NiE|UN>PIsF2f>8dWMIGf=9`CW zKg)J&Ad<&`jAl8KjNW(g)U>uRQVMmuUb z+K`KeE*w^<#hnJ8Xn-9`hv%}daAqlRQW^bZ6b052-#%y#s{O3Q2YIkZ7rRfHAKEhw zGWQhHoF+qEei1Irq3xZc#}_&GnO%wyXn|1?Ot3Pgo`+Dgpg|5?^K;J5RGK4+&-)C8 zbAu#_GiQGCGnr5s0qW5>DS+v4J+>y>9}yq43`kQ1oEYVfR655_?M5|GYf#ss@(c#s ztqXzGZZCDdV3ZM_OWfU3hfWsaXT-(-O%WdqH6T*}otqdbj%SS%x=opRP8QIQ&J&NsvsSl+maihn;@mlSHmoxp#an@qJ#Vpo{cBd$h9zBPO^koh!U+`m#ASv1)~cTBCk* z&rc?sp#iGI-&Ja2WrF=!V(UjZJ2|&H%dQaZoM+!$8LERmm-)M8N1s!Sci*t5#_hs@ zyC!(Ic7I=)e(&l7tV`=^bMGVW4FfV)H4~=pJ9c5f*5ZVvs7EK{@EK%OoOx_tdEZ&SE(nzPk&OjPc*<_fFKujN7aO&cbCK(|@V%3oaz2d)fC zh|KS|Vq~j{lJF8gvy?OEGxsMvG3DBsaEk%febrxTIgIRnx7i}eS`##KdZgyn>^K1NJ;YVw z)dO7fNUP z`f573$YbSGOKO5uhdi)bGnBdgmV-)IUoDx+gT(nRWmTN6n@|9*DJmNNh))vVq62^y zbi@}jAuC4m?B}VX<@61i?xF2Ac@{gL8kp%S-8t1te=d_;3ntfsa@L!(%T)hNydqS! zh#PR-)#r}(RLxM%Br8pfv+&Hr&xEL4CZTU>zG^^lO*?3_8#3t#O+l3S8Ftp++mbMu z&$A>sHt$J%kOa=?$h1lQ&l_*Nak$^5m!}VUcx_S82pNS4)3Ix^RQ}XcI`TCoNzSIH zX2E<`e^S>d3{(ks4r2AsHDSnrnuT0H>lVKy0f{%6{fC_c<51wi&QEnFsKig$hZ8 zT7Ef&bF!7w9}xcf%c@yzm_8;?Y_WK}7F-iy-Bk+X8Vr9wfLAAF6?NqiSQMQ_3g?ug z0<<8*V%yCFIYx&^rL8}=AD6_e6RszLWNA{jTDhhoatfnt|cDdRN}*58>FBTe)FuATT`abnh}ek!rHIALqM-BAa%y=x|VV)G9;B=$_# wo@@6m+PX{ZlA3szg!m^AJ#lZ6bN{LMFIdVn-cra*qyPW_07*qoM6N<$g43eSsQ>@~ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Misc/meteor.rsi/big_cluster.png b/Resources/Textures/Objects/Misc/meteor.rsi/big_cluster.png new file mode 100644 index 0000000000000000000000000000000000000000..292c93f6e62bbe0c0e1d8e192a48637b209feed7 GIT binary patch literal 4473 zcmV-<5r*!GP)IBNRzxwK{7Y`pk+?*pL7BgUo_&0Cf+`RF|8{78}9z59G zxpU{mT1>Fr+qZ9TzWw&wZCkc^nc6Tk-o)JY2N^KdD1(0Mt+zHm|NQgb_k8!{$&>B- z_uqei%YiA{0?Tg=j`)&J*7Uus<=|`6V z4pwmU?1-I!04+%PHHe@6X|)T(FN+CD1KRoZ*I##See}^s-D{H>Lw%WSg1EU%fCx!| zPe1+iKns%aOU;i1sFFw95CQ`53Z6cFy4Tk#y>l7j|1)MaJ&6zOg94D6;d{*F5F?rl z$j)jdpOnv zpJhTzGv9pk%{{GX^`WZ)4n%2d0p_G>S_?^h+E)k|5K!{@zA|6o01zd8)Kn(4d>`$6 z`Q?|}_c9*HgfG7MVvknz(Y{y4B@P&njVCv`NlIEZISGEtFmw)*_&@yc!@=(il)f-P z2bMyhW-@U4U;BBCCU7tApG1Wzyhqy<6qy35pQvbRK&p*)uO)3gw1_{&45iJ7_$|rN z92sS`G*FY#8~hX|q|ZyhgzML@@0sQ*<$i9N?}|xI*cZHtUZU}yiV0fLEjYw`qb)ArGb9r&p-d% z{QdXe2lqtqAU=RrV+5}_&;ZSk5eGz7?P;h=rj5V*?z`LHZr!@IW5Qp5{k7Es@bSkV zZ|>i}-|a}wI~WL#PN!ExO|`9s)W$>-9}H<^(m>)fz7_+rUp?aYGzoM~kWNf#Ow|{B z=KHtbetUbJP8y;^{JF4$s_@XDvJVOY|8orSThR|%_}Xi)Z3WTD&`4{nZ$@L#5n*<6 zmj35}0XfOi0c(aJ_V2&{zPpysNQ)7Y3`*0$ZwxpisHqqm;0GUkuzi(r3>azsO{VshR?d$M+<4b3(4^1X?H6Ukwn1fanq{F0fiL4W1AavHo zH9u=D%t34=KYhjH$B%bJ%GbIk)#?L%<~qQ&jL*+?(#P-VA7K#msiC?NlXHSlkgkvIJ5r=NC>(Fr=0a|tl!gcB~h;kY0; z|Hr^!vTX^ztHe#>gA5FYv`6j4C_AA}(zB;Ir1Uw-*zt2MQs zv@P=?r{<9}`GoG>)C0BzzmXRyZLsd-$JwqGIOcYMf_$SZw^X3YMG-l8Mlr^!nb znE%st!mU{w4IAyGRN1-O8P|fAqWTdBAWGt=zfkP>GMGR7Z#O_9s+t|3*;xX$z_y(O010d#G=0gaR{y+bOC!4` zs4}8%$_qQBsi_@Ux;LDDpmi@aEEfi4P)@?;wpshl+yxl@aBp6n(|C;*A(>v=?e$}H zB33spAd1W|+{#$H4q~YBDQznNRie3fPLworW8vl$D6vCYBopd2bK9Psn3bB5p59RK zn9dBfr&$11<#YLAtpu>4`y_LYZEtaAoYGkrzAhsT(fhiPCo^OOCSYl(xwJ29-Rr2_ z(5ueHbl|?GR$LYF*Tz|AN1rRv6KBnUR{{SqU?J8rf2-C9T!l|)?b}|pFM{}lp)Qrk zjMi4?7#1<0MTD9VyCzXm+H5QLXs@zLhQ2Tf1et=L{hY&u*$fyf%mA(3|0Sq|2WB|r z1WYFI`7#-yxw_B=%<{@Xx*b@-wM&@b9xGr#NqiZiDNqQ!zAl-IUSjbS z^vt0BQv+HF0Om*aFz5ra(X{VKL+0xEdkd*8Q<;DUnSD?6T@frh394ggE{Iifm6B|uqoeckn`RgBD75= z><#cDGi|C<1QK6OWZbj|&_3Gdd+4I(X$3NqPJtaNp}n4s`rh3vkXir}_*~000mP^& zUTBssP2CIMF(8+D zL2F+$8_2{gVI5Txy}nLif=o>FWAame9#Zc#36=~^$xU)oUcsv-(EEP!$tT;SFr+&Z z)A($TEHJ&lrv-Z&P@Ro?u&SL&S2Wm)G|0`Dc;?nCeRQN1zShBK+amKmGaX&x*S;7f z)qJ3__OorbJk$1Df95r0_MV_M897#x5abi}Cv_QC$a1c*_qQ>;`pjUIS{paiT~3gav?3 zz zq zIvpCJLAX6s4WARI%Q#O+^h`|^fH{3gCTL3YjJot^L^qxm;F&=waJg?XYex*^u6{1h zI>0PQ>q+O5CF^XzwJ9&^22c{GWd`P$z+?iDhTD(UH0N%U8tDkgDO^#OI?dd*YWUlz`W0hunjwy$}aSj`E8%OZ%OUmk_yv6GkG z_GM!>16s=iW-<&d9UOatI`BZHJUJ!J(J}43EKFuVP1P1wi~C(>$N667EImOz;SxlP z38@w5!ia<1P~W!}!)m5n#{Ll5#3{e?tkES;(HN@4NhZ|OSuBn?7YBWi8=A)q*Ngov z(=u{V%JX$V=5-zuwe%MG@;lnh(^}{g8hH*rVow8d^COX!A)r?s;^+KMqAbw@S2SCj zF11aVkkvEwl;2a;h^7zd5v#QUV{W`jQy>#tYjw*ULex`yD{>FlzVT`X-x8)@HFgYu zkeQs7TEIYC$C2fka<0Kwo8LNxa18aFpx*g)R-aTRTRV^i6-y6rx@_!efV)2}WT}mb zs_6sVmeUb0MeanQ0r}L5nv%ki`A*KvTLSbmwUz!{^!en>(5!iY=El++37rqtv9w5r zRlfp}daH;v@^Ov5+I|zDsMO&viv_v1Y6LLD@6>$3?1>mQ*?rJtg3eY`q2tV`sczUL zs@WOZNT*HAjE7^lQs&d_WLfK}X+oC)t?~F@<`31H-XW)0ADA}u zcr4n<9HrDmPSH(2mTBg0oS%{=955iW4NO51sD4(cSd2lowEm%W*5}ZkF7O<>y4h{= zZA)upthERp>}?|OP@(rJ;eY|wcX>8)O-NG8bB{LDQk3M(kIa*ATj_sp^XYgsbKE1D zom!D*CuhVN7*q{!*4ZOAu zvR)t$@&+}R=~U1?y0{mGm@N!?PSU3iK}gFqr=|zy)0-@?@E*N~^uRRizo~-Oq`5#> zD?jg@YZ$5>*3M%ZS_C0V;xF?m!JOn+Q~Y@Ksd^B$1_l7l(|pNjiO#h(`nq#MbAc`c z>LXkY4YLZR)`wNXWM1V|)a0kkG|q~X+E$iMah+>H&dxKX^4_UyKqXk~*@(#$ujwrv z&&f`1?E@GQ^}w7&vzKM0mRdP;XLf#-NnBGfYJ!}+N9;a${8{dOVY#BwpS#hJz762R9q(UaaVJzbgl}` z=Le)2Fd|8K4n&Iye&4H!nu^K<9kIv9A2c-}b03ZEt6#`EtXh?r z1=+_)UNV7u*;YQtM@am&GPAD=gC-~$(RzS`nvn(3$4Y*y57~b25#i@Xcrj@nkb_EM z3=w)wLR2R7!rF5qK3Mz!hpR>vg5GcEhO@~HO`J2qE6$PuuM++b&_4+S6L)w&00000 LNkvXXu0mjfiaUtG literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Misc/meteor.rsi/big_cluster_pixel.png b/Resources/Textures/Objects/Misc/meteor.rsi/big_cluster_pixel.png new file mode 100644 index 0000000000000000000000000000000000000000..292c93f6e62bbe0c0e1d8e192a48637b209feed7 GIT binary patch literal 4473 zcmV-<5r*!GP)IBNRzxwK{7Y`pk+?*pL7BgUo_&0Cf+`RF|8{78}9z59G zxpU{mT1>Fr+qZ9TzWw&wZCkc^nc6Tk-o)JY2N^KdD1(0Mt+zHm|NQgb_k8!{$&>B- z_uqei%YiA{0?Tg=j`)&J*7Uus<=|`6V z4pwmU?1-I!04+%PHHe@6X|)T(FN+CD1KRoZ*I##See}^s-D{H>Lw%WSg1EU%fCx!| zPe1+iKns%aOU;i1sFFw95CQ`53Z6cFy4Tk#y>l7j|1)MaJ&6zOg94D6;d{*F5F?rl z$j)jdpOnv zpJhTzGv9pk%{{GX^`WZ)4n%2d0p_G>S_?^h+E)k|5K!{@zA|6o01zd8)Kn(4d>`$6 z`Q?|}_c9*HgfG7MVvknz(Y{y4B@P&njVCv`NlIEZISGEtFmw)*_&@yc!@=(il)f-P z2bMyhW-@U4U;BBCCU7tApG1Wzyhqy<6qy35pQvbRK&p*)uO)3gw1_{&45iJ7_$|rN z92sS`G*FY#8~hX|q|ZyhgzML@@0sQ*<$i9N?}|xI*cZHtUZU}yiV0fLEjYw`qb)ArGb9r&p-d% z{QdXe2lqtqAU=RrV+5}_&;ZSk5eGz7?P;h=rj5V*?z`LHZr!@IW5Qp5{k7Es@bSkV zZ|>i}-|a}wI~WL#PN!ExO|`9s)W$>-9}H<^(m>)fz7_+rUp?aYGzoM~kWNf#Ow|{B z=KHtbetUbJP8y;^{JF4$s_@XDvJVOY|8orSThR|%_}Xi)Z3WTD&`4{nZ$@L#5n*<6 zmj35}0XfOi0c(aJ_V2&{zPpysNQ)7Y3`*0$ZwxpisHqqm;0GUkuzi(r3>azsO{VshR?d$M+<4b3(4^1X?H6Ukwn1fanq{F0fiL4W1AavHo zH9u=D%t34=KYhjH$B%bJ%GbIk)#?L%<~qQ&jL*+?(#P-VA7K#msiC?NlXHSlkgkvIJ5r=NC>(Fr=0a|tl!gcB~h;kY0; z|Hr^!vTX^ztHe#>gA5FYv`6j4C_AA}(zB;Ir1Uw-*zt2MQs zv@P=?r{<9}`GoG>)C0BzzmXRyZLsd-$JwqGIOcYMf_$SZw^X3YMG-l8Mlr^!nb znE%st!mU{w4IAyGRN1-O8P|fAqWTdBAWGt=zfkP>GMGR7Z#O_9s+t|3*;xX$z_y(O010d#G=0gaR{y+bOC!4` zs4}8%$_qQBsi_@Ux;LDDpmi@aEEfi4P)@?;wpshl+yxl@aBp6n(|C;*A(>v=?e$}H zB33spAd1W|+{#$H4q~YBDQznNRie3fPLworW8vl$D6vCYBopd2bK9Psn3bB5p59RK zn9dBfr&$11<#YLAtpu>4`y_LYZEtaAoYGkrzAhsT(fhiPCo^OOCSYl(xwJ29-Rr2_ z(5ueHbl|?GR$LYF*Tz|AN1rRv6KBnUR{{SqU?J8rf2-C9T!l|)?b}|pFM{}lp)Qrk zjMi4?7#1<0MTD9VyCzXm+H5QLXs@zLhQ2Tf1et=L{hY&u*$fyf%mA(3|0Sq|2WB|r z1WYFI`7#-yxw_B=%<{@Xx*b@-wM&@b9xGr#NqiZiDNqQ!zAl-IUSjbS z^vt0BQv+HF0Om*aFz5ra(X{VKL+0xEdkd*8Q<;DUnSD?6T@frh394ggE{Iifm6B|uqoeckn`RgBD75= z><#cDGi|C<1QK6OWZbj|&_3Gdd+4I(X$3NqPJtaNp}n4s`rh3vkXir}_*~000mP^& zUTBssP2CIMF(8+D zL2F+$8_2{gVI5Txy}nLif=o>FWAame9#Zc#36=~^$xU)oUcsv-(EEP!$tT;SFr+&Z z)A($TEHJ&lrv-Z&P@Ro?u&SL&S2Wm)G|0`Dc;?nCeRQN1zShBK+amKmGaX&x*S;7f z)qJ3__OorbJk$1Df95r0_MV_M897#x5abi}Cv_QC$a1c*_qQ>;`pjUIS{paiT~3gav?3 zz zq zIvpCJLAX6s4WARI%Q#O+^h`|^fH{3gCTL3YjJot^L^qxm;F&=waJg?XYex*^u6{1h zI>0PQ>q+O5CF^XzwJ9&^22c{GWd`P$z+?iDhTD(UH0N%U8tDkgDO^#OI?dd*YWUlz`W0hunjwy$}aSj`E8%OZ%OUmk_yv6GkG z_GM!>16s=iW-<&d9UOatI`BZHJUJ!J(J}43EKFuVP1P1wi~C(>$N667EImOz;SxlP z38@w5!ia<1P~W!}!)m5n#{Ll5#3{e?tkES;(HN@4NhZ|OSuBn?7YBWi8=A)q*Ngov z(=u{V%JX$V=5-zuwe%MG@;lnh(^}{g8hH*rVow8d^COX!A)r?s;^+KMqAbw@S2SCj zF11aVkkvEwl;2a;h^7zd5v#QUV{W`jQy>#tYjw*ULex`yD{>FlzVT`X-x8)@HFgYu zkeQs7TEIYC$C2fka<0Kwo8LNxa18aFpx*g)R-aTRTRV^i6-y6rx@_!efV)2}WT}mb zs_6sVmeUb0MeanQ0r}L5nv%ki`A*KvTLSbmwUz!{^!en>(5!iY=El++37rqtv9w5r zRlfp}daH;v@^Ov5+I|zDsMO&viv_v1Y6LLD@6>$3?1>mQ*?rJtg3eY`q2tV`sczUL zs@WOZNT*HAjE7^lQs&d_WLfK}X+oC)t?~F@<`31H-XW)0ADA}u zcr4n<9HrDmPSH(2mTBg0oS%{=955iW4NO51sD4(cSd2lowEm%W*5}ZkF7O<>y4h{= zZA)upthERp>}?|OP@(rJ;eY|wcX>8)O-NG8bB{LDQk3M(kIa*ATj_sp^XYgsbKE1D zom!D*CuhVN7*q{!*4ZOAu zvR)t$@&+}R=~U1?y0{mGm@N!?PSU3iK}gFqr=|zy)0-@?@E*N~^uRRizo~-Oq`5#> zD?jg@YZ$5>*3M%ZS_C0V;xF?m!JOn+Q~Y@Ksd^B$1_l7l(|pNjiO#h(`nq#MbAc`c z>LXkY4YLZR)`wNXWM1V|)a0kkG|q~X+E$iMah+>H&dxKX^4_UyKqXk~*@(#$ujwrv z&&f`1?E@GQ^}w7&vzKM0mRdP;XLf#-NnBGfYJ!}+N9;a${8{dOVY#BwpS#hJz762R9q(UaaVJzbgl}` z=Le)2Fd|8K4n&Iye&4H!nu^K<9kIv9A2c-}b03ZEt6#`EtXh?r z1=+_)UNV7u*;YQtM@am&GPAD=gC-~$(RzS`nvn(3$4Y*y57~b25#i@Xcrj@nkb_EM z3=w)wLR2R7!rF5qK3Mz!hpR>vg5GcEhO@~HO`J2qE6$PuuM++b&_4+S6L)w&00000 LNkvXXu0mjfiaUtG literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Misc/meteor.rsi/big_pixel.png b/Resources/Textures/Objects/Misc/meteor.rsi/big_pixel.png new file mode 100644 index 0000000000000000000000000000000000000000..34062b9a4354a34427a60a87b5a2267a2a3a6608 GIT binary patch literal 4562 zcmV;@5iRbCP)k#TJJ9=*AI6Q5;d!8(+aoAKlCS6e@~1pePDX zIGpnp=PUkRwIZj=>Rm1V&{S4dbwXzlJYt;1fDb?X@bA%QzyA8` z@%rJzhyS_R8C}~See}`p?OYn086W|kfByNy`)8hc=H}<0e?ETx)KgC#UVr%Ehno*R z_~7q7m{5ss+u+9^e>{ACDJDz_TViedlMI+^6aqkak=MWf{`=weg%@5pFkvsy=1VWV zbbSBIFTWfZ&;3g8GDQyaKN!{JF%h zLXhnWwQp}GR2tCEx8Hty)by8Me)-n-JB{ResxO;N5JX4hsnxrT%{GVpB?+iJzn|T!TWz;i)JL_KmYvmTf_&vmkFI_VhvI&y7q?} zz`%W=0|rTK1}uY+c%+|BCDXR}fFwTc`#c6@A0&9~R}w%?rBAQD_S(%?UwyTR37z)j zxMe($32(ji)-77`efwS+mpEZSHlBl#u-O2BC|`d0<>C6b-+sG!_0?Ao*IS)$5+A9n zV4!MUXAZKj`X{l*M^tB@NTR;|_S=VRv`vAKDWLj^idF+sZM1tnTs3!aN&Ey-Lg!!t z%vfTE(&l$64>T)AS+!5Tmmw)cK6?*GU8BG3tM9A%?y$%SC-H%U`sSN&ZXSR9@tYT4 zeDUUwKmIt}OLHX=)@XvEZ9b>=MdCBaC!c)s*e9i(>y$iAg#W`Fg^A)4q0sN7CM97t zyJ>!x694f3`KH=F8qIUSR_N`^6Vu z95n+Fneo4=iBnpcG*I9eAFov)A-+WRd(g~#{D0E0VrYVNVoGDGK48!e4(aE6T?o1b zbXekplqA(%A}ItgjP{Xu0)el;{`&B0|2yJWZS0~S+QZD!r!;XD2mqk{Y65wWFn7M^ zgaPTyly)E1Ng#yaI}Bb1(FxU%KL)&nIdqWcseL)S<`2hgUucW(>Qn(H0V(9W5Diox zG)H_)ljHEYwg+B+{q?r*Y9Z~T?KxMHZe0K{)PS7zAzf-gU7p|`#FfarrxBS@v1U@1 zj;~4;ZE60}&f<^!KgUq}JZc}}YeE?h|L6OR{b2$=CHn(|U;?I@&-jjW5Uq*yNXE7d zs8j9)&aXxoG?wa#Bqo%)DL;TjD1|wbP*+FFtmfx0O%l{Q0kBhqYyCXgoT7p=-iYp!M#e@I(JD-X`h-b z@m<&QGsh^@dbCdS$LG8!2=G}T=O~jJP`!0J!}RV-JOs%H>N6m|16fJ{kk8T&Kzw}( zpZgt{oazqH(3~gmou!h`bJbpj24sK%fn|bzkJlOj%7i*2u9l_M0Au;i4Dp$cE{RWv z=}0=`#FB}Lj!9FL!a#ozhHQ^(o=e2z+@Q88Q9k|j)7iH1Ph6+u+LnYi;7FUEYhv`% z>^Gc@uU8KNT9mH3*WZvAWY%o7Hr7S#B8M0^O55?VX4 zbRyP4!pl&ZomwU`;#y1mL~Wz)zEw#0ZZ~kG1)|jenUE1lhg`c!$xHibgKNw{!vB|{ z)x6oxIg+1H3vAmt0LaM54XB)~Wq<3IY-(2aX=s8nBB_i>&5)}}@Y>Pr$ju61E4##i zN_dbAGU7QW6^3Uq=>tYTJiBwa-b*2?ZIAjgI}xj!7ReBEe`JDc%XNl*TL@9Lkip>` zWwwk?yDXu$wwe7!Vyo8DzV}A6`nBz@&WcFQKth#pL%}^W;*$9gq>JT~@pG~M8gzaC z-@RjBwwkz#&6#mZs08=*5^0F}+_a@iKT^LJLDuwT51f@7`Y3WSJ4V#c?i229cJzHD zc87b*fPV`9Wxz%_R}fn@a`*axOZ$aKT^Epq&k#88uVKa}1|$)f3%Ja%G$VK|sQ0sKCNpu9jxXI5>w19pT;6&G!zvGCrTRrw}+3uRDFNg*ij#d(Oz`=rCEJ zQSa3}{Y=R=bHZ1WYt4;cLj(t0S36nhbbxu?^-r8@5|j8!J{YY`rYK$yA#_sQYe$^-`M8h@^a9y|U23_Z6c{cM!Ye6C5fKS1V-yjD1JW2$bGRt(eA zYmSUeFw1KR`0f@a#I=ice!t78P&3x_A#HvV-<4hk!+X^<`uQdeFv>_3 zPa@=spqtI3%?b#T*=tLH2AR^*Ntj!N3ARZ=S0*&d%N$`ue9fNw(5B&3)Qzac44`4Y z%;t9H*z+Jw4Da0+HbLr~4fhc$fhE2vATr2+zzpV^ec%}E<5Dev_-dkl&1Yd&%r`ab zfxi?CX(dMOo@jucJ_jz`XlB4l9JW49MlwU@j1p5vaB$Vxnsp)Z6J553{i)H}5@ec* z&&liyQ)03<4>EjD zJm?zE$%T$DlWtAMH3u}SL;xMuMsq)tw?-Laf&s_``{A=te+JEYZ>XZG6&zzRMqD*ONFvDNMyz0R5X$)AwCz#P{UKR zm}{mnNONfPvV{1Z^w$z8$Ckn+3`f%sWr0cdug#9GDS3&^KG69HCn8pe)Xt>@d2h+Q zfc7N1%=cL^0b*3mOJY>h;d3gwQvRyq$zl`-E*NiE|UN>PIsF2f>8dWMIGf=9`CW zKg)J&Ad<&`jAl8KjNW(g)U>uRQVMmuUb z+K`KeE*w^<#hnJ8Xn-9`hv%}daAqlRQW^bZ6b052-#%y#s{O3Q2YIkZ7rRfHAKEhw zGWQhHoF+qEei1Irq3xZc#}_&GnO%wyXn|1?Ot3Pgo`+Dgpg|5?^K;J5RGK4+&-)C8 zbAu#_GiQGCGnr5s0qW5>DS+v4J+>y>9}yq43`kQ1oEYVfR655_?M5|GYf#ss@(c#s ztqXzGZZCDdV3ZM_OWfU3hfWsaXT-(-O%WdqH6T*}otqdbj%SS%x=opRP8QIQ&J&NsvsSl+maihn;@mlSHmoxp#an@qJ#Vpo{cBd$h9zBPO^koh!U+`m#ASv1)~cTBCk* z&rc?sp#iGI-&Ja2WrF=!V(UjZJ2|&H%dQaZoM+!$8LERmm-)M8N1s!Sci*t5#_hs@ zyC!(Ic7I=)e(&l7tV`=^bMGVW4FfV)H4~=pJ9c5f*5ZVvs7EK{@EK%OoOx_tdEZ&SE(nzPk&OjPc*<_fFKujN7aO&cbCK(|@V%3oaz2d)fC zh|KS|Vq~j{lJF8gvy?OEGxsMvG3DBsaEk%febrxTIgIRnx7i}eS`##KdZgyn>^K1NJ;YVw z)dO7fNUP z`f573$YbSGOKO5uhdi)bGnBdgmV-)IUoDx+gT(nRWmTN6n@|9*DJmNNh))vVq62^y zbi@}jAuC4m?B}VX<@61i?xF2Ac@{gL8kp%S-8t1te=d_;3ntfsa@L!(%T)hNydqS! zh#PR-)#r}(RLxM%Br8pfv+&Hr&xEL4CZTU>zG^^lO*?3_8#3t#O+l3S8Ftp++mbMu z&$A>sHt$J%kOa=?$h1lQ&l_*Nak$^5m!}VUcx_S82pNS4)3Ix^RQ}XcI`TCoNzSIH zX2E<`e^S>d3{(ks4r2AsHDSnrnuT0H>lVKy0f{%6{fC_c<51wi&QEnFsKig$hZ8 zT7Ef&bF!7w9}xcf%c@yzm_8;?Y_WK}7F-iy-Bk+X8Vr9wfLAAF6?NqiSQMQ_3g?ug z0<<8*V%yCFIYx&^rL8}=AD6_e6RszLWNA{jTDhhoatfnt|cDdRN}*58>FBTe)FuATT`abnh}ek!rHIALqM-BAa%y=x|VV)G9;B=$_# wo@@6m+PX{ZlA3szg!m^AJ#lZ6bN{LMFIdVn-cra*qyPW_07*qoM6N<$g43eSsQ>@~ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Misc/meteor.rsi/firework.png b/Resources/Textures/Objects/Misc/meteor.rsi/firework.png new file mode 100644 index 0000000000000000000000000000000000000000..1c661fc1d5b161430f403e3ffe991d3c777f3885 GIT binary patch literal 367 zcmV-#0g(QQP)XOAV0>AkCL$F+-So zAcv9wJf+`csX{bB$lMAM1>iGh{<04=5T^h~<}|fHL`N`=<8}@803hah{=E~cQ-JR- zmfM?RM?DPP0_{IUr4;zVCO>i=6}1Fbq3W z+5K$PA^;pmn9C`U)xiBHinUk|xVb~J8X6@5(AXCNC8r@f0F6TtK&gH3KN0Xm3{3%q z-4`FjqbVplh7`;%n*s>tp$JkZKn38Q`5IF-fb}E93{XNhzzuLYz#I84uX_M#-hluB N002ovPDHLkV1iH?ksSa4 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Misc/meteor.rsi/firework_pixel.png b/Resources/Textures/Objects/Misc/meteor.rsi/firework_pixel.png new file mode 100644 index 0000000000000000000000000000000000000000..24b0847b76329ec0bc8d379d3cbb98e0c128ec08 GIT binary patch literal 430 zcmV;f0a5;mP)OOZ7W|0OJE;1)wo!gRBdh0|r8BP@p~# zy8v3X&oJQALeiWt_%Jnx08B#$Kr}T)0wR!W6pR428>Jy6%{jPSQ{mhN*a#c)38i7z zb&ECy5Icq)vIXLO9P6Q{A;Dyd7>T_ocmZ%qvJIiSt`k#KAeWKt9RY0ktn!&NfYMvi z^}GmrBVr_wV;BJ@#5@>4K&T>`Rsg+1F&JhHP1~ zd~Jm=k^PHlgpo1x>-qC{p68F(eV_Bb|J`%$``mLAP`8n+%$Jw}0AMw|rGMwIV*dk# z;cxBLxRJS0v6^CjOrI?H}=d@YejNt3nB4x1>{_>Ipy?BU4h;cwb=kQ_&aW zq#JDib?6=23p#Rln{+z-@aF5a8Tbs`p;=?<%&>ZHZ)>Zne%orM8h7ky#p`^~oCIGy z>(8#wTETN>K{MU&Mvm9`D7MKHxMJ zyVf0cQ&~XblYX`U*LeEnY)YMyd$$Sj-JD_fO0;wFIRMKs{Y)OHJ^bzjUInXa$Gi%4w)?3IM&>ShBb}LJ zix_cj3M_%zd{|{3^$f$@tGqIR_}X@oCmg`#B;`@u>?cBe!bn*`zUb>V*!OdPEES*u z+t2U0Ot2nYebiGy|s#z&JYIr zcHRJ@n8R>I?Ed)K-hs)axWd9tE0~(On(T$^5Bm)vn?9oEt968G`BAIu9XE^8PFw_r zfsYeIt|It$YARQxIPV-dCBr=Xa}g(lCgX(CeU>|$86N;+#Oo0iK_XJb$65&LR}i8X zj1s{u*d3CExo!2H9yDPb_nIzM9QBkbO@dIbJ1Vp40Lo0IRDs7vs6>q>EoCzZ7fAb9 z5Ug(FRnQsYKwVz=r9z!IY*?O$mU@}~J_SL~uy7{6(;qp#E_@!&Peg>t z>^vSU+MUHYZp$mj@VjE)cfZ4S@-n13uY3imt*g?0sC;}{D`MZf5p<>Tn2!k<;JXtE zOlqH81Jy?V2JTIGo?UmR6QR~>e9CD3>Uv6QQ~ds`{_@mb6XoyhJCtuM?~e!nbLQpS#@aGbkLLO_0@4`s`X5<{PL|iKQH8Yq7%_t**K1@dbcjfC`%D?$cf-A z*r$ofBF#cL2qW}$=&prbLuzA^RL!sK9X6q_El?4WZdxr@Vqh^?MBFv0hIDc*BmL%= z;0QULB$NuPesz<-bjj5~(LSfUS}57LItOALwsNXF=E|gi4Df-cBH3p5?f#RN@H&v+ zif6gbTj*y@SF?iKcG9P27Ak;aAYCQ6K1kG;ikyCMpZ-uSN1ikhsp^!s%hW5#wz z=S|*xk-vKwG>mMmPX?M82%-*@Weq=D=5Fe2Zp9c5+Btg9g|@@qU*{Vr8gF;n#tQpK zC51yFxcKOg;iER#C`u)5i-53TFpkw(*7dsr-k5e3XkLcS0GC=JzlN7tAi(@5A z2}a;tx5~@TPZ7@4w%wm$RCd~(yINQ?`_7dv;FZzZR9#8tqBfgC*yfQr$Tc@zor_NN zi^%65+*j@IDjBPve*ByIbII|WeC5&-(<@qXwETnCb%26P{=^OuN(@CKBAk1 z&3G3UirsImPu%NyO}Ld)JuB=F(+@pq;rF>e{2D7*FL#80K0btQTgv+!qITS^vmsXF z!)PJ7dCO+uGQGfy0Naxc{GRsU(rm}Om(IrI)XO9lRQXv!`mmG={FU+rM%|jr5h{l$ z_LwxfSQ@(#qpwJGU)S^X_nPO8;&jowiHQA}f^DGcXxVK!H4IP7KYL)VJlx>BP_~(& zfVjw3NQ#*6kui5XY1X{BXLLclUQQYutoeQCW$h^4Gm9?it;QSt*eLpN(YtUC*UJuL zU3g#7HVkI9tckT^`Vxu#9i0D8`KO}y#9_C?nF2?S1wf4FioT23L!(vc@3=UV&}5U3tUswnl0GfuiWK zqg)RMj1&Q(#J2lq`M5p-@xt&4D7d?cJyryIeNPz1dh-ut<#wS5)j@++J>l23?q^Q% zY2>bW#P-YtzN1&9PThTKXh&z95$aVzIhyAI(F#VdJ))$>jw$se2CJE6gbboMH_C>t z!=s76kIwJ8#z1KU-D0;Yza-XUmbo#D@apv+>Db!-&(SYMV9bjS^@tkRoeVFoZnQ}6 zaVZJP!I&p>l>lSX@`cg9BLJ)dbk9P`VsO}00CXE?N%iHhsuWDc5qb1eD5nkQ-!rsD zJm@@GE#!gG0N%2iwghmAgcqGEI%p~DBR=0Ad*N~8--JQPd=@-|bjb!D? z6HF~Q#CV;NhED%g4N<+TJkHMgq=`pwN_$WCy37mvzRkU<@5(m9O61YDLL;@qX_im$ z?V`t{fTcoc&}wb+agah*WP9>M$S0XpZwrMPIqYDXMVSiTb24)OW(R4gSA+%MtZ+o# z7{C7W10^niy|@Ck%lUZ=^f{Ly_c?pP-HJzIbzfE+`}*p^Z8=ZQ>&$_9I|AqnIC8oE z9xI!F3Ze5ke*^ezL&c{CY5jg z_@JeJ=6umJWmEeWmlC5t{G9H)pKin0Ax|jJ1qzJpzQ()o&DuA2|M3r4C`lme!^6d1 zZX@S0bBOkTkvgnq*{>5a`YgutC(c7gP4-T|jvYg1PZOzLlF9$JhM8uT((GFY1(5qo zamob)`|AH>R-%t{^40vFu~D%& zqz#w^oEE=wG7vOgSzT9?k77=>RxggPmNu4RYSfD{i#JBR!Z?S8Qp|%*i&iA;0vQI1 zNpsC8yen45%piUxc@Z9(Tk~t=!7~3TiPOAK#^(Am$Hw=+T|T6Y9kP<+lUmBm%evxU z_h#(#?FW2IWvW6{JpF^lYt5FJt<=|C2i-w_)_UjkPS?#dCvLnKSMRv$al*a08_@Ip zksRDx;gyQJo2$LfP}jZ*v-i)c3wZj5W({V`n-A$2bdL1~oz6$6<5wF5hoT_;ypyGh z=eql9)T?61d-oYK&GTU`bw0?}m9u6vW$wAQKbHIC1<_ zx4zD>OTFseY`erYctT=Zq*{$mL}{^7;L+=eW(7^SZ8z$f+{`^mzN(aQ0VWBYx}vBg zr5yxWGOwEL+nW_Mue(NplHx@jWk+m!eEGl|<{wC=-JR(3{+qj^AvexZG#nQD&RV=C z&sEpim_!t&t>Jmb&2_s4O)Aa-zDP^;sT%biP+E6%*LH48Yu9D319mnzGNNQC%7#Ov zFx`{{&t;ZcW#`~(2Bl;YrSF@IoC+Me%1&e=n?pS{gI5=|83{}3w-}X}b(;MXR<9?HDFgcw_ng)Xwg8B@X+v~yieYqCQldgj*g;g02x?}ef@FxA z=F|y={49I)*Ld4!y@hOWj;RJ)12Ty1*Y2q#qkz$_ervew%YdgIs!gB0|Gu#*kMO>FpAOqRkiOZ z&lZ_j>Lik)LZ{=k{Y4d(M;Gg^a&NBW@%PCU$w^Q`l5#>pk6{c;Zbav*?^% z9Qa8V`@LT|e4^p6G{pv;X^YMyCvZ1C=c|(C&VhYg-gA9L4B@L2i zt1e*FO5+a@0_TX+i`HVXue0uz02LfnvF1{zfEL?!KC%R~?-Jr8w12I2R_~-+O112} zs8}j~_XE?-xwY~i^?pLB4Cdjin;v)t6U|mmZN8lALbU+Y*7LNUZ@lCj)TBYwQT?_6 zzo^V;d+xa5$eY*UT15DqNa3l(f?nUGftr>2d+(JdnK1>YmWenVx1c%mujM)XWqC|I zLNp;R((w3goMnp);z7>74 zN%x?;qxH`qw$*o%7W7Ihk=YAdKFMrG+OGk|m+$DCGq z@V7kl*1at+XDqK;2dq5aNG-Rxv}$G1Jtllag+`w8I~Elg9CtWc-{B~IY89J`6h~w8 z+`zV^jlFea|iyCN=gxAp$cprKmEU47@t45x=o2VIFs`khJBvMd3CBC>yAg z-DX7>cMw{S%?*U6Ec5W3En`kvzOk4_g?;|JCYJx)`(mv-M>Gc=EGsQCS>GB1+7u01mNS`*Zb z&W;v84SL38F%J8j9iH9CBO}Xnm(IZGo86j4YHZiGrYLh6B^`pEe`@$x&?Kf%U9#j# zS8DhEyBsB7sxS0oWBYYNSCeQMWM3%6rI;+WbbjS^_F~)BrM!U#_@-$}Q~Vm{Pg=d| zlTf$cLTE^emxhhMF4y5%)89Bq_J=)04_|)HRThCki_2|D)5HD?GNPDiHX-x4xAN~F O4lp#htzW0>9Ql7C+KyEK literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Misc/meteor.rsi/human_pixel.png b/Resources/Textures/Objects/Misc/meteor.rsi/human_pixel.png new file mode 100644 index 0000000000000000000000000000000000000000..8207cd57d27f8c61d53be8ec7254799b275f9544 GIT binary patch literal 1844 zcmV-42g~@0P)KXGg~O`5i8C(PWU5*|BwQgo_PL;i5gI~-?s7;Xa zk&u*gddr_UNx3m_*Rd%g9J8S>To48Pxs#YM(be!G`?IcaM!Ul!dE}IPo*$c1f9<@8x&**@xZT#$19vRQL$Wu? zC8bp|qGOXy!yP_SgD*lMgusqccib~im-RIN&Xi{c=Y=%6tYQzJD`k}oB?Tnl87Bt&i9-U%*DhXj^MNVxMg;JJ1P{fBSAH;98|`=j&-+yi zDGv#(T&w@mvJ8*_9bmka$6m31J61mW$y^`_#vUL^V7JdXZ=B-~E(j8sc|Q_tf@M_R z@;pg-&~fqCTLgmEZ%?}<$n%B>*b_))xxis1Oi2K2ZfHms_sTo-{*0CtSuO7U`>xI< z2@NlV^-xl{Hp;KU8f{X`3s|#?(Z|5eeAF5}H{Rp)%;umwBKrQ*95a2gc z98`qn0SDc1Mz1zVU5*|B)aB?AQ0wMF>JQ+JR@?H8`UA?v9V%`tQ-1N6j`aud28Zqc zD~$RBBC&po4~cB-;+awt00C<5!r^CY*0ttY@c=LP?^k+^|fhxu) zCO)SA^zo|S*z6DBT_;%rllzgV72+Q)>c;NF*0C)}+sT$Wxwrkwh;(jQPwTBRpQ)*t|QgIhLN z9sy6lcN!txxIZADTUKs2s>fh_VOxNAs^`{g+I!?viO^PMb&ix7riFZCFdicE_JN4O*R;NYw0N&=7 z#4|V)Oi5^}KOm}%*FRRq?{2(MIUwrZ+u1E>5_TODY=ZlbxL1i~!UHfp^E3$(Oqb0~ z^#{aHU!>&dyLuePN7M`vO=R?SeBxtK~(U zBTtDYBsA9_Fg{J&ukI7AuIYPt3)=mbAE^X6RkJ^!u=0>>L9Y0!E7g@2+dijFrxpoK z_Xng$#;CCRM?+uG(wYuCi-wdv7sgQp^NQjG2ImF%vK`W&$S0AOh~) zyZ65@U%ve7^Zot(zZNq#LN5Yvyzj4Gy}J1H>C@u$>C?^YhYueXckkY9zMqNc#?}Pr z{PX9}H-F>wD_5>8-%AKY926uxaS-H}cKg`eih$DjM7?4-xuG$eOm@ZlEC*}HaiJu%lq%&zi*t*zlRSW zHqn3P%$eW*U(KO^|Ni~IY{#QVj~3UjUtc_Z`g9rTwBz;b*G;>A{`}eeADjYkO5c=N z_8C%Nym+zvo_1jW-Me?q-+Z5Gkk7mPu$F+*`LIj_>@?1ID4siaZkdMq=EJUbwBh#c z+f6$FZNdqUA3t7>jBHOI=zRJo2}0+a?);sp5RkIg`Jr5(;%QteMg^X_w)l> z=6L`Ktp2i1v;`7KgM7ztUcP+UISSSi;N(XmjD9A+G)(6)=J3R*paXp;z?^@WScxoP zbYU+^FP${R`M?13_^xuaL7!cIx&Yy~5P(l0;o`-MjSn(FN_38ZHWCs>gN?Sq4&fol z6yxNkEeV$hk)yCL?6WDP9NEGEVAPrZ_}&!A_mZ$G5I33wav3Oe01h!KAczL(e2or? zL@#%6JUXN;Ua^zIJwLAjkF|<~ocD}!Q=lZQi+-^6r3lgwOdE}*^Fa;gGm+@wS)tRapgrToeCxkbj(SL^$MzL_YtQ$(zP=_L-dr z+VQgtgjyE_B_S`j^I8(kr3u?WZJz?~Kx} zi0gx#d_4y#N4_?7G{LjU0%U6fXaFRX*F|)G&CWXtu)}d7!|N`#1-yFos(JNyHNhzG zJ)=RVwh^9DUiD&}&w+f6Ou)pL z378l&0TW{;U}DS!OpKX;i7^u}F=hfL#?BH@?$DLji*^OQ)X{+5swplln)8P1=#y;!8zzO)*%T?Ggk5&Q}4K-)+){jkTff&*qNT z5ascJu*t?^N;rMxf*@i zq#m?3++cTq*u8MuQp#5NtjeCS&ezzlU%#3Tt5nMd3L9601f##r`3Xlrmky^dQVjv= zI$6O$ZqwomexD13-l~Wk()nI#UTWr1haEe1tkKNW$itZe)oG^lafD*oF`b`q5rP66 zT~sP0QpRr(_EtyR`RsTiCEBS(vwCIdWLP@iVb3VAa|S^h##kI=KUL)Mdgsoa-#*(W z9j+Y#o8qGZZ=WIWCbW6u_3qIjI&2_A|x6Nj~rK%eFzcmH;On zg;0u;6v&c(XjoQ>fGl4figHy$dUNGtNszE~$+p)Zfsx2MU(kP39q(y_MDVI=kl#25 z^jZa}fl&mNvwS)9ae}2nSsFA1r9wFu0@fq6$pmvA8X^=k1*Y@un{7$*^-s=2UCsxc zlQ2=_N(duPK0?{L6(VKhhDM-iEmHvRaYi}v#88QP1|I$4yvNkX2(vA`hh*EA!LX@j zY2#}_rk_*=mlHFUit6~m(22NIC~J>lpN_~vJ=+R~*mmSW1piQA-@JLVA>QMsT}GY+ zY*UodNkA%mb%YUSr3}t6_v!rF3T14Y4m<}TIxUW)G9}N1hsq?qoFLTtTNiDWXd>sJ zYT8g!P@V-EjWmdcL4+l&APc!`pezu9WSq^2bJW#zKFE_Pz_B?21@sSJKmwOzJWIcD z;llF&Z<=~LYs6Bc-&T1-18|77xmhDN2Czpua6)uJU|DDl=O^I?6+~n;KJOU~5(FVm z{8dxXI=#DV@N|epX*R6JI^1haPVjBc&sA9so03r8svs|e3)`i7e493GJPEfQ5XV5m zSQo$&u1a)1c8$2K537l`+Bnk(gwLRfH>8Y*TmuNces;sRXY0QnGvG$w?6QFalVq^?Qq@7yTDSra0jDUl3 zz%Dy_6?RsZa#%1EFfnEVCdN#_#Fz<~7&8GAVlhB)hwx?%|B~@?R7&$EH{R9nF(``@Bs4Y#;eSo|tG@JAXT_jQ)o!U@Q zZcMao)Pqu{K9+OP>X4Gy8Eboj#@P02VeJS=aZ*{PR7%8?gd7n=kT!E4mW_FYQr<5V z5>kwnw*T}I(n>%oqf?wDln0hY399EzOEpuH4{1P^hd>Hj><{Oyic`cpMyb*mSUCbL zI^dN~GUQ9$r$nHa;lBP!Oy4I;lyFoj_(A}H7RbBRq6bQSKJTsMDeo!wCt@W5ijo-S zMjAt11+cfPcTz0x*IAM<1WH_#oK!KH&AavZc1T4m|G6a|cvV0Wu zNd>9P!7gc#HYkcUJ(&h+hqig$=@jIuMoFI4A9g+?-PDv1H?XiHC*+}U!o|L|0X{## z6_F#(0O<1opMyjz0cGS_2C4$Ol!GTELA4qqq((0G_Qb;XSu*wD!Gq>^E(UgC9$0%G z;3!D_rHbS>Seyn?q>EH64~;+zL41No-csK7`MX0g2c#|^=*WCpk||0}Jn;7RHLKPY zy(0hSxn0^*qL>eM5Y`ie{arf|6D0{=lgTsQbUtw6u2H2TEX?qkENKf8uwfc1A3L(M zld#BZK&B*zImK{d)lIZP4Xu8;94#NGLK?#HM~)m>e*b)z&jU)dJyF7F99yHAi-Np^ zIV&8ibTaL^RNm=jXd6lrz(EOQbK|AFGFwi%w5i5ZJPra|?*~}6l$$YAb<(!v!=+6- zwd)hcLaz;(KdEDRkD~l+u_M^2P5D*W-~W%-2h8Y?nShBg6EHDm0w%^xz{L0)S?Y&H TBRhnY00000NkvXXu0mjf2S$Bf literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Misc/meteor.rsi/medium_piercing.png b/Resources/Textures/Objects/Misc/meteor.rsi/medium_piercing.png new file mode 100644 index 0000000000000000000000000000000000000000..b758c2c1dd2579d2de811d7adb9e6581ca7c9809 GIT binary patch literal 3594 zcmV+l4)yVgP)#iLZbVn#UJqhPy7Mm1rP`^ zh@l&LV7~XR63f~IRd!82K0fl6tnyH*wLWc_TF1c#P#8lG%D;5!((*mub42h>VU5^|@ultBil%2ych#~*(zPMkQ=2$tv1)e5T8k>U00*NdNi`f2TdRn!n! zRJ`?}uC{bP*Zyxz%kOP~R6d2DIdf+5@4x>pE?&I2c>MTrbI!YW?-s|8A76UPT%B?? zyh!D%pf>QoF|t&p1L_U#-MiN~oWJQ1Z{NNhWb9rBs0vW|98>wt1^+J;M#=wTM7rSrOb_ip3;-+%x8^8BG*S5cJ@Xx>y3 zC0xCFb@AlMlcjQzng#66?i( zb-tf}{<-yBTOsA6bd2CAiV$wc%(-cZP6K2(NTpE81ce|Z9k7)J7{CzH7psPn^*WTL zL*#!9g8;)23UA-Oy%+=Jp&pc_kpV_v^p`SWAdEn0<~PnE3fNk0v2{4SvIRKiw*v%p zepxU|rZAhQp~nggfr_lk#+&ghWy&G&`Sa(S@2isRd<_>vhr&98PUR@aGN`k|PX{2J ziviGyvT+?gcj;oK0sPaizyA8w*f*g!Sn2Es>P^f#(9{h>{!fG2x#?Yk?;QTB1S*W@ zx5etdP=+*ubriOGTAksK-wlEMt`WM>yAQw!8H@FJ6rxvPAOuqRD73Eu@KC~DHA2q4 zP$9~)Jj%)D4*1O$gp6atk1}{e*=2<6_Z*%Y0yTo)clALl4Un20+#t2-DaPZYdz9?UhPqV>O};Jk}+ftN2|Hb>4)<&X9L z3`34!D2tG4pQ6EY`oUH=B>Z)@04tsyp|HT}@hDy+O`VEv>y&|gk#eXQK-p83-&Q^^ zX9OIYgVamy>?co0+kCR}7MhiMX!q7NE_sfnQS zCdX3$#-J}Tchk-=7h`%5HL)^ZI&Y7>^b(np1Qczy13ow@5H!SyJ#%0J!<>z~TgG$JB@LWbnZ?i0? zyz44emrSXUIb?BKnrU%4u)KF2#C7vb?ifW)>Wplx{N1u2MyX(}vJZF!+sr!{?NYAZ0z zvE0|D{Ddt4XUJvCDIrK*xb_Px5MXr5M-G0=)GWSpz~X;>-zG z=RZkLoB|iOt&o+@)+S31{X0oE%{4Qd6-nad}KXWcV@3A_o?{S1*)- z3>t!?tU=FNmoV5Fg4&pGqBecbGgT;4gAjJA0qkRPAYeX18%+=+oIH8*tA1!q2*gvl zMk?RBDN7n({nY81b!at!lsuCg7}0psW9K6r_nINnCfr!0=NRf7389SI@y^~P<#-sq6f@@;)7 zE0{72HfG~oykKDe^2;xc;k|yAn=M5r%=?ip-cn}>(({uDRksFkRDd#!eRC*3A;&c1 zr}rRK)Z{oaQ{=2FD;PThtMbeBH!s>OQBlL8AsQX6qDyu%bBhjt>db8wg8R51vG-gIuxxk z5CDakn>*J{n6P4izK8M%2X=@K2pq8hl|N+~Bx&h>&TM?%yDtX7AX)dM$B$0bZZkqo zyE^@l3dy9jIzkzWq=^G#Yn$?O`vm{Hm;o93>bz8y%TePH8P+byq!EAI+J>5yvpVZ;DM^l{bEY*oM^EK5e`{!FWS_EY z-dJwLA?8$m_JKqHH?*ultcYw4ZYdzL>1lvD7wS!v$ZUGU+#E5#;-DBFgJ~&U-jPi( zZ#d@iNRHCeb9Ax^@Tb?yRyj5XMJLBTKqwwcZN(V+;squ8yew_7=Z8cK@M{$#dUz( z6PowAQMel_?a~uGdTrc_GBf+bHChQ%$(BF?$BrFaD$J?ru}0{6NCR9Qw<<#h*%&&? zuC#`gEubc7xCkOgC;6YLC|d+dnfgc*mjW~HvoH@)%Kbt)#|;8qlirn(v@$~`W3GEO z1CDj$JeMWqkj}X*sVr`l2|`s418-!>A-pzHSLGPt)+^ zXN>^(&G%yzk^K&U000-r-D=?j~{5biuD0L zX#`Md*?p0V@Uk&50Oi5R%MD|JMsSVV3`RTW!)An)>}V>1(lr8={rm5~n-?2aYm`Lx z3mJ~4P!;pPJ}o1WTg$^ys^O2;Io1I-jg=WP4l&IHq2h)mU@}H-sBH-7N*^7Hqy`cO zkwH?dovx!Gr5?>i0=^xNNB%R8JlL1}n;0cZ3jauy+1`GJ5wK?V&zR#2?yxrY( z%_XZe`@@E{?C5-80!JCiZ7?|vLlG{Lu{;*WZL<$E?@KRNKH!e!iMa{Gb7Cz!S|eEL zd|Hwr%DgP#_V%g#u_2)HfXL~IVhU|Nq%6)n6nAbRr=*^C%l6K5CbCTf%-tc<-DY8q&^$}IQRuFZz7 zL)}$<6k~ zdIe}(@Yx0BgF{bC=|Vo%WS2a?VkZqyA8X=wiyg#H8UXC7!Yg*x07nJ?1LlPk!k-E& QVE_OC07*qoM6N<$f=Kz@$N&HU literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Misc/meteor.rsi/medium_piercing_pixel.png b/Resources/Textures/Objects/Misc/meteor.rsi/medium_piercing_pixel.png new file mode 100644 index 0000000000000000000000000000000000000000..b758c2c1dd2579d2de811d7adb9e6581ca7c9809 GIT binary patch literal 3594 zcmV+l4)yVgP)#iLZbVn#UJqhPy7Mm1rP`^ zh@l&LV7~XR63f~IRd!82K0fl6tnyH*wLWc_TF1c#P#8lG%D;5!((*mub42h>VU5^|@ultBil%2ych#~*(zPMkQ=2$tv1)e5T8k>U00*NdNi`f2TdRn!n! zRJ`?}uC{bP*Zyxz%kOP~R6d2DIdf+5@4x>pE?&I2c>MTrbI!YW?-s|8A76UPT%B?? zyh!D%pf>QoF|t&p1L_U#-MiN~oWJQ1Z{NNhWb9rBs0vW|98>wt1^+J;M#=wTM7rSrOb_ip3;-+%x8^8BG*S5cJ@Xx>y3 zC0xCFb@AlMlcjQzng#66?i( zb-tf}{<-yBTOsA6bd2CAiV$wc%(-cZP6K2(NTpE81ce|Z9k7)J7{CzH7psPn^*WTL zL*#!9g8;)23UA-Oy%+=Jp&pc_kpV_v^p`SWAdEn0<~PnE3fNk0v2{4SvIRKiw*v%p zepxU|rZAhQp~nggfr_lk#+&ghWy&G&`Sa(S@2isRd<_>vhr&98PUR@aGN`k|PX{2J ziviGyvT+?gcj;oK0sPaizyA8w*f*g!Sn2Es>P^f#(9{h>{!fG2x#?Yk?;QTB1S*W@ zx5etdP=+*ubriOGTAksK-wlEMt`WM>yAQw!8H@FJ6rxvPAOuqRD73Eu@KC~DHA2q4 zP$9~)Jj%)D4*1O$gp6atk1}{e*=2<6_Z*%Y0yTo)clALl4Un20+#t2-DaPZYdz9?UhPqV>O};Jk}+ftN2|Hb>4)<&X9L z3`34!D2tG4pQ6EY`oUH=B>Z)@04tsyp|HT}@hDy+O`VEv>y&|gk#eXQK-p83-&Q^^ zX9OIYgVamy>?co0+kCR}7MhiMX!q7NE_sfnQS zCdX3$#-J}Tchk-=7h`%5HL)^ZI&Y7>^b(np1Qczy13ow@5H!SyJ#%0J!<>z~TgG$JB@LWbnZ?i0? zyz44emrSXUIb?BKnrU%4u)KF2#C7vb?ifW)>Wplx{N1u2MyX(}vJZF!+sr!{?NYAZ0z zvE0|D{Ddt4XUJvCDIrK*xb_Px5MXr5M-G0=)GWSpz~X;>-zG z=RZkLoB|iOt&o+@)+S31{X0oE%{4Qd6-nad}KXWcV@3A_o?{S1*)- z3>t!?tU=FNmoV5Fg4&pGqBecbGgT;4gAjJA0qkRPAYeX18%+=+oIH8*tA1!q2*gvl zMk?RBDN7n({nY81b!at!lsuCg7}0psW9K6r_nINnCfr!0=NRf7389SI@y^~P<#-sq6f@@;)7 zE0{72HfG~oykKDe^2;xc;k|yAn=M5r%=?ip-cn}>(({uDRksFkRDd#!eRC*3A;&c1 zr}rRK)Z{oaQ{=2FD;PThtMbeBH!s>OQBlL8AsQX6qDyu%bBhjt>db8wg8R51vG-gIuxxk z5CDakn>*J{n6P4izK8M%2X=@K2pq8hl|N+~Bx&h>&TM?%yDtX7AX)dM$B$0bZZkqo zyE^@l3dy9jIzkzWq=^G#Yn$?O`vm{Hm;o93>bz8y%TePH8P+byq!EAI+J>5yvpVZ;DM^l{bEY*oM^EK5e`{!FWS_EY z-dJwLA?8$m_JKqHH?*ultcYw4ZYdzL>1lvD7wS!v$ZUGU+#E5#;-DBFgJ~&U-jPi( zZ#d@iNRHCeb9Ax^@Tb?yRyj5XMJLBTKqwwcZN(V+;squ8yew_7=Z8cK@M{$#dUz( z6PowAQMel_?a~uGdTrc_GBf+bHChQ%$(BF?$BrFaD$J?ru}0{6NCR9Qw<<#h*%&&? zuC#`gEubc7xCkOgC;6YLC|d+dnfgc*mjW~HvoH@)%Kbt)#|;8qlirn(v@$~`W3GEO z1CDj$JeMWqkj}X*sVr`l2|`s418-!>A-pzHSLGPt)+^ zXN>^(&G%yzk^K&U000-r-D=?j~{5biuD0L zX#`Md*?p0V@Uk&50Oi5R%MD|JMsSVV3`RTW!)An)>}V>1(lr8={rm5~n-?2aYm`Lx z3mJ~4P!;pPJ}o1WTg$^ys^O2;Io1I-jg=WP4l&IHq2h)mU@}H-sBH-7N*^7Hqy`cO zkwH?dovx!Gr5?>i0=^xNNB%R8JlL1}n;0cZ3jauy+1`GJ5wK?V&zR#2?yxrY( z%_XZe`@@E{?C5-80!JCiZ7?|vLlG{Lu{;*WZL<$E?@KRNKH!e!iMa{Gb7Cz!S|eEL zd|Hwr%DgP#_V%g#u_2)HfXL~IVhU|Nq%6)n6nAbRr=*^C%l6K5CbCTf%-tc<-DY8q&^$}IQRuFZz7 zL)}$<6k~ zdIe}(@Yx0BgF{bC=|Vo%WS2a?VkZqyA8X=wiyg#H8UXC7!Yg*x07nJ?1LlPk!k-E& QVE_OC07*qoM6N<$f=Kz@$N&HU literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Misc/meteor.rsi/medium_pixel.png b/Resources/Textures/Objects/Misc/meteor.rsi/medium_pixel.png new file mode 100644 index 0000000000000000000000000000000000000000..27b6b98ae6d86fd677de3ab2def545626896231a GIT binary patch literal 2921 zcmV-v3zqbWP)+uG(wYuCi-wdv7sgQp^NQjG2ImF%vK`W&$S0AOh~) zyZ65@U%ve7^Zot(zZNq#LN5Yvyzj4Gy}J1H>C@u$>C?^YhYueXckkY9zMqNc#?}Pr z{PX9}H-F>wD_5>8-%AKY926uxaS-H}cKg`eih$DjM7?4-xuG$eOm@ZlEC*}HaiJu%lq%&zi*t*zlRSW zHqn3P%$eW*U(KO^|Ni~IY{#QVj~3UjUtc_Z`g9rTwBz;b*G;>A{`}eeADjYkO5c=N z_8C%Nym+zvo_1jW-Me?q-+Z5Gkk7mPu$F+*`LIj_>@?1ID4siaZkdMq=EJUbwBh#c z+f6$FZNdqUA3t7>jBHOI=zRJo2}0+a?);sp5RkIg`Jr5(;%QteMg^X_w)l> z=6L`Ktp2i1v;`7KgM7ztUcP+UISSSi;N(XmjD9A+G)(6)=J3R*paXp;z?^@WScxoP zbYU+^FP${R`M?13_^xuaL7!cIx&Yy~5P(l0;o`-MjSn(FN_38ZHWCs>gN?Sq4&fol z6yxNkEeV$hk)yCL?6WDP9NEGEVAPrZ_}&!A_mZ$G5I33wav3Oe01h!KAczL(e2or? zL@#%6JUXN;Ua^zIJwLAjkF|<~ocD}!Q=lZQi+-^6r3lgwOdE}*^Fa;gGm+@wS)tRapgrToeCxkbj(SL^$MzL_YtQ$(zP=_L-dr z+VQgtgjyE_B_S`j^I8(kr3u?WZJz?~Kx} zi0gx#d_4y#N4_?7G{LjU0%U6fXaFRX*F|)G&CWXtu)}d7!|N`#1-yFos(JNyHNhzG zJ)=RVwh^9DUiD&}&w+f6Ou)pL z378l&0TW{;U}DS!OpKX;i7^u}F=hfL#?BH@?$DLji*^OQ)X{+5swplln)8P1=#y;!8zzO)*%T?Ggk5&Q}4K-)+){jkTff&*qNT z5ascJu*t?^N;rMxf*@i zq#m?3++cTq*u8MuQp#5NtjeCS&ezzlU%#3Tt5nMd3L9601f##r`3Xlrmky^dQVjv= zI$6O$ZqwomexD13-l~Wk()nI#UTWr1haEe1tkKNW$itZe)oG^lafD*oF`b`q5rP66 zT~sP0QpRr(_EtyR`RsTiCEBS(vwCIdWLP@iVb3VAa|S^h##kI=KUL)Mdgsoa-#*(W z9j+Y#o8qGZZ=WIWCbW6u_3qIjI&2_A|x6Nj~rK%eFzcmH;On zg;0u;6v&c(XjoQ>fGl4figHy$dUNGtNszE~$+p)Zfsx2MU(kP39q(y_MDVI=kl#25 z^jZa}fl&mNvwS)9ae}2nSsFA1r9wFu0@fq6$pmvA8X^=k1*Y@un{7$*^-s=2UCsxc zlQ2=_N(duPK0?{L6(VKhhDM-iEmHvRaYi}v#88QP1|I$4yvNkX2(vA`hh*EA!LX@j zY2#}_rk_*=mlHFUit6~m(22NIC~J>lpN_~vJ=+R~*mmSW1piQA-@JLVA>QMsT}GY+ zY*UodNkA%mb%YUSr3}t6_v!rF3T14Y4m<}TIxUW)G9}N1hsq?qoFLTtTNiDWXd>sJ zYT8g!P@V-EjWmdcL4+l&APc!`pezu9WSq^2bJW#zKFE_Pz_B?21@sSJKmwOzJWIcD z;llF&Z<=~LYs6Bc-&T1-18|77xmhDN2Czpua6)uJU|DDl=O^I?6+~n;KJOU~5(FVm z{8dxXI=#DV@N|epX*R6JI^1haPVjBc&sA9so03r8svs|e3)`i7e493GJPEfQ5XV5m zSQo$&u1a)1c8$2K537l`+Bnk(gwLRfH>8Y*TmuNces;sRXY0QnGvG$w?6QFalVq^?Qq@7yTDSra0jDUl3 zz%Dy_6?RsZa#%1EFfnEVCdN#_#Fz<~7&8GAVlhB)hwx?%|B~@?R7&$EH{R9nF(``@Bs4Y#;eSo|tG@JAXT_jQ)o!U@Q zZcMao)Pqu{K9+OP>X4Gy8Eboj#@P02VeJS=aZ*{PR7%8?gd7n=kT!E4mW_FYQr<5V z5>kwnw*T}I(n>%oqf?wDln0hY399EzOEpuH4{1P^hd>Hj><{Oyic`cpMyb*mSUCbL zI^dN~GUQ9$r$nHa;lBP!Oy4I;lyFoj_(A}H7RbBRq6bQSKJTsMDeo!wCt@W5ijo-S zMjAt11+cfPcTz0x*IAM<1WH_#oK!KH&AavZc1T4m|G6a|cvV0Wu zNd>9P!7gc#HYkcUJ(&h+hqig$=@jIuMoFI4A9g+?-PDv1H?XiHC*+}U!o|L|0X{## z6_F#(0O<1opMyjz0cGS_2C4$Ol!GTELA4qqq((0G_Qb;XSu*wD!Gq>^E(UgC9$0%G z;3!D_rHbS>Seyn?q>EH64~;+zL41No-csK7`MX0g2c#|^=*WCpk||0}Jn;7RHLKPY zy(0hSxn0^*qL>eM5Y`ie{arf|6D0{=lgTsQbUtw6u2H2TEX?qkENKf8uwfc1A3L(M zld#BZK&B*zImK{d)lIZP4Xu8;94#NGLK?#HM~)m>e*b)z&jU)dJyF7F99yHAi-Np^ zIV&8ibTaL^RNm=jXd6lrz(EOQbK|AFGFwi%w5i5ZJPra|?*~}6l$$YAb<(!v!=+6- zwd)hcLaz;(KdEDRkD~l+u_M^2P5D*W-~W%-2h8Y?nShBg6EHDm0w%^xz{L0)S?Y&H TBRhnY00000NkvXXu0mjf2S$Bf literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Misc/meteor.rsi/medium_radioactive.png b/Resources/Textures/Objects/Misc/meteor.rsi/medium_radioactive.png new file mode 100644 index 0000000000000000000000000000000000000000..a4e0cf266cf98d4ffaa64c0f4c014c5049574d3d GIT binary patch literal 2088 zcmV+@2-o+CP)+9=}_uIDptEqSqB>)W1=exVR&Bw<_v$nR@J-)xcH>ank-QTMaZh{4% z@i#U$y4NuJ&d$#4IR$|bV<9^PxxBp0F231rOq)Rhn8ru1CoeBA&C=3Rb8v7ld+*l+ z8cq5PEx~cUy}kYCv$=#gKR@rj|L*RtdyRI{W@vlC9)OdC;a68zo6pbBW_x?Pxxc?} zj*gC+oZ#eWV0HirL!kLLghTC6NaF)^IEcVw3l+gz0NML!{Jp)s?)B#8<{zKGxVTU| zX|#QEaxyznz!T^5*VotCaX|?D0|<$+BCuT-DI$0YV1^zTywB*lpb=zvGhfT&F~_C# z_4Qy8@cF(Oo{c^c@V-k3rvRq$O(WQVn`(IhzDK(K5D)?(@%#I`d;RnC6Fnh-_k<0kOs>nw}5}g}|{x z0AJ(tItDK)kgcmTjeU~6lu z6Y=Tk$@)2`2ZYQ(G{IH$Z!B&~fN+IzK!%V|F#cc?KoM*+F|RQoRfN!<$U!h>0Fj45U;1t+KRspmOfGb(V z;@jKXU=dQ_F~o);!2fHTg{cYvSCx4I4LBXdN-Mk|B^<;OaxUz24B4*#8!Z4_OHR>n z=?~)%xmzggf$#u^0<;2vWTwPr?Se%makVfa6na0<=+@}b5 z&hKZhLc2C^$Z_>OG#QC)&szXo6PN>|%zn`*Io4YEom|VIAZT;!We!t>)b@iykTk9- z#u)iu5e|yxnl(j_9s}B%a95$$1r??WP?#z}VX6RysR9(H3Q(9TKw+u?g{cA*CRl(m zYHNItL%we3^vXO)0G>1+k*_UL?;{P5WooX%%J;_^eZMl_Pnh-2)kJhLSL)py==hbP9STj@KoE(*xjM z_(FWKt4fSQ{98`076wYy2Ze%;fx-dU3E4uQT(VUF8E+%4vFCO0H_#Kec&p~c9Cj)t;s=ZRiLXhKFgJ` z+`m*kbsWlFr9C(Xl#Ia|RoN*WLF?RI9+*7@<+v*K zA;tLSI#Vn@;V+8-*rbNRJ9Q=$>jiT6dMIXTJZk)NZbHwt9PP6~&4*ACOyh@opRCGe zQ7}XRAwsCvhWcV|(bT|KgjC~8xb(sMVL%L=o9_m7-x-*y0O%>Pd#X~vjznyV0~*Gc zTa>uN1<%>B0ECcL+H%anYpjR)FepGw4CXn2d!%c_R*@5qd0bci+d`Hb{{*+EN<>;D%g& z#iMpwkb4lApPmoRk_FJbam5fU z6lSd|k{)<(3UxmzL<`WDB*|3>WhO>S-p5p%C;^7DWZELo_`D%Es*Yu)f|($iH;-`E zhO#ugFAHV^pJ6FpYMhqYC}LJ8$YU~(Z|Z_LOA|?GZkX{p1^Jr=vG?$tx>xiHAS!CWf(WlrQSB4cW+-r;{&SzEK0(U^TdD+9Z1qsgjkUC zz*9t?=z3PUwmXc$0cG5%@XO*eL@PATDi8N3dl z7qI>^6j`*I+5`VrAqdb5Sa}9dKn-RIBiMdDZwQ1Q(oT5Q)cF%8QUn+wv?pqWpHSmt zqcmn<2!EOvgE??6#=LWGKtS~|#1;41=*59HX>&Z`GVq&L_^$hGDoCk3uO3otyl z7HOoJ1vL zrc@425#+4^+BwP<&s9?121C;6946`)LIBdvVU@%}2{4aT0SZ$EC`=WgF#iDiH}Zl+ S=!|9n0000+9=}_uIDptEqSqB>)W1=exVR&Bw<_v$nR@J-)xcH>ank-QTMaZh{4% z@i#U$y4NuJ&d$#4IR$|bV<9^PxxBp0F231rOq)Rhn8ru1CoeBA&C=3Rb8v7ld+*l+ z8cq5PEx~cUy}kYCv$=#gKR@rj|L*RtdyRI{W@vlC9)OdC;a68zo6pbBW_x?Pxxc?} zj*gC+oZ#eWV0HirL!kLLghTC6NaF)^IEcVw3l+gz0NML!{Jp)s?)B#8<{zKGxVTU| zX|#QEaxyznz!T^5*VotCaX|?D0|<$+BCuT-DI$0YV1^zTywB*lpb=zvGhfT&F~_C# z_4Qy8@cF(Oo{c^c@V-k3rvRq$O(WQVn`(IhzDK(K5D)?(@%#I`d;RnC6Fnh-_k<0kOs>nw}5}g}|{x z0AJ(tItDK)kgcmTjeU~6lu z6Y=Tk$@)2`2ZYQ(G{IH$Z!B&~fN+IzK!%V|F#cc?KoM*+F|RQoRfN!<$U!h>0Fj45U;1t+KRspmOfGb(V z;@jKXU=dQ_F~o);!2fHTg{cYvSCx4I4LBXdN-Mk|B^<;OaxUz24B4*#8!Z4_OHR>n z=?~)%xmzggf$#u^0<;2vWTwPr?Se%makVfa6na0<=+@}b5 z&hKZhLc2C^$Z_>OG#QC)&szXo6PN>|%zn`*Io4YEom|VIAZT;!We!t>)b@iykTk9- z#u)iu5e|yxnl(j_9s}B%a95$$1r??WP?#z}VX6RysR9(H3Q(9TKw+u?g{cA*CRl(m zYHNItL%we3^vXO)0G>1+k*_UL?;{P5WooX%%J;_^eZMl_Pnh-2)kJhLSL)py==hbP9STj@KoE(*xjM z_(FWKt4fSQ{98`076wYy2Ze%;fx-dU3E4uQT(VUF8E+%4vFCO0H_#Kec&p~c9Cj)t;s=ZRiLXhKFgJ` z+`m*kbsWlFr9C(Xl#Ia|RoN*WLF?RI9+*7@<+v*K zA;tLSI#Vn@;V+8-*rbNRJ9Q=$>jiT6dMIXTJZk)NZbHwt9PP6~&4*ACOyh@opRCGe zQ7}XRAwsCvhWcV|(bT|KgjC~8xb(sMVL%L=o9_m7-x-*y0O%>Pd#X~vjznyV0~*Gc zTa>uN1<%>B0ECcL+H%anYpjR)FepGw4CXn2d!%c_R*@5qd0bci+d`Hb{{*+EN<>;D%g& z#iMpwkb4lApPmoRk_FJbam5fU z6lSd|k{)<(3UxmzL<`WDB*|3>WhO>S-p5p%C;^7DWZELo_`D%Es*Yu)f|($iH;-`E zhO#ugFAHV^pJ6FpYMhqYC}LJ8$YU~(Z|Z_LOA|?GZkX{p1^Jr=vG?$tx>xiHAS!CWf(WlrQSB4cW+-r;{&SzEK0(U^TdD+9Z1qsgjkUC zz*9t?=z3PUwmXc$0cG5%@XO*eL@PATDi8N3dl z7qI>^6j`*I+5`VrAqdb5Sa}9dKn-RIBiMdDZwQ1Q(oT5Q)cF%8QUn+wv?pqWpHSmt zqcmn<2!EOvgE??6#=LWGKtS~|#1;41=*59HX>&Z`GVq&L_^$hGDoCk3uO3otyl z7HOoJ1vL zrc@425#+4^+BwP<&s9?121C;6946`)LIBdvVU@%}2{4aT0SZ$EC`=WgF#iDiH}Zl+ S=!|9n0000#010qF04bvMej-i5 z1L+VTG-*Ky38DxZf+EI96Z9T8-+cePnK$o`-JRK;`R(p+cV{-)(cTg+DlZBE0N_?+ zqVs|E{zss~2l`#!O~V5N3nrfn0{|rY{}Eu$QHjF`K3glIx$CWh^}=DAlo8@gQ|ZIY zc$-EFyu0VV!{y=Qjj<5&n6ColTNLA6bDXQWQPU^g`L8+F=PtTk^kKjgFY*pQkLj!Q6(dv%FhrYqQ425&5O)|L7>jH#M2 z;+fSBk{k|)&R=FQ`Se6d`Z}kDxwjXa#5(J!%Th%n4u@^7y;@pkq|>V%im76<$13J- z-Qi7FhTltKXIyc56uf7X0gDr#oZwCrSDzevZgdSinTJ-h$8ph{?_TB`JPtAJ)*EzE z7YDHgV(rC8&rrv!8#dl_JM?aSeLw0Sb`kX(lCo4-Sh%#mE1(~MF!{q-YP`+{uWktu zNd+zWA9zs}PdTtc2-L$sS9!5B%HYC_P?b}E&pdW%$4$=RVLu(}Ut57!p@b)bbd1qf zzJU4Qr+k?TGgdi8La_g3iB6xLbsrgMR;Ce)ij98{y?N{rheqB%=$x7P^D7_~l#~IE z7t(#Ur(cbiD`Nuui2Edyl7g7 zJuZ(rmZIWwr&?g2$`Ub*&n}4}i6~0fp`nJd)kUYmR5u@f+dfG0y36mu+mahq7TiCN zw9kXR7v8HPp}}Byskz>#gAotoqwB*pu`idP&VY%h0c&*L$`$t3r}?IDzaJ5qwKBiC zvH03o3gr>>rt60?j0T-X-3ZqxLQ}F-eF#vFeFq^<7-JZ$_;lmmSX8CEqQc#u`wyon zqZgQ{hD@3qkaS0!62a+}tarni8OKlo*O}W*mnW*`c8o;MfhPfS5q-!5g3JocO^z)^ zD`${>pT}dc`O1;th5?D?ednV(oW?)E52{#+;zNwTa4V@@TA)?qVEA=HA9OInWJ7Rs z_zmEG`mdo{g(3t{$1Og#(quZTTEyA{WqXaK{F>Y*py5_Xrb7zA50M47U6(?$z=d9f z4I%8QpFK+O0dAF&OWEHiTmi9XbS#`PV+W0v}u0@<)~k>B%rbg$=xY7L|XkZoHNDqckS@VcaJq z!st+1`Wp`Je9@Zcr6@nOS|#{qx*5vD&RgQL!@waShb1;g;y?GIDNEu~8XT_6G}ry0TxvmaDF zYL~KbiJdX4sIY8sQ~}tSQhGX3VqFtGh^c!OV&2c6+|@)YDrnQ%Dj#ja3=c6*Q=Z9D z++nR}1KrhC?JDBsmPP|8nm+oOvd2C5?OMEqG@nJ7#FpH0kI==bJ7~Z+oxWiTYl-M= z;rIsW2bIK0K)BAD5)x}}rY#o}o*iB;$gETp(~~BEq)0iAmm6+ll2yMRiFfRk0Z$$S z>9>Tc<^v#(hQRnCRI;)EJ449uZFoOy;(}?Ui8-K5V8e#6%y%PqzrJ6IUI!+$MGp=n zzam7X-TM_*qNHbWqv|w#S&mfnGV^NAdB@11W%l!H!@#L7^B%5kg33xJp}4#})hc&b z!L6Am+>S@oxDFZe>pk0WQNcb#(U1;0+8C8y`rqzY$|C~9vh zm1c%uk^apfo>$+pv8{E9fZ%h%=mKgPi&SHGjyR>v!5G#^tEAu$wJ2h0uO*9B zM`n)aiCQ_?$U)}6ehcB|_&mv&Mb_u;To^Xen3s6axoFl0Ncti_Yh$*x0r=QkhCP>N zG5}k21y(m{Ma;~2Ao0j1M9(g(1WwuC7&;mO*=FbA9JV8!H198CPPoDao?3bJz_SF@ z#;Q<-sSHH_7|v5D>kj?s)E0XxgHm266^p>8OD88>*DuR(%hL>yg?L)u4fqG+#T+dc zTw~GEPEDBpuqHoQbmL3CyltNrcXq~+$U9q@eB zdn=%yud>j4tFKPUZCkw7AS+2nF&8KA`O*0E&S#nY)$k7Y?s7>vsJ?Z@Ro`_qPkRI7 xxMyFJ-xGRMm+Hfkd=5)d^)@Z}&wq#ii)C*glD%)XaPVvatj^dI>n*(F{teneebWE{ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Misc/meteor.rsi/small_flash.png b/Resources/Textures/Objects/Misc/meteor.rsi/small_flash.png new file mode 100644 index 0000000000000000000000000000000000000000..7ff19cde080fb5bb5befe72894e69b6640edca1a GIT binary patch literal 2484 zcmZuzS5Om(7EMBALj)3vh#(MZ1XMtZiV~6#N?a)tWGPaflm(UuN(n6zA|(_df(Rl= z08xsRr+`S0fC{1%1954gN{bZfg!0%Q=gqwLan7B&cjo@wbLQN5D+^O0s1y_c00`mD zaMp*_^&dd^4|yV!bm6cF_?y`W006>m{{Wb-E-Zc6^TgvYHX+$RaxSKb8^YW7;-;I9 zOqjtV5`_ffX%GrL3c(i@-KGkr0tBku%@9}wLP0@k*bk^M4yW-@-Y`+?4U#eNSp3V!ImJK*!e+}|635)g=2c0W`(@(@ux=w-JP2?HCVD7ix*Sr*2 zgPn>wzhfW;O%!U>u`aNf}5L#9K~t zB#&&2lV+(PbQ<T1n1x;taPC3#jOF?dK=w>tS-JElzHHbYuADhOFV;VZ3;`Q~kgh zyUG?*=0tnq$mSAfk0(_DUx1WZ_Y9Odj_j;2H2(Q5`{PDuy86h66gkHSj2OI@hD;IF=Zv=wEe_WgYfUSI89E~Bj9R?p(+B4@bU^5Oma-Tjj5r8|QKh98n;R)?4oEGe8= z@719z7++33sbVSI98bG~=_G~7(SJMK_%-Lk?RSk~>z!oY#^+{J8c3g`q726zJ$`o0 z`#zJeVQGJl*H03by*$f%ZUYfOc&NPtvR~RyE)KudUJl4#K0L#3&+O6!8{4 zlgipV(+QjJj%zq?k>80|;W2_#=GY2aX)H=&VW4bvJLJ=&GfgRoc9Db~SAwQ<`PxxW zh32#0mCzp=I$KWyKZw3rfD!#3qR|jT?o`a3yvnh1G6<=rhcflVg##`g?Dd^Jz0L$0JK4c+^HWN-n z9=t_YIU)(oH?{r*N9^tN$4PQUJwp&7n~OOdl>Zpz5@|78nqO0gTpPCT!{OmZJJOJ) z7713V_6$Cc#1^7yo)&pzhfRUBN!A<3BSwXW9l>-FRnqglG~wVA(* zd=-3&fvuK2^RBNjzldkQ)=Yf)cEqRrou7Db}0)h>+%F}$xJn-uy_1>gLoI0gr~~r zOeqdxPpPatTC^uA_w+Z8S!tA#y$e#+Cw(Vv5$!0Si%DO2lGM$5Jro_sKL!V!gG1>O z1UiCv%Jt=Jif145(0rF2gb7aoQwW_FM%j#81b^aH8Ac+e{$PyB$JV_yQa8QvV`wI( zJ~i5`@wApb)U}5=RI{#%t&D4sxl!xS9BS_jo=2#G;J98mpXsBI=w6RbMfY7B$k(Sa zYmWsp?~diDWh12EX>%wM7EOqZaRrNkr4HXg9C99qlrVNWP7RUayKNOLCuhky9yToOd6rd0b$1;WT; zj{=9`@SeCPDi0D;=*AM{ zG=`s_Ybiv(9t@wh=O4Px`ph~G1>DvdIy;nwq=7BWisxAepEv5O6%bvm&%pc@bi&=M zIgwHP<(&5bA3rPID;d~v!wk9M2a2Z8op#2SpX_+#&{PruNAuCsFIpZ=wMnS7A+|=E zm^0R%Ftw4G=ua6MJYtf|%x-}Mu(K8SE)8i}qRtqYj0;i?Yr65XrY&yfvKBJ3TFw1x z!P6j!cS+oVw1~;Sx*n5kpla_eQbNNOHYynZ6;;2~|Gz1Q&`vFraVmePXXF-CRYQ15 z=V>TrQ84O+Lg(BveB^194v~CF<@=e@%D~jTn>QsZW7+vs2VBQpJx&KLnX){7qz@W1 z@%LHzP)HB9_yRc6K}%#Rp;J;Pi|^T|f1_)4*V)@rcfwMS&~2=!XB0&Hos((42}RHo z4Z_~CXrT|3UTDlHXS!8o)1?$}MRY?q%;b$px#1;~BR_u&Q5UA*xvV`J#k&kkmYpFm!gsuc% zI+`mFKtvTL*$+r|bLWQv`Tb4l@uWF`lf2LPKzzKwQcR7GDZ@R!51{}iPn|N4zSui^ z>SKAH`1nH*I>i9O%lJetC2{b-Ztp=-OU+iXJ4{c@js? zl-0nl6~_{H{j&M6nj$4$LQ6~fKkO#?(!m{D6zf6%P~LXZx8Fs`uY8Xw&lXEbQpH*A zeB=vj?zi&HFS~TFQUjAL>m$BQ`7MxUE;+a)Kf>4)Cj+f>!QLWp0}Q?&c@8zU_t4wV z&g+gYYsOXqv!D%0ps`?Y&(aO#-c>dG?FrTh-iOf6g!Q a8~~4pBkg0FXSELBFaX}z0#}Z8rTzzr51erT literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Misc/meteor.rsi/small_flash_pixel.png b/Resources/Textures/Objects/Misc/meteor.rsi/small_flash_pixel.png new file mode 100644 index 0000000000000000000000000000000000000000..7ff19cde080fb5bb5befe72894e69b6640edca1a GIT binary patch literal 2484 zcmZuzS5Om(7EMBALj)3vh#(MZ1XMtZiV~6#N?a)tWGPaflm(UuN(n6zA|(_df(Rl= z08xsRr+`S0fC{1%1954gN{bZfg!0%Q=gqwLan7B&cjo@wbLQN5D+^O0s1y_c00`mD zaMp*_^&dd^4|yV!bm6cF_?y`W006>m{{Wb-E-Zc6^TgvYHX+$RaxSKb8^YW7;-;I9 zOqjtV5`_ffX%GrL3c(i@-KGkr0tBku%@9}wLP0@k*bk^M4yW-@-Y`+?4U#eNSp3V!ImJK*!e+}|635)g=2c0W`(@(@ux=w-JP2?HCVD7ix*Sr*2 zgPn>wzhfW;O%!U>u`aNf}5L#9K~t zB#&&2lV+(PbQ<T1n1x;taPC3#jOF?dK=w>tS-JElzHHbYuADhOFV;VZ3;`Q~kgh zyUG?*=0tnq$mSAfk0(_DUx1WZ_Y9Odj_j;2H2(Q5`{PDuy86h66gkHSj2OI@hD;IF=Zv=wEe_WgYfUSI89E~Bj9R?p(+B4@bU^5Oma-Tjj5r8|QKh98n;R)?4oEGe8= z@719z7++33sbVSI98bG~=_G~7(SJMK_%-Lk?RSk~>z!oY#^+{J8c3g`q726zJ$`o0 z`#zJeVQGJl*H03by*$f%ZUYfOc&NPtvR~RyE)KudUJl4#K0L#3&+O6!8{4 zlgipV(+QjJj%zq?k>80|;W2_#=GY2aX)H=&VW4bvJLJ=&GfgRoc9Db~SAwQ<`PxxW zh32#0mCzp=I$KWyKZw3rfD!#3qR|jT?o`a3yvnh1G6<=rhcflVg##`g?Dd^Jz0L$0JK4c+^HWN-n z9=t_YIU)(oH?{r*N9^tN$4PQUJwp&7n~OOdl>Zpz5@|78nqO0gTpPCT!{OmZJJOJ) z7713V_6$Cc#1^7yo)&pzhfRUBN!A<3BSwXW9l>-FRnqglG~wVA(* zd=-3&fvuK2^RBNjzldkQ)=Yf)cEqRrou7Db}0)h>+%F}$xJn-uy_1>gLoI0gr~~r zOeqdxPpPatTC^uA_w+Z8S!tA#y$e#+Cw(Vv5$!0Si%DO2lGM$5Jro_sKL!V!gG1>O z1UiCv%Jt=Jif145(0rF2gb7aoQwW_FM%j#81b^aH8Ac+e{$PyB$JV_yQa8QvV`wI( zJ~i5`@wApb)U}5=RI{#%t&D4sxl!xS9BS_jo=2#G;J98mpXsBI=w6RbMfY7B$k(Sa zYmWsp?~diDWh12EX>%wM7EOqZaRrNkr4HXg9C99qlrVNWP7RUayKNOLCuhky9yToOd6rd0b$1;WT; zj{=9`@SeCPDi0D;=*AM{ zG=`s_Ybiv(9t@wh=O4Px`ph~G1>DvdIy;nwq=7BWisxAepEv5O6%bvm&%pc@bi&=M zIgwHP<(&5bA3rPID;d~v!wk9M2a2Z8op#2SpX_+#&{PruNAuCsFIpZ=wMnS7A+|=E zm^0R%Ftw4G=ua6MJYtf|%x-}Mu(K8SE)8i}qRtqYj0;i?Yr65XrY&yfvKBJ3TFw1x z!P6j!cS+oVw1~;Sx*n5kpla_eQbNNOHYynZ6;;2~|Gz1Q&`vFraVmePXXF-CRYQ15 z=V>TrQ84O+Lg(BveB^194v~CF<@=e@%D~jTn>QsZW7+vs2VBQpJx&KLnX){7qz@W1 z@%LHzP)HB9_yRc6K}%#Rp;J;Pi|^T|f1_)4*V)@rcfwMS&~2=!XB0&Hos((42}RHo z4Z_~CXrT|3UTDlHXS!8o)1?$}MRY?q%;b$px#1;~BR_u&Q5UA*xvV`J#k&kkmYpFm!gsuc% zI+`mFKtvTL*$+r|bLWQv`Tb4l@uWF`lf2LPKzzKwQcR7GDZ@R!51{}iPn|N4zSui^ z>SKAH`1nH*I>i9O%lJetC2{b-Ztp=-OU+iXJ4{c@js? zl-0nl6~_{H{j&M6nj$4$LQ6~fKkO#?(!m{D6zf6%P~LXZx8Fs`uY8Xw&lXEbQpH*A zeB=vj?zi&HFS~TFQUjAL>m$BQ`7MxUE;+a)Kf>4)Cj+f>!QLWp0}Q?&c@8zU_t4wV z&g+gYYsOXqv!D%0ps`?Y&(aO#-c>dG?FrTh-iOf6g!Q a8~~4pBkg0FXSELBFaX}z0#}Z8rTzzr51erT literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Misc/meteor.rsi/small_pixel.png b/Resources/Textures/Objects/Misc/meteor.rsi/small_pixel.png new file mode 100644 index 0000000000000000000000000000000000000000..2c729ac87e9396c7156b483d25d26ecc9714c033 GIT binary patch literal 2458 zcmai0cTf|E(oaGH2@pu3iH3s^s-OfxFmN#010qF04bvMej-i5 z1L+VTG-*Ky38DxZf+EI96Z9T8-+cePnK$o`-JRK;`R(p+cV{-)(cTg+DlZBE0N_?+ zqVs|E{zss~2l`#!O~V5N3nrfn0{|rY{}Eu$QHjF`K3glIx$CWh^}=DAlo8@gQ|ZIY zc$-EFyu0VV!{y=Qjj<5&n6ColTNLA6bDXQWQPU^g`L8+F=PtTk^kKjgFY*pQkLj!Q6(dv%FhrYqQ425&5O)|L7>jH#M2 z;+fSBk{k|)&R=FQ`Se6d`Z}kDxwjXa#5(J!%Th%n4u@^7y;@pkq|>V%im76<$13J- z-Qi7FhTltKXIyc56uf7X0gDr#oZwCrSDzevZgdSinTJ-h$8ph{?_TB`JPtAJ)*EzE z7YDHgV(rC8&rrv!8#dl_JM?aSeLw0Sb`kX(lCo4-Sh%#mE1(~MF!{q-YP`+{uWktu zNd+zWA9zs}PdTtc2-L$sS9!5B%HYC_P?b}E&pdW%$4$=RVLu(}Ut57!p@b)bbd1qf zzJU4Qr+k?TGgdi8La_g3iB6xLbsrgMR;Ce)ij98{y?N{rheqB%=$x7P^D7_~l#~IE z7t(#Ur(cbiD`Nuui2Edyl7g7 zJuZ(rmZIWwr&?g2$`Ub*&n}4}i6~0fp`nJd)kUYmR5u@f+dfG0y36mu+mahq7TiCN zw9kXR7v8HPp}}Byskz>#gAotoqwB*pu`idP&VY%h0c&*L$`$t3r}?IDzaJ5qwKBiC zvH03o3gr>>rt60?j0T-X-3ZqxLQ}F-eF#vFeFq^<7-JZ$_;lmmSX8CEqQc#u`wyon zqZgQ{hD@3qkaS0!62a+}tarni8OKlo*O}W*mnW*`c8o;MfhPfS5q-!5g3JocO^z)^ zD`${>pT}dc`O1;th5?D?ednV(oW?)E52{#+;zNwTa4V@@TA)?qVEA=HA9OInWJ7Rs z_zmEG`mdo{g(3t{$1Og#(quZTTEyA{WqXaK{F>Y*py5_Xrb7zA50M47U6(?$z=d9f z4I%8QpFK+O0dAF&OWEHiTmi9XbS#`PV+W0v}u0@<)~k>B%rbg$=xY7L|XkZoHNDqckS@VcaJq z!st+1`Wp`Je9@Zcr6@nOS|#{qx*5vD&RgQL!@waShb1;g;y?GIDNEu~8XT_6G}ry0TxvmaDF zYL~KbiJdX4sIY8sQ~}tSQhGX3VqFtGh^c!OV&2c6+|@)YDrnQ%Dj#ja3=c6*Q=Z9D z++nR}1KrhC?JDBsmPP|8nm+oOvd2C5?OMEqG@nJ7#FpH0kI==bJ7~Z+oxWiTYl-M= z;rIsW2bIK0K)BAD5)x}}rY#o}o*iB;$gETp(~~BEq)0iAmm6+ll2yMRiFfRk0Z$$S z>9>Tc<^v#(hQRnCRI;)EJ449uZFoOy;(}?Ui8-K5V8e#6%y%PqzrJ6IUI!+$MGp=n zzam7X-TM_*qNHbWqv|w#S&mfnGV^NAdB@11W%l!H!@#L7^B%5kg33xJp}4#})hc&b z!L6Am+>S@oxDFZe>pk0WQNcb#(U1;0+8C8y`rqzY$|C~9vh zm1c%uk^apfo>$+pv8{E9fZ%h%=mKgPi&SHGjyR>v!5G#^tEAu$wJ2h0uO*9B zM`n)aiCQ_?$U)}6ehcB|_&mv&Mb_u;To^Xen3s6axoFl0Ncti_Yh$*x0r=QkhCP>N zG5}k21y(m{Ma;~2Ao0j1M9(g(1WwuC7&;mO*=FbA9JV8!H198CPPoDao?3bJz_SF@ z#;Q<-sSHH_7|v5D>kj?s)E0XxgHm266^p>8OD88>*DuR(%hL>yg?L)u4fqG+#T+dc zTw~GEPEDBpuqHoQbmL3CyltNrcXq~+$U9q@eB zdn=%yud>j4tFKPUZCkw7AS+2nF&8KA`O*0E&S#nY)$k7Y?s7>vsJ?Z@Ro`_qPkRI7 xxMyFJ-xGRMm+Hfkd=5)d^)@Z}&wq#ii)C*glD%)XaPVvatj^dI>n*(F{teneebWE{ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Misc/meteor.rsi/space_dust.png b/Resources/Textures/Objects/Misc/meteor.rsi/space_dust.png new file mode 100644 index 0000000000000000000000000000000000000000..6e13a867d8da7ada3018efeec3235b0aaa58573e GIT binary patch literal 328 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5DEQ0M z#WAE}&f95$T+E6*F3~SEza`8&ytsmo|CwpjvI+fcizl0I3Mi{%nfOFf{nhKjjd=~y z5B4(#dFA(Pz4kneLHnXcp$5Zb4yF}x-po(t?BAWU)>rt{t)Np|luQ_!6h9Qo94@_~ z%KVZ|fTQOcpQ4JGe+zTQ1P)%ts%00QOlNGiV?Ds~Ds(YBt8QtdXoD{wkdnyX#wPn< z;%;uYP>bYq@(gM_jwj?X*kZe>YOosb=UUca>Q+MBiM{cTJy zrkb4U5ox%dA+dc=Th9~I6i26B2Yz*Np4evp@XcNR|H7|Y1l>v)UE&YtHOTIgdB7}a Xvg!Y+NERDlC@^@s`njxgN@xNA?pb~N literal 0 HcmV?d00001 From 06c8238164c3b278245c94f5e91c5195fc836084 Mon Sep 17 00:00:00 2001 From: PJBot Date: Sat, 15 Jun 2024 03:39:49 +0000 Subject: [PATCH 054/142] Automatic changelog update --- Resources/Changelog/Changelog.yml | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 51fcaa28a0..8211adf57e 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: blueDev2 - changes: - - message: Generalized bounties to allow selling them off-station - type: Tweak - id: 6240 - time: '2024-03-28T04:06:00.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/26469 - author: Simyon changes: - message: The space dragon can now open doors by bumping into them! @@ -3848,3 +3841,16 @@ id: 6739 time: '2024-06-15T03:23:42.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/28999 +- author: EmoGarbage404 + changes: + - message: Revamped meteors. Meteors now crash through several walls before exploding. + They can still come in a weaker "space dust" form where they don't break through + structures. + type: Add + - message: Meteor and space dust events now occur on regular intervals during a + round rather than being tied to station events. Expect to see more of them during + a round. + type: Add + id: 6740 + time: '2024-06-15T03:38:43.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/28974 From 748e5831e834b192852533e5ce166b11a17d8cbb Mon Sep 17 00:00:00 2001 From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> Date: Fri, 14 Jun 2024 23:43:23 -0400 Subject: [PATCH 055/142] Add moon boots (#29009) --- Content.Client/Clothing/MagbootsSystem.cs | 8 -- .../Components/MovedByPressureComponent.cs | 31 -------- .../AtmosphereSystem.HighPressureDelta.cs | 1 + Content.Server/Clothing/MagbootsSystem.cs | 49 ------------ .../Damage/Systems/GodmodeSystem.cs | 2 +- Content.Server/Gravity/GravitySystem.cs | 1 - .../EntitySystems/GravityWellSystem.cs | 2 +- .../Components/MovedByPressureComponent.cs | 31 ++++++++ .../AntiGravityClothingComponent.cs | 9 +++ .../AntiGravityClothingSystem.cs | 23 ++++++ .../Clothing/SharedMagbootsSystem.cs | 72 +++++++++++++++--- Content.Shared/Gravity/SharedGravitySystem.cs | 37 +++++---- .../Inventory/InventorySystem.Relay.cs | 2 + .../Entities/Clothing/Shoes/misc.yml | 18 +++++ .../Entities/Structures/Machines/lathe.yml | 11 +-- Resources/Prototypes/Recipes/Lathes/misc.yml | 7 ++ .../Prototypes/Research/experimental.yml | 1 + .../Boots/moonboots.rsi/equipped-FEET-vox.png | Bin 0 -> 412 bytes .../Boots/moonboots.rsi/equipped-FEET.png | Bin 0 -> 316 bytes .../Shoes/Boots/moonboots.rsi/icon.png | Bin 0 -> 340 bytes .../Shoes/Boots/moonboots.rsi/inhand-left.png | Bin 0 -> 323 bytes .../Boots/moonboots.rsi/inhand-right.png | Bin 0 -> 340 bytes .../Shoes/Boots/moonboots.rsi/meta.json | 30 ++++++++ 23 files changed, 211 insertions(+), 124 deletions(-) delete mode 100644 Content.Client/Clothing/MagbootsSystem.cs delete mode 100644 Content.Server/Atmos/Components/MovedByPressureComponent.cs delete mode 100644 Content.Server/Clothing/MagbootsSystem.cs create mode 100644 Content.Shared/Atmos/Components/MovedByPressureComponent.cs create mode 100644 Content.Shared/Clothing/Components/AntiGravityClothingComponent.cs create mode 100644 Content.Shared/Clothing/EntitySystems/AntiGravityClothingSystem.cs create mode 100644 Resources/Textures/Clothing/Shoes/Boots/moonboots.rsi/equipped-FEET-vox.png create mode 100644 Resources/Textures/Clothing/Shoes/Boots/moonboots.rsi/equipped-FEET.png create mode 100644 Resources/Textures/Clothing/Shoes/Boots/moonboots.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Shoes/Boots/moonboots.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Shoes/Boots/moonboots.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Shoes/Boots/moonboots.rsi/meta.json diff --git a/Content.Client/Clothing/MagbootsSystem.cs b/Content.Client/Clothing/MagbootsSystem.cs deleted file mode 100644 index a3d39eafde..0000000000 --- a/Content.Client/Clothing/MagbootsSystem.cs +++ /dev/null @@ -1,8 +0,0 @@ -using Content.Shared.Clothing; - -namespace Content.Client.Clothing; - -public sealed class MagbootsSystem : SharedMagbootsSystem -{ - -} diff --git a/Content.Server/Atmos/Components/MovedByPressureComponent.cs b/Content.Server/Atmos/Components/MovedByPressureComponent.cs deleted file mode 100644 index ca830767bd..0000000000 --- a/Content.Server/Atmos/Components/MovedByPressureComponent.cs +++ /dev/null @@ -1,31 +0,0 @@ -namespace Content.Server.Atmos.Components -{ - // Unfortunately can't be friends yet due to magboots. - [RegisterComponent] - public sealed partial class MovedByPressureComponent : Component - { - public const float MoveForcePushRatio = 1f; - public const float MoveForceForcePushRatio = 1f; - public const float ProbabilityOffset = 25f; - public const float ProbabilityBasePercent = 10f; - public const float ThrowForce = 100f; - - /// - /// Accumulates time when yeeted by high pressure deltas. - /// - [DataField("accumulator")] - public float Accumulator = 0f; - - [ViewVariables(VVAccess.ReadWrite)] - [DataField("enabled")] - public bool Enabled { get; set; } = true; - [ViewVariables(VVAccess.ReadWrite)] - [DataField("pressureResistance")] - public float PressureResistance { get; set; } = 1f; - [ViewVariables(VVAccess.ReadWrite)] - [DataField("moveResist")] - public float MoveResist { get; set; } = 100f; - [ViewVariables(VVAccess.ReadWrite)] - public int LastHighPressureMovementAirCycle { get; set; } = 0; - } -} diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.HighPressureDelta.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.HighPressureDelta.cs index cb50ff114e..2e41e45d3f 100644 --- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.HighPressureDelta.cs +++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.HighPressureDelta.cs @@ -1,5 +1,6 @@ using Content.Server.Atmos.Components; using Content.Shared.Atmos; +using Content.Shared.Atmos.Components; using Content.Shared.Mobs.Components; using Content.Shared.Physics; using Robust.Shared.Audio; diff --git a/Content.Server/Clothing/MagbootsSystem.cs b/Content.Server/Clothing/MagbootsSystem.cs deleted file mode 100644 index 3838ad168d..0000000000 --- a/Content.Server/Clothing/MagbootsSystem.cs +++ /dev/null @@ -1,49 +0,0 @@ -using Content.Server.Atmos.Components; -using Content.Shared.Alert; -using Content.Shared.Clothing; - -namespace Content.Server.Clothing; - -public sealed class MagbootsSystem : SharedMagbootsSystem -{ - [Dependency] private readonly AlertsSystem _alerts = default!; - - public override void Initialize() - { - base.Initialize(); - - SubscribeLocalEvent(OnGotEquipped); - SubscribeLocalEvent(OnGotUnequipped); - } - - protected override void UpdateMagbootEffects(EntityUid parent, EntityUid uid, bool state, MagbootsComponent? component) - { - if (!Resolve(uid, ref component)) - return; - state = state && component.On; - - if (TryComp(parent, out MovedByPressureComponent? movedByPressure)) - { - movedByPressure.Enabled = !state; - } - - if (state) - { - _alerts.ShowAlert(parent, component.MagbootsAlert); - } - else - { - _alerts.ClearAlert(parent, component.MagbootsAlert); - } - } - - private void OnGotUnequipped(EntityUid uid, MagbootsComponent component, ref ClothingGotUnequippedEvent args) - { - UpdateMagbootEffects(args.Wearer, uid, false, component); - } - - private void OnGotEquipped(EntityUid uid, MagbootsComponent component, ref ClothingGotEquippedEvent args) - { - UpdateMagbootEffects(args.Wearer, uid, true, component); - } -} diff --git a/Content.Server/Damage/Systems/GodmodeSystem.cs b/Content.Server/Damage/Systems/GodmodeSystem.cs index 404cc63905..d896fba71c 100644 --- a/Content.Server/Damage/Systems/GodmodeSystem.cs +++ b/Content.Server/Damage/Systems/GodmodeSystem.cs @@ -1,4 +1,4 @@ -using Content.Server.Atmos.Components; +using Content.Shared.Atmos.Components; using Content.Shared.Damage.Components; using Content.Shared.Damage.Systems; diff --git a/Content.Server/Gravity/GravitySystem.cs b/Content.Server/Gravity/GravitySystem.cs index ea62d4a819..6807b9df4a 100644 --- a/Content.Server/Gravity/GravitySystem.cs +++ b/Content.Server/Gravity/GravitySystem.cs @@ -1,7 +1,6 @@ using Content.Shared.Gravity; using JetBrains.Annotations; using Robust.Shared.Map.Components; -using Robust.Shared.Utility; namespace Content.Server.Gravity { diff --git a/Content.Server/Singularity/EntitySystems/GravityWellSystem.cs b/Content.Server/Singularity/EntitySystems/GravityWellSystem.cs index 779b2f5971..f53d658ebd 100644 --- a/Content.Server/Singularity/EntitySystems/GravityWellSystem.cs +++ b/Content.Server/Singularity/EntitySystems/GravityWellSystem.cs @@ -1,6 +1,6 @@ using System.Numerics; -using Content.Server.Atmos.Components; using Content.Server.Singularity.Components; +using Content.Shared.Atmos.Components; using Content.Shared.Ghost; using Content.Shared.Singularity.EntitySystems; using Robust.Shared.Map; diff --git a/Content.Shared/Atmos/Components/MovedByPressureComponent.cs b/Content.Shared/Atmos/Components/MovedByPressureComponent.cs new file mode 100644 index 0000000000..8a4e2c6d4c --- /dev/null +++ b/Content.Shared/Atmos/Components/MovedByPressureComponent.cs @@ -0,0 +1,31 @@ +namespace Content.Shared.Atmos.Components; + +// Unfortunately can't be friends yet due to magboots. +[RegisterComponent] +public sealed partial class MovedByPressureComponent : Component +{ + public const float MoveForcePushRatio = 1f; + public const float MoveForceForcePushRatio = 1f; + public const float ProbabilityOffset = 25f; + public const float ProbabilityBasePercent = 10f; + public const float ThrowForce = 100f; + + /// + /// Accumulates time when yeeted by high pressure deltas. + /// + [DataField] + public float Accumulator; + + [DataField] + public bool Enabled { get; set; } = true; + + [DataField] + public float PressureResistance { get; set; } = 1f; + + [DataField] + public float MoveResist { get; set; } = 100f; + + [ViewVariables(VVAccess.ReadWrite)] + public int LastHighPressureMovementAirCycle { get; set; } = 0; +} + diff --git a/Content.Shared/Clothing/Components/AntiGravityClothingComponent.cs b/Content.Shared/Clothing/Components/AntiGravityClothingComponent.cs new file mode 100644 index 0000000000..a8fcbdd2eb --- /dev/null +++ b/Content.Shared/Clothing/Components/AntiGravityClothingComponent.cs @@ -0,0 +1,9 @@ +using Robust.Shared.GameStates; + +namespace Content.Shared.Clothing.Components; + +/// +/// This is used for clothing that makes an entity weightless when worn. +/// +[RegisterComponent, NetworkedComponent] +public sealed partial class AntiGravityClothingComponent : Component; diff --git a/Content.Shared/Clothing/EntitySystems/AntiGravityClothingSystem.cs b/Content.Shared/Clothing/EntitySystems/AntiGravityClothingSystem.cs new file mode 100644 index 0000000000..c5b2ee3dfc --- /dev/null +++ b/Content.Shared/Clothing/EntitySystems/AntiGravityClothingSystem.cs @@ -0,0 +1,23 @@ +using Content.Shared.Clothing.Components; +using Content.Shared.Gravity; +using Content.Shared.Inventory; + +namespace Content.Shared.Clothing.EntitySystems; + +public sealed class AntiGravityClothingSystem : EntitySystem +{ + /// + public override void Initialize() + { + SubscribeLocalEvent>(OnIsWeightless); + } + + private void OnIsWeightless(Entity ent, ref InventoryRelayedEvent args) + { + if (args.Args.Handled) + return; + + args.Args.Handled = true; + args.Args.IsWeightless = true; + } +} diff --git a/Content.Shared/Clothing/SharedMagbootsSystem.cs b/Content.Shared/Clothing/SharedMagbootsSystem.cs index 27fb0c1a50..bb3b05074f 100644 --- a/Content.Shared/Clothing/SharedMagbootsSystem.cs +++ b/Content.Shared/Clothing/SharedMagbootsSystem.cs @@ -1,5 +1,8 @@ using Content.Shared.Actions; +using Content.Shared.Alert; +using Content.Shared.Atmos.Components; using Content.Shared.Clothing.EntitySystems; +using Content.Shared.Gravity; using Content.Shared.Inventory; using Content.Shared.Item; using Content.Shared.Slippery; @@ -9,8 +12,9 @@ using Robust.Shared.Containers; namespace Content.Shared.Clothing; -public abstract class SharedMagbootsSystem : EntitySystem +public sealed class SharedMagbootsSystem : EntitySystem { + [Dependency] private readonly AlertsSystem _alerts = default!; [Dependency] private readonly ClothingSpeedModifierSystem _clothingSpeedModifier = default!; [Dependency] private readonly ClothingSystem _clothing = default!; [Dependency] private readonly InventorySystem _inventory = default!; @@ -29,6 +33,11 @@ public abstract class SharedMagbootsSystem : EntitySystem SubscribeLocalEvent(OnGetActions); SubscribeLocalEvent(OnToggleMagboots); SubscribeLocalEvent(OnMapInit); + + SubscribeLocalEvent(OnGotEquipped); + SubscribeLocalEvent(OnGotUnequipped); + + SubscribeLocalEvent>(OnIsWeightless); } private void OnMapInit(EntityUid uid, MagbootsComponent component, MapInitEvent args) @@ -37,6 +46,16 @@ public abstract class SharedMagbootsSystem : EntitySystem Dirty(uid, component); } + private void OnGotUnequipped(EntityUid uid, MagbootsComponent component, ref ClothingGotUnequippedEvent args) + { + UpdateMagbootEffects(args.Wearer, uid, false, component); + } + + private void OnGotEquipped(EntityUid uid, MagbootsComponent component, ref ClothingGotEquippedEvent args) + { + UpdateMagbootEffects(args.Wearer, uid, true, component); + } + private void OnToggleMagboots(EntityUid uid, MagbootsComponent component, ToggleMagbootsEvent args) { if (args.Handled) @@ -51,9 +70,11 @@ public abstract class SharedMagbootsSystem : EntitySystem { magboots.On = !magboots.On; - if (_sharedContainer.TryGetContainingContainer(uid, out var container) && + if (_sharedContainer.TryGetContainingContainer((uid, Transform(uid)), out var container) && _inventory.TryGetSlotEntity(container.Owner, "shoes", out var entityUid) && entityUid == uid) + { UpdateMagbootEffects(container.Owner, uid, true, magboots); + } if (TryComp(uid, out var item)) { @@ -66,9 +87,28 @@ public abstract class SharedMagbootsSystem : EntitySystem Dirty(uid, magboots); } - protected virtual void UpdateMagbootEffects(EntityUid parent, EntityUid uid, bool state, MagbootsComponent? component) { } + public void UpdateMagbootEffects(EntityUid parent, EntityUid uid, bool state, MagbootsComponent? component) + { + if (!Resolve(uid, ref component)) + return; + state = state && component.On; - protected void OnChanged(EntityUid uid, MagbootsComponent component) + if (TryComp(parent, out MovedByPressureComponent? movedByPressure)) + { + movedByPressure.Enabled = !state; + } + + if (state) + { + _alerts.ShowAlert(parent, component.MagbootsAlert); + } + else + { + _alerts.ClearAlert(parent, component.MagbootsAlert); + } + } + + private void OnChanged(EntityUid uid, MagbootsComponent component) { _sharedActions.SetToggled(component.ToggleActionEntity, component.On); _clothingSpeedModifier.SetClothingSpeedModifierEnabled(uid, component.On); @@ -79,10 +119,12 @@ public abstract class SharedMagbootsSystem : EntitySystem if (!args.CanAccess || !args.CanInteract) return; - ActivationVerb verb = new(); - verb.Text = Loc.GetString("toggle-magboots-verb-get-data-text"); - verb.Act = () => ToggleMagboots(uid, component); - // TODO VERB ICON add toggle icon? maybe a computer on/off symbol? + ActivationVerb verb = new() + { + Text = Loc.GetString("toggle-magboots-verb-get-data-text"), + Act = () => ToggleMagboots(uid, component), + // TODO VERB ICON add toggle icon? maybe a computer on/off symbol? + }; args.Verbs.Add(verb); } @@ -96,6 +138,18 @@ public abstract class SharedMagbootsSystem : EntitySystem { args.AddAction(ref component.ToggleActionEntity, component.ToggleAction); } + + private void OnIsWeightless(Entity ent, ref InventoryRelayedEvent args) + { + if (args.Args.Handled) + return; + + if (!ent.Comp.On) + return; + + args.Args.IsWeightless = false; + args.Args.Handled = true; + } } -public sealed partial class ToggleMagbootsEvent : InstantActionEvent {} +public sealed partial class ToggleMagbootsEvent : InstantActionEvent; diff --git a/Content.Shared/Gravity/SharedGravitySystem.cs b/Content.Shared/Gravity/SharedGravitySystem.cs index df13be51fd..42a6d5d1f8 100644 --- a/Content.Shared/Gravity/SharedGravitySystem.cs +++ b/Content.Shared/Gravity/SharedGravitySystem.cs @@ -1,9 +1,7 @@ using Content.Shared.Alert; -using Content.Shared.Clothing; using Content.Shared.Inventory; using Content.Shared.Movement.Components; using Robust.Shared.GameStates; -using Robust.Shared.Map; using Robust.Shared.Physics; using Robust.Shared.Physics.Components; using Robust.Shared.Serialization; @@ -15,7 +13,6 @@ namespace Content.Shared.Gravity { [Dependency] protected readonly IGameTiming Timing = default!; [Dependency] private readonly AlertsSystem _alerts = default!; - [Dependency] private readonly InventorySystem _inventory = default!; [ValidatePrototypeId] public const string WeightlessAlert = "Weightless"; @@ -30,6 +27,11 @@ namespace Content.Shared.Gravity if (TryComp(uid, out var ignoreGravityComponent)) return ignoreGravityComponent.Weightless; + var ev = new IsWeightlessEvent(uid); + RaiseLocalEvent(uid, ref ev); + if (ev.Handled) + return ev.IsWeightless; + if (!Resolve(uid, ref xform)) return true; @@ -40,18 +42,6 @@ namespace Content.Shared.Gravity return false; } - var hasGrav = gravity != null || mapGravity != null; - - // Check for something holding us down - // If the planet has gravity component and no gravity it will still give gravity - // If there's no gravity comp at all (i.e. space) then they don't work. - if (hasGrav && _inventory.TryGetSlotEntity(uid, "shoes", out var ent)) - { - // TODO this should just be a event that gets relayed instead of a specific slot & component check. - if (TryComp(ent, out var boots) && boots.On) - return false; - } - return true; } @@ -74,9 +64,11 @@ namespace Content.Shared.Gravity private void OnHandleState(EntityUid uid, GravityComponent component, ref ComponentHandleState args) { - if (args.Current is not GravityComponentState state) return; + if (args.Current is not GravityComponentState state) + return; - if (component.EnabledVV == state.Enabled) return; + if (component.EnabledVV == state.Enabled) + return; component.EnabledVV = state.Enabled; var ev = new GravityChangedEvent(uid, component.EnabledVV); RaiseLocalEvent(uid, ref ev, true); @@ -90,9 +82,10 @@ namespace Content.Shared.Gravity private void OnGravityChange(ref GravityChangedEvent ev) { var alerts = AllEntityQuery(); - while(alerts.MoveNext(out var uid, out var comp, out var xform)) + while(alerts.MoveNext(out var uid, out _, out var xform)) { - if (xform.GridUid != ev.ChangedGridIndex) continue; + if (xform.GridUid != ev.ChangedGridIndex) + continue; if (!ev.HasGravity) { @@ -145,4 +138,10 @@ namespace Content.Shared.Gravity } } } + + [ByRefEvent] + public record struct IsWeightlessEvent(EntityUid Entity, bool IsWeightless = false, bool Handled = false) : IInventoryRelayEvent + { + SlotFlags IInventoryRelayEvent.TargetSlots => ~SlotFlags.POCKET; + } } diff --git a/Content.Shared/Inventory/InventorySystem.Relay.cs b/Content.Shared/Inventory/InventorySystem.Relay.cs index 6bd65622f1..ea368884e0 100644 --- a/Content.Shared/Inventory/InventorySystem.Relay.cs +++ b/Content.Shared/Inventory/InventorySystem.Relay.cs @@ -3,6 +3,7 @@ using Content.Shared.Damage; using Content.Shared.Electrocution; using Content.Shared.Explosion; using Content.Shared.Eye.Blinding.Systems; +using Content.Shared.Gravity; using Content.Shared.IdentityManagement.Components; using Content.Shared.Inventory.Events; using Content.Shared.Movement.Systems; @@ -30,6 +31,7 @@ public partial class InventorySystem // by-ref events SubscribeLocalEvent(RefRelayInventoryEvent); + SubscribeLocalEvent(RefRelayInventoryEvent); // Eye/vision events SubscribeLocalEvent(RelayInventoryEvent); diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml b/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml index cbea9d319d..22cd13af60 100644 --- a/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml +++ b/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml @@ -134,3 +134,21 @@ event: !type:ToggleClothingSpeedEvent icon: { sprite: Clothing/Shoes/Boots/speedboots.rsi, state: icon } iconOn: { sprite: Clothing/Shoes/Boots/speedboots.rsi, state: icon-on } + +- type: entity + parent: ClothingShoesBase + id: ClothingShoesBootsMoon + name: moon boots + description: Special anti-gravity boots developed with a speciality blend of lunar rock gel. Shipped from the Netherlands. + components: + - type: Sprite + sprite: Clothing/Shoes/Boots/moonboots.rsi + layers: + - state: icon + - type: Clothing + sprite: Clothing/Shoes/Boots/moonboots.rsi + - type: AntiGravityClothing + - type: StaticPrice + price: 75 + - type: Tag + tags: [ ] diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 0ef76381f0..66af73088d 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -208,7 +208,7 @@ - MagazineBoxRifle - MagazineLightRifle - MagazineLightRifleEmpty - - MagazinePistol + - MagazinePistol - MagazinePistolEmpty - MagazinePistolSubMachineGun - MagazinePistolSubMachineGunEmpty @@ -308,6 +308,7 @@ - WeaponGauntletGorilla - SynthesizerInstrument - ClothingShoesBootsMagSci + - ClothingShoesBootsMoon - ClothingShoesBootsSpeed - NodeScanner - HolofanProjector @@ -707,7 +708,7 @@ staticRecipes: - BoxLethalshot - BoxShotgunFlare - - BoxShotgunPractice + - BoxShotgunPractice - BoxShotgunSlug - ClothingEyesHudSecurity - CombatKnife @@ -724,7 +725,7 @@ - MagazineBoxRiflePractice - MagazineLightRifle - MagazineLightRifleEmpty - - MagazinePistol + - MagazinePistol - MagazinePistolEmpty - MagazinePistolSubMachineGun - MagazinePistolSubMachineGunEmpty @@ -837,8 +838,8 @@ - MagazineBoxRifle - MagazineLightRifle - MagazineLightRifleEmpty - - MagazinePistol - - MagazinePistolEmpty + - MagazinePistol + - MagazinePistolEmpty - MagazineRifle - MagazineRifleEmpty - MagazineShotgun diff --git a/Resources/Prototypes/Recipes/Lathes/misc.yml b/Resources/Prototypes/Recipes/Lathes/misc.yml index ab13dc4573..378392bae1 100644 --- a/Resources/Prototypes/Recipes/Lathes/misc.yml +++ b/Resources/Prototypes/Recipes/Lathes/misc.yml @@ -126,6 +126,13 @@ Steel: 1000 Plastic: 500 +- type: latheRecipe + id: ClothingShoesBootsMoon + result: ClothingShoesBootsMoon + completetime: 2 + materials: + Steel: 600 + - type: latheRecipe id: ClothingShoesBootsSpeed result: ClothingShoesBootsSpeed diff --git a/Resources/Prototypes/Research/experimental.yml b/Resources/Prototypes/Research/experimental.yml index 77adfcf5d5..34443e78f0 100644 --- a/Resources/Prototypes/Research/experimental.yml +++ b/Resources/Prototypes/Research/experimental.yml @@ -68,6 +68,7 @@ cost: 7500 recipeUnlocks: - ClothingShoesBootsMagSci + - ClothingShoesBootsMoon - type: technology id: AnomalyCoreHarnessing diff --git a/Resources/Textures/Clothing/Shoes/Boots/moonboots.rsi/equipped-FEET-vox.png b/Resources/Textures/Clothing/Shoes/Boots/moonboots.rsi/equipped-FEET-vox.png new file mode 100644 index 0000000000000000000000000000000000000000..a65deca7604c8869eb12f083f48fd87f017e4117 GIT binary patch literal 412 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z!#rIaLn`LH zy=9np$U&g>p}WY$tQJ@2!}AopUQ9S@XrXbuLqN9EqH*B@$L^Tcv|!1bd`|aRtd)N4 z&s!6F-k^DPEGN)N2ymD?vo&%Sn=yBqSXcVf=ijI87msdG*=u9(J?Y-G)Aw|In^kIa z%qA_dIluT`rT@?KcgxO&TD_gK+Gpw6KhxFjp0rP}n#<;CCBt{?{r9PUvm+&X-K6;1 zCoQ>}Rr*=;%=6D5_Qk#aTrx=|HL~nnAkUMP_piTBS#&h%qDB4U*2f=rT)O$T?00Vb zWK;XE*MBm?9Q8roMP7a?zrtsm_g5cBi(U)m-ESqQ-?!v+;cZ`o%>}yquY6K?B`)%+ zQ2f+%CB37Da!KYXyYF7z;k|vuQ^T_6?{S`!L=r#T%Qldh^H|TWQEC47IH32c_I$ti zzFY5_W%&P#R&xDQO><2b{+oF<+hfv_qQXU;`d?yB_!|71w;1FKPgg&ebxsLQ0A0k44ofy`glX(f`Xa)F$xE?rg zfR~ro%ECfWP*7G@*38UIMMWhjC`d(FSw=>txv|m5$EP4SHzp>=U3}FEpf0|WAirRS z|HvTR>$V6`W|^mpV@O2n+iAP`4jXW|*5)d_|NsAPl2YiZlsl_}+p5`YWSS0gYqknF zaa3xpa$pPzUjNSY>%Ux)4-GznhIxM}%3-&Rr;HPtJcPTGce)?8Dix zPQH|_W--5vseA`>g@J=9EAw9)=wb#>S3j3^P6Px$4oO5oR9J=Wl)a8eKom#MZd3|Hrjn=>Dlagt-ottby;4G>(D*13jV(6Beq5@GL9p09RJ9HRV8s* z0HEtS`o2G%tGFc~gg^*E+qM7W$PEX%??&j5IyN7FP|mh~k!O>^&n>$>E5PF>gcr{GvT48#2! z*LBS?-{||Es;UTr;LP3B0#}P~*tShoRsR>5rip2qkWx|<1pxCr|C%4!#<3_0Ow&{f mDF1;gD_6x|>sX`Fyfz<2V56wR^>uOp0000I$f@PVL01S#5KR6_@~B8%R?PTznI>+OyP??wOI4i|Lq%X9=10=+$;$+2M8Ke z@9fRf{O&9H>|N>oZKqD`uD!i3sA&yD`Fc%N>yo)zpJqE>kM#14Yg*Fq^W^3SYy!(3R zd)*@$mgz4aojoG&Sjw5LUuXI*ZmM;{+IR)98$iUil$TdLtfXt&mKvWpD=v@}Q<9c& zne|NfKa06_dxgt>-TqZQe|qQ5S4--~J<)#0dDO3&e78sm}`&b`8=^x+yjj^}? zMJTV|WX534=lm(PMP@DMfwJ7{-8~Ae^3A4)*{%t>c6Be$tM?*f_W>FVdQ&MBb@0M3k$`v3p{ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Shoes/Boots/moonboots.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Boots/moonboots.rsi/meta.json new file mode 100644 index 0000000000..2c2d49e031 --- /dev/null +++ b/Resources/Textures/Clothing/Shoes/Boots/moonboots.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from Tau Ceti Station at commit https://github.com/TauCetiStation/TauCetiClassic/blob/HEAD/icons/obj/clothing/shoes.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-FEET", + "directions": 4 + }, + { + "name": "equipped-FEET-vox", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} From d6b8b34f25f6538d14ab91afe715d2ad7fdc4640 Mon Sep 17 00:00:00 2001 From: PJBot Date: Sat, 15 Jun 2024 03:44:29 +0000 Subject: [PATCH 056/142] Automatic changelog update --- Resources/Changelog/Changelog.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 8211adf57e..e03e30b1a9 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Simyon - changes: - - message: The space dragon can now open doors by bumping into them! - type: Tweak - id: 6241 - time: '2024-03-28T05:41:57.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/26490 - author: EmoGarbage404 changes: - message: Various announcements now announce location on the map (near Medical, @@ -3854,3 +3847,11 @@ id: 6740 time: '2024-06-15T03:38:43.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/28974 +- author: EmoGarbage404 + changes: + - message: Added Moon Boots! This science research item allows you to move like + you're in zero-gravity. + type: Add + id: 6741 + time: '2024-06-15T03:43:24.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/29009 From d907e4ef577e6df595a77c7c87e5f864ee38ad0c Mon Sep 17 00:00:00 2001 From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> Date: Sat, 15 Jun 2024 00:01:22 -0400 Subject: [PATCH 057/142] make pulled uncuffing slower & reduce uncuff spam cooldown (#29008) * prevent people being pulled from uncuffing themselves * block -> modify duration --- .../Cuffs/Components/HandcuffComponent.cs | 6 ++++++ Content.Shared/Cuffs/SharedCuffableSystem.cs | 5 ++++- .../Movement/Pulling/Systems/PullingSystem.cs | 16 ++++++++++++++++ .../Entities/Objects/Misc/handcuffs.yml | 2 +- 4 files changed, 27 insertions(+), 2 deletions(-) diff --git a/Content.Shared/Cuffs/Components/HandcuffComponent.cs b/Content.Shared/Cuffs/Components/HandcuffComponent.cs index 30577da064..289f587239 100644 --- a/Content.Shared/Cuffs/Components/HandcuffComponent.cs +++ b/Content.Shared/Cuffs/Components/HandcuffComponent.cs @@ -105,3 +105,9 @@ public record struct UncuffAttemptEvent(EntityUid User, EntityUid Target) public readonly EntityUid Target = Target; public bool Cancelled = false; } + +/// +/// Event raised on an entity being uncuffed to determine any modifiers to the amount of time it takes to uncuff them. +/// +[ByRefEvent] +public record struct ModifyUncuffDurationEvent(EntityUid User, EntityUid Target, float Duration); diff --git a/Content.Shared/Cuffs/SharedCuffableSystem.cs b/Content.Shared/Cuffs/SharedCuffableSystem.cs index 1ced3c8d6c..0e506f938e 100644 --- a/Content.Shared/Cuffs/SharedCuffableSystem.cs +++ b/Content.Shared/Cuffs/SharedCuffableSystem.cs @@ -561,7 +561,10 @@ namespace Content.Shared.Cuffs return; } - var uncuffTime = isOwner ? cuff.BreakoutTime : cuff.UncuffTime; + + var ev = new ModifyUncuffDurationEvent(user, target, isOwner ? cuff.BreakoutTime : cuff.UncuffTime); + RaiseLocalEvent(user, ref ev); + var uncuffTime = ev.Duration; if (isOwner) { diff --git a/Content.Shared/Movement/Pulling/Systems/PullingSystem.cs b/Content.Shared/Movement/Pulling/Systems/PullingSystem.cs index 225810daed..161868370e 100644 --- a/Content.Shared/Movement/Pulling/Systems/PullingSystem.cs +++ b/Content.Shared/Movement/Pulling/Systems/PullingSystem.cs @@ -3,6 +3,7 @@ using Content.Shared.ActionBlocker; using Content.Shared.Administration.Logs; using Content.Shared.Alert; using Content.Shared.Buckle.Components; +using Content.Shared.Cuffs.Components; using Content.Shared.Database; using Content.Shared.Hands; using Content.Shared.Hands.EntitySystems; @@ -12,6 +13,7 @@ using Content.Shared.Movement.Events; using Content.Shared.Movement.Pulling.Components; using Content.Shared.Movement.Pulling.Events; using Content.Shared.Movement.Systems; +using Content.Shared.Popups; using Content.Shared.Pulling.Events; using Content.Shared.Standing; using Content.Shared.Throwing; @@ -43,6 +45,7 @@ public sealed class PullingSystem : EntitySystem [Dependency] private readonly SharedHandsSystem _handsSystem = default!; [Dependency] private readonly SharedInteractionSystem _interaction = default!; [Dependency] private readonly SharedPhysicsSystem _physics = default!; + [Dependency] private readonly SharedPopupSystem _popup = default!; public override void Initialize() { @@ -56,6 +59,7 @@ public sealed class PullingSystem : EntitySystem SubscribeLocalEvent(OnJointRemoved); SubscribeLocalEvent>(AddPullVerbs); SubscribeLocalEvent(OnPullableContainerInsert); + SubscribeLocalEvent(OnModifyUncuffDuration); SubscribeLocalEvent(OnPullerContainerInsert); SubscribeLocalEvent(OnPullerUnpaused); @@ -94,6 +98,18 @@ public sealed class PullingSystem : EntitySystem TryStopPull(ent.Owner, ent.Comp); } + private void OnModifyUncuffDuration(Entity ent, ref ModifyUncuffDurationEvent args) + { + if (!ent.Comp.BeingPulled) + return; + + // We don't care if the person is being uncuffed by someone else + if (args.User != args.Target) + return; + + args.Duration *= 2; + } + public override void Shutdown() { base.Shutdown(); diff --git a/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml b/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml index f703886127..a502c71404 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml @@ -27,7 +27,7 @@ guides: - Security - type: UseDelay - delay: 30 + delay: 3 - type: entity name: makeshift handcuffs From 2953e87f1ca6f7ffe5a542342cc87e648be7f7ff Mon Sep 17 00:00:00 2001 From: PJBot Date: Sat, 15 Jun 2024 04:02:28 +0000 Subject: [PATCH 058/142] Automatic changelog update --- Resources/Changelog/Changelog.yml | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index e03e30b1a9..97d11497b9 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,12 +1,4 @@ Entries: -- author: EmoGarbage404 - changes: - - message: Various announcements now announce location on the map (near Medical, - etc.) instead of simply displaying coordinates. - type: Tweak - id: 6242 - time: '2024-03-28T05:53:18.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/26437 - author: Tayrtahn changes: - message: Arcade machines now advertise and make noise to bring in players. @@ -3855,3 +3847,14 @@ id: 6741 time: '2024-06-15T03:43:24.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/29009 +- author: EmoGarbage404 + changes: + - message: Attempting to uncuff oneself while being pulled will now take twice as + long. + type: Tweak + - message: Reduced cooldown after attempting to uncuff oneself back to previous + values. + type: Tweak + id: 6742 + time: '2024-06-15T04:01:22.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/29008 From c339773b5f6823630e9fa04bbec2dd1d87e521ff Mon Sep 17 00:00:00 2001 From: AJCM-git <60196617+AJCM-git@users.noreply.github.com> Date: Sat, 15 Jun 2024 00:41:25 -0400 Subject: [PATCH 059/142] Fixes the ShowRulesCommand and the client not syncing rules correctly (#28752) --- .../Systems/Info/InfoUIController.cs | 30 +++++++++++++------ Content.Server/Info/RulesManager.cs | 19 +++++++----- Content.Server/Info/ShowRulesCommand.cs | 16 +++++----- Content.Shared/CCVar/CCVars.cs | 2 +- Content.Shared/Info/RulesMessages.cs | 10 +++++-- 5 files changed, 50 insertions(+), 27 deletions(-) diff --git a/Content.Client/UserInterface/Systems/Info/InfoUIController.cs b/Content.Client/UserInterface/Systems/Info/InfoUIController.cs index 1e431b17fc..3706e89092 100644 --- a/Content.Client/UserInterface/Systems/Info/InfoUIController.cs +++ b/Content.Client/UserInterface/Systems/Info/InfoUIController.cs @@ -1,12 +1,10 @@ using Content.Client.Gameplay; using Content.Client.Info; -using Content.Shared.CCVar; using Content.Shared.Guidebook; using Content.Shared.Info; using Robust.Client.Console; using Robust.Client.UserInterface.Controllers; using Robust.Client.UserInterface.Controls; -using Robust.Shared.Configuration; using Robust.Shared.Network; using Robust.Shared.Prototypes; @@ -14,21 +12,27 @@ namespace Content.Client.UserInterface.Systems.Info; public sealed class InfoUIController : UIController, IOnStateExited { - [Dependency] private readonly IConfigurationManager _cfg = default!; [Dependency] private readonly IClientConsoleHost _consoleHost = default!; [Dependency] private readonly INetManager _netManager = default!; [Dependency] private readonly IPrototypeManager _prototype = default!; + [Dependency] private readonly ILogManager _logMan = default!; private RulesPopup? _rulesPopup; private RulesAndInfoWindow? _infoWindow; + private ISawmill _sawmill = default!; + + [ValidatePrototypeId] + private const string DefaultRuleset = "DefaultRuleset"; + + public ProtoId RulesEntryId = DefaultRuleset; public override void Initialize() { base.Initialize(); - + _sawmill = _logMan.GetSawmill("rules"); _netManager.RegisterNetMessage(); - _netManager.RegisterNetMessage(OnShowRulesPopupMessage); + _netManager.RegisterNetMessage(OnRulesInformationMessage); _consoleHost.RegisterCommand("fuckrules", "", @@ -39,9 +43,12 @@ public sealed class InfoUIController : UIController, IOnStateExited(guide); + if (!_prototype.TryIndex(RulesEntryId, out var guideEntryPrototype)) + { + guideEntryPrototype = _prototype.Index(DefaultRuleset); + _sawmill.Error($"Couldn't find the following prototype: {RulesEntryId}. Falling back to {DefaultRuleset}, please check that the server has the rules set up correctly"); + return guideEntryPrototype; + } + return guideEntryPrototype; } diff --git a/Content.Server/Info/RulesManager.cs b/Content.Server/Info/RulesManager.cs index 168e5846b9..f4d9e57bd4 100644 --- a/Content.Server/Info/RulesManager.cs +++ b/Content.Server/Info/RulesManager.cs @@ -18,22 +18,25 @@ public sealed class RulesManager public void Initialize() { _netManager.Connected += OnConnected; - _netManager.RegisterNetMessage(); + _netManager.RegisterNetMessage(); _netManager.RegisterNetMessage(OnRulesAccepted); } private async void OnConnected(object? sender, NetChannelArgs e) { - if (IPAddress.IsLoopback(e.Channel.RemoteEndPoint.Address) && _cfg.GetCVar(CCVars.RulesExemptLocal)) - return; + var isLocalhost = IPAddress.IsLoopback(e.Channel.RemoteEndPoint.Address) && + _cfg.GetCVar(CCVars.RulesExemptLocal); var lastRead = await _dbManager.GetLastReadRules(e.Channel.UserId); - if (lastRead > LastValidReadTime) - return; + var hasCooldown = lastRead > LastValidReadTime; - var message = new ShowRulesPopupMessage(); - message.PopupTime = _cfg.GetCVar(CCVars.RulesWaitTime); - _netManager.ServerSendMessage(message, e.Channel); + var showRulesMessage = new SendRulesInformationMessage + { + PopupTime = _cfg.GetCVar(CCVars.RulesWaitTime), + CoreRules = _cfg.GetCVar(CCVars.RulesFile), + ShouldShowRules = !isLocalhost && !hasCooldown + }; + _netManager.ServerSendMessage(showRulesMessage, e.Channel); } private async void OnRulesAccepted(RulesAcceptedMessage message) diff --git a/Content.Server/Info/ShowRulesCommand.cs b/Content.Server/Info/ShowRulesCommand.cs index b13b8d11a5..eb3fb08db0 100644 --- a/Content.Server/Info/ShowRulesCommand.cs +++ b/Content.Server/Info/ShowRulesCommand.cs @@ -12,6 +12,10 @@ namespace Content.Server.Info; [AdminCommand(AdminFlags.Admin)] public sealed class ShowRulesCommand : IConsoleCommand { + [Dependency] private readonly INetManager _net = default!; + [Dependency] private readonly IConfigurationManager _configuration = default!; + [Dependency] private readonly IPlayerManager _player = default!; + public string Command => "showrules"; public string Description => "Opens the rules popup for the specified player."; public string Help => "showrules [seconds]"; @@ -25,8 +29,7 @@ public sealed class ShowRulesCommand : IConsoleCommand case 1: { target = args[0]; - var configurationManager = IoCManager.Resolve(); - seconds = configurationManager.GetCVar(CCVars.RulesWaitTime); + seconds = _configuration.GetCVar(CCVars.RulesWaitTime); break; } case 2: @@ -48,15 +51,14 @@ public sealed class ShowRulesCommand : IConsoleCommand } - var message = new ShowRulesPopupMessage { PopupTime = seconds }; - - if (!IoCManager.Resolve().TryGetSessionByUsername(target, out var player)) + if (!_player.TryGetSessionByUsername(target, out var player)) { shell.WriteError("Unable to find a player with that name."); return; } - var netManager = IoCManager.Resolve(); - netManager.ServerSendMessage(message, player.Channel); + var coreRules = _configuration.GetCVar(CCVars.RulesFile); + var message = new SendRulesInformationMessage { PopupTime = seconds, CoreRules = coreRules, ShouldShowRules = true}; + _net.ServerSendMessage(message, player.Channel); } } diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs index e3f0f65438..a9cc2d11da 100644 --- a/Content.Shared/CCVar/CCVars.cs +++ b/Content.Shared/CCVar/CCVars.cs @@ -1856,7 +1856,7 @@ namespace Content.Shared.CCVar /// Don't show rules to localhost/loopback interface. /// public static readonly CVarDef RulesExemptLocal = - CVarDef.Create("rules.exempt_local", false, CVar.SERVERONLY); + CVarDef.Create("rules.exempt_local", true, CVar.SERVERONLY); /* diff --git a/Content.Shared/Info/RulesMessages.cs b/Content.Shared/Info/RulesMessages.cs index ac7400238f..999e5441da 100644 --- a/Content.Shared/Info/RulesMessages.cs +++ b/Content.Shared/Info/RulesMessages.cs @@ -5,22 +5,28 @@ using Robust.Shared.Serialization; namespace Content.Shared.Info; /// -/// Sent by the server to show the rules to the client instantly. +/// Sent by the server when the client connects to sync the client rules and displaying a popup with them if necessitated. /// -public sealed class ShowRulesPopupMessage : NetMessage +public sealed class SendRulesInformationMessage : NetMessage { public override MsgGroups MsgGroup => MsgGroups.Command; public float PopupTime { get; set; } + public string CoreRules { get; set; } = string.Empty; + public bool ShouldShowRules { get; set; } public override void ReadFromBuffer(NetIncomingMessage buffer, IRobustSerializer serializer) { PopupTime = buffer.ReadFloat(); + CoreRules = buffer.ReadString(); + ShouldShowRules = buffer.ReadBoolean(); } public override void WriteToBuffer(NetOutgoingMessage buffer, IRobustSerializer serializer) { buffer.Write(PopupTime); + buffer.Write(CoreRules); + buffer.Write(ShouldShowRules); } } From ba24cc8f5c453d111c59e5b332b10b33e10ae3fb Mon Sep 17 00:00:00 2001 From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> Date: Sat, 15 Jun 2024 01:20:42 -0400 Subject: [PATCH 060/142] Fix drinking from openable containers (#29010) --- Content.Shared/Nutrition/EntitySystems/OpenableSystem.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Shared/Nutrition/EntitySystems/OpenableSystem.cs b/Content.Shared/Nutrition/EntitySystems/OpenableSystem.cs index 0a7a8d88f3..85a94a7ec6 100644 --- a/Content.Shared/Nutrition/EntitySystems/OpenableSystem.cs +++ b/Content.Shared/Nutrition/EntitySystems/OpenableSystem.cs @@ -62,7 +62,7 @@ public sealed partial class OpenableSystem : EntitySystem if (args.Handled || !ent.Comp.OpenableByHand) return; - args.Handled = TryToggle(ent, args.User); + args.Handled = TryOpen(ent, ent, args.User); } private void OnActivated(Entity ent, ref ActivateInWorldEvent args) From 16e7fec5e820041c2edac756662a15c54a2f7a48 Mon Sep 17 00:00:00 2001 From: PJBot Date: Sat, 15 Jun 2024 05:21:49 +0000 Subject: [PATCH 061/142] Automatic changelog update --- Resources/Changelog/Changelog.yml | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 97d11497b9..ef08bf29eb 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,13 +1,4 @@ Entries: -- author: Tayrtahn - changes: - - message: Arcade machines now advertise and make noise to bring in players. - type: Add - - message: Space Villain arcade machines have a new screen animation. - type: Tweak - id: 6243 - time: '2024-03-28T06:28:45.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/24200 - author: EmoGarbage404 changes: - message: The revenant essence alert now displays the exact amount of essence. @@ -3858,3 +3849,11 @@ id: 6742 time: '2024-06-15T04:01:22.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/29008 +- author: EmoGarbage404 + changes: + - message: Fixed bottles, when used inhand, not being drank from but instead repeatedly + opening and closing. + type: Fix + id: 6743 + time: '2024-06-15T05:20:43.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/29010 From 65424e02532744e0694ccbe93c4001952f695b67 Mon Sep 17 00:00:00 2001 From: deltanedas <39013340+deltanedas@users.noreply.github.com> Date: Sat, 15 Jun 2024 06:01:13 +0000 Subject: [PATCH 062/142] saltern update (#29001) Co-authored-by: deltanedas <@deltanedas:kde.org> --- Resources/Maps/saltern.yml | 165 ++++++++++++++++++++++++------------- 1 file changed, 110 insertions(+), 55 deletions(-) diff --git a/Resources/Maps/saltern.yml b/Resources/Maps/saltern.yml index 09df7eeb52..c9d3218c45 100644 --- a/Resources/Maps/saltern.yml +++ b/Resources/Maps/saltern.yml @@ -772,7 +772,8 @@ entities: 6,6: 2: 35049 7,5: - 0: 36063 + 0: 35999 + 3: 64 2: 4096 7,6: 2: 53196 @@ -783,7 +784,7 @@ entities: 2: 57344 8,5: 0: 272 - 3: 17472 + 4: 17472 8,6: 2: 65345 8,7: @@ -824,10 +825,10 @@ entities: 0: 53759 11,2: 0: 4319 - 4: 49152 + 5: 49152 11,3: 0: 61457 - 4: 204 + 5: 204 11,-1: 0: 30583 11,4: @@ -839,9 +840,9 @@ entities: 0: 28791 12,2: 0: 119 - 4: 28672 + 5: 28672 12,3: - 4: 119 + 5: 119 0: 61440 12,-1: 0: 29311 @@ -1259,17 +1260,17 @@ entities: 8,8: 2: 65534 9,5: - 5: 4368 - 4: 17472 + 6: 4368 + 5: 17472 9,6: 2: 7936 10,5: - 4: 4368 - 6: 17472 + 5: 4368 + 7: 17472 10,6: 2: 3840 11,5: - 4: 21840 + 5: 21840 11,6: 2: 3856 12,5: @@ -1425,6 +1426,21 @@ entities: - 0 - 0 - 0 + - volume: 2500 + temperature: 293.15 + moles: + - 23.57087 + - 88.67137 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 - volume: 2500 temperature: 293.15 moles: @@ -14253,6 +14269,11 @@ entities: - type: Transform pos: 33.5,-17.5 parent: 31 + - uid: 9867 + components: + - type: Transform + pos: 48.5,19.5 + parent: 31 - uid: 9927 components: - type: Transform @@ -15333,6 +15354,11 @@ entities: - type: Transform pos: -27.5,-18.5 parent: 31 + - uid: 11305 + components: + - type: Transform + pos: 48.5,20.5 + parent: 31 - uid: 11328 components: - type: Transform @@ -15368,6 +15394,11 @@ entities: - type: Transform pos: 17.5,11.5 parent: 31 + - uid: 11384 + components: + - type: Transform + pos: 48.5,21.5 + parent: 31 - uid: 11415 components: - type: Transform @@ -15433,6 +15464,66 @@ entities: - type: Transform pos: -25.5,-3.5 parent: 31 + - uid: 11454 + components: + - type: Transform + pos: 48.5,22.5 + parent: 31 + - uid: 11455 + components: + - type: Transform + pos: 48.5,23.5 + parent: 31 + - uid: 11456 + components: + - type: Transform + pos: 48.5,24.5 + parent: 31 + - uid: 11457 + components: + - type: Transform + pos: 49.5,24.5 + parent: 31 + - uid: 11458 + components: + - type: Transform + pos: 50.5,24.5 + parent: 31 + - uid: 11459 + components: + - type: Transform + pos: 51.5,24.5 + parent: 31 + - uid: 11460 + components: + - type: Transform + pos: 52.5,24.5 + parent: 31 + - uid: 11461 + components: + - type: Transform + pos: 52.5,23.5 + parent: 31 + - uid: 11462 + components: + - type: Transform + pos: 52.5,22.5 + parent: 31 + - uid: 11463 + components: + - type: Transform + pos: 52.5,21.5 + parent: 31 + - uid: 11464 + components: + - type: Transform + pos: 52.5,20.5 + parent: 31 + - uid: 11465 + components: + - type: Transform + pos: 52.5,19.5 + parent: 31 - proto: CableApcStack entities: - uid: 94 @@ -28356,46 +28447,6 @@ entities: - type: Transform pos: 16.5,-29.5 parent: 31 -- proto: CrateEngineeringSecure - entities: - - uid: 11305 - components: - - type: MetaData - desc: Stores logic gates that control the salvage-atmos airlocks. - name: logic gate crate - - type: Transform - pos: 30.5,21.5 - parent: 31 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.1496 - 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: - - 11306 - - 11307 - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - proto: CrateEngineeringSingularityContainment entities: - uid: 6437 @@ -49183,7 +49234,9 @@ entities: - uid: 11306 components: - type: Transform - parent: 11305 + anchored: True + pos: 31.5,20.5 + parent: 31 - type: DeviceLinkSink links: - 9067 @@ -49196,11 +49249,13 @@ entities: - Output: DoorBolt - type: Physics canCollide: False - - type: InsideEntityStorage + bodyType: Static - uid: 11307 components: - type: Transform - parent: 11305 + anchored: True + pos: 31.5,21.5 + parent: 31 - type: DeviceLinkSink links: - 6522 @@ -49213,7 +49268,7 @@ entities: - Output: DoorBolt - type: Physics canCollide: False - - type: InsideEntityStorage + bodyType: Static - proto: MachineAnomalyGenerator entities: - uid: 6098 From 7afbe3c98e6c19ede53b16c7dadc2bb24ec9741c Mon Sep 17 00:00:00 2001 From: Flareguy <78941145+Flareguy@users.noreply.github.com> Date: Sat, 15 Jun 2024 01:02:56 -0500 Subject: [PATCH 063/142] Adds 2 new space ruins (#28971) adds 2 new space ruins --- Resources/Maps/Ruins/chunked_tcomms.yml | 217 + Resources/Maps/Ruins/empty_flagship.yml | 13115 ++++++++++++++++ Resources/Maps/Ruins/relaystation.yml | 760 - .../Prototypes/Entities/Stations/base.yml | 3 +- 4 files changed, 13334 insertions(+), 761 deletions(-) create mode 100644 Resources/Maps/Ruins/chunked_tcomms.yml create mode 100644 Resources/Maps/Ruins/empty_flagship.yml delete mode 100644 Resources/Maps/Ruins/relaystation.yml diff --git a/Resources/Maps/Ruins/chunked_tcomms.yml b/Resources/Maps/Ruins/chunked_tcomms.yml new file mode 100644 index 0000000000..d17b925bf2 --- /dev/null +++ b/Resources/Maps/Ruins/chunked_tcomms.yml @@ -0,0 +1,217 @@ +meta: + format: 6 + postmapinit: false +tilemap: + 0: Space + 128: Lattice + 129: Plating + 1: PlatingDamaged +entities: +- proto: "" + entities: + - uid: 1 + components: + - type: MetaData + name: grid + - type: Transform + pos: -0.4375,0.984375 + parent: invalid + - type: MapGrid + chunks: + 0,0: + ind: 0,0 + tiles: gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + 0,-1: + ind: 0,-1 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAQAAAAABAQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAQAAAAABAQAAAAACAQAAAAAAAQAAAAACgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAAQAAAAAAgQAAAAAAAQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAABgAAAAAAAgAAAAAAAgAAAAAAAAQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAQAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAABAQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + -1,-1: + ind: -1,-1 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAA + version: 6 + - type: Broadphase + - type: Physics + bodyStatus: InAir + angularDamping: 0.05 + linearDamping: 0.05 + fixedRotation: False + bodyType: Dynamic + - type: Fixtures + fixtures: {} + - type: OccluderTree + - type: SpreaderGrid + - type: Shuttle + - type: GridPathfinding + - type: Gravity + gravityShakeSound: !type:SoundPathSpecifier + path: /Audio/Effects/alert.ogg + - type: DecalGrid + chunkCollection: + version: 2 + nodes: + - node: + cleanable: True + color: '#FFFFFFFF' + id: Remains + decals: + 0: 7,-2 + - type: GridAtmosphere + version: 2 + data: + chunkSize: 4 + - type: GasTileOverlay + - type: RadiationGridResistance +- proto: ClothingHeadsetGrey + entities: + - uid: 27 + components: + - type: Transform + pos: 4.4739795,-2.5042162 + parent: 1 +- proto: LootSpawnerEncryptionKey + entities: + - uid: 21 + components: + - type: Transform + pos: 6.5,-4.5 + parent: 1 +- proto: LootSpawnerIndustrial + entities: + - uid: 25 + components: + - type: Transform + pos: 8.5,2.5 + parent: 1 +- proto: MachineFrame + entities: + - uid: 19 + components: + - type: Transform + pos: 8.5,-3.5 + parent: 1 + - uid: 22 + components: + - type: Transform + pos: 8.5,-4.5 + parent: 1 +- proto: MachineFrameDestroyed + entities: + - uid: 20 + components: + - type: Transform + pos: 6.5,-3.5 + parent: 1 +- proto: PosterLegitHereForYourSafety + entities: + - uid: 24 + components: + - type: Transform + pos: 7.5,-0.5 + parent: 1 +- proto: ReinforcedGirder + entities: + - uid: 9 + components: + - type: Transform + pos: 1.5,-0.5 + parent: 1 + - uid: 10 + components: + - type: Transform + pos: 2.5,-0.5 + parent: 1 + - uid: 17 + components: + - type: Transform + pos: 10.5,-6.5 + parent: 1 +- proto: SheetPlasteel1 + entities: + - uid: 26 + components: + - type: Transform + pos: 2.5,-1.5 + parent: 1 +- proto: TelecomServer + entities: + - uid: 23 + components: + - type: Transform + pos: 8.5,-2.5 + parent: 1 +- proto: UnfinishedMachineFrame + entities: + - uid: 18 + components: + - type: Transform + pos: 6.5,-2.5 + parent: 1 +- proto: WallReinforced + entities: + - uid: 2 + components: + - type: Transform + pos: 4.5,-0.5 + parent: 1 + - uid: 3 + components: + - type: Transform + pos: 5.5,-0.5 + parent: 1 + - uid: 4 + components: + - type: Transform + pos: 6.5,-0.5 + parent: 1 + - uid: 5 + components: + - type: Transform + pos: 7.5,-0.5 + parent: 1 + - uid: 6 + components: + - type: Transform + pos: 8.5,-0.5 + parent: 1 + - uid: 7 + components: + - type: Transform + pos: 10.5,-0.5 + parent: 1 + - uid: 8 + components: + - type: Transform + pos: 9.5,-0.5 + parent: 1 + - uid: 11 + components: + - type: Transform + pos: 3.5,-0.5 + parent: 1 + - uid: 12 + components: + - type: Transform + pos: 10.5,-1.5 + parent: 1 + - uid: 13 + components: + - type: Transform + pos: 10.5,-2.5 + parent: 1 + - uid: 14 + components: + - type: Transform + pos: 10.5,-4.5 + parent: 1 + - uid: 15 + components: + - type: Transform + pos: 10.5,-5.5 + parent: 1 + - uid: 16 + components: + - type: Transform + pos: 10.5,-3.5 + parent: 1 +... diff --git a/Resources/Maps/Ruins/empty_flagship.yml b/Resources/Maps/Ruins/empty_flagship.yml new file mode 100644 index 0000000000..92800f54b8 --- /dev/null +++ b/Resources/Maps/Ruins/empty_flagship.yml @@ -0,0 +1,13115 @@ +meta: + format: 6 + postmapinit: false +tilemap: + 0: Space + 15: FloorBar + 22: FloorBrokenWood + 82: FloorReinforced + 85: FloorShowroom + 96: FloorSteel + 99: FloorSteelCheckerLight + 100: FloorSteelDamaged + 115: FloorWhite + 125: FloorWood + 128: Lattice + 129: Plating + 133: PlatingDamaged +entities: +- proto: "" + entities: + - uid: 1 + components: + - type: MetaData + name: empty flagship + - type: Transform + pos: -1.109375,2.5 + parent: invalid + - type: MapGrid + chunks: + 0,0: + ind: 0,0 + tiles: UgAAAAAAYAAAAAACYAAAAAAAYAAAAAABYAAAAAADYAAAAAAAYAAAAAADYAAAAAABYAAAAAADYAAAAAADYAAAAAABYAAAAAACYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAACUgAAAAAAYAAAAAACYAAAAAAAYAAAAAACYAAAAAACYAAAAAACYAAAAAADYAAAAAAAYAAAAAAAYAAAAAABYAAAAAAAYAAAAAAAYAAAAAACYAAAAAAAYAAAAAACYAAAAAABUgAAAAAAYAAAAAADYAAAAAAAYAAAAAABYAAAAAACZAAAAAACYAAAAAADZAAAAAADZAAAAAAEYAAAAAACYAAAAAACYAAAAAACYAAAAAACYAAAAAAAYAAAAAAAYAAAAAADUgAAAAAAYAAAAAACYAAAAAADZAAAAAABYAAAAAACZAAAAAACZAAAAAACYAAAAAACYAAAAAACYAAAAAAAYAAAAAACYAAAAAABYAAAAAADYAAAAAABYAAAAAAAYAAAAAACUgAAAAAAYAAAAAABYAAAAAAAZAAAAAADhQAAAAACZAAAAAAAZAAAAAAAhQAAAAABZAAAAAACYAAAAAADYAAAAAABYAAAAAAAYAAAAAADYAAAAAABYAAAAAAAYAAAAAABUgAAAAAAYAAAAAAAYAAAAAAAhQAAAAAAgQAAAAAAhQAAAAABgQAAAAAAgQAAAAAAhQAAAAACYAAAAAABYAAAAAABYAAAAAABYAAAAAAAYAAAAAABYAAAAAADYAAAAAACUgAAAAAAYAAAAAACZAAAAAADhQAAAAABgAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAZAAAAAABYAAAAAADYAAAAAADYAAAAAAAYAAAAAADYAAAAAABYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAhQAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + 0,-1: + ind: 0,-1 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgAAAAAAAhQAAAAAAgQAAAAAAhQAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhQAAAAAChQAAAAAAgQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAUgAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhQAAAAAAgQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAUgAAAAAAgQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAhQAAAAACgQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAhQAAAAACgQAAAAAAUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAhQAAAAACUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgAAAAAAAhQAAAAABhQAAAAABUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAhQAAAAABgQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAUgAAAAAAYAAAAAABYAAAAAADYAAAAAADYAAAAAADYAAAAAACYAAAAAACYAAAAAACYAAAAAACYAAAAAACYAAAAAABYAAAAAABYAAAAAAAYAAAAAACYAAAAAADYAAAAAABUgAAAAAAYAAAAAACYAAAAAACYAAAAAAAYAAAAAADYAAAAAABYAAAAAAAYAAAAAABYAAAAAABYAAAAAACYAAAAAACYAAAAAADYAAAAAADYAAAAAADYAAAAAACYAAAAAAD + version: 6 + 1,-1: + ind: 1,-1 + tiles: UgAAAAAAUgAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAUgAAAAAAUgAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAUgAAAAAAUgAAAAAAgQAAAAAAUgAAAAAAUgAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAUgAAAAAAUgAAAAAAgQAAAAAAUgAAAAAAUgAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAUgAAAAAAUgAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAUgAAAAAAUgAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAUgAAAAAAUgAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAUgAAAAAAUgAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAUgAAAAAAUgAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAABgQAAAAAAYAAAAAAAYAAAAAABYAAAAAABYAAAAAADYAAAAAAAYAAAAAABYAAAAAACYAAAAAADYAAAAAABYAAAAAACYAAAAAAAYAAAAAABYAAAAAACYAAAAAABYAAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAACYAAAAAABYAAAAAABYAAAAAACYAAAAAAAYAAAAAABYAAAAAABYAAAAAADYAAAAAADYAAAAAAAYAAAAAAD + version: 6 + 1,0: + ind: 1,0 + tiles: YAAAAAACYAAAAAACgQAAAAAAYAAAAAACYAAAAAACYAAAAAADYAAAAAADYAAAAAADYAAAAAABYAAAAAACYAAAAAADYAAAAAADYAAAAAADYAAAAAABYAAAAAABYAAAAAADYAAAAAADYAAAAAABgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAACYAAAAAABYAAAAAAAYAAAAAACYAAAAAAAYAAAAAACYAAAAAADYAAAAAAAYAAAAAABYAAAAAABYAAAAAACYAAAAAACgQAAAAAAYAAAAAAAYAAAAAABYAAAAAADYAAAAAADYAAAAAACYAAAAAAAYAAAAAABYAAAAAAAYAAAAAADYAAAAAAAYAAAAAADYAAAAAAAYAAAAAABYAAAAAACYAAAAAADgQAAAAAAYAAAAAADYAAAAAAAYAAAAAABYAAAAAADYAAAAAADYAAAAAACYAAAAAAAYAAAAAABYAAAAAACYAAAAAAAYAAAAAACYAAAAAADYAAAAAAAYAAAAAACYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAADYAAAAAABYAAAAAAAYAAAAAADYAAAAAACYAAAAAAAYAAAAAACYAAAAAADYAAAAAABYAAAAAADYAAAAAAAYAAAAAADYAAAAAABYAAAAAAAYAAAAAAAYAAAAAADYAAAAAACYAAAAAAAYAAAAAACYAAAAAACYAAAAAABYAAAAAADYAAAAAABYAAAAAABYAAAAAAAYAAAAAADYAAAAAABYAAAAAADYAAAAAACYAAAAAADYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + -1,0: + ind: -1,0 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + -1,-1: + ind: -1,-1 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAA + version: 6 + 2,0: + ind: 2,0 + tiles: gQAAAAAAYAAAAAAAYAAAAAABgQAAAAAADwAAAAABDwAAAAABDwAAAAACDwAAAAACDwAAAAAADwAAAAAADwAAAAADDwAAAAACgQAAAAAAYAAAAAAAYAAAAAABYAAAAAACgQAAAAAAYAAAAAACYAAAAAAAgQAAAAAAYwAAAAADYwAAAAAAYwAAAAABYwAAAAADYwAAAAAAYwAAAAADYwAAAAACYwAAAAADgQAAAAAAYAAAAAABYAAAAAADgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAACgQAAAAAAYwAAAAADYwAAAAABYwAAAAACYwAAAAACYwAAAAADYwAAAAACYwAAAAADYwAAAAAAgQAAAAAAYAAAAAACYAAAAAACgQAAAAAAgQAAAAAAYAAAAAACYAAAAAAAgQAAAAAAYwAAAAACYwAAAAABYwAAAAACYwAAAAAAYwAAAAACYwAAAAAAYwAAAAABYwAAAAACgQAAAAAAYAAAAAACYAAAAAACgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAACgQAAAAAAYAAAAAADYAAAAAAAYAAAAAADYAAAAAADYAAAAAABYAAAAAACYAAAAAABYAAAAAADYAAAAAADYAAAAAADYAAAAAAAYAAAAAABYAAAAAADYAAAAAACYAAAAAADgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAABYAAAAAAAYAAAAAABYAAAAAADYAAAAAAAYAAAAAACYAAAAAACYAAAAAACYAAAAAACYAAAAAACYAAAAAABYAAAAAACYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + 2,-1: + ind: 2,-1 + tiles: gQAAAAAAYAAAAAACYAAAAAADgQAAAAAAcwAAAAADcwAAAAAAcwAAAAADcwAAAAADcwAAAAAAcwAAAAAAcwAAAAACcwAAAAABgQAAAAAAYAAAAAABYAAAAAADgQAAAAAAgQAAAAAAYAAAAAABYAAAAAACgQAAAAAAcwAAAAABcwAAAAACcwAAAAACcwAAAAAAcwAAAAACcwAAAAABcwAAAAABcwAAAAADgQAAAAAAYAAAAAACYAAAAAABgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAABgQAAAAAAcwAAAAADcwAAAAAAcwAAAAACcwAAAAACcwAAAAACcwAAAAABcwAAAAACcwAAAAAAgQAAAAAAYAAAAAADYAAAAAABgQAAAAAAgQAAAAAAYAAAAAABYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAABgQAAAAAAgQAAAAAAYAAAAAABYAAAAAABYAAAAAADYAAAAAABYAAAAAABYAAAAAABYAAAAAAAYAAAAAAAYAAAAAADYAAAAAACYAAAAAABYAAAAAAAYAAAAAABYAAAAAAAYAAAAAABgQAAAAAAYAAAAAACYAAAAAACYAAAAAABYAAAAAACYAAAAAABYAAAAAADYAAAAAADYAAAAAABYAAAAAACYAAAAAADYAAAAAADYAAAAAABYAAAAAABYAAAAAAAYAAAAAADgQAAAAAAYAAAAAAAYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAACgQAAAAAADwAAAAACDwAAAAAADwAAAAACDwAAAAAADwAAAAACDwAAAAAADwAAAAADDwAAAAACgQAAAAAAYAAAAAABYAAAAAABgQAAAAAAgQAAAAAAYAAAAAACYAAAAAAAgQAAAAAADwAAAAAADwAAAAACDwAAAAADDwAAAAADDwAAAAADDwAAAAACDwAAAAAADwAAAAABgQAAAAAAYAAAAAACZAAAAAAChQAAAAACgQAAAAAAYAAAAAABYAAAAAABgQAAAAAADwAAAAACDwAAAAABDwAAAAABDwAAAAABDwAAAAADDwAAAAABDwAAAAAADwAAAAADgQAAAAAAZAAAAAAEZAAAAAABhQAAAAACgQAAAAAAYAAAAAABYAAAAAADgQAAAAAADwAAAAAADwAAAAAADwAAAAAADwAAAAABDwAAAAADDwAAAAAADwAAAAAADwAAAAADgQAAAAAAYAAAAAAAZAAAAAAEhQAAAAABgQAAAAAAYAAAAAADYAAAAAACgQAAAAAADwAAAAACDwAAAAACDwAAAAADDwAAAAABDwAAAAABDwAAAAACDwAAAAADDwAAAAADgQAAAAAAYAAAAAACYAAAAAADgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAABgQAAAAAADwAAAAAADwAAAAAADwAAAAACDwAAAAABDwAAAAACDwAAAAADDwAAAAAADwAAAAADgQAAAAAAYAAAAAAAYAAAAAADgQAAAAAAgQAAAAAAYAAAAAADYAAAAAACgQAAAAAADwAAAAAADwAAAAACDwAAAAACDwAAAAABDwAAAAABDwAAAAAADwAAAAADDwAAAAADgQAAAAAAYAAAAAAAYAAAAAABgQAAAAAAgQAAAAAAYAAAAAABYAAAAAABgQAAAAAADwAAAAAADwAAAAACDwAAAAABDwAAAAABDwAAAAACDwAAAAABDwAAAAADDwAAAAABgQAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAABgQAAAAAADwAAAAAADwAAAAABDwAAAAADDwAAAAAADwAAAAADDwAAAAADDwAAAAABDwAAAAAAgQAAAAAAYAAAAAACYAAAAAABYAAAAAAA + version: 6 + 1,-2: + ind: 1,-2 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAZAAAAAAEZAAAAAACYAAAAAACYAAAAAABYAAAAAADYAAAAAADYAAAAAAAYAAAAAACYAAAAAAAYAAAAAAAYAAAAAACYAAAAAADYAAAAAAAYAAAAAACYAAAAAABYAAAAAAAZAAAAAACgQAAAAAAYAAAAAABYAAAAAACYAAAAAACYAAAAAACYAAAAAADYAAAAAABYAAAAAADYAAAAAABYAAAAAADYAAAAAAAYAAAAAACYAAAAAAAYAAAAAACYAAAAAACgQAAAAAAZAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAhQAAAAAAhQAAAAABgQAAAAAAZAAAAAABVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAgQAAAAAAhQAAAAAAgQAAAAAAZAAAAAABVQAAAAAAVQAAAAAAgQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAgQAAAAAAZAAAAAABgQAAAAAAZAAAAAABVQAAAAAAVQAAAAAAgQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAhQAAAAACgQAAAAAAgQAAAAAAZAAAAAAEVQAAAAAAVQAAAAAAgQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAhQAAAAACZAAAAAACgQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAgQAAAAAAVQAAAAAAgQAAAAAAVQAAAAAAgQAAAAAAVQAAAAAAgQAAAAAAVQAAAAAAgQAAAAAAVQAAAAAAgQAAAAAAZAAAAAAAgQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAgQAAAAAAVQAAAAAAgQAAAAAAVQAAAAAAgQAAAAAAVQAAAAAAgQAAAAAAVQAAAAAAgQAAAAAAVQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAhQAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAUgAAAAAAUgAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAA + version: 6 + 2,-2: + ind: 2,-2 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAADYAAAAAACYAAAAAADYAAAAAAAYAAAAAABYAAAAAACYAAAAAABYAAAAAAAYAAAAAABYAAAAAABYAAAAAACYAAAAAABYAAAAAADgQAAAAAAYAAAAAACYAAAAAADYAAAAAACYAAAAAABYAAAAAACYAAAAAABYAAAAAAAYAAAAAACYAAAAAAAYAAAAAACYAAAAAAAYAAAAAACYAAAAAADYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAADgQAAAAAAgQAAAAAAYAAAAAABYAAAAAADgQAAAAAAcwAAAAADcwAAAAAAcwAAAAAAcwAAAAABcwAAAAADcwAAAAAAcwAAAAADcwAAAAADgQAAAAAAYAAAAAABYAAAAAACgQAAAAAAgQAAAAAAYAAAAAADYAAAAAAAgQAAAAAAcwAAAAABcwAAAAACcwAAAAABcwAAAAAAcwAAAAACcwAAAAAAcwAAAAAAcwAAAAABgQAAAAAAYAAAAAACYAAAAAACgQAAAAAAYAAAAAABYAAAAAAAYAAAAAACgQAAAAAAcwAAAAAAcwAAAAAAcwAAAAACcwAAAAADcwAAAAAAcwAAAAACcwAAAAACcwAAAAAAgQAAAAAAYAAAAAACYAAAAAACgQAAAAAAYAAAAAABYAAAAAABYAAAAAABgQAAAAAAcwAAAAABcwAAAAACcwAAAAADcwAAAAADcwAAAAABcwAAAAAAcwAAAAABcwAAAAABgQAAAAAAYAAAAAABYAAAAAABYAAAAAAAgQAAAAAAYAAAAAABYAAAAAABgQAAAAAAcwAAAAAAcwAAAAACcwAAAAAAcwAAAAAAcwAAAAADcwAAAAABcwAAAAABcwAAAAADgQAAAAAAYAAAAAACYAAAAAADYAAAAAABgQAAAAAAYAAAAAAAYAAAAAABgQAAAAAAcwAAAAADcwAAAAAAcwAAAAADcwAAAAABcwAAAAABcwAAAAAAcwAAAAABcwAAAAAAgQAAAAAAYAAAAAAAYAAAAAACgQAAAAAAgQAAAAAAYAAAAAABYAAAAAABYAAAAAAAcwAAAAAAcwAAAAACcwAAAAAAcwAAAAABcwAAAAACcwAAAAABcwAAAAAAcwAAAAABgQAAAAAAYAAAAAAAYAAAAAADgQAAAAAAgQAAAAAAYAAAAAADYAAAAAABYAAAAAADcwAAAAABcwAAAAABcwAAAAAAcwAAAAADcwAAAAACcwAAAAACcwAAAAACcwAAAAADgQAAAAAAYAAAAAADYAAAAAACgQAAAAAAgQAAAAAAYAAAAAADYAAAAAADgQAAAAAAcwAAAAADcwAAAAAAcwAAAAACcwAAAAAAcwAAAAAAcwAAAAADcwAAAAAAcwAAAAADgQAAAAAAYAAAAAACYAAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAADgQAAAAAAcwAAAAAAcwAAAAABcwAAAAAAcwAAAAABcwAAAAADcwAAAAABcwAAAAAAcwAAAAADgQAAAAAAYAAAAAACYAAAAAABgQAAAAAAgQAAAAAAYAAAAAABYAAAAAAAgQAAAAAAcwAAAAABcwAAAAAAcwAAAAAAcwAAAAACcwAAAAACcwAAAAADcwAAAAABcwAAAAAAgQAAAAAAYAAAAAACYAAAAAADgQAAAAAA + version: 6 + 0,-2: + ind: 0,-2 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAhQAAAAACgQAAAAAAhQAAAAACZAAAAAADZAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAhQAAAAAAhQAAAAAChQAAAAAChQAAAAABgQAAAAAAZAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAhQAAAAAAgAAAAAAAgAAAAAAAhQAAAAABgQAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAhQAAAAABgQAAAAAAhQAAAAAAhQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAhQAAAAABgAAAAAAAhQAAAAABgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAhQAAAAAAgQAAAAAAhQAAAAABhQAAAAABAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAhQAAAAABgAAAAAAAgAAAAAAAgAAAAAAAhQAAAAAAhQAAAAABhQAAAAAChQAAAAABgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAhQAAAAAAhQAAAAACgAAAAAAAhQAAAAABhQAAAAABgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAhQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAhQAAAAABgQAAAAAAgAAAAAAAgAAAAAAAhQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAhQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAhQAAAAAAhQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAhQAAAAAAgAAAAAAAhQAAAAAAhQAAAAABgQAAAAAA + version: 6 + 3,0: + ind: 3,0 + tiles: YAAAAAABYAAAAAABYAAAAAADYAAAAAADYAAAAAABYAAAAAADYAAAAAAAZAAAAAACZAAAAAADYAAAAAAAYAAAAAADYAAAAAACYAAAAAAAYAAAAAADYAAAAAADYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + 3,-1: + ind: 3,-1 + tiles: fQAAAAADfQAAAAACfQAAAAAAfQAAAAAAfQAAAAADgQAAAAAAYAAAAAACYAAAAAACYAAAAAAAYAAAAAABYAAAAAAAYAAAAAABYAAAAAABYAAAAAADYAAAAAADgQAAAAAAfQAAAAAAfQAAAAAAfQAAAAACfQAAAAAAfQAAAAACgQAAAAAAYAAAAAAAYAAAAAACYAAAAAABYAAAAAABYAAAAAADYAAAAAACYAAAAAADYAAAAAACYAAAAAABgQAAAAAAfQAAAAAAfQAAAAADFgAAAAAFFgAAAAACFgAAAAAEgQAAAAAAYAAAAAADYAAAAAAAYAAAAAADYAAAAAACYAAAAAABYAAAAAAAYAAAAAABYAAAAAACYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAhQAAAAABgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAACYAAAAAABYAAAAAACYAAAAAACYAAAAAACYAAAAAACYAAAAAAAYAAAAAABgQAAAAAAYAAAAAACYAAAAAACYAAAAAACYAAAAAAAYAAAAAAAYAAAAAACYAAAAAAAYAAAAAACYAAAAAAAYAAAAAABYAAAAAABYAAAAAABYAAAAAABYAAAAAADYAAAAAABgQAAAAAAYAAAAAABYAAAAAADYAAAAAAAYAAAAAACYAAAAAABZAAAAAADYAAAAAADYAAAAAADYAAAAAABYAAAAAAAYAAAAAAAYAAAAAADYAAAAAABYAAAAAADYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADgQAAAAAAgQAAAAAAhQAAAAACYAAAAAAAYAAAAAABYAAAAAABYAAAAAADYAAAAAADYAAAAAAAYAAAAAACYAAAAAACYAAAAAABgQAAAAAAYAAAAAABYAAAAAABYAAAAAABYAAAAAADZAAAAAADhQAAAAABZAAAAAAEYAAAAAAAYAAAAAADYAAAAAACYAAAAAACYAAAAAABYAAAAAAAYAAAAAADYAAAAAABgQAAAAAAZAAAAAAAYAAAAAACYAAAAAABYAAAAAACZAAAAAAAhQAAAAAAZAAAAAADYAAAAAABYAAAAAADYAAAAAABYAAAAAAAYAAAAAADYAAAAAADYAAAAAABYAAAAAAAgQAAAAAAZAAAAAACYAAAAAACYAAAAAADYAAAAAABZAAAAAACgQAAAAAAYAAAAAAAYAAAAAADYAAAAAAAYAAAAAAAYAAAAAADYAAAAAACYAAAAAADYAAAAAAAYAAAAAADgQAAAAAAZAAAAAAEYAAAAAADYAAAAAACYAAAAAAAYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAADYAAAAAABYAAAAAADYAAAAAADgQAAAAAAYAAAAAADYAAAAAABYAAAAAABYAAAAAABYAAAAAAAYAAAAAADYAAAAAAAYAAAAAACYAAAAAABgQAAAAAAYAAAAAABYAAAAAABYAAAAAAAYAAAAAADYAAAAAADgQAAAAAAYAAAAAAAYAAAAAABYAAAAAABYAAAAAADYAAAAAACYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAACYAAAAAADYAAAAAABYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAACgQAAAAAAYAAAAAACZAAAAAAAZAAAAAAEZAAAAAACYAAAAAADYAAAAAACYAAAAAADYAAAAAABYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAACYAAAAAABYAAAAAACYAAAAAADYAAAAAABYAAAAAABZAAAAAADZAAAAAADZAAAAAAAYAAAAAADYAAAAAADYAAAAAABYAAAAAAAYAAAAAACYAAAAAAD + version: 6 + 3,-2: + ind: 3,-2 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAABYAAAAAABYAAAAAABYAAAAAADYAAAAAADYAAAAAADYAAAAAABYAAAAAADYAAAAAACYAAAAAAAYAAAAAABYAAAAAABYAAAAAADYAAAAAACYAAAAAABYAAAAAABYAAAAAADYAAAAAACYAAAAAABYAAAAAACYAAAAAAAZAAAAAACZAAAAAAEZAAAAAAEYAAAAAABYAAAAAACYAAAAAABYAAAAAADYAAAAAACYAAAAAADYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfQAAAAACfQAAAAAAfQAAAAACfQAAAAABfQAAAAADgQAAAAAAYAAAAAADZAAAAAABZAAAAAAEYAAAAAADYAAAAAADYAAAAAABYAAAAAAAYAAAAAACYAAAAAADgQAAAAAAfQAAAAACfQAAAAACfQAAAAAAfQAAAAACfQAAAAACgQAAAAAAYAAAAAACYAAAAAAAYAAAAAADYAAAAAADYAAAAAABYAAAAAAAYAAAAAACYAAAAAACYAAAAAACYAAAAAAAfQAAAAABfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAgQAAAAAAYAAAAAACYAAAAAABYAAAAAAAYAAAAAACYAAAAAAAYAAAAAADYAAAAAACYAAAAAACYAAAAAADgQAAAAAAfQAAAAABfQAAAAABfQAAAAACfQAAAAACfQAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfQAAAAABfQAAAAAAfQAAAAADfQAAAAACfQAAAAACgQAAAAAAYAAAAAADYAAAAAADYAAAAAABYAAAAAADYAAAAAADYAAAAAACYAAAAAABYAAAAAACYAAAAAAAgQAAAAAA + version: 6 + -1,-2: + ind: -1,-2 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + 4,0: + ind: 4,0 + tiles: YAAAAAAAYAAAAAACYAAAAAADYAAAAAACYAAAAAACYAAAAAABYAAAAAAAYAAAAAABYAAAAAAAYAAAAAAAYAAAAAABYAAAAAADYAAAAAABYAAAAAAAYAAAAAADYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + 4,-1: + ind: 4,-1 + tiles: gQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAABYAAAAAAAYAAAAAADYAAAAAABYAAAAAADYAAAAAABYAAAAAAAYAAAAAADYAAAAAAAYAAAAAABYAAAAAADYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAA + version: 6 + 4,-2: + ind: 4,-2 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAACYAAAAAAAYAAAAAABYAAAAAAAYAAAAAACYAAAAAACYAAAAAAAYAAAAAADYAAAAAABYAAAAAACYAAAAAADYAAAAAACYAAAAAAAYAAAAAAAYAAAAAADYAAAAAAAYAAAAAACYAAAAAABYAAAAAADYAAAAAABYAAAAAABYAAAAAACYAAAAAADYAAAAAACYAAAAAABYAAAAAABYAAAAAAAYAAAAAABYAAAAAACYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAA + version: 6 + 5,0: + ind: 5,0 + tiles: YAAAAAAAYAAAAAACgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + 5,-1: + ind: 5,-1 + tiles: YAAAAAACYAAAAAAAYAAAAAAAYAAAAAABYAAAAAADYAAAAAACYAAAAAACYAAAAAABYAAAAAABYAAAAAADYAAAAAABYAAAAAAAYAAAAAACYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAABYAAAAAAAYAAAAAADYAAAAAABYAAAAAABYAAAAAAAYAAAAAAAYAAAAAABYAAAAAADYAAAAAAAYAAAAAACYAAAAAAAYAAAAAAAYAAAAAADYAAAAAACYAAAAAAAYAAAAAAAYAAAAAACYAAAAAADYAAAAAABYAAAAAACYAAAAAACYAAAAAADYAAAAAACYAAAAAACYAAAAAABYAAAAAADYAAAAAACYAAAAAABYAAAAAADYAAAAAADYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAABYAAAAAAAYAAAAAABYAAAAAACYAAAAAACYAAAAAADYAAAAAABYAAAAAABYAAAAAABYAAAAAAAYAAAAAADYAAAAAABYAAAAAACYAAAAAACYAAAAAACYAAAAAABYAAAAAABYAAAAAACYAAAAAABYAAAAAADYAAAAAADYAAAAAAAYAAAAAABYAAAAAABYAAAAAADYAAAAAABYAAAAAAAYAAAAAABYAAAAAAAYAAAAAAAYAAAAAABYAAAAAAAYAAAAAACYAAAAAABYAAAAAACYAAAAAACYAAAAAAAYAAAAAACYAAAAAAAYAAAAAADYAAAAAACYAAAAAADYAAAAAADYAAAAAAAYAAAAAAAYAAAAAADYAAAAAADYAAAAAABYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAYAAAAAACYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAYAAAAAACYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAYAAAAAACYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + 5,-2: + ind: 5,-2 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAYAAAAAACgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAYAAAAAACgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAABYAAAAAABgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAACYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAACYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAhQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAYAAAAAACYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAYAAAAAADYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAA + version: 6 + 6,-1: + ind: 6,-1 + tiles: YAAAAAADYAAAAAACYAAAAAAAYAAAAAABYAAAAAABYAAAAAADYAAAAAAAYAAAAAABYAAAAAACYAAAAAABYAAAAAADYAAAAAACYAAAAAADYAAAAAAAYAAAAAABYAAAAAADYAAAAAADYAAAAAACYAAAAAACYAAAAAACYAAAAAAAYAAAAAACYAAAAAADYAAAAAACYAAAAAACYAAAAAAAYAAAAAADYAAAAAAAYAAAAAAAYAAAAAACYAAAAAADYAAAAAADYAAAAAAAYAAAAAADYAAAAAACYAAAAAACYAAAAAABYAAAAAADYAAAAAABYAAAAAABYAAAAAACYAAAAAADYAAAAAAAYAAAAAADYAAAAAAAYAAAAAADYAAAAAAAYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAADYAAAAAABYAAAAAADYAAAAAABYAAAAAAAYAAAAAAAYAAAAAACYAAAAAAAYAAAAAABYAAAAAACYAAAAAABYAAAAAABYAAAAAABYAAAAAABYAAAAAADYAAAAAACYAAAAAABYAAAAAACYAAAAAADYAAAAAABYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAACYAAAAAAAYAAAAAADYAAAAAABYAAAAAACYAAAAAADYAAAAAAAYAAAAAACYAAAAAAAYAAAAAACYAAAAAAAYAAAAAACYAAAAAACYAAAAAADYAAAAAADYAAAAAADYAAAAAADYAAAAAABYAAAAAABYAAAAAABYAAAAAABYAAAAAADYAAAAAACYAAAAAACUgAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAAD + version: 6 + 6,0: + ind: 6,0 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + 6,-2: + ind: 6,-2 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAhQAAAAAChQAAAAABUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAUgAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAC + version: 6 + 7,0: + ind: 7,0 + tiles: YAAAAAAAYAAAAAADYAAAAAACYAAAAAAAYAAAAAACYAAAAAADYAAAAAACYAAAAAADYAAAAAABYAAAAAADYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + 7,-1: + ind: 7,-1 + tiles: YAAAAAAAYAAAAAADYAAAAAABYAAAAAAAYAAAAAAAYAAAAAACYAAAAAADYAAAAAADYAAAAAABYAAAAAAAYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAYAAAAAABYAAAAAAAYAAAAAADYAAAAAADYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAADYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAYAAAAAABYAAAAAAAYAAAAAAAYAAAAAABYAAAAAADYAAAAAABYAAAAAABYAAAAAAAYAAAAAACYAAAAAABYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAYAAAAAABYAAAAAABYAAAAAABYAAAAAACYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAADYAAAAAAAYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAYAAAAAADYAAAAAAAYAAAAAAAYAAAAAADYAAAAAACYAAAAAACYAAAAAABYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAYAAAAAADYAAAAAABYAAAAAAAYAAAAAACYAAAAAABYAAAAAADYAAAAAAAYAAAAAADYAAAAAACYAAAAAADYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAYAAAAAACYAAAAAABYAAAAAACYAAAAAADYAAAAAABYAAAAAACYAAAAAADYAAAAAAAYAAAAAABYAAAAAAAYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAYAAAAAADYAAAAAABYAAAAAABYAAAAAADYAAAAAACYAAAAAADYAAAAAADYAAAAAADYAAAAAAAYAAAAAADYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAYAAAAAADYAAAAAAAYAAAAAABYAAAAAABYAAAAAABYAAAAAADYAAAAAAAYAAAAAABYAAAAAADYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAYAAAAAADYAAAAAABYAAAAAADYAAAAAACYAAAAAABYAAAAAABYAAAAAADYAAAAAADYAAAAAACYAAAAAADYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAYAAAAAADYAAAAAADYAAAAAABYAAAAAABYAAAAAACYAAAAAABYAAAAAACYAAAAAADYAAAAAABYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAYAAAAAABYAAAAAAAYAAAAAABYAAAAAACYAAAAAAAYAAAAAACYAAAAAAAYAAAAAADYAAAAAADYAAAAAADYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAA + version: 6 + 7,-2: + ind: 7,-2 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAYAAAAAACYAAAAAACYAAAAAACYAAAAAACYAAAAAACYAAAAAAAYAAAAAACYAAAAAADYAAAAAAAYAAAAAACYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAYAAAAAACYAAAAAABYAAAAAABYAAAAAAAYAAAAAADYAAAAAADYAAAAAADYAAAAAABYAAAAAADYAAAAAADYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAYAAAAAADYAAAAAABYAAAAAADYAAAAAACYAAAAAACYAAAAAABYAAAAAAAYAAAAAADYAAAAAAAYAAAAAACYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAYAAAAAADYAAAAAACYAAAAAABYAAAAAABYAAAAAACYAAAAAACYAAAAAAAYAAAAAABYAAAAAAAYAAAAAAAYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAYAAAAAADYAAAAAABYAAAAAABYAAAAAADYAAAAAABYAAAAAACYAAAAAACYAAAAAADYAAAAAAAYAAAAAADYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAYAAAAAACYAAAAAAAYAAAAAAAYAAAAAACYAAAAAABYAAAAAACYAAAAAABYAAAAAABYAAAAAAAYAAAAAADYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAYAAAAAADYAAAAAABYAAAAAABYAAAAAADYAAAAAABYAAAAAACYAAAAAACYAAAAAAAYAAAAAAAYAAAAAADYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAYAAAAAABYAAAAAABYAAAAAACYAAAAAADYAAAAAABYAAAAAADYAAAAAAAYAAAAAABYAAAAAAAYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAA + version: 6 + - type: Broadphase + - type: Physics + bodyStatus: InAir + angularDamping: 0.05 + linearDamping: 0.05 + fixedRotation: False + bodyType: Dynamic + - type: Fixtures + fixtures: {} + - type: OccluderTree + - type: SpreaderGrid + - type: Shuttle + - type: GridPathfinding + - type: Gravity + gravityShakeSound: !type:SoundPathSpecifier + path: /Audio/Effects/alert.ogg + - type: DecalGrid + chunkCollection: + version: 2 + nodes: + - node: + cleanable: True + zIndex: 1 + color: '#3100007F' + id: Dirt + decals: + 43: 34.06549,-6.739004 + - node: + cleanable: True + zIndex: 1 + color: '#FFFFFF66' + id: Dirt + decals: + 44: 21.10283,-12.718225 + - node: + cleanable: True + zIndex: 1 + color: '#FFFFFFFF' + id: Dirt + decals: + 36: 17,5 + 37: 17,4 + 41: 10,6 + 42: 9,5 + - node: + cleanable: True + zIndex: 1 + color: '#FFFFFFFF' + id: DirtLight + decals: + 39: 16,6 + 40: 16,-2 + - node: + cleanable: True + zIndex: 1 + color: '#FFFFFFFF' + id: DirtMedium + decals: + 38: 17,6 + - node: + color: '#DE3A3A96' + id: HalfTileOverlayGreyscale270 + decals: + 29: 48,-5 + - node: + color: '#DE3A3A96' + id: QuarterTileOverlayGreyscale + decals: + 19: 51,-3 + 20: 50,-3 + 21: 49,-3 + 22: 48,-4 + - node: + color: '#DE3A3A96' + id: QuarterTileOverlayGreyscale180 + decals: + 13: 51,-9 + 14: 50,-9 + 15: 49,-9 + 16: 52,-6 + 17: 52,-5 + 18: 52,-4 + - node: + color: '#DE3A3A96' + id: QuarterTileOverlayGreyscale270 + decals: + 3: 48,-4 + 4: 49,-9 + 5: 50,-9 + 6: 51,-9 + - node: + color: '#DE3A3A96' + id: QuarterTileOverlayGreyscale90 + decals: + 7: 51,-3 + 8: 50,-3 + 9: 49,-3 + 10: 52,-4 + 11: 52,-5 + 12: 52,-6 + - node: + cleanable: True + color: '#FFFFFFFF' + id: Remains + decals: + 30: 112,-1 + - node: + cleanable: True + zIndex: 1 + color: '#FFFFFFFF' + id: Remains + decals: + 33: 3,-2 + 34: 30,-2 + 35: 61,-21 + 45: 59,-16 + - node: + color: '#DE3A3A96' + id: ThreeQuarterTileOverlayGreyscale + decals: + 0: 48,-3 + - node: + color: '#DE3A3A96' + id: ThreeQuarterTileOverlayGreyscale270 + decals: + 1: 48,-9 + - node: + color: '#DE3A3A96' + id: ThreeQuarterTileOverlayGreyscale90 + decals: + 2: 52,-3 + - node: + color: '#FFFFFFFF' + id: WarnCornerNE + decals: + 25: 62,-19 + 27: 62,-3 + - node: + color: '#FFFFFFFF' + id: WarnCornerSE + decals: + 24: 62,-21 + 26: 62,-5 + - node: + color: '#FFFFFFFF' + id: WarnLineE + decals: + 23: 62,-20 + 28: 62,-4 + - node: + cleanable: True + zIndex: 1 + angle: 1.3962634015954636 rad + color: '#310000EF' + id: splatter + decals: + 31: 32.54619,-10.905022 + - node: + cleanable: True + zIndex: 1 + angle: 1.3962634015954636 rad + color: '#310000FF' + id: splatter + decals: + 32: 36.03916,-14.974812 + - type: GridAtmosphere + version: 2 + data: + tiles: + 0,0: + 0: 65535 + 0,-1: + 0: 65280 + -1,0: + 0: 34952 + 0,1: + 0: 36863 + -1,1: + 0: 2184 + 1,0: + 0: 65535 + 1,1: + 0: 33023 + 1: 22784 + 1,-1: + 0: 65280 + 2,0: + 0: 65535 + 2,1: + 0: 8191 + 2,-1: + 0: 65288 + 3,0: + 0: 65535 + 3,1: + 0: 4095 + 3,-1: + 0: 65295 + 4,0: + 0: 48059 + 4,1: + 0: 4083 + -1,-1: + 0: 34816 + 2,-4: + 0: 32900 + 1: 8 + 2,-5: + 1: 17604 + 0: 32768 + 2,-3: + 0: 35020 + 1: 17408 + 2,-2: + 1: 35908 + 0: 16392 + 3,-4: + 0: 61695 + 3,-3: + 0: 8191 + 3,-2: + 0: 65279 + 1: 256 + 3,-5: + 1: 4986 + 0: 60544 + 4,-4: + 0: 47291 + 4,-3: + 0: 35771 + 4,-2: + 0: 48059 + 4,-1: + 0: 47883 + 4,-5: + 0: 48059 + 5,-4: + 0: 65535 + 5,-3: + 0: 65535 + 5,-2: + 0: 65535 + 5,-1: + 0: 65295 + 5,-5: + 0: 65535 + 5,0: + 0: 65535 + 6,-4: + 0: 65535 + 6,-3: + 0: 65535 + 6,-2: + 0: 65535 + 6,-1: + 0: 65295 + 6,-5: + 0: 65535 + 6,0: + 0: 65535 + 7,-4: + 0: 65535 + 7,-3: + 0: 65535 + 7,-2: + 0: 65535 + 7,-1: + 0: 65295 + 7,-5: + 0: 65535 + 7,0: + 0: 65535 + 5,1: + 0: 4080 + 6,1: + 0: 4080 + 7,1: + 0: 4080 + 8,0: + 0: 26231 + 8,1: + 0: 4086 + 8,-1: + 0: 26350 + 9,0: + 0: 65530 + 9,1: + 0: 4080 + 9,-1: + 0: 65535 + 10,0: + 0: 65535 + 10,1: + 0: 4080 + 10,-1: + 0: 65535 + 11,1: + 0: 34678 + 11,0: + 0: 61038 + 11,-1: + 0: 58982 + 12,0: + 0: 65295 + 8,-4: + 0: 26214 + 8,-3: + 0: 26350 + 8,-2: + 0: 26214 + 8,-5: + 0: 26222 + 9,-4: + 0: 4095 + 9,-3: + 0: 61695 + 9,-2: + 0: 65535 + 9,-5: + 0: 65535 + 10,-4: + 0: 4095 + 10,-3: + 0: 61695 + 10,-2: + 0: 65535 + 10,-5: + 0: 65535 + 11,-3: + 0: 26367 + 11,-4: + 0: 26214 + 11,-2: + 0: 61166 + 11,-5: + 0: 26214 + 12,-4: + 0: 53247 + 12,-3: + 0: 62719 + 12,-2: + 0: 65535 + 12,-1: + 0: 61695 + 4,-8: + 0: 65280 + 3,-8: + 0: 65328 + 4,-7: + 0: 65459 + 3,-7: + 0: 65519 + 1: 16 + 4,-6: + 0: 7099 + 3,-6: + 0: 2510 + 1: 9777 + 5,-8: + 0: 65280 + 5,-7: + 0: 48112 + 5,-6: + 0: 3003 + 6,-8: + 0: 65280 + 6,-7: + 0: 65520 + 6,-6: + 0: 2735 + 7,-8: + 0: 65280 + 7,-7: + 0: 65520 + 7,-6: + 0: 2735 + 8,-8: + 0: 65280 + 8,-7: + 0: 30310 + 8,-6: + 0: 58983 + 9,-8: + 0: 65280 + 9,-7: + 0: 65520 + 9,-6: + 0: 65535 + 10,-8: + 0: 65280 + 10,-7: + 0: 65520 + 10,-6: + 0: 65535 + 11,-8: + 0: 30592 + 11,-7: + 0: 28390 + 11,-6: + 0: 26350 + 12,-7: + 0: 4080 + 12,-6: + 0: 61695 + 12,-5: + 0: 65535 + 0,-7: + 1: 51335 + 0: 8 + -1,-7: + 1: 12 + 0,-8: + 1: 35040 + 1,-8: + 1: 6384 + 0: 32768 + 1,-7: + 0: 32793 + 1: 30854 + 2,-8: + 1: 1072 + 0: 51392 + 2,-7: + 0: 32905 + 1: 32326 + 1,-6: + 1: 8 + 2,-6: + 0: 2060 + 1: 17600 + 13,0: + 0: 30479 + 13,-1: + 0: 63709 + 13,1: + 1: 4 + 14,0: + 0: 15 + 14,-1: + 0: 63487 + 15,0: + 0: 15 + 15,-1: + 0: 61567 + 16,0: + 0: 15 + 13,-4: + 0: 52701 + 13,-3: + 0: 65535 + 13,-2: + 0: 53759 + 13,-5: + 0: 53725 + 14,-4: + 0: 65535 + 14,-3: + 0: 65535 + 14,-2: + 0: 61695 + 14,-5: + 0: 61695 + 15,-4: + 0: 49151 + 15,-3: + 0: 65535 + 15,-2: + 0: 28927 + 15,-5: + 0: 61567 + 16,-4: + 0: 65535 + 16,-3: + 0: 65535 + 16,-2: + 0: 65535 + 16,-1: + 0: 61695 + 13,-7: + 0: 1904 + 13,-6: + 0: 55551 + 14,-6: + 0: 62719 + 15,-6: + 0: 28927 + 16,-6: + 0: 61695 + 16,-5: + 0: 65535 + 17,0: + 0: 15 + 17,-1: + 0: 61695 + 18,0: + 0: 15 + 18,-1: + 0: 61695 + 19,0: + 0: 15 + 19,-1: + 0: 61559 + 20,0: + 0: 3 + 1: 64 + 17,-4: + 0: 65535 + 17,-3: + 0: 65535 + 17,-2: + 0: 65535 + 17,-5: + 0: 65535 + 18,-4: + 0: 65535 + 18,-3: + 0: 65535 + 18,-2: + 0: 65535 + 18,-5: + 0: 65535 + 19,-4: + 0: 30583 + 19,-3: + 0: 30719 + 19,-2: + 0: 30583 + 19,-5: + 0: 30583 + 20,-4: + 0: 4095 + 20,-3: + 0: 61440 + 20,-2: + 0: 13311 + 20,-1: + 0: 13107 + 17,-6: + 0: 61695 + 18,-6: + 0: 61695 + 19,-6: + 0: 28927 + 20,-6: + 0: 13107 + 20,-5: + 0: 13107 + 21,-4: + 0: 4095 + 21,-3: + 0: 61440 + 21,-2: + 0: 57599 + 21,-1: + 0: 3822 + 22,-4: + 0: 4095 + 22,-3: + 0: 61440 + 22,-2: + 0: 61695 + 22,-1: + 0: 4095 + 23,-4: + 0: 4095 + 23,-3: + 0: 61440 + 23,-2: + 0: 61695 + 23,-1: + 0: 4095 + 24,-4: + 0: 4095 + 24,-3: + 0: 61440 + 24,-2: + 0: 61951 + 24,-1: + 0: 4095 + 20,-7: + 0: 16384 + 21,-6: + 0: 57344 + 21,-5: + 0: 3822 + 22,-6: + 0: 4096 + 1: 24576 + 22,-5: + 0: 4083 + 1: 4 + 23,-5: + 1: 240 + 0: 3840 + 24,-5: + 1: 113 + 0: 8072 + 25,-4: + 0: 4095 + 25,-3: + 0: 61440 + 25,-2: + 0: 61695 + 25,-1: + 0: 4095 + 26,-4: + 0: 4095 + 26,-3: + 0: 61440 + 26,-2: + 0: 61695 + 26,-1: + 0: 4095 + 27,-4: + 0: 4095 + 27,-3: + 0: 61440 + 27,-2: + 0: 35071 + 27,-1: + 0: 34952 + 27,-5: + 0: 34952 + 28,-4: + 0: 4095 + 28,-3: + 0: 61440 + 28,-2: + 0: 65535 + 28,-1: + 0: 65535 + 27,0: + 0: 8 + 1: 64 + 28,0: + 0: 15 + 25,-5: + 0: 4095 + 25,-6: + 1: 4096 + 0: 57344 + 26,-6: + 0: 61440 + 26,-5: + 0: 4095 + 27,-7: + 0: 16384 + 27,-6: + 0: 34952 + 28,-6: + 0: 65535 + 28,-5: + 0: 65535 + 29,0: + 0: 15 + 29,-1: + 0: 65535 + 30,0: + 0: 15 + 30,-1: + 0: 65535 + 31,0: + 0: 3 + 1: 32 + 31,-1: + 0: 13107 + 29,-4: + 0: 4095 + 29,-3: + 0: 61440 + 29,-2: + 0: 65535 + 29,-5: + 0: 65535 + 30,-4: + 0: 4095 + 30,-3: + 0: 61440 + 30,-2: + 0: 65535 + 30,-5: + 0: 65535 + 31,-4: + 0: 819 + 1: 8192 + 31,-3: + 0: 12288 + 1: 512 + 31,-2: + 0: 13107 + 31,-5: + 0: 13107 + 29,-6: + 0: 65535 + 30,-6: + 0: 65535 + 31,-6: + 0: 13107 + 31,-7: + 1: 8192 + uniqueMixes: + - volume: 2500 + temperature: 293.15 + moles: + - 21.824879 + - 82.10312 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - volume: 2500 + immutable: True + moles: + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + chunkSize: 4 + - type: GasTileOverlay + - type: RadiationGridResistance +- proto: AirCanister + entities: + - uid: 933 + components: + - type: Transform + pos: 62.5,-18.5 + parent: 1 + - uid: 934 + components: + - type: Transform + pos: 62.5,-4.5 + parent: 1 +- proto: Airlock + entities: + - uid: 158 + components: + - type: Transform + pos: 32.5,1.5 + parent: 1 + - uid: 214 + components: + - type: Transform + pos: 32.5,0.5 + parent: 1 + - uid: 339 + components: + - type: Transform + pos: 37.5,0.5 + parent: 1 + - uid: 558 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 32.5,-24.5 + parent: 1 + - uid: 2239 + components: + - type: Transform + pos: 32.5,-23.5 + parent: 1 +- proto: AirlockCommand + entities: + - uid: 723 + components: + - type: Transform + pos: 50.5,-12.5 + parent: 1 + - uid: 1243 + components: + - type: Transform + pos: 96.5,-16.5 + parent: 1 + - uid: 1277 + components: + - type: Transform + pos: 96.5,-5.5 + parent: 1 +- proto: AirlockEngineering + entities: + - uid: 781 + components: + - type: Transform + pos: 58.5,-1.5 + parent: 1 + - uid: 842 + components: + - type: Transform + pos: 58.5,-21.5 + parent: 1 +- proto: AirlockEngineeringGlass + entities: + - uid: 599 + components: + - type: Transform + pos: 18.5,-28.5 + parent: 1 + - uid: 600 + components: + - type: Transform + pos: 18.5,-29.5 + parent: 1 +- proto: AirlockExternal + entities: + - uid: 1269 + components: + - type: Transform + pos: 63.5,-19.5 + parent: 1 + - uid: 1270 + components: + - type: Transform + pos: 63.5,-3.5 + parent: 1 +- proto: AirlockFreezer + entities: + - uid: 556 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 31.5,-22.5 + parent: 1 + - uid: 559 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 29.5,-22.5 + parent: 1 + - uid: 560 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 27.5,-22.5 + parent: 1 + - uid: 561 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 25.5,-22.5 + parent: 1 + - uid: 562 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 22.5,-26.5 + parent: 1 + - uid: 565 + components: + - type: Transform + pos: 23.5,-22.5 + parent: 1 +- proto: AirlockGlass + entities: + - uid: 23 + components: + - type: Transform + pos: 18.5,6.5 + parent: 1 + - uid: 24 + components: + - type: Transform + pos: 18.5,5.5 + parent: 1 + - uid: 25 + components: + - type: Transform + pos: 35.5,-2.5 + parent: 1 + - type: Door + secondsUntilStateChange: -1077.4529 + state: Opening + - type: DeviceLinkSource + lastSignals: + DoorStatus: True + - uid: 109 + components: + - type: Transform + pos: 35.5,-3.5 + parent: 1 + - uid: 1271 + components: + - type: Transform + pos: 81.5,-1.5 + parent: 1 + - uid: 1272 + components: + - type: Transform + pos: 80.5,-1.5 + parent: 1 + - uid: 1334 + components: + - type: Transform + pos: 80.5,-21.5 + parent: 1 + - uid: 1335 + components: + - type: Transform + pos: 81.5,-21.5 + parent: 1 +- proto: AirlockMedical + entities: + - uid: 639 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 35.5,-19.5 + parent: 1 + - uid: 640 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 35.5,-20.5 + parent: 1 +- proto: AirlockSecurity + entities: + - uid: 510 + components: + - type: Transform + pos: 50.5,-9.5 + parent: 1 +- proto: AirlockShuttle + entities: + - uid: 40 + components: + - type: Transform + pos: 54.5,3.5 + parent: 1 + - uid: 316 + components: + - type: Transform + pos: 47.5,3.5 + parent: 1 + - uid: 470 + components: + - type: Transform + pos: 47.5,2.5 + parent: 1 + - uid: 472 + components: + - type: Transform + pos: 54.5,2.5 + parent: 1 + - uid: 1273 + components: + - type: Transform + pos: 47.5,-25.5 + parent: 1 + - uid: 1274 + components: + - type: Transform + pos: 47.5,-26.5 + parent: 1 + - uid: 1275 + components: + - type: Transform + pos: 54.5,-26.5 + parent: 1 + - uid: 1276 + components: + - type: Transform + pos: 54.5,-25.5 + parent: 1 + - uid: 1400 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 123.5,-15.5 + parent: 1 + - uid: 1401 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 123.5,-21.5 + parent: 1 + - uid: 1421 + components: + - type: Transform + pos: 123.5,-6.5 + parent: 1 + - uid: 1422 + components: + - type: Transform + pos: 123.5,-1.5 + parent: 1 +- proto: APCHyperCapacity + entities: + - uid: 2160 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,-2.5 + parent: 1 +- proto: BaseComputer + entities: + - uid: 399 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 31.5,-6.5 + parent: 1 +- proto: Bed + entities: + - uid: 181 + components: + - type: Transform + pos: 21.5,3.5 + parent: 1 + - uid: 182 + components: + - type: Transform + pos: 23.5,3.5 + parent: 1 + - uid: 183 + components: + - type: Transform + pos: 25.5,3.5 + parent: 1 + - uid: 184 + components: + - type: Transform + pos: 27.5,3.5 + parent: 1 + - uid: 185 + components: + - type: Transform + pos: 29.5,3.5 + parent: 1 + - uid: 186 + components: + - type: Transform + pos: 29.5,1.5 + parent: 1 + - uid: 187 + components: + - type: Transform + pos: 27.5,1.5 + parent: 1 + - uid: 188 + components: + - type: Transform + pos: 25.5,1.5 + parent: 1 + - uid: 189 + components: + - type: Transform + pos: 23.5,1.5 + parent: 1 + - uid: 190 + components: + - type: Transform + pos: 21.5,1.5 + parent: 1 + - uid: 191 + components: + - type: Transform + pos: 21.5,-0.5 + parent: 1 + - uid: 192 + components: + - type: Transform + pos: 23.5,-0.5 + parent: 1 + - uid: 193 + components: + - type: Transform + pos: 25.5,-0.5 + parent: 1 + - uid: 194 + components: + - type: Transform + pos: 27.5,-0.5 + parent: 1 + - uid: 195 + components: + - type: Transform + pos: 29.5,-0.5 + parent: 1 + - uid: 718 + components: + - type: Transform + pos: 48.5,-20.5 + parent: 1 +- proto: BedsheetCaptain + entities: + - uid: 719 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 48.5,-20.5 + parent: 1 +- proto: BedsheetWhite + entities: + - uid: 180 + components: + - type: Transform + pos: 27.5,3.5 + parent: 1 + - uid: 200 + components: + - type: Transform + pos: 29.5,3.5 + parent: 1 + - uid: 201 + components: + - type: Transform + pos: 29.5,1.5 + parent: 1 + - uid: 202 + components: + - type: Transform + pos: 27.5,1.5 + parent: 1 + - uid: 203 + components: + - type: Transform + pos: 25.5,1.5 + parent: 1 + - uid: 204 + components: + - type: Transform + pos: 23.5,1.5 + parent: 1 + - uid: 205 + components: + - type: Transform + pos: 21.5,1.5 + parent: 1 + - uid: 206 + components: + - type: Transform + pos: 21.5,3.5 + parent: 1 + - uid: 207 + components: + - type: Transform + pos: 23.5,3.5 + parent: 1 + - uid: 208 + components: + - type: Transform + pos: 21.5,-0.5 + parent: 1 + - uid: 209 + components: + - type: Transform + pos: 23.5,-0.5 + parent: 1 + - uid: 210 + components: + - type: Transform + pos: 25.5,-0.5 + parent: 1 + - uid: 211 + components: + - type: Transform + pos: 27.5,-0.5 + parent: 1 + - uid: 212 + components: + - type: Transform + pos: 29.5,-0.5 + parent: 1 + - uid: 213 + components: + - type: Transform + pos: 25.5,3.5 + parent: 1 +- proto: BlastDoor + entities: + - uid: 383 + components: + - type: Transform + pos: 32.5,-9.5 + parent: 1 + - uid: 384 + components: + - type: Transform + pos: 32.5,-10.5 + parent: 1 + - uid: 386 + components: + - type: Transform + pos: 32.5,-12.5 + parent: 1 + - uid: 411 + components: + - type: Transform + pos: 18.5,-11.5 + parent: 1 + - uid: 412 + components: + - type: Transform + pos: 18.5,-10.5 + parent: 1 + - uid: 487 + components: + - type: Transform + pos: 12.5,-13.5 + parent: 1 + - uid: 1552 + components: + - type: Transform + pos: 32.5,-11.5 + parent: 1 +- proto: BlastDoorFrame + entities: + - uid: 457 + components: + - type: Transform + anchored: True + pos: 12.5,-8.5 + parent: 1 +- proto: CableApcExtension + entities: + - uid: 115 + components: + - type: Transform + pos: 31.5,-24.5 + parent: 1 + - uid: 432 + components: + - type: Transform + pos: 17.5,-10.5 + parent: 1 + - uid: 450 + components: + - type: Transform + pos: 20.5,-14.5 + parent: 1 + - uid: 451 + components: + - type: Transform + pos: 20.5,-16.5 + parent: 1 + - uid: 452 + components: + - type: Transform + pos: 16.5,-10.5 + parent: 1 + - uid: 1239 + components: + - type: Transform + pos: 43.5,-28.5 + parent: 1 + - uid: 1241 + components: + - type: Transform + pos: 86.5,-3.5 + parent: 1 + - uid: 1443 + components: + - type: Transform + pos: 25.5,-28.5 + parent: 1 + - uid: 1445 + components: + - type: Transform + pos: 21.5,-28.5 + parent: 1 + - uid: 1446 + components: + - type: Transform + pos: 24.5,-28.5 + parent: 1 + - uid: 1447 + components: + - type: Transform + pos: 26.5,-28.5 + parent: 1 + - uid: 1448 + components: + - type: Transform + pos: 20.5,-28.5 + parent: 1 + - uid: 1449 + components: + - type: Transform + pos: 19.5,-28.5 + parent: 1 + - uid: 1450 + components: + - type: Transform + pos: 22.5,-28.5 + parent: 1 + - uid: 1451 + components: + - type: Transform + pos: 23.5,-28.5 + parent: 1 + - uid: 1485 + components: + - type: Transform + pos: 27.5,-28.5 + parent: 1 + - uid: 1486 + components: + - type: Transform + pos: 29.5,-28.5 + parent: 1 + - uid: 1487 + components: + - type: Transform + pos: 28.5,-28.5 + parent: 1 + - uid: 1490 + components: + - type: Transform + pos: 30.5,-28.5 + parent: 1 + - uid: 1491 + components: + - type: Transform + pos: 31.5,-28.5 + parent: 1 + - uid: 1492 + components: + - type: Transform + pos: 32.5,-28.5 + parent: 1 + - uid: 1493 + components: + - type: Transform + pos: 33.5,-28.5 + parent: 1 + - uid: 1494 + components: + - type: Transform + pos: 33.5,-27.5 + parent: 1 + - uid: 1495 + components: + - type: Transform + pos: 33.5,-26.5 + parent: 1 + - uid: 1496 + components: + - type: Transform + pos: 33.5,-25.5 + parent: 1 + - uid: 1497 + components: + - type: Transform + pos: 33.5,-24.5 + parent: 1 + - uid: 1498 + components: + - type: Transform + pos: 33.5,-23.5 + parent: 1 + - uid: 1499 + components: + - type: Transform + pos: 33.5,-22.5 + parent: 1 + - uid: 1500 + components: + - type: Transform + pos: 33.5,-21.5 + parent: 1 + - uid: 1501 + components: + - type: Transform + pos: 33.5,-20.5 + parent: 1 + - uid: 1502 + components: + - type: Transform + pos: 33.5,-19.5 + parent: 1 + - uid: 1503 + components: + - type: Transform + pos: 33.5,-18.5 + parent: 1 + - uid: 1504 + components: + - type: Transform + pos: 33.5,-17.5 + parent: 1 + - uid: 1505 + components: + - type: Transform + pos: 33.5,-16.5 + parent: 1 + - uid: 1506 + components: + - type: Transform + pos: 33.5,-15.5 + parent: 1 + - uid: 1507 + components: + - type: Transform + pos: 33.5,-14.5 + parent: 1 + - uid: 1508 + components: + - type: Transform + pos: 33.5,-13.5 + parent: 1 + - uid: 1509 + components: + - type: Transform + pos: 33.5,-12.5 + parent: 1 + - uid: 1510 + components: + - type: Transform + pos: 33.5,-11.5 + parent: 1 + - uid: 1511 + components: + - type: Transform + pos: 33.5,-10.5 + parent: 1 + - uid: 1512 + components: + - type: Transform + pos: 33.5,-9.5 + parent: 1 + - uid: 1513 + components: + - type: Transform + pos: 33.5,-8.5 + parent: 1 + - uid: 1514 + components: + - type: Transform + pos: 33.5,-7.5 + parent: 1 + - uid: 1515 + components: + - type: Transform + pos: 33.5,-6.5 + parent: 1 + - uid: 1516 + components: + - type: Transform + pos: 33.5,-5.5 + parent: 1 + - uid: 1517 + components: + - type: Transform + pos: 33.5,-4.5 + parent: 1 + - uid: 1518 + components: + - type: Transform + pos: 33.5,-3.5 + parent: 1 + - uid: 1519 + components: + - type: Transform + pos: 33.5,-2.5 + parent: 1 + - uid: 1520 + components: + - type: Transform + pos: 33.5,-1.5 + parent: 1 + - uid: 1521 + components: + - type: Transform + pos: 33.5,-0.5 + parent: 1 + - uid: 1522 + components: + - type: Transform + pos: 33.5,0.5 + parent: 1 + - uid: 1523 + components: + - type: Transform + pos: 33.5,1.5 + parent: 1 + - uid: 1524 + components: + - type: Transform + pos: 33.5,2.5 + parent: 1 + - uid: 1525 + components: + - type: Transform + pos: 33.5,3.5 + parent: 1 + - uid: 1526 + components: + - type: Transform + pos: 33.5,4.5 + parent: 1 + - uid: 1527 + components: + - type: Transform + pos: 33.5,5.5 + parent: 1 + - uid: 1528 + components: + - type: Transform + pos: 32.5,5.5 + parent: 1 + - uid: 1529 + components: + - type: Transform + pos: 31.5,5.5 + parent: 1 + - uid: 1530 + components: + - type: Transform + pos: 30.5,5.5 + parent: 1 + - uid: 1531 + components: + - type: Transform + pos: 29.5,5.5 + parent: 1 + - uid: 1532 + components: + - type: Transform + pos: 28.5,5.5 + parent: 1 + - uid: 1533 + components: + - type: Transform + pos: 27.5,5.5 + parent: 1 + - uid: 1534 + components: + - type: Transform + pos: 26.5,5.5 + parent: 1 + - uid: 1535 + components: + - type: Transform + pos: 25.5,5.5 + parent: 1 + - uid: 1536 + components: + - type: Transform + pos: 24.5,5.5 + parent: 1 + - uid: 1537 + components: + - type: Transform + pos: 23.5,5.5 + parent: 1 + - uid: 1538 + components: + - type: Transform + pos: 22.5,5.5 + parent: 1 + - uid: 1539 + components: + - type: Transform + pos: 21.5,5.5 + parent: 1 + - uid: 1540 + components: + - type: Transform + pos: 20.5,5.5 + parent: 1 + - uid: 1541 + components: + - type: Transform + pos: 19.5,5.5 + parent: 1 + - uid: 1542 + components: + - type: Transform + pos: 18.5,5.5 + parent: 1 + - uid: 1543 + components: + - type: Transform + pos: 17.5,5.5 + parent: 1 + - uid: 1544 + components: + - type: Transform + pos: 16.5,5.5 + parent: 1 + - uid: 1545 + components: + - type: Transform + pos: 15.5,5.5 + parent: 1 + - uid: 1546 + components: + - type: Transform + pos: 14.5,5.5 + parent: 1 + - uid: 1547 + components: + - type: Transform + pos: 13.5,5.5 + parent: 1 + - uid: 1548 + components: + - type: Transform + pos: 32.5,0.5 + parent: 1 + - uid: 1549 + components: + - type: Transform + pos: 30.5,0.5 + parent: 1 + - uid: 1550 + components: + - type: Transform + pos: 31.5,0.5 + parent: 1 + - uid: 1551 + components: + - type: Transform + pos: 30.5,1.5 + parent: 1 + - uid: 1553 + components: + - type: Transform + pos: 29.5,1.5 + parent: 1 + - uid: 1554 + components: + - type: Transform + pos: 28.5,1.5 + parent: 1 + - uid: 1555 + components: + - type: Transform + pos: 27.5,1.5 + parent: 1 + - uid: 1556 + components: + - type: Transform + pos: 26.5,1.5 + parent: 1 + - uid: 1557 + components: + - type: Transform + pos: 25.5,1.5 + parent: 1 + - uid: 1558 + components: + - type: Transform + pos: 24.5,1.5 + parent: 1 + - uid: 1559 + components: + - type: Transform + pos: 23.5,1.5 + parent: 1 + - uid: 1560 + components: + - type: Transform + pos: 22.5,1.5 + parent: 1 + - uid: 1561 + components: + - type: Transform + pos: 21.5,1.5 + parent: 1 + - uid: 1562 + components: + - type: Transform + pos: 20.5,1.5 + parent: 1 + - uid: 1594 + components: + - type: Transform + pos: 34.5,5.5 + parent: 1 + - uid: 1595 + components: + - type: Transform + pos: 34.5,5.5 + parent: 1 + - uid: 1596 + components: + - type: Transform + pos: 35.5,5.5 + parent: 1 + - uid: 1597 + components: + - type: Transform + pos: 36.5,5.5 + parent: 1 + - uid: 1598 + components: + - type: Transform + pos: 37.5,5.5 + parent: 1 + - uid: 1599 + components: + - type: Transform + pos: 38.5,5.5 + parent: 1 + - uid: 1600 + components: + - type: Transform + pos: 39.5,5.5 + parent: 1 + - uid: 1601 + components: + - type: Transform + pos: 40.5,5.5 + parent: 1 + - uid: 1602 + components: + - type: Transform + pos: 41.5,5.5 + parent: 1 + - uid: 1603 + components: + - type: Transform + pos: 42.5,5.5 + parent: 1 + - uid: 1604 + components: + - type: Transform + pos: 43.5,5.5 + parent: 1 + - uid: 1605 + components: + - type: Transform + pos: 44.5,5.5 + parent: 1 + - uid: 1606 + components: + - type: Transform + pos: 45.5,5.5 + parent: 1 + - uid: 1607 + components: + - type: Transform + pos: 45.5,4.5 + parent: 1 + - uid: 1608 + components: + - type: Transform + pos: 45.5,3.5 + parent: 1 + - uid: 1609 + components: + - type: Transform + pos: 48.5,0.5 + parent: 1 + - uid: 1610 + components: + - type: Transform + pos: 50.5,0.5 + parent: 1 + - uid: 1611 + components: + - type: Transform + pos: 45.5,2.5 + parent: 1 + - uid: 1612 + components: + - type: Transform + pos: 45.5,1.5 + parent: 1 + - uid: 1613 + components: + - type: Transform + pos: 45.5,0.5 + parent: 1 + - uid: 1614 + components: + - type: Transform + pos: 45.5,-0.5 + parent: 1 + - uid: 1615 + components: + - type: Transform + pos: 46.5,0.5 + parent: 1 + - uid: 1616 + components: + - type: Transform + pos: 47.5,0.5 + parent: 1 + - uid: 1617 + components: + - type: Transform + pos: 49.5,0.5 + parent: 1 + - uid: 1618 + components: + - type: Transform + pos: 51.5,0.5 + parent: 1 + - uid: 1619 + components: + - type: Transform + pos: 52.5,0.5 + parent: 1 + - uid: 1620 + components: + - type: Transform + pos: 53.5,0.5 + parent: 1 + - uid: 1621 + components: + - type: Transform + pos: 54.5,0.5 + parent: 1 + - uid: 1622 + components: + - type: Transform + pos: 55.5,0.5 + parent: 1 + - uid: 1623 + components: + - type: Transform + pos: 56.5,0.5 + parent: 1 + - uid: 1624 + components: + - type: Transform + pos: 57.5,0.5 + parent: 1 + - uid: 1625 + components: + - type: Transform + pos: 58.5,0.5 + parent: 1 + - uid: 1626 + components: + - type: Transform + pos: 59.5,0.5 + parent: 1 + - uid: 1627 + components: + - type: Transform + pos: 60.5,0.5 + parent: 1 + - uid: 1628 + components: + - type: Transform + pos: 61.5,0.5 + parent: 1 + - uid: 1629 + components: + - type: Transform + pos: 62.5,0.5 + parent: 1 + - uid: 1630 + components: + - type: Transform + pos: 63.5,0.5 + parent: 1 + - uid: 1631 + components: + - type: Transform + pos: 64.5,0.5 + parent: 1 + - uid: 1632 + components: + - type: Transform + pos: 65.5,0.5 + parent: 1 + - uid: 1633 + components: + - type: Transform + pos: 66.5,0.5 + parent: 1 + - uid: 1634 + components: + - type: Transform + pos: 67.5,0.5 + parent: 1 + - uid: 1635 + components: + - type: Transform + pos: 68.5,0.5 + parent: 1 + - uid: 1636 + components: + - type: Transform + pos: 69.5,0.5 + parent: 1 + - uid: 1637 + components: + - type: Transform + pos: 70.5,0.5 + parent: 1 + - uid: 1638 + components: + - type: Transform + pos: 71.5,0.5 + parent: 1 + - uid: 1639 + components: + - type: Transform + pos: 72.5,0.5 + parent: 1 + - uid: 1640 + components: + - type: Transform + pos: 73.5,0.5 + parent: 1 + - uid: 1641 + components: + - type: Transform + pos: 74.5,0.5 + parent: 1 + - uid: 1642 + components: + - type: Transform + pos: 58.5,-0.5 + parent: 1 + - uid: 1643 + components: + - type: Transform + pos: 58.5,-1.5 + parent: 1 + - uid: 1644 + components: + - type: Transform + pos: 58.5,-2.5 + parent: 1 + - uid: 1645 + components: + - type: Transform + pos: 58.5,-3.5 + parent: 1 + - uid: 1646 + components: + - type: Transform + pos: 59.5,-3.5 + parent: 1 + - uid: 1647 + components: + - type: Transform + pos: 57.5,-3.5 + parent: 1 + - uid: 1648 + components: + - type: Transform + pos: 56.5,-3.5 + parent: 1 + - uid: 1649 + components: + - type: Transform + pos: 55.5,-3.5 + parent: 1 + - uid: 1650 + components: + - type: Transform + pos: 60.5,-3.5 + parent: 1 + - uid: 1651 + components: + - type: Transform + pos: 61.5,-3.5 + parent: 1 + - uid: 1652 + components: + - type: Transform + pos: 62.5,-3.5 + parent: 1 + - uid: 1653 + components: + - type: Transform + pos: 63.5,-3.5 + parent: 1 + - uid: 1659 + components: + - type: Transform + pos: 54.5,-3.5 + parent: 1 + - uid: 1660 + components: + - type: Transform + pos: 30.5,-24.5 + parent: 1 + - uid: 1661 + components: + - type: Transform + pos: 18.5,-28.5 + parent: 1 + - uid: 1662 + components: + - type: Transform + pos: 32.5,-24.5 + parent: 1 + - uid: 1663 + components: + - type: Transform + pos: 17.5,-28.5 + parent: 1 + - uid: 1665 + components: + - type: Transform + pos: 29.5,-24.5 + parent: 1 + - uid: 1666 + components: + - type: Transform + pos: 28.5,-24.5 + parent: 1 + - uid: 1680 + components: + - type: Transform + pos: 99.5,-3.5 + parent: 1 + - uid: 1685 + components: + - type: Transform + pos: 117.5,-22.5 + parent: 1 + - uid: 1697 + components: + - type: Transform + pos: 56.5,-14.5 + parent: 1 + - uid: 1702 + components: + - type: Transform + pos: 115.5,-22.5 + parent: 1 + - uid: 1703 + components: + - type: Transform + pos: 114.5,-22.5 + parent: 1 + - uid: 1704 + components: + - type: Transform + pos: 116.5,-22.5 + parent: 1 + - uid: 1705 + components: + - type: Transform + pos: 119.5,-22.5 + parent: 1 + - uid: 1706 + components: + - type: Transform + pos: 118.5,-22.5 + parent: 1 + - uid: 1707 + components: + - type: Transform + pos: 121.5,-22.5 + parent: 1 + - uid: 1708 + components: + - type: Transform + pos: 120.5,-22.5 + parent: 1 + - uid: 1709 + components: + - type: Transform + pos: 122.5,-16.5 + parent: 1 + - uid: 1710 + components: + - type: Transform + pos: 122.5,-17.5 + parent: 1 + - uid: 1711 + components: + - type: Transform + pos: 122.5,-14.5 + parent: 1 + - uid: 1712 + components: + - type: Transform + pos: 122.5,-15.5 + parent: 1 + - uid: 1713 + components: + - type: Transform + pos: 122.5,-19.5 + parent: 1 + - uid: 1714 + components: + - type: Transform + pos: 122.5,-20.5 + parent: 1 + - uid: 1715 + components: + - type: Transform + pos: 122.5,-18.5 + parent: 1 + - uid: 1716 + components: + - type: Transform + pos: 94.5,-14.5 + parent: 1 + - uid: 1717 + components: + - type: Transform + pos: 95.5,-14.5 + parent: 1 + - uid: 1718 + components: + - type: Transform + pos: 78.5,-11.5 + parent: 1 + - uid: 1719 + components: + - type: Transform + pos: 84.5,-14.5 + parent: 1 + - uid: 1720 + components: + - type: Transform + pos: 89.5,-14.5 + parent: 1 + - uid: 1721 + components: + - type: Transform + pos: 77.5,-11.5 + parent: 1 + - uid: 1722 + components: + - type: Transform + pos: 85.5,-14.5 + parent: 1 + - uid: 1723 + components: + - type: Transform + pos: 90.5,-14.5 + parent: 1 + - uid: 1724 + components: + - type: Transform + pos: 59.5,-22.5 + parent: 1 + - uid: 1725 + components: + - type: Transform + pos: 86.5,-14.5 + parent: 1 + - uid: 1726 + components: + - type: Transform + pos: 91.5,-14.5 + parent: 1 + - uid: 1727 + components: + - type: Transform + pos: 76.5,-11.5 + parent: 1 + - uid: 1728 + components: + - type: Transform + pos: 87.5,-14.5 + parent: 1 + - uid: 1729 + components: + - type: Transform + pos: 92.5,-14.5 + parent: 1 + - uid: 1730 + components: + - type: Transform + pos: 60.5,-22.5 + parent: 1 + - uid: 1731 + components: + - type: Transform + pos: 88.5,-14.5 + parent: 1 + - uid: 1732 + components: + - type: Transform + pos: 93.5,-14.5 + parent: 1 + - uid: 1733 + components: + - type: Transform + pos: 61.5,-22.5 + parent: 1 + - uid: 1734 + components: + - type: Transform + pos: 74.5,-22.5 + parent: 1 + - uid: 1735 + components: + - type: Transform + pos: 77.5,-22.5 + parent: 1 + - uid: 1736 + components: + - type: Transform + pos: 75.5,-11.5 + parent: 1 + - uid: 1737 + components: + - type: Transform + pos: 75.5,-22.5 + parent: 1 + - uid: 1738 + components: + - type: Transform + pos: 78.5,-22.5 + parent: 1 + - uid: 1739 + components: + - type: Transform + pos: 62.5,-22.5 + parent: 1 + - uid: 1740 + components: + - type: Transform + pos: 76.5,-22.5 + parent: 1 + - uid: 1741 + components: + - type: Transform + pos: 79.5,-22.5 + parent: 1 + - uid: 1742 + components: + - type: Transform + pos: 74.5,-11.5 + parent: 1 + - uid: 1743 + components: + - type: Transform + pos: 81.5,-17.5 + parent: 1 + - uid: 1744 + components: + - type: Transform + pos: 81.5,-14.5 + parent: 1 + - uid: 1745 + components: + - type: Transform + pos: 63.5,-22.5 + parent: 1 + - uid: 1746 + components: + - type: Transform + pos: 81.5,-16.5 + parent: 1 + - uid: 1747 + components: + - type: Transform + pos: 82.5,-14.5 + parent: 1 + - uid: 1748 + components: + - type: Transform + pos: 73.5,-11.5 + parent: 1 + - uid: 1749 + components: + - type: Transform + pos: 81.5,-15.5 + parent: 1 + - uid: 1750 + components: + - type: Transform + pos: 83.5,-14.5 + parent: 1 + - uid: 1751 + components: + - type: Transform + pos: 72.5,-11.5 + parent: 1 + - uid: 1752 + components: + - type: Transform + pos: 80.5,-22.5 + parent: 1 + - uid: 1753 + components: + - type: Transform + pos: 81.5,-20.5 + parent: 1 + - uid: 1754 + components: + - type: Transform + pos: 64.5,-22.5 + parent: 1 + - uid: 1755 + components: + - type: Transform + pos: 81.5,-22.5 + parent: 1 + - uid: 1756 + components: + - type: Transform + pos: 81.5,-19.5 + parent: 1 + - uid: 1757 + components: + - type: Transform + pos: 67.5,-11.5 + parent: 1 + - uid: 1758 + components: + - type: Transform + pos: 81.5,-21.5 + parent: 1 + - uid: 1759 + components: + - type: Transform + pos: 81.5,-18.5 + parent: 1 + - uid: 1760 + components: + - type: Transform + pos: 65.5,-22.5 + parent: 1 + - uid: 1761 + components: + - type: Transform + pos: 102.5,-14.5 + parent: 1 + - uid: 1762 + components: + - type: Transform + pos: 105.5,-14.5 + parent: 1 + - uid: 1763 + components: + - type: Transform + pos: 68.5,-11.5 + parent: 1 + - uid: 1764 + components: + - type: Transform + pos: 103.5,-14.5 + parent: 1 + - uid: 1765 + components: + - type: Transform + pos: 106.5,-14.5 + parent: 1 + - uid: 1766 + components: + - type: Transform + pos: 66.5,-22.5 + parent: 1 + - uid: 1767 + components: + - type: Transform + pos: 104.5,-14.5 + parent: 1 + - uid: 1768 + components: + - type: Transform + pos: 107.5,-14.5 + parent: 1 + - uid: 1769 + components: + - type: Transform + pos: 69.5,-11.5 + parent: 1 + - uid: 1770 + components: + - type: Transform + pos: 96.5,-14.5 + parent: 1 + - uid: 1771 + components: + - type: Transform + pos: 99.5,-14.5 + parent: 1 + - uid: 1772 + components: + - type: Transform + pos: 67.5,-22.5 + parent: 1 + - uid: 1773 + components: + - type: Transform + pos: 97.5,-14.5 + parent: 1 + - uid: 1774 + components: + - type: Transform + pos: 100.5,-14.5 + parent: 1 + - uid: 1775 + components: + - type: Transform + pos: 68.5,-22.5 + parent: 1 + - uid: 1776 + components: + - type: Transform + pos: 98.5,-14.5 + parent: 1 + - uid: 1777 + components: + - type: Transform + pos: 101.5,-14.5 + parent: 1 + - uid: 1778 + components: + - type: Transform + pos: 70.5,-11.5 + parent: 1 + - uid: 1779 + components: + - type: Transform + pos: 114.5,-14.5 + parent: 1 + - uid: 1780 + components: + - type: Transform + pos: 117.5,-14.5 + parent: 1 + - uid: 1781 + components: + - type: Transform + pos: 69.5,-22.5 + parent: 1 + - uid: 1782 + components: + - type: Transform + pos: 115.5,-14.5 + parent: 1 + - uid: 1783 + components: + - type: Transform + pos: 118.5,-14.5 + parent: 1 + - uid: 1784 + components: + - type: Transform + pos: 71.5,-10.5 + parent: 1 + - uid: 1785 + components: + - type: Transform + pos: 116.5,-14.5 + parent: 1 + - uid: 1786 + components: + - type: Transform + pos: 119.5,-14.5 + parent: 1 + - uid: 1787 + components: + - type: Transform + pos: 70.5,-22.5 + parent: 1 + - uid: 1788 + components: + - type: Transform + pos: 108.5,-14.5 + parent: 1 + - uid: 1789 + components: + - type: Transform + pos: 109.5,-14.5 + parent: 1 + - uid: 1790 + components: + - type: Transform + pos: 71.5,-11.5 + parent: 1 + - uid: 1791 + components: + - type: Transform + pos: 110.5,-14.5 + parent: 1 + - uid: 1792 + components: + - type: Transform + pos: 112.5,-14.5 + parent: 1 + - uid: 1793 + components: + - type: Transform + pos: 71.5,-22.5 + parent: 1 + - uid: 1794 + components: + - type: Transform + pos: 111.5,-14.5 + parent: 1 + - uid: 1795 + components: + - type: Transform + pos: 113.5,-14.5 + parent: 1 + - uid: 1796 + components: + - type: Transform + pos: 72.5,-22.5 + parent: 1 + - uid: 1797 + components: + - type: Transform + pos: 121.5,-14.5 + parent: 1 + - uid: 1798 + components: + - type: Transform + pos: 120.5,-14.5 + parent: 1 + - uid: 1799 + components: + - type: Transform + pos: 73.5,-22.5 + parent: 1 + - uid: 1800 + components: + - type: Transform + pos: 64.5,-3.5 + parent: 1 + - uid: 1801 + components: + - type: Transform + pos: 65.5,-3.5 + parent: 1 + - uid: 1802 + components: + - type: Transform + pos: 71.5,-9.5 + parent: 1 + - uid: 1803 + components: + - type: Transform + pos: 63.5,-19.5 + parent: 1 + - uid: 1804 + components: + - type: Transform + pos: 62.5,-19.5 + parent: 1 + - uid: 1805 + components: + - type: Transform + pos: 71.5,-7.5 + parent: 1 + - uid: 1806 + components: + - type: Transform + pos: 40.5,-17.5 + parent: 1 + - uid: 1807 + components: + - type: Transform + pos: 34.5,-19.5 + parent: 1 + - uid: 1808 + components: + - type: Transform + pos: 71.5,-8.5 + parent: 1 + - uid: 1809 + components: + - type: Transform + pos: 40.5,-14.5 + parent: 1 + - uid: 1810 + components: + - type: Transform + pos: 35.5,-19.5 + parent: 1 + - uid: 1811 + components: + - type: Transform + pos: 71.5,-6.5 + parent: 1 + - uid: 1812 + components: + - type: Transform + pos: 43.5,-15.5 + parent: 1 + - uid: 1813 + components: + - type: Transform + pos: 36.5,-19.5 + parent: 1 + - uid: 1814 + components: + - type: Transform + pos: 67.5,-3.5 + parent: 1 + - uid: 1816 + components: + - type: Transform + pos: 37.5,-19.5 + parent: 1 + - uid: 1817 + components: + - type: Transform + pos: 66.5,-3.5 + parent: 1 + - uid: 1818 + components: + - type: Transform + pos: 36.5,-15.5 + parent: 1 + - uid: 1819 + components: + - type: Transform + pos: 38.5,-19.5 + parent: 1 + - uid: 1820 + components: + - type: Transform + pos: 71.5,-5.5 + parent: 1 + - uid: 1821 + components: + - type: Transform + pos: 37.5,-15.5 + parent: 1 + - uid: 1822 + components: + - type: Transform + pos: 39.5,-19.5 + parent: 1 + - uid: 1823 + components: + - type: Transform + pos: 68.5,-3.5 + parent: 1 + - uid: 1824 + components: + - type: Transform + pos: 40.5,-20.5 + parent: 1 + - uid: 1825 + components: + - type: Transform + pos: 40.5,-19.5 + parent: 1 + - uid: 1826 + components: + - type: Transform + pos: 71.5,-4.5 + parent: 1 + - uid: 1827 + components: + - type: Transform + pos: 40.5,-21.5 + parent: 1 + - uid: 1828 + components: + - type: Transform + pos: 40.5,-18.5 + parent: 1 + - uid: 1829 + components: + - type: Transform + pos: 69.5,-3.5 + parent: 1 + - uid: 1830 + components: + - type: Transform + pos: 50.5,-14.5 + parent: 1 + - uid: 1832 + components: + - type: Transform + pos: 71.5,-3.5 + parent: 1 + - uid: 1833 + components: + - type: Transform + pos: 50.5,-15.5 + parent: 1 + - uid: 1834 + components: + - type: Transform + pos: 46.5,-11.5 + parent: 1 + - uid: 1835 + components: + - type: Transform + pos: 70.5,-3.5 + parent: 1 + - uid: 1836 + components: + - type: Transform + pos: 56.5,-11.5 + parent: 1 + - uid: 1837 + components: + - type: Transform + pos: 47.5,-11.5 + parent: 1 + - uid: 1838 + components: + - type: Transform + pos: 48.5,-11.5 + parent: 1 + - uid: 1839 + components: + - type: Transform + pos: 57.5,-11.5 + parent: 1 + - uid: 1840 + components: + - type: Transform + pos: 61.5,-8.5 + parent: 1 + - uid: 1841 + components: + - type: Transform + pos: 61.5,-7.5 + parent: 1 + - uid: 1842 + components: + - type: Transform + pos: 57.5,-8.5 + parent: 1 + - uid: 1843 + components: + - type: Transform + pos: 56.5,-8.5 + parent: 1 + - uid: 1844 + components: + - type: Transform + pos: 55.5,-22.5 + parent: 1 + - uid: 1845 + components: + - type: Transform + pos: 54.5,-22.5 + parent: 1 + - uid: 1846 + components: + - type: Transform + pos: 50.5,-18.5 + parent: 1 + - uid: 1847 + components: + - type: Transform + pos: 50.5,-19.5 + parent: 1 + - uid: 1848 + components: + - type: Transform + pos: 50.5,-12.5 + parent: 1 + - uid: 1849 + components: + - type: Transform + pos: 55.5,-8.5 + parent: 1 + - uid: 1850 + components: + - type: Transform + pos: 45.5,-14.5 + parent: 1 + - uid: 1851 + components: + - type: Transform + pos: 56.5,-22.5 + parent: 1 + - uid: 1852 + components: + - type: Transform + pos: 53.5,-22.5 + parent: 1 + - uid: 1853 + components: + - type: Transform + pos: 50.5,-16.5 + parent: 1 + - uid: 1854 + components: + - type: Transform + pos: 50.5,-17.5 + parent: 1 + - uid: 1855 + components: + - type: Transform + pos: 50.5,-13.5 + parent: 1 + - uid: 1856 + components: + - type: Transform + pos: 54.5,-8.5 + parent: 1 + - uid: 1857 + components: + - type: Transform + pos: 45.5,-13.5 + parent: 1 + - uid: 1858 + components: + - type: Transform + pos: 45.5,-21.5 + parent: 1 + - uid: 1859 + components: + - type: Transform + pos: 52.5,-22.5 + parent: 1 + - uid: 1860 + components: + - type: Transform + pos: 36.5,-23.5 + parent: 1 + - uid: 1861 + components: + - type: Transform + pos: 37.5,-23.5 + parent: 1 + - uid: 1862 + components: + - type: Transform + pos: 39.5,-23.5 + parent: 1 + - uid: 1863 + components: + - type: Transform + pos: 38.5,-15.5 + parent: 1 + - uid: 1864 + components: + - type: Transform + pos: 45.5,-15.5 + parent: 1 + - uid: 1865 + components: + - type: Transform + pos: 57.5,-22.5 + parent: 1 + - uid: 1866 + components: + - type: Transform + pos: 51.5,-22.5 + parent: 1 + - uid: 1867 + components: + - type: Transform + pos: 43.5,-19.5 + parent: 1 + - uid: 1868 + components: + - type: Transform + pos: 34.5,-28.5 + parent: 1 + - uid: 1869 + components: + - type: Transform + pos: 40.5,-13.5 + parent: 1 + - uid: 1870 + components: + - type: Transform + pos: 39.5,-15.5 + parent: 1 + - uid: 1871 + components: + - type: Transform + pos: 45.5,-12.5 + parent: 1 + - uid: 1872 + components: + - type: Transform + pos: 58.5,-22.5 + parent: 1 + - uid: 1873 + components: + - type: Transform + pos: 50.5,-22.5 + parent: 1 + - uid: 1874 + components: + - type: Transform + pos: 40.5,-22.5 + parent: 1 + - uid: 1875 + components: + - type: Transform + pos: 40.5,-23.5 + parent: 1 + - uid: 1876 + components: + - type: Transform + pos: 40.5,-24.5 + parent: 1 + - uid: 1877 + components: + - type: Transform + pos: 40.5,-25.5 + parent: 1 + - uid: 1878 + components: + - type: Transform + pos: 45.5,-16.5 + parent: 1 + - uid: 1879 + components: + - type: Transform + pos: 45.5,-27.5 + parent: 1 + - uid: 1880 + components: + - type: Transform + pos: 48.5,-22.5 + parent: 1 + - uid: 1881 + components: + - type: Transform + pos: 38.5,-23.5 + parent: 1 + - uid: 1882 + components: + - type: Transform + pos: 41.5,-19.5 + parent: 1 + - uid: 1883 + components: + - type: Transform + pos: 42.5,-19.5 + parent: 1 + - uid: 1884 + components: + - type: Transform + pos: 42.5,-28.5 + parent: 1 + - uid: 1885 + components: + - type: Transform + pos: 45.5,-17.5 + parent: 1 + - uid: 1886 + components: + - type: Transform + pos: 45.5,-22.5 + parent: 1 + - uid: 1887 + components: + - type: Transform + pos: 49.5,-22.5 + parent: 1 + - uid: 1888 + components: + - type: Transform + pos: 38.5,-28.5 + parent: 1 + - uid: 1889 + components: + - type: Transform + pos: 36.5,-28.5 + parent: 1 + - uid: 1890 + components: + - type: Transform + pos: 37.5,-28.5 + parent: 1 + - uid: 1891 + components: + - type: Transform + pos: 41.5,-28.5 + parent: 1 + - uid: 1892 + components: + - type: Transform + pos: 45.5,-18.5 + parent: 1 + - uid: 1893 + components: + - type: Transform + pos: 45.5,-26.5 + parent: 1 + - uid: 1894 + components: + - type: Transform + pos: 46.5,-22.5 + parent: 1 + - uid: 1895 + components: + - type: Transform + pos: 42.5,-23.5 + parent: 1 + - uid: 1896 + components: + - type: Transform + pos: 41.5,-23.5 + parent: 1 + - uid: 1897 + components: + - type: Transform + pos: 40.5,-28.5 + parent: 1 + - uid: 1898 + components: + - type: Transform + pos: 43.5,-23.5 + parent: 1 + - uid: 1899 + components: + - type: Transform + pos: 45.5,-19.5 + parent: 1 + - uid: 1900 + components: + - type: Transform + pos: 45.5,-25.5 + parent: 1 + - uid: 1901 + components: + - type: Transform + pos: 47.5,-22.5 + parent: 1 + - uid: 1902 + components: + - type: Transform + pos: 40.5,-26.5 + parent: 1 + - uid: 1903 + components: + - type: Transform + pos: 45.5,-28.5 + parent: 1 + - uid: 1904 + components: + - type: Transform + pos: 39.5,-28.5 + parent: 1 + - uid: 1905 + components: + - type: Transform + pos: 44.5,-28.5 + parent: 1 + - uid: 1906 + components: + - type: Transform + pos: 45.5,-20.5 + parent: 1 + - uid: 1907 + components: + - type: Transform + pos: 45.5,-24.5 + parent: 1 + - uid: 1908 + components: + - type: Transform + pos: 58.5,-20.5 + parent: 1 + - uid: 1909 + components: + - type: Transform + pos: 40.5,-16.5 + parent: 1 + - uid: 1910 + components: + - type: Transform + pos: 40.5,-15.5 + parent: 1 + - uid: 1911 + components: + - type: Transform + pos: 42.5,-15.5 + parent: 1 + - uid: 1912 + components: + - type: Transform + pos: 41.5,-15.5 + parent: 1 + - uid: 1913 + components: + - type: Transform + pos: 35.5,-28.5 + parent: 1 + - uid: 1914 + components: + - type: Transform + pos: 45.5,-23.5 + parent: 1 + - uid: 1915 + components: + - type: Transform + pos: 58.5,-21.5 + parent: 1 + - uid: 1916 + components: + - type: Transform + pos: 61.5,-19.5 + parent: 1 + - uid: 1917 + components: + - type: Transform + pos: 60.5,-19.5 + parent: 1 + - uid: 1918 + components: + - type: Transform + pos: 55.5,-19.5 + parent: 1 + - uid: 1919 + components: + - type: Transform + pos: 59.5,-19.5 + parent: 1 + - uid: 1920 + components: + - type: Transform + pos: 56.5,-19.5 + parent: 1 + - uid: 1921 + components: + - type: Transform + pos: 57.5,-19.5 + parent: 1 + - uid: 1922 + components: + - type: Transform + pos: 58.5,-19.5 + parent: 1 + - uid: 1923 + components: + - type: Transform + pos: 55.5,-14.5 + parent: 1 + - uid: 1924 + components: + - type: Transform + pos: 60.5,-8.5 + parent: 1 + - uid: 1925 + components: + - type: Transform + pos: 59.5,-8.5 + parent: 1 + - uid: 1926 + components: + - type: Transform + pos: 61.5,-13.5 + parent: 1 + - uid: 1927 + components: + - type: Transform + pos: 61.5,-9.5 + parent: 1 + - uid: 1928 + components: + - type: Transform + pos: 59.5,-11.5 + parent: 1 + - uid: 1929 + components: + - type: Transform + pos: 54.5,-11.5 + parent: 1 + - uid: 1930 + components: + - type: Transform + pos: 51.5,-11.5 + parent: 1 + - uid: 1931 + components: + - type: Transform + pos: 50.5,-11.5 + parent: 1 + - uid: 1932 + components: + - type: Transform + pos: 58.5,-14.5 + parent: 1 + - uid: 1933 + components: + - type: Transform + pos: 57.5,-14.5 + parent: 1 + - uid: 1934 + components: + - type: Transform + pos: 59.5,-14.5 + parent: 1 + - uid: 1935 + components: + - type: Transform + pos: 60.5,-14.5 + parent: 1 + - uid: 1936 + components: + - type: Transform + pos: 61.5,-14.5 + parent: 1 + - uid: 1937 + components: + - type: Transform + pos: 61.5,-11.5 + parent: 1 + - uid: 1938 + components: + - type: Transform + pos: 60.5,-11.5 + parent: 1 + - uid: 1939 + components: + - type: Transform + pos: 53.5,-11.5 + parent: 1 + - uid: 1940 + components: + - type: Transform + pos: 52.5,-11.5 + parent: 1 + - uid: 1941 + components: + - type: Transform + pos: 49.5,-11.5 + parent: 1 + - uid: 1942 + components: + - type: Transform + pos: 61.5,-12.5 + parent: 1 + - uid: 1943 + components: + - type: Transform + pos: 54.5,-14.5 + parent: 1 + - uid: 1944 + components: + - type: Transform + pos: 55.5,-11.5 + parent: 1 + - uid: 1945 + components: + - type: Transform + pos: 61.5,-10.5 + parent: 1 + - uid: 1946 + components: + - type: Transform + pos: 58.5,-11.5 + parent: 1 + - uid: 1947 + components: + - type: Transform + pos: 117.5,-20.5 + parent: 1 + - uid: 1948 + components: + - type: Transform + pos: 58.5,-8.5 + parent: 1 + - uid: 1949 + components: + - type: Transform + pos: 76.5,0.5 + parent: 1 + - uid: 1950 + components: + - type: Transform + pos: 77.5,0.5 + parent: 1 + - uid: 1951 + components: + - type: Transform + pos: 78.5,0.5 + parent: 1 + - uid: 1952 + components: + - type: Transform + pos: 79.5,0.5 + parent: 1 + - uid: 1953 + components: + - type: Transform + pos: 81.5,0.5 + parent: 1 + - uid: 1954 + components: + - type: Transform + pos: 121.5,-0.5 + parent: 1 + - uid: 1955 + components: + - type: Transform + pos: 120.5,-0.5 + parent: 1 + - uid: 1956 + components: + - type: Transform + pos: 122.5,-0.5 + parent: 1 + - uid: 1957 + components: + - type: Transform + pos: 121.5,-7.5 + parent: 1 + - uid: 1958 + components: + - type: Transform + pos: 81.5,-1.5 + parent: 1 + - uid: 1959 + components: + - type: Transform + pos: 112.5,-7.5 + parent: 1 + - uid: 1960 + components: + - type: Transform + pos: 113.5,-7.5 + parent: 1 + - uid: 1961 + components: + - type: Transform + pos: 114.5,-7.5 + parent: 1 + - uid: 1962 + components: + - type: Transform + pos: 115.5,-7.5 + parent: 1 + - uid: 1963 + components: + - type: Transform + pos: 116.5,-7.5 + parent: 1 + - uid: 1964 + components: + - type: Transform + pos: 117.5,-7.5 + parent: 1 + - uid: 1965 + components: + - type: Transform + pos: 118.5,-7.5 + parent: 1 + - uid: 1966 + components: + - type: Transform + pos: 119.5,-7.5 + parent: 1 + - uid: 1967 + components: + - type: Transform + pos: 111.5,-7.5 + parent: 1 + - uid: 1968 + components: + - type: Transform + pos: 104.5,-7.5 + parent: 1 + - uid: 1969 + components: + - type: Transform + pos: 99.5,-7.5 + parent: 1 + - uid: 1970 + components: + - type: Transform + pos: 86.5,-7.5 + parent: 1 + - uid: 1971 + components: + - type: Transform + pos: 90.5,-18.5 + parent: 1 + - uid: 1972 + components: + - type: Transform + pos: 113.5,-22.5 + parent: 1 + - uid: 1973 + components: + - type: Transform + pos: 112.5,-22.5 + parent: 1 + - uid: 1974 + components: + - type: Transform + pos: 112.5,-21.5 + parent: 1 + - uid: 1975 + components: + - type: Transform + pos: 112.5,-20.5 + parent: 1 + - uid: 1976 + components: + - type: Transform + pos: 112.5,-19.5 + parent: 1 + - uid: 1977 + components: + - type: Transform + pos: 112.5,-18.5 + parent: 1 + - uid: 1978 + components: + - type: Transform + pos: 112.5,-17.5 + parent: 1 + - uid: 1979 + components: + - type: Transform + pos: 112.5,-16.5 + parent: 1 + - uid: 1980 + components: + - type: Transform + pos: 117.5,-15.5 + parent: 1 + - uid: 1981 + components: + - type: Transform + pos: 117.5,-16.5 + parent: 1 + - uid: 1982 + components: + - type: Transform + pos: 112.5,-15.5 + parent: 1 + - uid: 1983 + components: + - type: Transform + pos: 117.5,-18.5 + parent: 1 + - uid: 1984 + components: + - type: Transform + pos: 122.5,-21.5 + parent: 1 + - uid: 1985 + components: + - type: Transform + pos: 117.5,-21.5 + parent: 1 + - uid: 1986 + components: + - type: Transform + pos: 122.5,-22.5 + parent: 1 + - uid: 1987 + components: + - type: Transform + pos: 75.5,0.5 + parent: 1 + - uid: 1988 + components: + - type: Transform + pos: 81.5,-0.5 + parent: 1 + - uid: 1989 + components: + - type: Transform + pos: 80.5,0.5 + parent: 1 + - uid: 1990 + components: + - type: Transform + pos: 117.5,-17.5 + parent: 1 + - uid: 1991 + components: + - type: Transform + pos: 117.5,-19.5 + parent: 1 + - uid: 1992 + components: + - type: Transform + pos: 85.5,-7.5 + parent: 1 + - uid: 1993 + components: + - type: Transform + pos: 87.5,-7.5 + parent: 1 + - uid: 1994 + components: + - type: Transform + pos: 100.5,-7.5 + parent: 1 + - uid: 1995 + components: + - type: Transform + pos: 103.5,-7.5 + parent: 1 + - uid: 1996 + components: + - type: Transform + pos: 84.5,-7.5 + parent: 1 + - uid: 1997 + components: + - type: Transform + pos: 88.5,-7.5 + parent: 1 + - uid: 1998 + components: + - type: Transform + pos: 98.5,-7.5 + parent: 1 + - uid: 1999 + components: + - type: Transform + pos: 105.5,-7.5 + parent: 1 + - uid: 2000 + components: + - type: Transform + pos: 83.5,-7.5 + parent: 1 + - uid: 2001 + components: + - type: Transform + pos: 89.5,-7.5 + parent: 1 + - uid: 2002 + components: + - type: Transform + pos: 97.5,-7.5 + parent: 1 + - uid: 2003 + components: + - type: Transform + pos: 106.5,-7.5 + parent: 1 + - uid: 2004 + components: + - type: Transform + pos: 82.5,-7.5 + parent: 1 + - uid: 2005 + components: + - type: Transform + pos: 90.5,-7.5 + parent: 1 + - uid: 2006 + components: + - type: Transform + pos: 96.5,-7.5 + parent: 1 + - uid: 2007 + components: + - type: Transform + pos: 107.5,-7.5 + parent: 1 + - uid: 2008 + components: + - type: Transform + pos: 81.5,-7.5 + parent: 1 + - uid: 2009 + components: + - type: Transform + pos: 91.5,-7.5 + parent: 1 + - uid: 2010 + components: + - type: Transform + pos: 95.5,-7.5 + parent: 1 + - uid: 2011 + components: + - type: Transform + pos: 108.5,-7.5 + parent: 1 + - uid: 2012 + components: + - type: Transform + pos: 81.5,-6.5 + parent: 1 + - uid: 2013 + components: + - type: Transform + pos: 92.5,-7.5 + parent: 1 + - uid: 2014 + components: + - type: Transform + pos: 94.5,-7.5 + parent: 1 + - uid: 2015 + components: + - type: Transform + pos: 109.5,-7.5 + parent: 1 + - uid: 2016 + components: + - type: Transform + pos: 81.5,-5.5 + parent: 1 + - uid: 2017 + components: + - type: Transform + pos: 93.5,-7.5 + parent: 1 + - uid: 2018 + components: + - type: Transform + pos: 101.5,-7.5 + parent: 1 + - uid: 2019 + components: + - type: Transform + pos: 110.5,-7.5 + parent: 1 + - uid: 2020 + components: + - type: Transform + pos: 81.5,-4.5 + parent: 1 + - uid: 2021 + components: + - type: Transform + pos: 81.5,-3.5 + parent: 1 + - uid: 2022 + components: + - type: Transform + pos: 81.5,-2.5 + parent: 1 + - uid: 2023 + components: + - type: Transform + pos: 102.5,-7.5 + parent: 1 + - uid: 2024 + components: + - type: Transform + pos: 45.5,-9.5 + parent: 1 + - uid: 2025 + components: + - type: Transform + pos: 45.5,-10.5 + parent: 1 + - uid: 2026 + components: + - type: Transform + pos: 45.5,-3.5 + parent: 1 + - uid: 2027 + components: + - type: Transform + pos: 45.5,-5.5 + parent: 1 + - uid: 2028 + components: + - type: Transform + pos: 45.5,-2.5 + parent: 1 + - uid: 2029 + components: + - type: Transform + pos: 43.5,-11.5 + parent: 1 + - uid: 2030 + components: + - type: Transform + pos: 41.5,-11.5 + parent: 1 + - uid: 2031 + components: + - type: Transform + pos: 40.5,-11.5 + parent: 1 + - uid: 2032 + components: + - type: Transform + pos: 39.5,-11.5 + parent: 1 + - uid: 2033 + components: + - type: Transform + pos: 36.5,-11.5 + parent: 1 + - uid: 2034 + components: + - type: Transform + pos: 35.5,-11.5 + parent: 1 + - uid: 2035 + components: + - type: Transform + pos: 45.5,-7.5 + parent: 1 + - uid: 2036 + components: + - type: Transform + pos: 45.5,-8.5 + parent: 1 + - uid: 2037 + components: + - type: Transform + pos: 45.5,-6.5 + parent: 1 + - uid: 2038 + components: + - type: Transform + pos: 45.5,-4.5 + parent: 1 + - uid: 2039 + components: + - type: Transform + pos: 45.5,-1.5 + parent: 1 + - uid: 2040 + components: + - type: Transform + pos: 44.5,-11.5 + parent: 1 + - uid: 2041 + components: + - type: Transform + pos: 45.5,-11.5 + parent: 1 + - uid: 2042 + components: + - type: Transform + pos: 42.5,-11.5 + parent: 1 + - uid: 2043 + components: + - type: Transform + pos: 38.5,-11.5 + parent: 1 + - uid: 2044 + components: + - type: Transform + pos: 37.5,-11.5 + parent: 1 + - uid: 2045 + components: + - type: Transform + pos: 34.5,-11.5 + parent: 1 + - uid: 2046 + components: + - type: Transform + pos: 114.5,-0.5 + parent: 1 + - uid: 2047 + components: + - type: Transform + pos: 112.5,-5.5 + parent: 1 + - uid: 2048 + components: + - type: Transform + pos: 112.5,-4.5 + parent: 1 + - uid: 2049 + components: + - type: Transform + pos: 113.5,-0.5 + parent: 1 + - uid: 2050 + components: + - type: Transform + pos: 112.5,-6.5 + parent: 1 + - uid: 2051 + components: + - type: Transform + pos: 112.5,-3.5 + parent: 1 + - uid: 2052 + components: + - type: Transform + pos: 112.5,-0.5 + parent: 1 + - uid: 2053 + components: + - type: Transform + pos: 122.5,-7.5 + parent: 1 + - uid: 2054 + components: + - type: Transform + pos: 112.5,-2.5 + parent: 1 + - uid: 2055 + components: + - type: Transform + pos: 122.5,-1.5 + parent: 1 + - uid: 2056 + components: + - type: Transform + pos: 122.5,-6.5 + parent: 1 + - uid: 2057 + components: + - type: Transform + pos: 122.5,-2.5 + parent: 1 + - uid: 2058 + components: + - type: Transform + pos: 122.5,-4.5 + parent: 1 + - uid: 2059 + components: + - type: Transform + pos: 100.5,-3.5 + parent: 1 + - uid: 2060 + components: + - type: Transform + pos: 101.5,-3.5 + parent: 1 + - uid: 2061 + components: + - type: Transform + pos: 102.5,-3.5 + parent: 1 + - uid: 2062 + components: + - type: Transform + pos: 104.5,-3.5 + parent: 1 + - uid: 2063 + components: + - type: Transform + pos: 105.5,-3.5 + parent: 1 + - uid: 2064 + components: + - type: Transform + pos: 106.5,-3.5 + parent: 1 + - uid: 2065 + components: + - type: Transform + pos: 103.5,-3.5 + parent: 1 + - uid: 2066 + components: + - type: Transform + pos: 112.5,-1.5 + parent: 1 + - uid: 2067 + components: + - type: Transform + pos: 122.5,-3.5 + parent: 1 + - uid: 2068 + components: + - type: Transform + pos: 122.5,-5.5 + parent: 1 + - uid: 2069 + components: + - type: Transform + pos: 100.5,-18.5 + parent: 1 + - uid: 2070 + components: + - type: Transform + pos: 101.5,-18.5 + parent: 1 + - uid: 2071 + components: + - type: Transform + pos: 102.5,-18.5 + parent: 1 + - uid: 2072 + components: + - type: Transform + pos: 103.5,-18.5 + parent: 1 + - uid: 2073 + components: + - type: Transform + pos: 96.5,-15.5 + parent: 1 + - uid: 2074 + components: + - type: Transform + pos: 96.5,-16.5 + parent: 1 + - uid: 2075 + components: + - type: Transform + pos: 96.5,-17.5 + parent: 1 + - uid: 2076 + components: + - type: Transform + pos: 93.5,-3.5 + parent: 1 + - uid: 2077 + components: + - type: Transform + pos: 117.5,-1.5 + parent: 1 + - uid: 2078 + components: + - type: Transform + pos: 115.5,-0.5 + parent: 1 + - uid: 2083 + components: + - type: Transform + pos: 50.5,-10.5 + parent: 1 + - uid: 2084 + components: + - type: Transform + pos: 50.5,-9.5 + parent: 1 + - uid: 2085 + components: + - type: Transform + pos: 96.5,-5.5 + parent: 1 + - uid: 2086 + components: + - type: Transform + pos: 117.5,-3.5 + parent: 1 + - uid: 2087 + components: + - type: Transform + pos: 116.5,-0.5 + parent: 1 + - uid: 2088 + components: + - type: Transform + pos: 88.5,-18.5 + parent: 1 + - uid: 2089 + components: + - type: Transform + pos: 87.5,-18.5 + parent: 1 + - uid: 2090 + components: + - type: Transform + pos: 86.5,-18.5 + parent: 1 + - uid: 2091 + components: + - type: Transform + pos: 96.5,-3.5 + parent: 1 + - uid: 2092 + components: + - type: Transform + pos: 117.5,-5.5 + parent: 1 + - uid: 2093 + components: + - type: Transform + pos: 117.5,-0.5 + parent: 1 + - uid: 2094 + components: + - type: Transform + pos: 104.5,-18.5 + parent: 1 + - uid: 2095 + components: + - type: Transform + pos: 105.5,-18.5 + parent: 1 + - uid: 2096 + components: + - type: Transform + pos: 89.5,-18.5 + parent: 1 + - uid: 2097 + components: + - type: Transform + pos: 96.5,-4.5 + parent: 1 + - uid: 2098 + components: + - type: Transform + pos: 117.5,-6.5 + parent: 1 + - uid: 2099 + components: + - type: Transform + pos: 118.5,-0.5 + parent: 1 + - uid: 2100 + components: + - type: Transform + pos: 50.5,-5.5 + parent: 1 + - uid: 2101 + components: + - type: Transform + pos: 50.5,-4.5 + parent: 1 + - uid: 2102 + components: + - type: Transform + pos: 50.5,-3.5 + parent: 1 + - uid: 2104 + components: + - type: Transform + pos: 94.5,-3.5 + parent: 1 + - uid: 2105 + components: + - type: Transform + pos: 117.5,-4.5 + parent: 1 + - uid: 2106 + components: + - type: Transform + pos: 119.5,-0.5 + parent: 1 + - uid: 2107 + components: + - type: Transform + pos: 50.5,-8.5 + parent: 1 + - uid: 2108 + components: + - type: Transform + pos: 50.5,-7.5 + parent: 1 + - uid: 2109 + components: + - type: Transform + pos: 50.5,-6.5 + parent: 1 + - uid: 2112 + components: + - type: Transform + pos: 95.5,-3.5 + parent: 1 + - uid: 2113 + components: + - type: Transform + pos: 96.5,-6.5 + parent: 1 + - uid: 2115 + components: + - type: Transform + pos: 92.5,-3.5 + parent: 1 + - uid: 2116 + components: + - type: Transform + pos: 91.5,-3.5 + parent: 1 + - uid: 2117 + components: + - type: Transform + pos: 90.5,-3.5 + parent: 1 + - uid: 2118 + components: + - type: Transform + pos: 89.5,-3.5 + parent: 1 + - uid: 2119 + components: + - type: Transform + pos: 87.5,-3.5 + parent: 1 + - uid: 2120 + components: + - type: Transform + pos: 88.5,-3.5 + parent: 1 + - uid: 2121 + components: + - type: Transform + pos: 97.5,-3.5 + parent: 1 + - uid: 2122 + components: + - type: Transform + pos: 98.5,-3.5 + parent: 1 + - uid: 2123 + components: + - type: Transform + pos: 117.5,-2.5 + parent: 1 + - uid: 2126 + components: + - type: Transform + pos: 120.5,-7.5 + parent: 1 + - uid: 2128 + components: + - type: Transform + pos: 12.5,5.5 + parent: 1 + - uid: 2129 + components: + - type: Transform + pos: 11.5,5.5 + parent: 1 + - uid: 2130 + components: + - type: Transform + pos: 10.5,5.5 + parent: 1 + - uid: 2131 + components: + - type: Transform + pos: 9.5,5.5 + parent: 1 + - uid: 2147 + components: + - type: Transform + pos: 18.5,-10.5 + parent: 1 + - uid: 2151 + components: + - type: Transform + pos: 20.5,-10.5 + parent: 1 + - uid: 2152 + components: + - type: Transform + pos: 19.5,-10.5 + parent: 1 + - uid: 2153 + components: + - type: Transform + pos: 20.5,-13.5 + parent: 1 + - uid: 2154 + components: + - type: Transform + pos: 20.5,-12.5 + parent: 1 + - uid: 2155 + components: + - type: Transform + pos: 20.5,-11.5 + parent: 1 + - uid: 2156 + components: + - type: Transform + pos: 20.5,-15.5 + parent: 1 + - uid: 2157 + components: + - type: Transform + pos: 20.5,-17.5 + parent: 1 + - uid: 2158 + components: + - type: Transform + pos: 20.5,-18.5 + parent: 1 + - uid: 2159 + components: + - type: Transform + pos: 20.5,-19.5 + parent: 1 + - uid: 2169 + components: + - type: Transform + pos: 2.5,-2.5 + parent: 1 + - uid: 2170 + components: + - type: Transform + pos: 2.5,-1.5 + parent: 1 + - uid: 2171 + components: + - type: Transform + pos: 2.5,-0.5 + parent: 1 + - uid: 2172 + components: + - type: Transform + pos: 3.5,-0.5 + parent: 1 + - uid: 2173 + components: + - type: Transform + pos: 6.5,0.5 + parent: 1 + - uid: 2174 + components: + - type: Transform + pos: 5.5,-0.5 + parent: 1 + - uid: 2175 + components: + - type: Transform + pos: 6.5,-0.5 + parent: 1 + - uid: 2176 + components: + - type: Transform + pos: 4.5,-0.5 + parent: 1 + - uid: 2177 + components: + - type: Transform + pos: 6.5,1.5 + parent: 1 + - uid: 2178 + components: + - type: Transform + pos: 6.5,2.5 + parent: 1 + - uid: 2179 + components: + - type: Transform + pos: 6.5,3.5 + parent: 1 + - uid: 2180 + components: + - type: Transform + pos: 6.5,4.5 + parent: 1 + - uid: 2182 + components: + - type: Transform + pos: 20.5,-20.5 + parent: 1 + - uid: 2183 + components: + - type: Transform + pos: 20.5,-21.5 + parent: 1 + - uid: 2188 + components: + - type: Transform + pos: 1.5,-0.5 + parent: 1 + - uid: 2189 + components: + - type: Transform + pos: 0.5,-0.5 + parent: 1 + - uid: 2190 + components: + - type: Transform + pos: 0.5,0.5 + parent: 1 + - uid: 2191 + components: + - type: Transform + pos: 0.5,1.5 + parent: 1 + - uid: 2192 + components: + - type: Transform + pos: 0.5,2.5 + parent: 1 + - uid: 2193 + components: + - type: Transform + pos: 0.5,3.5 + parent: 1 + - uid: 2194 + components: + - type: Transform + pos: 0.5,4.5 + parent: 1 + - uid: 2195 + components: + - type: Transform + pos: 0.5,5.5 + parent: 1 + - uid: 2196 + components: + - type: Transform + pos: 34.5,-3.5 + parent: 1 + - uid: 2197 + components: + - type: Transform + pos: 35.5,-3.5 + parent: 1 + - uid: 2198 + components: + - type: Transform + pos: 36.5,-3.5 + parent: 1 + - uid: 2199 + components: + - type: Transform + pos: 37.5,-3.5 + parent: 1 + - uid: 2200 + components: + - type: Transform + pos: 37.5,-2.5 + parent: 1 + - uid: 2201 + components: + - type: Transform + pos: 37.5,-1.5 + parent: 1 + - uid: 2202 + components: + - type: Transform + pos: 37.5,-0.5 + parent: 1 + - uid: 2203 + components: + - type: Transform + pos: 37.5,1.5 + parent: 1 + - uid: 2204 + components: + - type: Transform + pos: 37.5,0.5 + parent: 1 + - uid: 2205 + components: + - type: Transform + pos: 38.5,1.5 + parent: 1 + - uid: 2206 + components: + - type: Transform + pos: 40.5,1.5 + parent: 1 + - uid: 2207 + components: + - type: Transform + pos: 41.5,1.5 + parent: 1 + - uid: 2208 + components: + - type: Transform + pos: 42.5,1.5 + parent: 1 + - uid: 2209 + components: + - type: Transform + pos: 39.5,1.5 + parent: 1 + - uid: 2210 + components: + - type: Transform + pos: 38.5,-3.5 + parent: 1 + - uid: 2211 + components: + - type: Transform + pos: 39.5,-3.5 + parent: 1 + - uid: 2212 + components: + - type: Transform + pos: 40.5,-3.5 + parent: 1 + - uid: 2213 + components: + - type: Transform + pos: 41.5,-3.5 + parent: 1 + - uid: 2214 + components: + - type: Transform + pos: 42.5,-3.5 + parent: 1 + - uid: 2215 + components: + - type: Transform + pos: 37.5,-4.5 + parent: 1 + - uid: 2216 + components: + - type: Transform + pos: 37.5,-5.5 + parent: 1 + - uid: 2217 + components: + - type: Transform + pos: 37.5,-6.5 + parent: 1 + - uid: 2218 + components: + - type: Transform + pos: 37.5,-7.5 + parent: 1 + - uid: 2219 + components: + - type: Transform + pos: 38.5,-7.5 + parent: 1 + - uid: 2220 + components: + - type: Transform + pos: 39.5,-7.5 + parent: 1 + - uid: 2221 + components: + - type: Transform + pos: 39.5,-7.5 + parent: 1 + - uid: 2222 + components: + - type: Transform + pos: 40.5,-7.5 + parent: 1 + - uid: 2223 + components: + - type: Transform + pos: 41.5,-7.5 + parent: 1 + - uid: 2224 + components: + - type: Transform + pos: 42.5,-7.5 + parent: 1 + - uid: 2225 + components: + - type: Transform + pos: 27.5,-24.5 + parent: 1 + - uid: 2226 + components: + - type: Transform + pos: 26.5,-24.5 + parent: 1 + - uid: 2227 + components: + - type: Transform + pos: 25.5,-24.5 + parent: 1 + - uid: 2228 + components: + - type: Transform + pos: 24.5,-24.5 + parent: 1 + - uid: 2229 + components: + - type: Transform + pos: 24.5,-25.5 + parent: 1 + - uid: 2230 + components: + - type: Transform + pos: 24.5,-26.5 + parent: 1 + - uid: 2231 + components: + - type: Transform + pos: 23.5,-26.5 + parent: 1 + - uid: 2232 + components: + - type: Transform + pos: 22.5,-26.5 + parent: 1 + - uid: 2233 + components: + - type: Transform + pos: 21.5,-26.5 + parent: 1 + - uid: 2234 + components: + - type: Transform + pos: 20.5,-26.5 + parent: 1 + - uid: 2235 + components: + - type: Transform + pos: 20.5,-25.5 + parent: 1 + - uid: 2236 + components: + - type: Transform + pos: 20.5,-24.5 + parent: 1 + - uid: 2237 + components: + - type: Transform + pos: 20.5,-23.5 + parent: 1 + - uid: 2238 + components: + - type: Transform + pos: 20.5,-22.5 + parent: 1 + - uid: 2240 + components: + - type: Transform + pos: 15.5,-10.5 + parent: 1 + - uid: 2241 + components: + - type: Transform + pos: 14.5,-10.5 + parent: 1 + - uid: 2242 + components: + - type: Transform + pos: 13.5,-10.5 + parent: 1 + - uid: 2243 + components: + - type: Transform + pos: 12.5,-10.5 + parent: 1 + - uid: 2244 + components: + - type: Transform + pos: 12.5,-11.5 + parent: 1 + - uid: 2245 + components: + - type: Transform + pos: 12.5,-12.5 + parent: 1 + - uid: 2246 + components: + - type: Transform + pos: 12.5,-13.5 + parent: 1 + - uid: 2249 + components: + - type: Transform + pos: 46.5,-26.5 + parent: 1 + - uid: 2250 + components: + - type: Transform + pos: 47.5,-26.5 + parent: 1 + - uid: 2251 + components: + - type: Transform + pos: 48.5,-26.5 + parent: 1 + - uid: 2252 + components: + - type: Transform + pos: 49.5,-26.5 + parent: 1 + - uid: 2253 + components: + - type: Transform + pos: 50.5,-26.5 + parent: 1 + - uid: 2254 + components: + - type: Transform + pos: 51.5,-26.5 + parent: 1 + - uid: 2255 + components: + - type: Transform + pos: 52.5,-26.5 + parent: 1 + - uid: 2256 + components: + - type: Transform + pos: 53.5,-26.5 + parent: 1 + - uid: 2257 + components: + - type: Transform + pos: 46.5,3.5 + parent: 1 + - uid: 2258 + components: + - type: Transform + pos: 47.5,3.5 + parent: 1 + - uid: 2259 + components: + - type: Transform + pos: 48.5,3.5 + parent: 1 + - uid: 2260 + components: + - type: Transform + pos: 49.5,3.5 + parent: 1 + - uid: 2261 + components: + - type: Transform + pos: 50.5,3.5 + parent: 1 + - uid: 2262 + components: + - type: Transform + pos: 51.5,3.5 + parent: 1 + - uid: 2263 + components: + - type: Transform + pos: 52.5,3.5 + parent: 1 + - uid: 2264 + components: + - type: Transform + pos: 53.5,3.5 + parent: 1 + - uid: 2266 + components: + - type: Transform + pos: 20.5,0.5 + parent: 1 + - uid: 2267 + components: + - type: Transform + pos: 20.5,-0.5 + parent: 1 + - uid: 2268 + components: + - type: Transform + pos: 20.5,-1.5 + parent: 1 + - uid: 2269 + components: + - type: Transform + pos: 20.5,-2.5 + parent: 1 + - uid: 2270 + components: + - type: Transform + pos: 21.5,-2.5 + parent: 1 + - uid: 2271 + components: + - type: Transform + pos: 21.5,-3.5 + parent: 1 + - uid: 2272 + components: + - type: Transform + pos: 21.5,-4.5 + parent: 1 +- proto: CableApcStack1 + entities: + - uid: 1664 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 16.436966,-27.524946 + parent: 1 + - uid: 2081 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 91.33842,-18.44619 + parent: 1 + - uid: 2247 + components: + - type: Transform + pos: 12.438142,-14.644106 + parent: 1 + - uid: 2248 + components: + - type: Transform + pos: 12.485017,-8.572691 + parent: 1 +- proto: CableApcStack10 + entities: + - uid: 2082 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 94.12803,-18.509699 + parent: 1 + - uid: 2150 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 7.9671464,5.7231894 + parent: 1 +- proto: CableHV + entities: + - uid: 1237 + components: + - type: Transform + pos: 2.5,2.5 + parent: 1 + - uid: 2133 + components: + - type: Transform + pos: 2.5,3.5 + parent: 1 + - uid: 2135 + components: + - type: Transform + pos: 2.5,1.5 + parent: 1 + - uid: 2138 + components: + - type: Transform + pos: 2.5,4.5 + parent: 1 + - uid: 2139 + components: + - type: Transform + pos: 2.5,5.5 + parent: 1 + - uid: 2140 + components: + - type: Transform + pos: 2.5,6.5 + parent: 1 + - uid: 2141 + components: + - type: Transform + pos: 1.5,6.5 + parent: 1 +- proto: CableMV + entities: + - uid: 2142 + components: + - type: Transform + pos: 1.5,6.5 + parent: 1 + - uid: 2143 + components: + - type: Transform + pos: 2.5,6.5 + parent: 1 + - uid: 2144 + components: + - type: Transform + pos: 2.5,5.5 + parent: 1 + - uid: 2145 + components: + - type: Transform + pos: 2.5,4.5 + parent: 1 + - uid: 2148 + components: + - type: Transform + pos: 3.5,4.5 + parent: 1 + - uid: 2161 + components: + - type: Transform + pos: 3.5,3.5 + parent: 1 + - uid: 2162 + components: + - type: Transform + pos: 3.5,1.5 + parent: 1 + - uid: 2163 + components: + - type: Transform + pos: 3.5,2.5 + parent: 1 + - uid: 2164 + components: + - type: Transform + pos: 3.5,0.5 + parent: 1 + - uid: 2165 + components: + - type: Transform + pos: 2.5,0.5 + parent: 1 + - uid: 2166 + components: + - type: Transform + pos: 2.5,-0.5 + parent: 1 + - uid: 2167 + components: + - type: Transform + pos: 2.5,-1.5 + parent: 1 + - uid: 2168 + components: + - type: Transform + pos: 2.5,-2.5 + parent: 1 +- proto: CableMVStack1 + entities: + - uid: 2146 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 4.3421464,4.3950644 + parent: 1 + - uid: 2149 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 7.4671464,4.4731894 + parent: 1 +- proto: CableTerminal + entities: + - uid: 2132 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,3.5 + parent: 1 + - uid: 2134 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,1.5 + parent: 1 + - uid: 2137 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,2.5 + parent: 1 +- proto: Cautery + entities: + - uid: 661 + components: + - type: Transform + pos: 41.220383,-13.268032 + parent: 1 +- proto: Chair + entities: + - uid: 268 + components: + - type: Transform + pos: 42.5,-5.5 + parent: 1 + - uid: 269 + components: + - type: Transform + pos: 41.5,-5.5 + parent: 1 + - uid: 270 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 43.5,-7.5 + parent: 1 + - uid: 272 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 43.5,-6.5 + parent: 1 + - uid: 273 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 43.5,-3.5 + parent: 1 + - uid: 274 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 41.5,-4.5 + parent: 1 + - uid: 275 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 43.5,-2.5 + parent: 1 + - uid: 276 + components: + - type: Transform + pos: 42.5,-1.5 + parent: 1 + - uid: 300 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 40.5,-6.5 + parent: 1 + - uid: 301 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 40.5,-7.5 + parent: 1 + - uid: 302 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 40.5,-2.5 + parent: 1 + - uid: 303 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 40.5,-3.5 + parent: 1 + - uid: 304 + components: + - type: Transform + pos: 41.5,-1.5 + parent: 1 + - uid: 319 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 38.5,-8.5 + parent: 1 + - uid: 320 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 37.5,-8.5 + parent: 1 + - uid: 322 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 39.5,-6.5 + parent: 1 + - uid: 323 + components: + - type: Transform + pos: 38.5,-5.5 + parent: 1 + - uid: 324 + components: + - type: Transform + pos: 37.5,-5.5 + parent: 1 + - uid: 325 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 36.5,-6.5 + parent: 1 + - uid: 326 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 36.5,-7.5 + parent: 1 + - uid: 331 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 39.5,-7.5 + parent: 1 + - uid: 332 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 42.5,-8.5 + parent: 1 + - uid: 333 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 41.5,-8.5 + parent: 1 + - uid: 334 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 42.5,-4.5 + parent: 1 + - uid: 606 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 11.5,-23.5 + parent: 1 + - uid: 832 + components: + - type: Transform + pos: 59.5,-9.5 + parent: 1 + - uid: 833 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 61.5,-8.5 + parent: 1 + - uid: 834 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 61.5,-10.5 + parent: 1 + - uid: 835 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 61.5,-11.5 + parent: 1 + - uid: 836 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 61.5,-12.5 + parent: 1 + - uid: 837 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 61.5,-14.5 + parent: 1 + - uid: 838 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 61.5,-15.5 + parent: 1 +- proto: ChairWood + entities: + - uid: 716 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 52.5,-16.5 + parent: 1 +- proto: ClosetL3Security + entities: + - uid: 729 + components: + - type: Transform + pos: 52.5,-5.5 + parent: 1 + - uid: 730 + components: + - type: Transform + pos: 52.5,-4.5 + parent: 1 +- proto: ClosetToolFilled + entities: + - uid: 130 + components: + - type: Transform + pos: 17.5,-1.5 + parent: 1 + - uid: 131 + components: + - type: Transform + pos: 16.5,-1.5 + parent: 1 + - uid: 135 + components: + - type: Transform + pos: 15.5,-1.5 + parent: 1 +- proto: ClothingBackpackDuffelSurgeryFilled + entities: + - uid: 662 + components: + - type: Transform + pos: 41.751633,-13.424282 + parent: 1 +- proto: computerBodyScanner + entities: + - uid: 647 + components: + - type: Transform + pos: 43.5,-16.5 + parent: 1 + - uid: 648 + components: + - type: Transform + pos: 36.5,-16.5 + parent: 1 + - uid: 649 + components: + - type: Transform + pos: 43.5,-13.5 + parent: 1 + - uid: 650 + components: + - type: Transform + pos: 36.5,-13.5 + parent: 1 +- proto: ComputerBroken + entities: + - uid: 433 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 31.5,-15.5 + parent: 1 + - uid: 823 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 62.5,-14.5 + parent: 1 + - uid: 825 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 62.5,-15.5 + parent: 1 + - uid: 831 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 62.5,-11.5 + parent: 1 +- proto: ComputerFrame + entities: + - uid: 824 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 57.5,-8.5 + parent: 1 + - uid: 827 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 62.5,-8.5 + parent: 1 + - uid: 830 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 62.5,-10.5 + parent: 1 + - uid: 932 + components: + - type: Transform + pos: 71.5,-12.5 + parent: 1 + - uid: 1831 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 62.5,-20.5 + parent: 1 +- proto: ComputerPowerMonitoring + entities: + - uid: 1656 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 62.5,-2.5 + parent: 1 +- proto: ContainmentFieldGenerator + entities: + - uid: 1366 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 125.5,-23.5 + parent: 1 + - uid: 1367 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 125.5,-13.5 + parent: 1 + - uid: 1423 + components: + - type: Transform + pos: 125.5,-8.5 + parent: 1 + - uid: 1424 + components: + - type: Transform + pos: 125.5,0.5 + parent: 1 +- proto: CrateEmergencyInternals + entities: + - uid: 445 + components: + - type: Transform + pos: 19.5,-12.5 + parent: 1 +- proto: CrateEmergencyRadiation + entities: + - uid: 1459 + components: + - type: Transform + pos: 26.5,-18.5 + parent: 1 +- proto: CrateEmptySpawner + entities: + - uid: 340 + components: + - type: Transform + pos: 22.5,-8.5 + parent: 1 + - uid: 429 + components: + - type: Transform + pos: 22.5,-9.5 + parent: 1 + - uid: 430 + components: + - type: Transform + pos: 22.5,-11.5 + parent: 1 + - type: RandomSpawner + offset: 0.2 + - uid: 1453 + components: + - type: Transform + pos: 25.5,-18.5 + parent: 1 + - uid: 1457 + components: + - type: Transform + pos: 20.5,-18.5 + parent: 1 + - uid: 1476 + components: + - type: Transform + pos: 22.5,-18.5 + parent: 1 + - uid: 1477 + components: + - type: Transform + pos: 23.5,-18.5 + parent: 1 + - uid: 1478 + components: + - type: Transform + pos: 23.5,-19.5 + parent: 1 + - uid: 1479 + components: + - type: Transform + pos: 22.5,-19.5 + parent: 1 + - uid: 2186 + components: + - type: Transform + pos: 19.5,-8.5 + parent: 1 +- proto: CrateEngineeringSolar + entities: + - uid: 1455 + components: + - type: Transform + pos: 25.5,-19.5 + parent: 1 +- proto: CrateFilledSpawner + entities: + - uid: 419 + components: + - type: Transform + pos: 25.5,-9.5 + parent: 1 + - type: RandomSpawner + offset: 0.2 + - uid: 421 + components: + - type: Transform + pos: 25.5,-11.5 + parent: 1 + - type: RandomSpawner + offset: 0.2 + - uid: 423 + components: + - type: Transform + pos: 25.5,-12.5 + parent: 1 + - type: RandomSpawner + offset: 0.2 + - uid: 427 + components: + - type: Transform + pos: 22.5,-10.5 + parent: 1 + - type: RandomSpawner + offset: 0.2 + - uid: 428 + components: + - type: Transform + pos: 22.5,-7.5 + parent: 1 + - type: RandomSpawner + offset: 0.2 + - uid: 438 + components: + - type: Transform + pos: 22.5,-13.5 + parent: 1 + - type: RandomSpawner + offset: 0.2 + - uid: 439 + components: + - type: Transform + pos: 22.5,-14.5 + parent: 1 + - type: RandomSpawner + offset: 0.2 + - uid: 2187 + components: + - type: Transform + pos: 19.5,-7.5 + parent: 1 +- proto: CrateGenericSteel + entities: + - uid: 349 + components: + - type: Transform + pos: 25.5,-14.5 + parent: 1 + - uid: 385 + components: + - type: Transform + pos: 25.5,-13.5 + parent: 1 + - uid: 424 + components: + - type: Transform + pos: 25.5,-7.5 + parent: 1 + - uid: 425 + components: + - type: Transform + pos: 25.5,-8.5 + parent: 1 + - uid: 426 + components: + - type: Transform + pos: 25.5,-10.5 + parent: 1 +- proto: CratePlasma + entities: + - uid: 1452 + components: + - type: Transform + pos: 24.5,-19.5 + parent: 1 + - uid: 1454 + components: + - type: Transform + pos: 24.5,-18.5 + parent: 1 +- proto: CrateWeaponSecure + entities: + - uid: 446 + components: + - type: Transform + pos: 19.5,-13.5 + parent: 1 +- proto: DeployableBarrier + entities: + - uid: 38 + components: + - type: Transform + pos: 17.5,-12.5 + parent: 1 + - uid: 215 + components: + - type: Transform + pos: 31.5,-11.5 + parent: 1 + - uid: 431 + components: + - type: Transform + pos: 31.5,-10.5 + parent: 1 + - uid: 435 + components: + - type: Transform + pos: 31.5,-12.5 + parent: 1 + - uid: 447 + components: + - type: Transform + pos: 31.5,-9.5 + parent: 1 + - uid: 466 + components: + - type: Transform + pos: 17.5,-9.5 + parent: 1 + - uid: 468 + components: + - type: Transform + pos: 17.5,-11.5 + parent: 1 + - uid: 469 + components: + - type: Transform + pos: 17.5,-10.5 + parent: 1 + - uid: 1470 + components: + - type: Transform + pos: 19.5,-16.5 + parent: 1 + - uid: 1471 + components: + - type: Transform + pos: 19.5,-17.5 + parent: 1 + - uid: 1474 + components: + - type: Transform + pos: 20.5,-16.5 + parent: 1 + - uid: 1475 + components: + - type: Transform + pos: 20.5,-17.5 + parent: 1 +- proto: Emitter + entities: + - uid: 1418 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 122.5,-13.5 + parent: 1 + - uid: 1419 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 122.5,-23.5 + parent: 1 + - uid: 1431 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 122.5,0.5 + parent: 1 + - uid: 1432 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 122.5,-8.5 + parent: 1 +- proto: FoodCondimentBottleEnzyme + entities: + - uid: 2080 + components: + - type: Transform + pos: 36.55369,3.5419717 + parent: 1 +- proto: GravityGenerator + entities: + - uid: 2265 + components: + - type: Transform + pos: 21.5,-4.5 + parent: 1 +- proto: Grille + entities: + - uid: 443 + components: + - type: Transform + pos: 107.5,-2.5 + parent: 1 + - uid: 444 + components: + - type: Transform + pos: 63.5,-7.5 + parent: 1 + - uid: 448 + components: + - type: Transform + pos: 63.5,-9.5 + parent: 1 + - uid: 449 + components: + - type: Transform + pos: 63.5,-8.5 + parent: 1 + - uid: 462 + components: + - type: Transform + pos: 63.5,-11.5 + parent: 1 + - uid: 557 + components: + - type: Transform + pos: 63.5,-10.5 + parent: 1 + - uid: 604 + components: + - type: Transform + pos: 63.5,-13.5 + parent: 1 + - uid: 614 + components: + - type: Transform + pos: 63.5,-12.5 + parent: 1 + - uid: 641 + components: + - type: Transform + pos: 63.5,-14.5 + parent: 1 + - uid: 667 + components: + - type: Transform + pos: 63.5,-15.5 + parent: 1 + - uid: 753 + components: + - type: Transform + pos: 63.5,-16.5 + parent: 1 + - uid: 754 + components: + - type: Transform + pos: 63.5,-6.5 + parent: 1 + - uid: 755 + components: + - type: Transform + pos: 85.5,-3.5 + parent: 1 + - uid: 756 + components: + - type: Transform + pos: 85.5,-1.5 + parent: 1 + - uid: 757 + components: + - type: Transform + pos: 85.5,-2.5 + parent: 1 + - uid: 758 + components: + - type: Transform + pos: 88.5,-1.5 + parent: 1 + - uid: 759 + components: + - type: Transform + pos: 90.5,-1.5 + parent: 1 + - uid: 760 + components: + - type: Transform + pos: 87.5,-1.5 + parent: 1 + - uid: 761 + components: + - type: Transform + pos: 89.5,-1.5 + parent: 1 + - uid: 762 + components: + - type: Transform + pos: 86.5,-1.5 + parent: 1 + - uid: 763 + components: + - type: Transform + pos: 93.5,-1.5 + parent: 1 + - uid: 839 + components: + - type: Transform + pos: 91.5,-1.5 + parent: 1 + - uid: 840 + components: + - type: Transform + pos: 95.5,-1.5 + parent: 1 + - uid: 841 + components: + - type: Transform + pos: 92.5,-1.5 + parent: 1 + - uid: 928 + components: + - type: Transform + pos: 105.5,-1.5 + parent: 1 + - uid: 987 + components: + - type: Transform + pos: 94.5,-1.5 + parent: 1 + - uid: 988 + components: + - type: Transform + pos: 107.5,-3.5 + parent: 1 + - uid: 989 + components: + - type: Transform + pos: 104.5,-1.5 + parent: 1 + - uid: 990 + components: + - type: Transform + pos: 101.5,-1.5 + parent: 1 + - uid: 991 + components: + - type: Transform + pos: 106.5,-1.5 + parent: 1 + - uid: 994 + components: + - type: Transform + pos: 103.5,-1.5 + parent: 1 + - uid: 995 + components: + - type: Transform + pos: 100.5,-1.5 + parent: 1 + - uid: 998 + components: + - type: Transform + pos: 98.5,-1.5 + parent: 1 + - uid: 999 + components: + - type: Transform + pos: 102.5,-1.5 + parent: 1 + - uid: 1000 + components: + - type: Transform + pos: 97.5,-1.5 + parent: 1 + - uid: 1001 + components: + - type: Transform + pos: 107.5,-1.5 + parent: 1 + - uid: 1002 + components: + - type: Transform + pos: 99.5,-1.5 + parent: 1 + - uid: 1003 + components: + - type: Transform + pos: 96.5,-1.5 + parent: 1 + - uid: 1005 + components: + - type: Transform + pos: 101.5,-20.5 + parent: 1 + - uid: 1012 + components: + - type: Transform + pos: 106.5,-20.5 + parent: 1 + - uid: 1022 + components: + - type: Transform + pos: 107.5,-20.5 + parent: 1 + - uid: 1023 + components: + - type: Transform + pos: 103.5,-20.5 + parent: 1 + - uid: 1030 + components: + - type: Transform + pos: 104.5,-20.5 + parent: 1 + - uid: 1031 + components: + - type: Transform + pos: 107.5,-19.5 + parent: 1 + - uid: 1032 + components: + - type: Transform + pos: 102.5,-20.5 + parent: 1 + - uid: 1218 + components: + - type: Transform + pos: 105.5,-20.5 + parent: 1 + - uid: 1219 + components: + - type: Transform + pos: 88.5,-20.5 + parent: 1 + - uid: 1220 + components: + - type: Transform + pos: 107.5,-18.5 + parent: 1 + - uid: 1227 + components: + - type: Transform + pos: 87.5,-20.5 + parent: 1 + - uid: 1228 + components: + - type: Transform + pos: 85.5,-18.5 + parent: 1 + - uid: 1229 + components: + - type: Transform + pos: 85.5,-20.5 + parent: 1 + - uid: 1230 + components: + - type: Transform + pos: 85.5,-19.5 + parent: 1 + - uid: 1282 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 123.5,0.5 + parent: 1 + - uid: 1283 + components: + - type: Transform + pos: 86.5,-20.5 + parent: 1 + - uid: 1289 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 123.5,-7.5 + parent: 1 + - uid: 1308 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 123.5,-0.5 + parent: 1 + - uid: 1313 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 123.5,-8.5 + parent: 1 + - uid: 1316 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 123.5,-5.5 + parent: 1 + - uid: 1318 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 123.5,-2.5 + parent: 1 + - uid: 1319 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 123.5,-4.5 + parent: 1 + - uid: 1368 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 123.5,-14.5 + parent: 1 + - uid: 1369 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 123.5,-13.5 + parent: 1 + - uid: 1371 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 123.5,-16.5 + parent: 1 + - uid: 1372 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 123.5,-17.5 + parent: 1 + - uid: 1373 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 123.5,-23.5 + parent: 1 + - uid: 1374 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 123.5,-22.5 + parent: 1 + - uid: 1375 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 123.5,-20.5 + parent: 1 + - uid: 1376 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 123.5,-19.5 + parent: 1 + - uid: 1377 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 123.5,-18.5 + parent: 1 +- proto: GrilleBroken + entities: + - uid: 1259 + components: + - type: Transform + pos: 89.5,-20.5 + parent: 1 + - uid: 1287 + components: + - type: Transform + pos: 100.5,-20.5 + parent: 1 + - uid: 1317 + components: + - type: Transform + pos: 123.5,-3.5 + parent: 1 +- proto: HandLabeler + entities: + - uid: 1473 + components: + - type: Transform + pos: 27.839834,-9.886635 + parent: 1 +- proto: Hemostat + entities: + - uid: 660 + components: + - type: Transform + pos: 38.345383,-13.221157 + parent: 1 +- proto: KitchenMicrowave + entities: + - uid: 141 + components: + - type: Transform + pos: 43.5,3.5 + parent: 1 + - uid: 142 + components: + - type: Transform + pos: 42.5,3.5 + parent: 1 +- proto: LockerDetective + entities: + - uid: 160 + components: + - type: Transform + pos: 19.5,3.5 + parent: 1 + - uid: 161 + components: + - type: Transform + pos: 19.5,1.5 + parent: 1 + - uid: 162 + components: + - type: Transform + pos: 19.5,-0.5 + parent: 1 + - uid: 163 + components: + - type: Transform + pos: 19.5,2.5 + parent: 1 + - uid: 164 + components: + - type: Transform + pos: 19.5,0.5 + parent: 1 + - uid: 165 + components: + - type: Transform + pos: 19.5,-1.5 + parent: 1 +- proto: LockerElectricalSuppliesFilled + entities: + - uid: 125 + components: + - type: Transform + pos: 8.5,-1.5 + parent: 1 + - uid: 126 + components: + - type: Transform + pos: 9.5,-1.5 + parent: 1 +- proto: LockerFreezerBase + entities: + - uid: 2103 + components: + - type: Transform + pos: 40.5,3.5 + parent: 1 + - uid: 2110 + components: + - type: Transform + pos: 41.5,3.5 + parent: 1 +- proto: LockerSecurity + entities: + - uid: 726 + components: + - type: Transform + pos: 52.5,-2.5 + parent: 1 + - uid: 727 + components: + - type: Transform + pos: 52.5,-3.5 + parent: 1 +- proto: LockerSteel + entities: + - uid: 720 + components: + - type: Transform + pos: 52.5,-20.5 + parent: 1 +- proto: LockerWeldingSuppliesFilled + entities: + - uid: 127 + components: + - type: Transform + pos: 10.5,-1.5 + parent: 1 + - uid: 128 + components: + - type: Transform + pos: 11.5,-1.5 + parent: 1 +- proto: LootSpawnerArmoryArmorOnly + entities: + - uid: 463 + components: + - type: Transform + pos: 17.5,-15.5 + parent: 1 + - uid: 728 + components: + - type: Transform + pos: 48.5,-2.5 + parent: 1 + - uid: 731 + components: + - type: Transform + pos: 48.5,-2.5 + parent: 1 + - uid: 732 + components: + - type: Transform + pos: 48.5,-3.5 + parent: 1 +- proto: LootSpawnerIndustrial + entities: + - uid: 471 + components: + - type: Transform + pos: 1.5,5.5 + parent: 1 + - uid: 1428 + components: + - type: Transform + pos: 60.5,-18.5 + parent: 1 + - uid: 1429 + components: + - type: Transform + pos: 54.5,-2.5 + parent: 1 +- proto: LootSpawnerIndustrialFluff + entities: + - uid: 36 + components: + - type: Transform + pos: 1.5,-0.5 + parent: 1 + - uid: 608 + components: + - type: Transform + pos: 16.5,-23.5 + parent: 1 + - uid: 1430 + components: + - type: Transform + pos: 54.5,-3.5 + parent: 1 + - uid: 2111 + components: + - type: Transform + pos: 99.5,-13.5 + parent: 1 +- proto: LootSpawnerMaterials + entities: + - uid: 1425 + components: + - type: Transform + pos: 54.5,-18.5 + parent: 1 + - uid: 1427 + components: + - type: Transform + pos: 54.5,-19.5 + parent: 1 +- proto: LootSpawnerMaterialsHighValueConstruction + entities: + - uid: 1426 + components: + - type: Transform + pos: 54.5,-20.5 + parent: 1 +- proto: LootSpawnerMedicalClassy + entities: + - uid: 664 + components: + - type: Transform + pos: 43.5,-19.5 + parent: 1 + - uid: 665 + components: + - type: Transform + pos: 42.5,-22.5 + parent: 1 + - uid: 666 + components: + - type: Transform + pos: 37.5,-13.5 + parent: 1 +- proto: LootSpawnerRandomCrateEngineering + entities: + - uid: 1240 + components: + - type: Transform + pos: 19.5,-19.5 + parent: 1 + - uid: 1456 + components: + - type: Transform + pos: 19.5,-18.5 + parent: 1 + - uid: 1458 + components: + - type: Transform + pos: 20.5,-19.5 + parent: 1 + - uid: 1467 + components: + - type: Transform + pos: 21.5,-18.5 + parent: 1 + - uid: 1468 + components: + - type: Transform + pos: 21.5,-19.5 + parent: 1 +- proto: LootSpawnerRandomCrateSecurity + entities: + - uid: 440 + components: + - type: Transform + pos: 19.5,-14.5 + parent: 1 + - uid: 441 + components: + - type: Transform + pos: 19.5,-15.5 + parent: 1 +- proto: LootSpawnerSecurity + entities: + - uid: 1231 + components: + - type: Transform + pos: 17.5,-4.5 + parent: 1 + - uid: 1370 + components: + - type: Transform + pos: 62.5,-13.5 + parent: 1 +- proto: MachineFrame + entities: + - uid: 895 + components: + - type: Transform + pos: 67.5,-11.5 + parent: 1 + - uid: 896 + components: + - type: Transform + pos: 68.5,-11.5 + parent: 1 + - uid: 897 + components: + - type: Transform + pos: 69.5,-11.5 + parent: 1 + - uid: 900 + components: + - type: Transform + pos: 74.5,-11.5 + parent: 1 + - uid: 901 + components: + - type: Transform + pos: 75.5,-11.5 + parent: 1 + - uid: 902 + components: + - type: Transform + pos: 76.5,-11.5 + parent: 1 + - uid: 904 + components: + - type: Transform + pos: 78.5,-11.5 + parent: 1 + - uid: 1234 + components: + - type: Transform + pos: 42.5,-26.5 + parent: 1 + - uid: 1235 + components: + - type: Transform + pos: 42.5,-24.5 + parent: 1 + - uid: 1480 + components: + - type: Transform + pos: 36.5,-26.5 + parent: 1 + - uid: 1481 + components: + - type: Transform + pos: 36.5,-24.5 + parent: 1 + - uid: 1482 + components: + - type: Transform + pos: 39.5,-26.5 + parent: 1 + - uid: 1483 + components: + - type: Transform + pos: 39.5,-24.5 + parent: 1 +- proto: MagazinePistolSubMachineGunEmpty + entities: + - uid: 473 + components: + - type: Transform + pos: 4.945919,4.3761344 + parent: 1 +- proto: MagazinePistolSubMachineGunTopMountedEmpty + entities: + - uid: 1698 + components: + - type: Transform + pos: 14.469492,4.7017136 + parent: 1 + - uid: 1700 + components: + - type: Transform + pos: 120.48175,-7.394827 + parent: 1 +- proto: MagazineShotgunEmpty + entities: + - uid: 1242 + components: + - type: Transform + pos: 56.248035,-14.895625 + parent: 1 +- proto: MaintenanceToolSpawner + entities: + - uid: 1460 + components: + - type: Transform + pos: 21.5,-1.5 + parent: 1 + - uid: 1461 + components: + - type: Transform + pos: 22.5,-16.5 + parent: 1 + - uid: 1462 + components: + - type: Transform + pos: 22.5,-17.5 + parent: 1 + - uid: 1463 + components: + - type: Transform + pos: 23.5,-17.5 + parent: 1 + - uid: 1464 + components: + - type: Transform + pos: 23.5,-16.5 + parent: 1 +- proto: MaintenanceWeaponSpawner + entities: + - uid: 1696 + components: + - type: Transform + pos: 98.5,-18.5 + parent: 1 +- proto: MedkitOxygenFilled + entities: + - uid: 668 + components: + - type: Transform + pos: 43.517258,-22.231878 + parent: 1 +- proto: OperatingTable + entities: + - uid: 645 + components: + - type: Transform + pos: 43.5,-17.5 + parent: 1 + - uid: 646 + components: + - type: Transform + pos: 36.5,-17.5 + parent: 1 + - uid: 651 + components: + - type: Transform + pos: 43.5,-14.5 + parent: 1 + - uid: 652 + components: + - type: Transform + pos: 36.5,-14.5 + parent: 1 +- proto: PartRodMetal1 + entities: + - uid: 1284 + components: + - type: Transform + pos: 89.383995,-19.754372 + parent: 1 + - uid: 1402 + components: + - type: Transform + pos: 123.46295,-3.4430885 + parent: 1 +- proto: PartRodMetal10 + entities: + - uid: 1285 + components: + - type: Transform + pos: 91.71212,-18.379372 + parent: 1 +- proto: PlasmaCanister + entities: + - uid: 401 + components: + - type: Transform + pos: 24.5,-3.5 + parent: 1 +- proto: PortableGeneratorSuperPacman + entities: + - uid: 1484 + components: + - type: Transform + pos: 26.5,-19.5 + parent: 1 +- proto: PoweredlightEmpty + entities: + - uid: 1570 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 17.5,-16.5 + parent: 1 + - uid: 1688 + components: + - type: Transform + pos: 90.5,-13.5 + parent: 1 + - uid: 1689 + components: + - type: Transform + pos: 98.5,-13.5 + parent: 1 + - uid: 1690 + components: + - type: Transform + pos: 106.5,-13.5 + parent: 1 + - uid: 1694 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 106.5,-8.5 + parent: 1 + - uid: 1695 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 114.5,-8.5 + parent: 1 +- proto: PoweredlightLED + entities: + - uid: 116 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,-1.5 + parent: 1 + - uid: 117 + components: + - type: Transform + pos: 1.5,6.5 + parent: 1 + - uid: 129 + components: + - type: Transform + pos: 33.5,6.5 + parent: 1 + - uid: 136 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 17.5,-1.5 + parent: 1 + - uid: 137 + components: + - type: Transform + pos: 9.5,6.5 + parent: 1 + - uid: 138 + components: + - type: Transform + pos: 17.5,6.5 + parent: 1 + - uid: 442 + components: + - type: Transform + pos: 37.5,3.5 + parent: 1 + - uid: 1312 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 82.5,-8.5 + parent: 1 + - uid: 1434 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 9.5,-1.5 + parent: 1 + - uid: 1435 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 33.5,-21.5 + parent: 1 + - uid: 1436 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 33.5,-8.5 + parent: 1 + - uid: 1437 + components: + - type: Transform + pos: 25.5,6.5 + parent: 1 + - uid: 1438 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 33.5,-13.5 + parent: 1 + - uid: 1439 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 33.5,-0.5 + parent: 1 + - uid: 1440 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 33.5,-29.5 + parent: 1 + - uid: 1441 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 41.5,-29.5 + parent: 1 + - uid: 1442 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 27.5,-26.5 + parent: 1 + - uid: 1444 + components: + - type: Transform + pos: 20.5,-21.5 + parent: 1 + - uid: 1488 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 30.5,-1.5 + parent: 1 + - uid: 1489 + components: + - type: Transform + pos: 30.5,3.5 + parent: 1 + - uid: 1563 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 36.5,-6.5 + parent: 1 + - uid: 1564 + components: + - type: Transform + pos: 21.5,3.5 + parent: 1 + - uid: 1565 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 21.5,-1.5 + parent: 1 + - uid: 1566 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 31.5,-8.5 + parent: 1 + - uid: 1567 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 31.5,-13.5 + parent: 1 + - uid: 1568 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 19.5,-13.5 + parent: 1 + - uid: 1569 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 19.5,-9.5 + parent: 1 + - uid: 1571 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 17.5,-5.5 + parent: 1 + - uid: 1572 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 16.5,-12.5 + parent: 1 + - uid: 1573 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 43.5,-16.5 + parent: 1 + - uid: 1574 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 43.5,-7.5 + parent: 1 + - uid: 1575 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 43.5,-1.5 + parent: 1 + - uid: 1576 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 36.5,-23.5 + parent: 1 + - uid: 1577 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 36.5,-16.5 + parent: 1 + - uid: 1578 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 43.5,-23.5 + parent: 1 + - uid: 1579 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 61.5,-0.5 + parent: 1 + - uid: 1580 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 25.5,-29.5 + parent: 1 + - uid: 1581 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 41.5,5.5 + parent: 1 + - uid: 1582 + components: + - type: Transform + pos: 45.5,6.5 + parent: 1 + - uid: 1583 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 45.5,-0.5 + parent: 1 + - uid: 1584 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 45.5,-8.5 + parent: 1 + - uid: 1585 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 45.5,-13.5 + parent: 1 + - uid: 1586 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 45.5,-21.5 + parent: 1 + - uid: 1587 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 46.5,-28.5 + parent: 1 + - uid: 1654 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 43.5,-11.5 + parent: 1 + - uid: 1655 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 36.5,-11.5 + parent: 1 + - uid: 1657 + components: + - type: Transform + pos: 61.5,-6.5 + parent: 1 + - uid: 1658 + components: + - type: Transform + pos: 55.5,-6.5 + parent: 1 + - uid: 1667 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 49.5,-11.5 + parent: 1 + - uid: 1668 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 48.5,-19.5 + parent: 1 + - uid: 1669 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 48.5,-14.5 + parent: 1 + - uid: 1670 + components: + - type: Transform + pos: 55.5,-18.5 + parent: 1 + - uid: 1671 + components: + - type: Transform + pos: 61.5,-18.5 + parent: 1 + - uid: 1672 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 49.5,-0.5 + parent: 1 + - uid: 1673 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 52.5,-4.5 + parent: 1 + - uid: 1674 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 55.5,-4.5 + parent: 1 + - uid: 1675 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 61.5,-4.5 + parent: 1 + - uid: 1676 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 55.5,-16.5 + parent: 1 + - uid: 1677 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 61.5,-16.5 + parent: 1 + - uid: 1678 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 69.5,-0.5 + parent: 1 + - uid: 1679 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 77.5,-0.5 + parent: 1 + - uid: 1681 + components: + - type: Transform + pos: 69.5,-22.5 + parent: 1 + - uid: 1682 + components: + - type: Transform + pos: 61.5,-22.5 + parent: 1 + - uid: 1683 + components: + - type: Transform + pos: 49.5,-22.5 + parent: 1 + - uid: 1684 + components: + - type: Transform + pos: 77.5,-22.5 + parent: 1 + - uid: 1686 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 80.5,-17.5 + parent: 1 + - uid: 1687 + components: + - type: Transform + pos: 82.5,-13.5 + parent: 1 + - uid: 1691 + components: + - type: Transform + pos: 114.5,-13.5 + parent: 1 + - uid: 1692 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 90.5,-8.5 + parent: 1 + - uid: 1693 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 98.5,-8.5 + parent: 1 + - uid: 2114 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 71.5,-20.5 + parent: 1 + - uid: 2125 + components: + - type: Transform + pos: 71.5,-2.5 + parent: 1 +- proto: Rack + entities: + - uid: 41 + components: + - type: Transform + pos: 17.5,-17.5 + parent: 1 + - uid: 98 + components: + - type: Transform + pos: 17.5,-15.5 + parent: 1 + - uid: 122 + components: + - type: Transform + pos: 5.5,-1.5 + parent: 1 + - uid: 123 + components: + - type: Transform + pos: 6.5,-1.5 + parent: 1 + - uid: 124 + components: + - type: Transform + pos: 7.5,-1.5 + parent: 1 + - uid: 144 + components: + - type: Transform + pos: 17.5,-16.5 + parent: 1 + - uid: 422 + components: + - type: Transform + pos: 17.5,-5.5 + parent: 1 + - uid: 434 + components: + - type: Transform + pos: 17.5,-4.5 + parent: 1 + - uid: 436 + components: + - type: Transform + pos: 17.5,-6.5 + parent: 1 + - uid: 453 + components: + - type: Transform + pos: 14.5,-3.5 + parent: 1 + - uid: 454 + components: + - type: Transform + pos: 15.5,-3.5 + parent: 1 + - uid: 671 + components: + - type: Transform + pos: 48.5,-3.5 + parent: 1 + - uid: 691 + components: + - type: Transform + pos: 48.5,-5.5 + parent: 1 + - uid: 695 + components: + - type: Transform + pos: 48.5,-4.5 + parent: 1 + - uid: 706 + components: + - type: Transform + pos: 48.5,-2.5 + parent: 1 + - uid: 935 + components: + - type: Transform + pos: 54.5,-2.5 + parent: 1 + - uid: 936 + components: + - type: Transform + pos: 54.5,-3.5 + parent: 1 + - uid: 937 + components: + - type: Transform + pos: 54.5,-4.5 + parent: 1 + - uid: 938 + components: + - type: Transform + pos: 54.5,-18.5 + parent: 1 + - uid: 939 + components: + - type: Transform + pos: 54.5,-19.5 + parent: 1 + - uid: 940 + components: + - type: Transform + pos: 54.5,-20.5 + parent: 1 +- proto: RandomSoap + entities: + - uid: 563 + components: + - type: Transform + pos: 21.5,-23.5 + parent: 1 +- proto: ReinforcedGirder + entities: + - uid: 43 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 3.5,7.5 + parent: 1 + - uid: 62 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 8.5,7.5 + parent: 1 + - uid: 455 + components: + - type: Transform + pos: 10.5,-4.5 + parent: 1 + - uid: 456 + components: + - type: Transform + pos: 11.5,-8.5 + parent: 1 + - uid: 486 + components: + - type: Transform + pos: 10.5,-11.5 + parent: 1 + - uid: 546 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 18.5,-25.5 + parent: 1 + - uid: 547 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 18.5,-24.5 + parent: 1 + - uid: 553 + components: + - type: Transform + pos: 16.5,-20.5 + parent: 1 + - uid: 597 + components: + - type: Transform + pos: 12.5,-30.5 + parent: 1 + - uid: 598 + components: + - type: Transform + pos: 13.5,-30.5 + parent: 1 + - uid: 692 + components: + - type: Transform + pos: 53.5,-6.5 + parent: 1 + - uid: 724 + components: + - type: Transform + pos: 52.5,-9.5 + parent: 1 + - uid: 725 + components: + - type: Transform + pos: 47.5,-4.5 + parent: 1 + - uid: 843 + components: + - type: Transform + pos: 55.5,-21.5 + parent: 1 + - uid: 941 + components: + - type: Transform + pos: 56.5,-1.5 + parent: 1 + - uid: 942 + components: + - type: Transform + pos: 57.5,-1.5 + parent: 1 +- proto: RollingPin + entities: + - uid: 2079 + components: + - type: Transform + pos: 39.42869,3.5263467 + parent: 1 +- proto: RubberStampApproved + entities: + - uid: 1593 + components: + - type: Transform + pos: 51.504005,-15.395966 + parent: 1 +- proto: SalvageCanisterSpawner + entities: + - uid: 402 + components: + - type: Transform + pos: 25.5,-3.5 + parent: 1 + - uid: 403 + components: + - type: Transform + pos: 25.5,-4.5 + parent: 1 +- proto: SalvageHumanCorpseSpawner + entities: + - uid: 1701 + components: + - type: Transform + pos: 116.5,-7.5 + parent: 1 +- proto: SalvageMaterialCrateSpawner + entities: + - uid: 395 + components: + - type: Transform + pos: 27.5,-3.5 + parent: 1 + - uid: 396 + components: + - type: Transform + pos: 27.5,-4.5 + parent: 1 + - uid: 397 + components: + - type: Transform + pos: 26.5,-3.5 + parent: 1 + - uid: 398 + components: + - type: Transform + pos: 26.5,-4.5 + parent: 1 + - uid: 1465 + components: + - type: Transform + pos: 21.5,-16.5 + parent: 1 + - uid: 1466 + components: + - type: Transform + pos: 21.5,-17.5 + parent: 1 + - uid: 2184 + components: + - type: Transform + pos: 22.5,-12.5 + parent: 1 + - uid: 2185 + components: + - type: Transform + pos: 19.5,-9.5 + parent: 1 +- proto: SalvageMobSpawner + entities: + - uid: 1588 + components: + - type: Transform + pos: 121.5,-2.5 + parent: 1 + - uid: 1589 + components: + - type: Transform + pos: 14.5,-15.5 + parent: 1 + - uid: 1590 + components: + - type: Transform + pos: 15.5,-5.5 + parent: 1 + - uid: 1591 + components: + - type: Transform + pos: 12.5,-12.5 + parent: 1 + - uid: 1592 + components: + - type: Transform + pos: 15.5,-28.5 + parent: 1 +- proto: SalvageMobSpawner75 + entities: + - uid: 1232 + components: + - type: Transform + pos: 111.5,-7.5 + parent: 1 + - uid: 1433 + components: + - type: Transform + pos: 122.5,-3.5 + parent: 1 +- proto: SawElectric + entities: + - uid: 663 + components: + - type: Transform + pos: 37.767258,-14.627407 + parent: 1 +- proto: Scalpel + entities: + - uid: 659 + components: + - type: Transform + pos: 38.986008,-13.518032 + parent: 1 +- proto: ShardGlassReinforced + entities: + - uid: 63 + components: + - type: Transform + pos: 11.663511,-4.0794153 + parent: 1 + - uid: 64 + components: + - type: Transform + pos: 17.5,-18.5 + parent: 1 + - uid: 1286 + components: + - type: Transform + pos: 88.76036,-18.52459 + parent: 1 + - uid: 1288 + components: + - type: Transform + pos: 90.66661,-19.80584 + parent: 1 + - uid: 1290 + components: + - type: Transform + pos: 100.25953,-19.61834 + parent: 1 + - uid: 1346 + components: + - type: Transform + pos: 95.812454,-18.054329 + parent: 1 + - uid: 1405 + components: + - type: Transform + pos: 124.60358,-3.4430885 + parent: 1 +- proto: SheetPlasteel1 + entities: + - uid: 140 + components: + - type: Transform + pos: 12.5,-9.5 + parent: 1 + - uid: 143 + components: + - type: Transform + pos: 10.5,-5.5 + parent: 1 + - uid: 603 + components: + - type: Transform + pos: 11.457185,-30.582111 + parent: 1 + - uid: 609 + components: + - type: Transform + pos: 7.44156,-29.519611 + parent: 1 + - uid: 610 + components: + - type: Transform + pos: 2.8634348,-24.238361 + parent: 1 + - uid: 611 + components: + - type: Transform + pos: 15.528238,-19.046759 + parent: 1 + - uid: 612 + components: + - type: Transform + pos: 11.323664,-16.746466 + parent: 1 + - uid: 708 + components: + - type: Transform + pos: 51.5,-12.5 + parent: 1 +- proto: SheetSteel1 + entities: + - uid: 118 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.4674037,-0.40548372 + parent: 1 + - uid: 119 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 5.4409523,0.6101413 + parent: 1 + - uid: 120 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 7.4253273,3.5788913 + parent: 1 + - uid: 121 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 9.648506,1.1570163 + parent: 1 + - uid: 437 + components: + - type: Transform + pos: 13.5,-3.5 + parent: 1 + - uid: 607 + components: + - type: Transform + pos: 14.389973,-26.965555 + parent: 1 +- proto: SignalButton + entities: + - uid: 1233 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 62.5,-9.5 + parent: 1 + - type: DeviceLinkSource + linkedPorts: + 383: [] + 510: [] +- proto: SinkEmpty + entities: + - uid: 554 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 31.5,-25.5 + parent: 1 + - uid: 555 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 31.5,-26.5 + parent: 1 +- proto: SMESBasicEmpty + entities: + - uid: 1236 + components: + - type: Transform + pos: 1.5,1.5 + parent: 1 + - uid: 1238 + components: + - type: Transform + pos: 1.5,3.5 + parent: 1 + - uid: 2136 + components: + - type: Transform + pos: 1.5,2.5 + parent: 1 +- proto: SubstationBasicEmpty + entities: + - uid: 216 + components: + - type: Transform + pos: 1.5,6.5 + parent: 1 +- proto: TableFrame + entities: + - uid: 601 + components: + - type: Transform + pos: 13.5,-25.5 + parent: 1 + - uid: 605 + components: + - type: Transform + pos: 13.5,-27.5 + parent: 1 + - uid: 2127 + components: + - type: Transform + pos: 13.5,-26.5 + parent: 1 +- proto: TableReinforced + entities: + - uid: 99 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 42.5,3.5 + parent: 1 + - uid: 110 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,5.5 + parent: 1 + - uid: 111 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,4.5 + parent: 1 + - uid: 112 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,-1.5 + parent: 1 + - uid: 113 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,-0.5 + parent: 1 + - uid: 114 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,0.5 + parent: 1 + - uid: 277 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 36.5,3.5 + parent: 1 + - uid: 278 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 37.5,3.5 + parent: 1 + - uid: 279 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 38.5,3.5 + parent: 1 + - uid: 280 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 39.5,3.5 + parent: 1 + - uid: 282 + components: + - type: Transform + pos: 42.5,0.5 + parent: 1 + - uid: 283 + components: + - type: Transform + pos: 43.5,0.5 + parent: 1 + - uid: 284 + components: + - type: Transform + pos: 40.5,0.5 + parent: 1 + - uid: 285 + components: + - type: Transform + pos: 41.5,0.5 + parent: 1 + - uid: 286 + components: + - type: Transform + pos: 39.5,0.5 + parent: 1 + - uid: 305 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 43.5,3.5 + parent: 1 + - uid: 306 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 41.5,-7.5 + parent: 1 + - uid: 307 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 42.5,-6.5 + parent: 1 + - uid: 308 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 42.5,-3.5 + parent: 1 + - uid: 309 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 41.5,-2.5 + parent: 1 + - uid: 312 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 42.5,-7.5 + parent: 1 + - uid: 313 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 42.5,-2.5 + parent: 1 + - uid: 327 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 37.5,-6.5 + parent: 1 + - uid: 328 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 37.5,-7.5 + parent: 1 + - uid: 329 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 38.5,-6.5 + parent: 1 + - uid: 330 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 38.5,-7.5 + parent: 1 + - uid: 335 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 41.5,-6.5 + parent: 1 + - uid: 336 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 41.5,-3.5 + parent: 1 + - uid: 642 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 43.5,-21.5 + parent: 1 + - uid: 643 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 43.5,-20.5 + parent: 1 + - uid: 644 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 43.5,-19.5 + parent: 1 + - uid: 653 + components: + - type: Transform + pos: 42.5,-13.5 + parent: 1 + - uid: 654 + components: + - type: Transform + pos: 41.5,-13.5 + parent: 1 + - uid: 655 + components: + - type: Transform + pos: 40.5,-13.5 + parent: 1 + - uid: 656 + components: + - type: Transform + pos: 39.5,-13.5 + parent: 1 + - uid: 657 + components: + - type: Transform + pos: 38.5,-13.5 + parent: 1 + - uid: 658 + components: + - type: Transform + pos: 37.5,-13.5 + parent: 1 + - uid: 805 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 62.5,-6.5 + parent: 1 + - uid: 806 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 61.5,-6.5 + parent: 1 + - uid: 807 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 60.5,-6.5 + parent: 1 + - uid: 808 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 59.5,-6.5 + parent: 1 + - uid: 809 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 58.5,-6.5 + parent: 1 + - uid: 810 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 57.5,-6.5 + parent: 1 + - uid: 811 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 56.5,-6.5 + parent: 1 + - uid: 812 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 55.5,-6.5 + parent: 1 + - uid: 813 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 54.5,-6.5 + parent: 1 + - uid: 814 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 54.5,-16.5 + parent: 1 + - uid: 815 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 55.5,-16.5 + parent: 1 + - uid: 816 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 56.5,-16.5 + parent: 1 + - uid: 817 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 57.5,-16.5 + parent: 1 + - uid: 818 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 58.5,-16.5 + parent: 1 + - uid: 819 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 59.5,-16.5 + parent: 1 + - uid: 820 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 60.5,-16.5 + parent: 1 + - uid: 821 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 61.5,-16.5 + parent: 1 + - uid: 822 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 62.5,-16.5 + parent: 1 + - uid: 826 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 62.5,-9.5 + parent: 1 + - uid: 828 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 62.5,-13.5 + parent: 1 + - uid: 1815 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 43.5,-22.5 + parent: 1 +- proto: TableWood + entities: + - uid: 712 + components: + - type: Transform + pos: 52.5,-15.5 + parent: 1 + - uid: 713 + components: + - type: Transform + pos: 51.5,-15.5 + parent: 1 + - uid: 714 + components: + - type: Transform + pos: 51.5,-16.5 + parent: 1 + - uid: 715 + components: + - type: Transform + pos: 51.5,-17.5 + parent: 1 + - uid: 717 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 48.5,-19.5 + parent: 1 +- proto: Thruster + entities: + - uid: 33 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,6.5 + parent: 1 + - uid: 53 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,5.5 + parent: 1 + - uid: 54 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,4.5 + parent: 1 + - uid: 55 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,3.5 + parent: 1 + - uid: 56 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,2.5 + parent: 1 + - uid: 57 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,1.5 + parent: 1 + - uid: 58 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,0.5 + parent: 1 + - uid: 59 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,-0.5 + parent: 1 + - uid: 60 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,-1.5 + parent: 1 +- proto: ToiletDirtyWater + entities: + - uid: 461 + components: + - type: Transform + pos: 23.5,-21.5 + parent: 1 + - uid: 613 + components: + - type: Transform + pos: 25.5,-21.5 + parent: 1 + - uid: 615 + components: + - type: Transform + pos: 27.5,-21.5 + parent: 1 + - uid: 616 + components: + - type: Transform + pos: 29.5,-21.5 + parent: 1 + - uid: 617 + components: + - type: Transform + pos: 31.5,-21.5 + parent: 1 +- proto: ToyRubberDuck + entities: + - uid: 564 + components: + - type: Transform + pos: 19.517994,-21.428076 + parent: 1 +- proto: trayScanner + entities: + - uid: 2181 + components: + - type: Transform + pos: 7.497275,-1.3804722 + parent: 1 +- proto: TritiumCanister + entities: + - uid: 400 + components: + - type: Transform + pos: 24.5,-4.5 + parent: 1 +- proto: UnfinishedMachineFrame + entities: + - uid: 898 + components: + - type: Transform + pos: 72.5,-11.5 + parent: 1 + - uid: 899 + components: + - type: Transform + pos: 73.5,-11.5 + parent: 1 + - uid: 903 + components: + - type: Transform + pos: 77.5,-11.5 + parent: 1 +- proto: VendingMachineCigs + entities: + - uid: 217 + components: + - type: Transform + pos: 31.5,3.5 + parent: 1 + - uid: 721 + components: + - type: Transform + pos: 48.5,-13.5 + parent: 1 +- proto: VendingMachineCoffee + entities: + - uid: 722 + components: + - type: Transform + pos: 48.5,-14.5 + parent: 1 +- proto: WallReinforced + entities: + - uid: 382 + components: + - type: Transform + pos: 18.5,-20.5 + parent: 1 + - uid: 404 + components: + - type: Transform + pos: 18.5,-3.5 + parent: 1 + - uid: 405 + components: + - type: Transform + pos: 18.5,-4.5 + parent: 1 + - uid: 406 + components: + - type: Transform + pos: 18.5,-5.5 + parent: 1 + - uid: 407 + components: + - type: Transform + pos: 18.5,-6.5 + parent: 1 + - uid: 408 + components: + - type: Transform + pos: 18.5,-7.5 + parent: 1 + - uid: 409 + components: + - type: Transform + pos: 18.5,-8.5 + parent: 1 + - uid: 410 + components: + - type: Transform + pos: 18.5,-9.5 + parent: 1 + - uid: 413 + components: + - type: Transform + pos: 18.5,-12.5 + parent: 1 + - uid: 414 + components: + - type: Transform + pos: 18.5,-13.5 + parent: 1 + - uid: 415 + components: + - type: Transform + pos: 18.5,-14.5 + parent: 1 + - uid: 416 + components: + - type: Transform + pos: 18.5,-15.5 + parent: 1 + - uid: 417 + components: + - type: Transform + pos: 18.5,-16.5 + parent: 1 + - uid: 418 + components: + - type: Transform + pos: 18.5,-17.5 + parent: 1 + - uid: 420 + components: + - type: Transform + pos: 18.5,-19.5 + parent: 1 + - uid: 458 + components: + - type: Transform + pos: 10.5,-12.5 + parent: 1 + - uid: 459 + components: + - type: Transform + pos: 10.5,-13.5 + parent: 1 + - uid: 460 + components: + - type: Transform + pos: 10.5,-14.5 + parent: 1 + - uid: 474 + components: + - type: Transform + pos: 17.5,-8.5 + parent: 1 + - uid: 475 + components: + - type: Transform + pos: 16.5,-8.5 + parent: 1 + - uid: 476 + components: + - type: Transform + pos: 15.5,-8.5 + parent: 1 + - uid: 477 + components: + - type: Transform + pos: 14.5,-8.5 + parent: 1 + - uid: 478 + components: + - type: Transform + pos: 13.5,-8.5 + parent: 1 + - uid: 479 + components: + - type: Transform + pos: 10.5,-3.5 + parent: 1 + - uid: 480 + components: + - type: Transform + pos: 11.5,-13.5 + parent: 1 + - uid: 481 + components: + - type: Transform + pos: 13.5,-13.5 + parent: 1 + - uid: 482 + components: + - type: Transform + pos: 14.5,-13.5 + parent: 1 + - uid: 483 + components: + - type: Transform + pos: 15.5,-13.5 + parent: 1 + - uid: 484 + components: + - type: Transform + pos: 16.5,-13.5 + parent: 1 + - uid: 485 + components: + - type: Transform + pos: 17.5,-13.5 + parent: 1 + - uid: 602 + components: + - type: Transform + pos: 17.5,-20.5 + parent: 1 + - uid: 1469 + components: + - type: Transform + pos: 18.5,-18.5 + parent: 1 +- proto: WallShuttle + entities: + - uid: 2 + components: + - type: Transform + pos: 19.5,4.5 + parent: 1 + - uid: 3 + components: + - type: Transform + pos: -0.5,-2.5 + parent: 1 + - uid: 4 + components: + - type: Transform + pos: 0.5,-2.5 + parent: 1 + - uid: 5 + components: + - type: Transform + pos: 1.5,-2.5 + parent: 1 + - uid: 6 + components: + - type: Transform + pos: 2.5,-2.5 + parent: 1 + - uid: 7 + components: + - type: Transform + pos: 3.5,-2.5 + parent: 1 + - uid: 8 + components: + - type: Transform + pos: 4.5,-2.5 + parent: 1 + - uid: 9 + components: + - type: Transform + pos: 5.5,-2.5 + parent: 1 + - uid: 10 + components: + - type: Transform + pos: 6.5,-2.5 + parent: 1 + - uid: 11 + components: + - type: Transform + pos: 7.5,-2.5 + parent: 1 + - uid: 12 + components: + - type: Transform + pos: 8.5,-2.5 + parent: 1 + - uid: 13 + components: + - type: Transform + pos: 9.5,-2.5 + parent: 1 + - uid: 14 + components: + - type: Transform + pos: 10.5,-2.5 + parent: 1 + - uid: 15 + components: + - type: Transform + pos: 11.5,-2.5 + parent: 1 + - uid: 16 + components: + - type: Transform + pos: 12.5,-2.5 + parent: 1 + - uid: 17 + components: + - type: Transform + pos: 13.5,-2.5 + parent: 1 + - uid: 18 + components: + - type: Transform + pos: 14.5,-2.5 + parent: 1 + - uid: 19 + components: + - type: Transform + pos: 15.5,-2.5 + parent: 1 + - uid: 20 + components: + - type: Transform + pos: 16.5,-2.5 + parent: 1 + - uid: 21 + components: + - type: Transform + pos: 17.5,-2.5 + parent: 1 + - uid: 22 + components: + - type: Transform + pos: 18.5,-2.5 + parent: 1 + - uid: 26 + components: + - type: Transform + pos: 18.5,-1.5 + parent: 1 + - uid: 27 + components: + - type: Transform + pos: 18.5,-0.5 + parent: 1 + - uid: 28 + components: + - type: Transform + pos: 18.5,0.5 + parent: 1 + - uid: 29 + components: + - type: Transform + pos: 18.5,1.5 + parent: 1 + - uid: 30 + components: + - type: Transform + pos: 18.5,3.5 + parent: 1 + - uid: 31 + components: + - type: Transform + pos: 18.5,2.5 + parent: 1 + - uid: 32 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,7.5 + parent: 1 + - uid: 34 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,7.5 + parent: 1 + - uid: 35 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 0.5,7.5 + parent: 1 + - uid: 37 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 2.5,7.5 + parent: 1 + - uid: 39 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 44.5,-12.5 + parent: 1 + - uid: 42 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 9.5,7.5 + parent: 1 + - uid: 44 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 11.5,7.5 + parent: 1 + - uid: 45 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 10.5,7.5 + parent: 1 + - uid: 46 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 13.5,7.5 + parent: 1 + - uid: 47 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 12.5,7.5 + parent: 1 + - uid: 48 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 15.5,7.5 + parent: 1 + - uid: 49 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 14.5,7.5 + parent: 1 + - uid: 50 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 16.5,7.5 + parent: 1 + - uid: 51 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 17.5,7.5 + parent: 1 + - uid: 52 + components: + - type: Transform + pos: 18.5,7.5 + parent: 1 + - uid: 61 + components: + - type: Transform + pos: 18.5,4.5 + parent: 1 + - uid: 65 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 43.5,-27.5 + parent: 1 + - uid: 67 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 39.5,-27.5 + parent: 1 + - uid: 68 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 42.5,-27.5 + parent: 1 + - uid: 69 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 36.5,-27.5 + parent: 1 + - uid: 70 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 37.5,-27.5 + parent: 1 + - uid: 71 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 44.5,-24.5 + parent: 1 + - uid: 72 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 44.5,-27.5 + parent: 1 + - uid: 73 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 44.5,-15.5 + parent: 1 + - uid: 74 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 41.5,-27.5 + parent: 1 + - uid: 75 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 44.5,-14.5 + parent: 1 + - uid: 76 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 35.5,-21.5 + parent: 1 + - uid: 77 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 35.5,-23.5 + parent: 1 + - uid: 78 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 44.5,-13.5 + parent: 1 + - uid: 79 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 35.5,-25.5 + parent: 1 + - uid: 80 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 44.5,-21.5 + parent: 1 + - uid: 81 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 44.5,-17.5 + parent: 1 + - uid: 82 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 44.5,-22.5 + parent: 1 + - uid: 83 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 44.5,-26.5 + parent: 1 + - uid: 84 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 44.5,-20.5 + parent: 1 + - uid: 85 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 44.5,-23.5 + parent: 1 + - uid: 86 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 40.5,-27.5 + parent: 1 + - uid: 87 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 44.5,-25.5 + parent: 1 + - uid: 88 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 35.5,-22.5 + parent: 1 + - uid: 89 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 35.5,-24.5 + parent: 1 + - uid: 90 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 35.5,-27.5 + parent: 1 + - uid: 91 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 38.5,-27.5 + parent: 1 + - uid: 92 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 44.5,-16.5 + parent: 1 + - uid: 93 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 35.5,-18.5 + parent: 1 + - uid: 94 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 35.5,-17.5 + parent: 1 + - uid: 95 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 35.5,-26.5 + parent: 1 + - uid: 96 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 44.5,-18.5 + parent: 1 + - uid: 97 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 44.5,-19.5 + parent: 1 + - uid: 139 + components: + - type: Transform + pos: 36.5,0.5 + parent: 1 + - uid: 145 + components: + - type: Transform + pos: 20.5,4.5 + parent: 1 + - uid: 146 + components: + - type: Transform + pos: 21.5,4.5 + parent: 1 + - uid: 147 + components: + - type: Transform + pos: 22.5,4.5 + parent: 1 + - uid: 148 + components: + - type: Transform + pos: 23.5,4.5 + parent: 1 + - uid: 149 + components: + - type: Transform + pos: 24.5,4.5 + parent: 1 + - uid: 150 + components: + - type: Transform + pos: 25.5,4.5 + parent: 1 + - uid: 151 + components: + - type: Transform + pos: 26.5,4.5 + parent: 1 + - uid: 152 + components: + - type: Transform + pos: 27.5,4.5 + parent: 1 + - uid: 153 + components: + - type: Transform + pos: 28.5,4.5 + parent: 1 + - uid: 154 + components: + - type: Transform + pos: 29.5,4.5 + parent: 1 + - uid: 155 + components: + - type: Transform + pos: 30.5,4.5 + parent: 1 + - uid: 156 + components: + - type: Transform + pos: 31.5,4.5 + parent: 1 + - uid: 157 + components: + - type: Transform + pos: 32.5,4.5 + parent: 1 + - uid: 159 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 18.5,-21.5 + parent: 1 + - uid: 166 + components: + - type: Transform + pos: 19.5,-2.5 + parent: 1 + - uid: 167 + components: + - type: Transform + pos: 20.5,-2.5 + parent: 1 + - uid: 168 + components: + - type: Transform + pos: 21.5,-2.5 + parent: 1 + - uid: 169 + components: + - type: Transform + pos: 22.5,-2.5 + parent: 1 + - uid: 170 + components: + - type: Transform + pos: 23.5,-2.5 + parent: 1 + - uid: 171 + components: + - type: Transform + pos: 24.5,-2.5 + parent: 1 + - uid: 172 + components: + - type: Transform + pos: 25.5,-2.5 + parent: 1 + - uid: 173 + components: + - type: Transform + pos: 26.5,-2.5 + parent: 1 + - uid: 174 + components: + - type: Transform + pos: 27.5,-2.5 + parent: 1 + - uid: 175 + components: + - type: Transform + pos: 28.5,-2.5 + parent: 1 + - uid: 176 + components: + - type: Transform + pos: 29.5,-2.5 + parent: 1 + - uid: 177 + components: + - type: Transform + pos: 30.5,-2.5 + parent: 1 + - uid: 178 + components: + - type: Transform + pos: 31.5,-2.5 + parent: 1 + - uid: 179 + components: + - type: Transform + pos: 32.5,-2.5 + parent: 1 + - uid: 196 + components: + - type: Transform + pos: 32.5,-1.5 + parent: 1 + - uid: 197 + components: + - type: Transform + pos: 32.5,-0.5 + parent: 1 + - uid: 198 + components: + - type: Transform + pos: 32.5,2.5 + parent: 1 + - uid: 199 + components: + - type: Transform + pos: 32.5,3.5 + parent: 1 + - uid: 218 + components: + - type: Transform + pos: 19.5,7.5 + parent: 1 + - uid: 219 + components: + - type: Transform + pos: 20.5,7.5 + parent: 1 + - uid: 220 + components: + - type: Transform + pos: 21.5,7.5 + parent: 1 + - uid: 221 + components: + - type: Transform + pos: 22.5,7.5 + parent: 1 + - uid: 222 + components: + - type: Transform + pos: 23.5,7.5 + parent: 1 + - uid: 223 + components: + - type: Transform + pos: 24.5,7.5 + parent: 1 + - uid: 224 + components: + - type: Transform + pos: 25.5,7.5 + parent: 1 + - uid: 225 + components: + - type: Transform + pos: 26.5,7.5 + parent: 1 + - uid: 226 + components: + - type: Transform + pos: 27.5,7.5 + parent: 1 + - uid: 227 + components: + - type: Transform + pos: 28.5,7.5 + parent: 1 + - uid: 228 + components: + - type: Transform + pos: 29.5,7.5 + parent: 1 + - uid: 229 + components: + - type: Transform + pos: 30.5,7.5 + parent: 1 + - uid: 230 + components: + - type: Transform + pos: 31.5,7.5 + parent: 1 + - uid: 231 + components: + - type: Transform + pos: 32.5,7.5 + parent: 1 + - uid: 232 + components: + - type: Transform + pos: 33.5,7.5 + parent: 1 + - uid: 233 + components: + - type: Transform + pos: 34.5,7.5 + parent: 1 + - uid: 234 + components: + - type: Transform + pos: 35.5,7.5 + parent: 1 + - uid: 235 + components: + - type: Transform + pos: 36.5,7.5 + parent: 1 + - uid: 236 + components: + - type: Transform + pos: 37.5,7.5 + parent: 1 + - uid: 237 + components: + - type: Transform + pos: 38.5,7.5 + parent: 1 + - uid: 238 + components: + - type: Transform + pos: 39.5,7.5 + parent: 1 + - uid: 239 + components: + - type: Transform + pos: 35.5,4.5 + parent: 1 + - uid: 240 + components: + - type: Transform + pos: 35.5,3.5 + parent: 1 + - uid: 241 + components: + - type: Transform + pos: 35.5,2.5 + parent: 1 + - uid: 242 + components: + - type: Transform + pos: 35.5,1.5 + parent: 1 + - uid: 243 + components: + - type: Transform + pos: 35.5,0.5 + parent: 1 + - uid: 244 + components: + - type: Transform + pos: 35.5,-0.5 + parent: 1 + - uid: 245 + components: + - type: Transform + pos: 35.5,-1.5 + parent: 1 + - uid: 246 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 35.5,-4.5 + parent: 1 + - uid: 247 + components: + - type: Transform + pos: 36.5,4.5 + parent: 1 + - uid: 248 + components: + - type: Transform + pos: 37.5,4.5 + parent: 1 + - uid: 249 + components: + - type: Transform + pos: 38.5,4.5 + parent: 1 + - uid: 250 + components: + - type: Transform + pos: 39.5,4.5 + parent: 1 + - uid: 251 + components: + - type: Transform + pos: 40.5,4.5 + parent: 1 + - uid: 252 + components: + - type: Transform + pos: 41.5,4.5 + parent: 1 + - uid: 253 + components: + - type: Transform + pos: 45.5,7.5 + parent: 1 + - uid: 254 + components: + - type: Transform + pos: 44.5,7.5 + parent: 1 + - uid: 255 + components: + - type: Transform + pos: 43.5,7.5 + parent: 1 + - uid: 256 + components: + - type: Transform + pos: 42.5,7.5 + parent: 1 + - uid: 257 + components: + - type: Transform + pos: 41.5,7.5 + parent: 1 + - uid: 258 + components: + - type: Transform + pos: 40.5,7.5 + parent: 1 + - uid: 260 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 46.5,7.5 + parent: 1 + - uid: 261 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 47.5,6.5 + parent: 1 + - uid: 262 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 47.5,1.5 + parent: 1 + - uid: 263 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 44.5,4.5 + parent: 1 + - uid: 264 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 48.5,1.5 + parent: 1 + - uid: 265 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 47.5,4.5 + parent: 1 + - uid: 266 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 42.5,4.5 + parent: 1 + - uid: 267 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 43.5,4.5 + parent: 1 + - uid: 271 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 47.5,5.5 + parent: 1 + - uid: 281 + components: + - type: Transform + pos: 38.5,0.5 + parent: 1 + - uid: 287 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 35.5,-5.5 + parent: 1 + - uid: 288 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 35.5,-6.5 + parent: 1 + - uid: 289 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 35.5,-7.5 + parent: 1 + - uid: 290 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 35.5,-8.5 + parent: 1 + - uid: 291 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 35.5,-9.5 + parent: 1 + - uid: 292 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 36.5,-9.5 + parent: 1 + - uid: 293 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 37.5,-9.5 + parent: 1 + - uid: 294 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 38.5,-9.5 + parent: 1 + - uid: 295 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 39.5,-9.5 + parent: 1 + - uid: 296 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 40.5,-9.5 + parent: 1 + - uid: 297 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 41.5,-9.5 + parent: 1 + - uid: 298 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 42.5,-9.5 + parent: 1 + - uid: 299 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 43.5,-9.5 + parent: 1 + - uid: 310 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 44.5,-1.5 + parent: 1 + - uid: 311 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 44.5,-4.5 + parent: 1 + - uid: 314 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 44.5,-6.5 + parent: 1 + - uid: 315 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 44.5,-5.5 + parent: 1 + - uid: 317 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 44.5,-7.5 + parent: 1 + - uid: 318 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 44.5,-8.5 + parent: 1 + - uid: 321 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 44.5,-9.5 + parent: 1 + - uid: 337 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 44.5,-3.5 + parent: 1 + - uid: 338 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 44.5,-2.5 + parent: 1 + - uid: 341 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 36.5,-12.5 + parent: 1 + - uid: 342 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 32.5,-3.5 + parent: 1 + - uid: 343 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 32.5,-4.5 + parent: 1 + - uid: 344 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 35.5,-12.5 + parent: 1 + - uid: 345 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 32.5,-8.5 + parent: 1 + - uid: 346 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 32.5,-7.5 + parent: 1 + - uid: 347 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 32.5,-6.5 + parent: 1 + - uid: 348 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 32.5,-5.5 + parent: 1 + - uid: 350 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 37.5,-12.5 + parent: 1 + - uid: 351 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 38.5,-12.5 + parent: 1 + - uid: 352 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 39.5,-12.5 + parent: 1 + - uid: 353 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 40.5,-12.5 + parent: 1 + - uid: 354 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 41.5,-12.5 + parent: 1 + - uid: 355 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 42.5,-12.5 + parent: 1 + - uid: 356 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 43.5,-12.5 + parent: 1 + - uid: 357 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 32.5,-13.5 + parent: 1 + - uid: 358 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 32.5,-14.5 + parent: 1 + - uid: 359 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 35.5,-13.5 + parent: 1 + - uid: 360 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 35.5,-14.5 + parent: 1 + - uid: 361 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 35.5,-15.5 + parent: 1 + - uid: 362 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 35.5,-16.5 + parent: 1 + - uid: 363 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 32.5,-15.5 + parent: 1 + - uid: 364 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 32.5,-16.5 + parent: 1 + - uid: 365 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 32.5,-17.5 + parent: 1 + - uid: 366 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 32.5,-18.5 + parent: 1 + - uid: 367 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 32.5,-19.5 + parent: 1 + - uid: 368 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 32.5,-20.5 + parent: 1 + - uid: 369 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 31.5,-20.5 + parent: 1 + - uid: 370 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 30.5,-20.5 + parent: 1 + - uid: 371 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 29.5,-20.5 + parent: 1 + - uid: 372 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 28.5,-20.5 + parent: 1 + - uid: 373 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 27.5,-20.5 + parent: 1 + - uid: 374 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 26.5,-20.5 + parent: 1 + - uid: 375 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 25.5,-20.5 + parent: 1 + - uid: 376 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 24.5,-20.5 + parent: 1 + - uid: 377 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 23.5,-20.5 + parent: 1 + - uid: 378 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 22.5,-20.5 + parent: 1 + - uid: 379 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 21.5,-20.5 + parent: 1 + - uid: 380 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 20.5,-20.5 + parent: 1 + - uid: 381 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 19.5,-20.5 + parent: 1 + - uid: 488 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 44.5,1.5 + parent: 1 + - uid: 489 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 44.5,3.5 + parent: 1 + - uid: 490 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 44.5,2.5 + parent: 1 + - uid: 491 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 53.5,4.5 + parent: 1 + - uid: 492 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 49.5,1.5 + parent: 1 + - uid: 493 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 49.5,4.5 + parent: 1 + - uid: 495 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 44.5,-0.5 + parent: 1 + - uid: 496 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 51.5,4.5 + parent: 1 + - uid: 497 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 52.5,1.5 + parent: 1 + - uid: 498 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 50.5,4.5 + parent: 1 + - uid: 499 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 52.5,4.5 + parent: 1 + - uid: 500 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 53.5,1.5 + parent: 1 + - uid: 501 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 50.5,1.5 + parent: 1 + - uid: 502 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 48.5,4.5 + parent: 1 + - uid: 503 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 54.5,1.5 + parent: 1 + - uid: 504 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 51.5,1.5 + parent: 1 + - uid: 505 + components: + - type: Transform + pos: 53.5,-2.5 + parent: 1 + - uid: 506 + components: + - type: Transform + pos: 53.5,-1.5 + parent: 1 + - uid: 507 + components: + - type: Transform + pos: 49.5,-9.5 + parent: 1 + - uid: 508 + components: + - type: Transform + pos: 48.5,-9.5 + parent: 1 + - uid: 509 + components: + - type: Transform + pos: 48.5,-12.5 + parent: 1 + - uid: 511 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 47.5,-2.5 + parent: 1 + - uid: 512 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 44.5,0.5 + parent: 1 + - uid: 513 + components: + - type: Transform + pos: 53.5,-5.5 + parent: 1 + - uid: 514 + components: + - type: Transform + pos: 53.5,-3.5 + parent: 1 + - uid: 515 + components: + - type: Transform + pos: 53.5,-4.5 + parent: 1 + - uid: 516 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 32.5,-21.5 + parent: 1 + - uid: 517 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 32.5,-22.5 + parent: 1 + - uid: 518 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 30.5,-21.5 + parent: 1 + - uid: 519 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 30.5,-22.5 + parent: 1 + - uid: 520 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 28.5,-22.5 + parent: 1 + - uid: 521 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 28.5,-21.5 + parent: 1 + - uid: 522 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 26.5,-21.5 + parent: 1 + - uid: 523 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 26.5,-22.5 + parent: 1 + - uid: 524 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 24.5,-21.5 + parent: 1 + - uid: 525 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 24.5,-22.5 + parent: 1 + - uid: 526 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 22.5,-21.5 + parent: 1 + - uid: 527 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 22.5,-22.5 + parent: 1 + - uid: 528 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 32.5,-25.5 + parent: 1 + - uid: 529 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 32.5,-26.5 + parent: 1 + - uid: 530 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 32.5,-27.5 + parent: 1 + - uid: 531 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 31.5,-27.5 + parent: 1 + - uid: 532 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 30.5,-27.5 + parent: 1 + - uid: 533 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 29.5,-27.5 + parent: 1 + - uid: 534 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 28.5,-27.5 + parent: 1 + - uid: 535 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 27.5,-27.5 + parent: 1 + - uid: 536 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 26.5,-27.5 + parent: 1 + - uid: 537 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 25.5,-27.5 + parent: 1 + - uid: 538 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 24.5,-27.5 + parent: 1 + - uid: 539 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 23.5,-27.5 + parent: 1 + - uid: 540 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 22.5,-27.5 + parent: 1 + - uid: 541 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 22.5,-25.5 + parent: 1 + - uid: 542 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 22.5,-24.5 + parent: 1 + - uid: 543 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 22.5,-23.5 + parent: 1 + - uid: 544 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 18.5,-22.5 + parent: 1 + - uid: 545 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 18.5,-23.5 + parent: 1 + - uid: 548 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 18.5,-26.5 + parent: 1 + - uid: 549 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 18.5,-27.5 + parent: 1 + - uid: 550 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 19.5,-27.5 + parent: 1 + - uid: 551 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 20.5,-27.5 + parent: 1 + - uid: 552 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 21.5,-27.5 + parent: 1 + - uid: 566 + components: + - type: Transform + pos: 18.5,-30.5 + parent: 1 + - uid: 567 + components: + - type: Transform + pos: 19.5,-30.5 + parent: 1 + - uid: 568 + components: + - type: Transform + pos: 20.5,-30.5 + parent: 1 + - uid: 569 + components: + - type: Transform + pos: 21.5,-30.5 + parent: 1 + - uid: 570 + components: + - type: Transform + pos: 22.5,-30.5 + parent: 1 + - uid: 571 + components: + - type: Transform + pos: 23.5,-30.5 + parent: 1 + - uid: 572 + components: + - type: Transform + pos: 24.5,-30.5 + parent: 1 + - uid: 573 + components: + - type: Transform + pos: 25.5,-30.5 + parent: 1 + - uid: 574 + components: + - type: Transform + pos: 26.5,-30.5 + parent: 1 + - uid: 575 + components: + - type: Transform + pos: 27.5,-30.5 + parent: 1 + - uid: 576 + components: + - type: Transform + pos: 28.5,-30.5 + parent: 1 + - uid: 577 + components: + - type: Transform + pos: 29.5,-30.5 + parent: 1 + - uid: 578 + components: + - type: Transform + pos: 30.5,-30.5 + parent: 1 + - uid: 579 + components: + - type: Transform + pos: 31.5,-30.5 + parent: 1 + - uid: 580 + components: + - type: Transform + pos: 32.5,-30.5 + parent: 1 + - uid: 581 + components: + - type: Transform + pos: 33.5,-30.5 + parent: 1 + - uid: 582 + components: + - type: Transform + pos: 34.5,-30.5 + parent: 1 + - uid: 583 + components: + - type: Transform + pos: 35.5,-30.5 + parent: 1 + - uid: 584 + components: + - type: Transform + pos: 36.5,-30.5 + parent: 1 + - uid: 585 + components: + - type: Transform + pos: 37.5,-30.5 + parent: 1 + - uid: 586 + components: + - type: Transform + pos: 38.5,-30.5 + parent: 1 + - uid: 587 + components: + - type: Transform + pos: 39.5,-30.5 + parent: 1 + - uid: 588 + components: + - type: Transform + pos: 40.5,-30.5 + parent: 1 + - uid: 589 + components: + - type: Transform + pos: 41.5,-30.5 + parent: 1 + - uid: 590 + components: + - type: Transform + pos: 42.5,-30.5 + parent: 1 + - uid: 591 + components: + - type: Transform + pos: 43.5,-30.5 + parent: 1 + - uid: 592 + components: + - type: Transform + pos: 44.5,-30.5 + parent: 1 + - uid: 593 + components: + - type: Transform + pos: 17.5,-30.5 + parent: 1 + - uid: 594 + components: + - type: Transform + pos: 16.5,-30.5 + parent: 1 + - uid: 595 + components: + - type: Transform + pos: 15.5,-30.5 + parent: 1 + - uid: 596 + components: + - type: Transform + pos: 14.5,-30.5 + parent: 1 + - uid: 618 + components: + - type: Transform + pos: 45.5,-30.5 + parent: 1 + - uid: 619 + components: + - type: Transform + pos: 46.5,-30.5 + parent: 1 + - uid: 621 + components: + - type: Transform + pos: 47.5,-29.5 + parent: 1 + - uid: 622 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 47.5,-27.5 + parent: 1 + - uid: 623 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 47.5,-28.5 + parent: 1 + - uid: 624 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 47.5,-24.5 + parent: 1 + - uid: 625 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 48.5,-24.5 + parent: 1 + - uid: 626 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 48.5,-27.5 + parent: 1 + - uid: 627 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 49.5,-27.5 + parent: 1 + - uid: 628 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 50.5,-27.5 + parent: 1 + - uid: 629 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 51.5,-27.5 + parent: 1 + - uid: 630 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 52.5,-27.5 + parent: 1 + - uid: 631 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 53.5,-27.5 + parent: 1 + - uid: 632 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 53.5,-24.5 + parent: 1 + - uid: 633 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 52.5,-24.5 + parent: 1 + - uid: 634 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 51.5,-24.5 + parent: 1 + - uid: 635 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 50.5,-24.5 + parent: 1 + - uid: 636 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 49.5,-24.5 + parent: 1 + - uid: 637 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 54.5,-24.5 + parent: 1 + - uid: 638 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 54.5,-27.5 + parent: 1 + - uid: 669 + components: + - type: Transform + pos: 47.5,-21.5 + parent: 1 + - uid: 670 + components: + - type: Transform + pos: 48.5,-21.5 + parent: 1 + - uid: 672 + components: + - type: Transform + pos: 47.5,-20.5 + parent: 1 + - uid: 673 + components: + - type: Transform + pos: 47.5,-19.5 + parent: 1 + - uid: 674 + components: + - type: Transform + pos: 47.5,-18.5 + parent: 1 + - uid: 675 + components: + - type: Transform + pos: 47.5,-17.5 + parent: 1 + - uid: 676 + components: + - type: Transform + pos: 47.5,-16.5 + parent: 1 + - uid: 677 + components: + - type: Transform + pos: 47.5,-15.5 + parent: 1 + - uid: 678 + components: + - type: Transform + pos: 47.5,-14.5 + parent: 1 + - uid: 679 + components: + - type: Transform + pos: 47.5,-13.5 + parent: 1 + - uid: 680 + components: + - type: Transform + pos: 47.5,-12.5 + parent: 1 + - uid: 681 + components: + - type: Transform + pos: 47.5,-9.5 + parent: 1 + - uid: 682 + components: + - type: Transform + pos: 47.5,-8.5 + parent: 1 + - uid: 683 + components: + - type: Transform + pos: 47.5,-3.5 + parent: 1 + - uid: 684 + components: + - type: Transform + pos: 47.5,-1.5 + parent: 1 + - uid: 685 + components: + - type: Transform + pos: 48.5,-1.5 + parent: 1 + - uid: 686 + components: + - type: Transform + pos: 49.5,-1.5 + parent: 1 + - uid: 687 + components: + - type: Transform + pos: 50.5,-1.5 + parent: 1 + - uid: 688 + components: + - type: Transform + pos: 51.5,-1.5 + parent: 1 + - uid: 689 + components: + - type: Transform + pos: 52.5,-1.5 + parent: 1 + - uid: 690 + components: + - type: Transform + pos: 51.5,-9.5 + parent: 1 + - uid: 693 + components: + - type: Transform + pos: 53.5,-14.5 + parent: 1 + - uid: 694 + components: + - type: Transform + pos: 53.5,-13.5 + parent: 1 + - uid: 696 + components: + - type: Transform + pos: 52.5,-12.5 + parent: 1 + - uid: 697 + components: + - type: Transform + pos: 53.5,-12.5 + parent: 1 + - uid: 698 + components: + - type: Transform + pos: 53.5,-15.5 + parent: 1 + - uid: 699 + components: + - type: Transform + pos: 53.5,-16.5 + parent: 1 + - uid: 700 + components: + - type: Transform + pos: 53.5,-17.5 + parent: 1 + - uid: 701 + components: + - type: Transform + pos: 53.5,-18.5 + parent: 1 + - uid: 702 + components: + - type: Transform + pos: 53.5,-19.5 + parent: 1 + - uid: 703 + components: + - type: Transform + pos: 53.5,-20.5 + parent: 1 + - uid: 704 + components: + - type: Transform + pos: 53.5,-21.5 + parent: 1 + - uid: 705 + components: + - type: Transform + pos: 52.5,-21.5 + parent: 1 + - uid: 707 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 49.5,-12.5 + parent: 1 + - uid: 709 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 49.5,-21.5 + parent: 1 + - uid: 710 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 51.5,-21.5 + parent: 1 + - uid: 711 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 50.5,-21.5 + parent: 1 + - uid: 733 + components: + - type: Transform + pos: 54.5,-21.5 + parent: 1 + - uid: 734 + components: + - type: Transform + pos: 56.5,-21.5 + parent: 1 + - uid: 735 + components: + - type: Transform + pos: 57.5,-21.5 + parent: 1 + - uid: 736 + components: + - type: Transform + pos: 54.5,-17.5 + parent: 1 + - uid: 737 + components: + - type: Transform + pos: 55.5,-17.5 + parent: 1 + - uid: 738 + components: + - type: Transform + pos: 56.5,-17.5 + parent: 1 + - uid: 739 + components: + - type: Transform + pos: 57.5,-17.5 + parent: 1 + - uid: 740 + components: + - type: Transform + pos: 58.5,-17.5 + parent: 1 + - uid: 741 + components: + - type: Transform + pos: 59.5,-17.5 + parent: 1 + - uid: 742 + components: + - type: Transform + pos: 60.5,-17.5 + parent: 1 + - uid: 743 + components: + - type: Transform + pos: 59.5,-21.5 + parent: 1 + - uid: 744 + components: + - type: Transform + pos: 60.5,-21.5 + parent: 1 + - uid: 745 + components: + - type: Transform + pos: 61.5,-21.5 + parent: 1 + - uid: 746 + components: + - type: Transform + pos: 62.5,-21.5 + parent: 1 + - uid: 747 + components: + - type: Transform + pos: 63.5,-21.5 + parent: 1 + - uid: 748 + components: + - type: Transform + pos: 63.5,-20.5 + parent: 1 + - uid: 749 + components: + - type: Transform + pos: 63.5,-18.5 + parent: 1 + - uid: 750 + components: + - type: Transform + pos: 63.5,-17.5 + parent: 1 + - uid: 751 + components: + - type: Transform + pos: 62.5,-17.5 + parent: 1 + - uid: 752 + components: + - type: Transform + pos: 61.5,-17.5 + parent: 1 + - uid: 764 + components: + - type: Transform + pos: 63.5,-5.5 + parent: 1 + - uid: 765 + components: + - type: Transform + pos: 62.5,-5.5 + parent: 1 + - uid: 766 + components: + - type: Transform + pos: 61.5,-5.5 + parent: 1 + - uid: 767 + components: + - type: Transform + pos: 60.5,-5.5 + parent: 1 + - uid: 768 + components: + - type: Transform + pos: 59.5,-5.5 + parent: 1 + - uid: 769 + components: + - type: Transform + pos: 58.5,-5.5 + parent: 1 + - uid: 770 + components: + - type: Transform + pos: 57.5,-5.5 + parent: 1 + - uid: 771 + components: + - type: Transform + pos: 56.5,-5.5 + parent: 1 + - uid: 772 + components: + - type: Transform + pos: 55.5,-5.5 + parent: 1 + - uid: 773 + components: + - type: Transform + pos: 54.5,-5.5 + parent: 1 + - uid: 774 + components: + - type: Transform + pos: 63.5,-4.5 + parent: 1 + - uid: 775 + components: + - type: Transform + pos: 63.5,-2.5 + parent: 1 + - uid: 776 + components: + - type: Transform + pos: 63.5,-1.5 + parent: 1 + - uid: 777 + components: + - type: Transform + pos: 62.5,-1.5 + parent: 1 + - uid: 778 + components: + - type: Transform + pos: 61.5,-1.5 + parent: 1 + - uid: 779 + components: + - type: Transform + pos: 60.5,-1.5 + parent: 1 + - uid: 780 + components: + - type: Transform + pos: 59.5,-1.5 + parent: 1 + - uid: 782 + components: + - type: Transform + pos: 54.5,-1.5 + parent: 1 + - uid: 829 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 62.5,-12.5 + parent: 1 + - uid: 844 + components: + - type: Transform + pos: 55.5,-24.5 + parent: 1 + - uid: 845 + components: + - type: Transform + pos: 56.5,-24.5 + parent: 1 + - uid: 846 + components: + - type: Transform + pos: 57.5,-24.5 + parent: 1 + - uid: 847 + components: + - type: Transform + pos: 58.5,-24.5 + parent: 1 + - uid: 848 + components: + - type: Transform + pos: 59.5,-24.5 + parent: 1 + - uid: 849 + components: + - type: Transform + pos: 60.5,-24.5 + parent: 1 + - uid: 850 + components: + - type: Transform + pos: 61.5,-24.5 + parent: 1 + - uid: 851 + components: + - type: Transform + pos: 62.5,-24.5 + parent: 1 + - uid: 852 + components: + - type: Transform + pos: 63.5,-24.5 + parent: 1 + - uid: 853 + components: + - type: Transform + pos: 64.5,-21.5 + parent: 1 + - uid: 854 + components: + - type: Transform + pos: 65.5,-21.5 + parent: 1 + - uid: 855 + components: + - type: Transform + pos: 66.5,-21.5 + parent: 1 + - uid: 856 + components: + - type: Transform + pos: 67.5,-21.5 + parent: 1 + - uid: 857 + components: + - type: Transform + pos: 68.5,-21.5 + parent: 1 + - uid: 858 + components: + - type: Transform + pos: 69.5,-21.5 + parent: 1 + - uid: 859 + components: + - type: Transform + pos: 70.5,-21.5 + parent: 1 + - uid: 860 + components: + - type: Transform + pos: 71.5,-21.5 + parent: 1 + - uid: 861 + components: + - type: Transform + pos: 72.5,-21.5 + parent: 1 + - uid: 862 + components: + - type: Transform + pos: 73.5,-21.5 + parent: 1 + - uid: 863 + components: + - type: Transform + pos: 74.5,-21.5 + parent: 1 + - uid: 864 + components: + - type: Transform + pos: 74.5,-1.5 + parent: 1 + - uid: 865 + components: + - type: Transform + pos: 73.5,-1.5 + parent: 1 + - uid: 866 + components: + - type: Transform + pos: 72.5,-1.5 + parent: 1 + - uid: 867 + components: + - type: Transform + pos: 71.5,-1.5 + parent: 1 + - uid: 868 + components: + - type: Transform + pos: 70.5,-1.5 + parent: 1 + - uid: 869 + components: + - type: Transform + pos: 69.5,-1.5 + parent: 1 + - uid: 870 + components: + - type: Transform + pos: 68.5,-1.5 + parent: 1 + - uid: 871 + components: + - type: Transform + pos: 67.5,-1.5 + parent: 1 + - uid: 872 + components: + - type: Transform + pos: 66.5,-1.5 + parent: 1 + - uid: 873 + components: + - type: Transform + pos: 65.5,-1.5 + parent: 1 + - uid: 874 + components: + - type: Transform + pos: 64.5,-1.5 + parent: 1 + - uid: 875 + components: + - type: Transform + pos: 55.5,1.5 + parent: 1 + - uid: 876 + components: + - type: Transform + pos: 56.5,1.5 + parent: 1 + - uid: 877 + components: + - type: Transform + pos: 57.5,1.5 + parent: 1 + - uid: 878 + components: + - type: Transform + pos: 58.5,1.5 + parent: 1 + - uid: 879 + components: + - type: Transform + pos: 59.5,1.5 + parent: 1 + - uid: 880 + components: + - type: Transform + pos: 60.5,1.5 + parent: 1 + - uid: 881 + components: + - type: Transform + pos: 61.5,1.5 + parent: 1 + - uid: 882 + components: + - type: Transform + pos: 62.5,1.5 + parent: 1 + - uid: 883 + components: + - type: Transform + pos: 63.5,1.5 + parent: 1 + - uid: 884 + components: + - type: Transform + pos: 64.5,1.5 + parent: 1 + - uid: 885 + components: + - type: Transform + pos: 65.5,1.5 + parent: 1 + - uid: 886 + components: + - type: Transform + pos: 66.5,1.5 + parent: 1 + - uid: 887 + components: + - type: Transform + pos: 67.5,1.5 + parent: 1 + - uid: 888 + components: + - type: Transform + pos: 68.5,1.5 + parent: 1 + - uid: 889 + components: + - type: Transform + pos: 69.5,1.5 + parent: 1 + - uid: 890 + components: + - type: Transform + pos: 70.5,1.5 + parent: 1 + - uid: 891 + components: + - type: Transform + pos: 71.5,1.5 + parent: 1 + - uid: 892 + components: + - type: Transform + pos: 72.5,1.5 + parent: 1 + - uid: 893 + components: + - type: Transform + pos: 73.5,1.5 + parent: 1 + - uid: 894 + components: + - type: Transform + pos: 74.5,1.5 + parent: 1 + - uid: 905 + components: + - type: Transform + pos: 79.5,-9.5 + parent: 1 + - uid: 906 + components: + - type: Transform + pos: 79.5,-8.5 + parent: 1 + - uid: 907 + components: + - type: Transform + pos: 79.5,-7.5 + parent: 1 + - uid: 908 + components: + - type: Transform + pos: 79.5,-6.5 + parent: 1 + - uid: 909 + components: + - type: Transform + pos: 79.5,-5.5 + parent: 1 + - uid: 910 + components: + - type: Transform + pos: 79.5,-4.5 + parent: 1 + - uid: 911 + components: + - type: Transform + pos: 79.5,-3.5 + parent: 1 + - uid: 912 + components: + - type: Transform + pos: 79.5,-2.5 + parent: 1 + - uid: 913 + components: + - type: Transform + pos: 79.5,-1.5 + parent: 1 + - uid: 914 + components: + - type: Transform + pos: 78.5,-1.5 + parent: 1 + - uid: 915 + components: + - type: Transform + pos: 77.5,-1.5 + parent: 1 + - uid: 916 + components: + - type: Transform + pos: 76.5,-1.5 + parent: 1 + - uid: 917 + components: + - type: Transform + pos: 75.5,-1.5 + parent: 1 + - uid: 918 + components: + - type: Transform + pos: 79.5,-21.5 + parent: 1 + - uid: 919 + components: + - type: Transform + pos: 78.5,-21.5 + parent: 1 + - uid: 920 + components: + - type: Transform + pos: 77.5,-21.5 + parent: 1 + - uid: 921 + components: + - type: Transform + pos: 76.5,-21.5 + parent: 1 + - uid: 922 + components: + - type: Transform + pos: 75.5,-21.5 + parent: 1 + - uid: 923 + components: + - type: Transform + pos: 79.5,-20.5 + parent: 1 + - uid: 924 + components: + - type: Transform + pos: 79.5,-19.5 + parent: 1 + - uid: 925 + components: + - type: Transform + pos: 79.5,-18.5 + parent: 1 + - uid: 926 + components: + - type: Transform + pos: 79.5,-17.5 + parent: 1 + - uid: 927 + components: + - type: Transform + pos: 79.5,-16.5 + parent: 1 + - uid: 929 + components: + - type: Transform + pos: 79.5,-14.5 + parent: 1 + - uid: 930 + components: + - type: Transform + pos: 79.5,-13.5 + parent: 1 + - uid: 931 + components: + - type: Transform + pos: 79.5,-12.5 + parent: 1 + - uid: 943 + components: + - type: Transform + pos: 75.5,1.5 + parent: 1 + - uid: 944 + components: + - type: Transform + pos: 76.5,1.5 + parent: 1 + - uid: 945 + components: + - type: Transform + pos: 77.5,1.5 + parent: 1 + - uid: 946 + components: + - type: Transform + pos: 78.5,1.5 + parent: 1 + - uid: 947 + components: + - type: Transform + pos: 79.5,1.5 + parent: 1 + - uid: 948 + components: + - type: Transform + pos: 80.5,1.5 + parent: 1 + - uid: 949 + components: + - type: Transform + pos: 81.5,1.5 + parent: 1 + - uid: 951 + components: + - type: Transform + pos: 82.5,0.5 + parent: 1 + - uid: 952 + components: + - type: Transform + pos: 82.5,-0.5 + parent: 1 + - uid: 953 + components: + - type: Transform + pos: 82.5,-1.5 + parent: 1 + - uid: 954 + components: + - type: Transform + pos: 83.5,-9.5 + parent: 1 + - uid: 955 + components: + - type: Transform + pos: 80.5,-9.5 + parent: 1 + - uid: 956 + components: + - type: Transform + pos: 81.5,-9.5 + parent: 1 + - uid: 957 + components: + - type: Transform + pos: 82.5,-9.5 + parent: 1 + - uid: 958 + components: + - type: Transform + pos: 82.5,-5.5 + parent: 1 + - uid: 959 + components: + - type: Transform + pos: 82.5,-4.5 + parent: 1 + - uid: 960 + components: + - type: Transform + pos: 82.5,-3.5 + parent: 1 + - uid: 961 + components: + - type: Transform + pos: 82.5,-2.5 + parent: 1 + - uid: 962 + components: + - type: Transform + pos: 83.5,-5.5 + parent: 1 + - uid: 963 + components: + - type: Transform + pos: 83.5,-4.5 + parent: 1 + - uid: 964 + components: + - type: Transform + pos: 83.5,-3.5 + parent: 1 + - uid: 965 + components: + - type: Transform + pos: 83.5,-2.5 + parent: 1 + - uid: 966 + components: + - type: Transform + pos: 84.5,-2.5 + parent: 1 + - uid: 967 + components: + - type: Transform + pos: 84.5,-3.5 + parent: 1 + - uid: 968 + components: + - type: Transform + pos: 84.5,-4.5 + parent: 1 + - uid: 969 + components: + - type: Transform + pos: 84.5,-5.5 + parent: 1 + - uid: 970 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 84.5,-1.5 + parent: 1 + - uid: 971 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 85.5,-5.5 + parent: 1 + - uid: 972 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 86.5,-5.5 + parent: 1 + - uid: 973 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 87.5,-5.5 + parent: 1 + - uid: 974 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 88.5,-5.5 + parent: 1 + - uid: 975 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 89.5,-5.5 + parent: 1 + - uid: 976 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 90.5,-5.5 + parent: 1 + - uid: 977 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 91.5,-5.5 + parent: 1 + - uid: 978 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 91.5,-9.5 + parent: 1 + - uid: 979 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 90.5,-9.5 + parent: 1 + - uid: 980 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 89.5,-9.5 + parent: 1 + - uid: 981 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 88.5,-9.5 + parent: 1 + - uid: 982 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 87.5,-9.5 + parent: 1 + - uid: 983 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 86.5,-9.5 + parent: 1 + - uid: 984 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 85.5,-9.5 + parent: 1 + - uid: 985 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 84.5,-9.5 + parent: 1 + - uid: 986 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 83.5,-1.5 + parent: 1 + - uid: 1006 + components: + - type: Transform + pos: 123.5,1.5 + parent: 1 + - uid: 1007 + components: + - type: Transform + pos: 121.5,1.5 + parent: 1 + - uid: 1008 + components: + - type: Transform + pos: 123.5,-9.5 + parent: 1 + - uid: 1009 + components: + - type: Transform + pos: 122.5,1.5 + parent: 1 + - uid: 1010 + components: + - type: Transform + pos: 124.5,1.5 + parent: 1 + - uid: 1011 + components: + - type: Transform + pos: 122.5,-9.5 + parent: 1 + - uid: 1013 + components: + - type: Transform + pos: 124.5,-9.5 + parent: 1 + - uid: 1033 + components: + - type: Transform + pos: 107.5,-9.5 + parent: 1 + - uid: 1034 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 95.5,-5.5 + parent: 1 + - uid: 1035 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 94.5,-5.5 + parent: 1 + - uid: 1036 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 93.5,-5.5 + parent: 1 + - uid: 1037 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 92.5,-5.5 + parent: 1 + - uid: 1038 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 97.5,-5.5 + parent: 1 + - uid: 1039 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 98.5,-5.5 + parent: 1 + - uid: 1040 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 99.5,-5.5 + parent: 1 + - uid: 1041 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 100.5,-5.5 + parent: 1 + - uid: 1042 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 101.5,-5.5 + parent: 1 + - uid: 1043 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 102.5,-5.5 + parent: 1 + - uid: 1044 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 103.5,-5.5 + parent: 1 + - uid: 1045 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 104.5,-5.5 + parent: 1 + - uid: 1046 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 105.5,-5.5 + parent: 1 + - uid: 1047 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 106.5,-5.5 + parent: 1 + - uid: 1048 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 107.5,-5.5 + parent: 1 + - uid: 1088 + components: + - type: Transform + pos: 106.5,-9.5 + parent: 1 + - uid: 1089 + components: + - type: Transform + pos: 105.5,-9.5 + parent: 1 + - uid: 1090 + components: + - type: Transform + pos: 104.5,-9.5 + parent: 1 + - uid: 1091 + components: + - type: Transform + pos: 103.5,-9.5 + parent: 1 + - uid: 1092 + components: + - type: Transform + pos: 102.5,-9.5 + parent: 1 + - uid: 1093 + components: + - type: Transform + pos: 101.5,-9.5 + parent: 1 + - uid: 1094 + components: + - type: Transform + pos: 100.5,-9.5 + parent: 1 + - uid: 1095 + components: + - type: Transform + pos: 99.5,-9.5 + parent: 1 + - uid: 1096 + components: + - type: Transform + pos: 98.5,-9.5 + parent: 1 + - uid: 1097 + components: + - type: Transform + pos: 97.5,-9.5 + parent: 1 + - uid: 1098 + components: + - type: Transform + pos: 96.5,-9.5 + parent: 1 + - uid: 1099 + components: + - type: Transform + pos: 95.5,-9.5 + parent: 1 + - uid: 1100 + components: + - type: Transform + pos: 94.5,-9.5 + parent: 1 + - uid: 1101 + components: + - type: Transform + pos: 93.5,-9.5 + parent: 1 + - uid: 1102 + components: + - type: Transform + pos: 92.5,-9.5 + parent: 1 + - uid: 1103 + components: + - type: Transform + pos: 108.5,-1.5 + parent: 1 + - uid: 1104 + components: + - type: Transform + pos: 108.5,-2.5 + parent: 1 + - uid: 1105 + components: + - type: Transform + pos: 108.5,-3.5 + parent: 1 + - uid: 1106 + components: + - type: Transform + pos: 108.5,-4.5 + parent: 1 + - uid: 1107 + components: + - type: Transform + pos: 108.5,-5.5 + parent: 1 + - uid: 1108 + components: + - type: Transform + pos: 109.5,-1.5 + parent: 1 + - uid: 1109 + components: + - type: Transform + pos: 109.5,-2.5 + parent: 1 + - uid: 1110 + components: + - type: Transform + pos: 109.5,-3.5 + parent: 1 + - uid: 1111 + components: + - type: Transform + pos: 109.5,-4.5 + parent: 1 + - uid: 1112 + components: + - type: Transform + pos: 109.5,-5.5 + parent: 1 + - uid: 1113 + components: + - type: Transform + pos: 110.5,-1.5 + parent: 1 + - uid: 1114 + components: + - type: Transform + pos: 110.5,-2.5 + parent: 1 + - uid: 1115 + components: + - type: Transform + pos: 110.5,-3.5 + parent: 1 + - uid: 1116 + components: + - type: Transform + pos: 110.5,-4.5 + parent: 1 + - uid: 1117 + components: + - type: Transform + pos: 110.5,-5.5 + parent: 1 + - uid: 1118 + components: + - type: Transform + pos: 110.5,-0.5 + parent: 1 + - uid: 1119 + components: + - type: Transform + pos: 110.5,0.5 + parent: 1 + - uid: 1121 + components: + - type: Transform + pos: 114.5,1.5 + parent: 1 + - uid: 1122 + components: + - type: Transform + pos: 113.5,1.5 + parent: 1 + - uid: 1123 + components: + - type: Transform + pos: 112.5,1.5 + parent: 1 + - uid: 1124 + components: + - type: Transform + pos: 111.5,1.5 + parent: 1 + - uid: 1125 + components: + - type: Transform + pos: 108.5,-9.5 + parent: 1 + - uid: 1126 + components: + - type: Transform + pos: 109.5,-9.5 + parent: 1 + - uid: 1127 + components: + - type: Transform + pos: 110.5,-9.5 + parent: 1 + - uid: 1128 + components: + - type: Transform + pos: 111.5,-9.5 + parent: 1 + - uid: 1129 + components: + - type: Transform + pos: 112.5,-9.5 + parent: 1 + - uid: 1130 + components: + - type: Transform + pos: 113.5,-9.5 + parent: 1 + - uid: 1131 + components: + - type: Transform + pos: 114.5,-9.5 + parent: 1 + - uid: 1132 + components: + - type: Transform + pos: 80.5,-12.5 + parent: 1 + - uid: 1133 + components: + - type: Transform + pos: 81.5,-12.5 + parent: 1 + - uid: 1134 + components: + - type: Transform + pos: 82.5,-12.5 + parent: 1 + - uid: 1135 + components: + - type: Transform + pos: 83.5,-12.5 + parent: 1 + - uid: 1136 + components: + - type: Transform + pos: 84.5,-12.5 + parent: 1 + - uid: 1137 + components: + - type: Transform + pos: 85.5,-12.5 + parent: 1 + - uid: 1138 + components: + - type: Transform + pos: 86.5,-12.5 + parent: 1 + - uid: 1139 + components: + - type: Transform + pos: 87.5,-12.5 + parent: 1 + - uid: 1140 + components: + - type: Transform + pos: 88.5,-12.5 + parent: 1 + - uid: 1141 + components: + - type: Transform + pos: 89.5,-12.5 + parent: 1 + - uid: 1142 + components: + - type: Transform + pos: 90.5,-12.5 + parent: 1 + - uid: 1143 + components: + - type: Transform + pos: 91.5,-12.5 + parent: 1 + - uid: 1144 + components: + - type: Transform + pos: 92.5,-12.5 + parent: 1 + - uid: 1145 + components: + - type: Transform + pos: 93.5,-12.5 + parent: 1 + - uid: 1146 + components: + - type: Transform + pos: 94.5,-12.5 + parent: 1 + - uid: 1147 + components: + - type: Transform + pos: 95.5,-12.5 + parent: 1 + - uid: 1148 + components: + - type: Transform + pos: 96.5,-12.5 + parent: 1 + - uid: 1149 + components: + - type: Transform + pos: 97.5,-12.5 + parent: 1 + - uid: 1150 + components: + - type: Transform + pos: 98.5,-12.5 + parent: 1 + - uid: 1151 + components: + - type: Transform + pos: 99.5,-12.5 + parent: 1 + - uid: 1152 + components: + - type: Transform + pos: 100.5,-12.5 + parent: 1 + - uid: 1153 + components: + - type: Transform + pos: 101.5,-12.5 + parent: 1 + - uid: 1154 + components: + - type: Transform + pos: 102.5,-12.5 + parent: 1 + - uid: 1155 + components: + - type: Transform + pos: 103.5,-12.5 + parent: 1 + - uid: 1156 + components: + - type: Transform + pos: 104.5,-12.5 + parent: 1 + - uid: 1157 + components: + - type: Transform + pos: 105.5,-12.5 + parent: 1 + - uid: 1158 + components: + - type: Transform + pos: 106.5,-12.5 + parent: 1 + - uid: 1159 + components: + - type: Transform + pos: 107.5,-12.5 + parent: 1 + - uid: 1160 + components: + - type: Transform + pos: 108.5,-12.5 + parent: 1 + - uid: 1161 + components: + - type: Transform + pos: 109.5,-12.5 + parent: 1 + - uid: 1162 + components: + - type: Transform + pos: 110.5,-12.5 + parent: 1 + - uid: 1163 + components: + - type: Transform + pos: 64.5,-24.5 + parent: 1 + - uid: 1164 + components: + - type: Transform + pos: 65.5,-24.5 + parent: 1 + - uid: 1165 + components: + - type: Transform + pos: 66.5,-24.5 + parent: 1 + - uid: 1166 + components: + - type: Transform + pos: 67.5,-24.5 + parent: 1 + - uid: 1167 + components: + - type: Transform + pos: 68.5,-24.5 + parent: 1 + - uid: 1168 + components: + - type: Transform + pos: 69.5,-24.5 + parent: 1 + - uid: 1169 + components: + - type: Transform + pos: 70.5,-24.5 + parent: 1 + - uid: 1170 + components: + - type: Transform + pos: 71.5,-24.5 + parent: 1 + - uid: 1171 + components: + - type: Transform + pos: 72.5,-24.5 + parent: 1 + - uid: 1172 + components: + - type: Transform + pos: 73.5,-24.5 + parent: 1 + - uid: 1173 + components: + - type: Transform + pos: 74.5,-24.5 + parent: 1 + - uid: 1174 + components: + - type: Transform + pos: 75.5,-24.5 + parent: 1 + - uid: 1175 + components: + - type: Transform + pos: 76.5,-24.5 + parent: 1 + - uid: 1176 + components: + - type: Transform + pos: 77.5,-24.5 + parent: 1 + - uid: 1177 + components: + - type: Transform + pos: 78.5,-24.5 + parent: 1 + - uid: 1178 + components: + - type: Transform + pos: 79.5,-24.5 + parent: 1 + - uid: 1179 + components: + - type: Transform + pos: 80.5,-24.5 + parent: 1 + - uid: 1180 + components: + - type: Transform + pos: 81.5,-24.5 + parent: 1 + - uid: 1182 + components: + - type: Transform + pos: 82.5,-19.5 + parent: 1 + - uid: 1183 + components: + - type: Transform + pos: 82.5,-23.5 + parent: 1 + - uid: 1184 + components: + - type: Transform + pos: 82.5,-22.5 + parent: 1 + - uid: 1185 + components: + - type: Transform + pos: 82.5,-21.5 + parent: 1 + - uid: 1186 + components: + - type: Transform + pos: 82.5,-20.5 + parent: 1 + - uid: 1187 + components: + - type: Transform + pos: 82.5,-18.5 + parent: 1 + - uid: 1188 + components: + - type: Transform + pos: 82.5,-17.5 + parent: 1 + - uid: 1189 + components: + - type: Transform + pos: 82.5,-16.5 + parent: 1 + - uid: 1190 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 84.5,-17.5 + parent: 1 + - uid: 1191 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 83.5,-18.5 + parent: 1 + - uid: 1192 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 83.5,-16.5 + parent: 1 + - uid: 1193 + components: + - type: Transform + pos: 83.5,-20.5 + parent: 1 + - uid: 1194 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 84.5,-16.5 + parent: 1 + - uid: 1195 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 83.5,-19.5 + parent: 1 + - uid: 1196 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 83.5,-17.5 + parent: 1 + - uid: 1197 + components: + - type: Transform + pos: 84.5,-20.5 + parent: 1 + - uid: 1198 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 84.5,-18.5 + parent: 1 + - uid: 1199 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 84.5,-19.5 + parent: 1 + - uid: 1200 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 85.5,-16.5 + parent: 1 + - uid: 1201 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 86.5,-16.5 + parent: 1 + - uid: 1202 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 87.5,-16.5 + parent: 1 + - uid: 1203 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 88.5,-16.5 + parent: 1 + - uid: 1204 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 89.5,-16.5 + parent: 1 + - uid: 1205 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 90.5,-16.5 + parent: 1 + - uid: 1206 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 91.5,-16.5 + parent: 1 + - uid: 1207 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 92.5,-16.5 + parent: 1 + - uid: 1208 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 93.5,-16.5 + parent: 1 + - uid: 1209 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 94.5,-16.5 + parent: 1 + - uid: 1210 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 95.5,-16.5 + parent: 1 + - uid: 1211 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 97.5,-16.5 + parent: 1 + - uid: 1212 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 98.5,-16.5 + parent: 1 + - uid: 1213 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 99.5,-16.5 + parent: 1 + - uid: 1214 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 100.5,-16.5 + parent: 1 + - uid: 1215 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 101.5,-16.5 + parent: 1 + - uid: 1216 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 102.5,-16.5 + parent: 1 + - uid: 1217 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 103.5,-16.5 + parent: 1 + - uid: 1223 + components: + - type: Transform + pos: 121.5,-9.5 + parent: 1 + - uid: 1224 + components: + - type: Transform + pos: 119.5,-9.5 + parent: 1 + - uid: 1225 + components: + - type: Transform + pos: 118.5,-9.5 + parent: 1 + - uid: 1226 + components: + - type: Transform + pos: 120.5,-9.5 + parent: 1 + - uid: 1245 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 104.5,-16.5 + parent: 1 + - uid: 1246 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 105.5,-16.5 + parent: 1 + - uid: 1247 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 106.5,-16.5 + parent: 1 + - uid: 1248 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 107.5,-16.5 + parent: 1 + - uid: 1249 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 108.5,-16.5 + parent: 1 + - uid: 1250 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 108.5,-17.5 + parent: 1 + - uid: 1251 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 108.5,-18.5 + parent: 1 + - uid: 1252 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 108.5,-19.5 + parent: 1 + - uid: 1253 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 108.5,-20.5 + parent: 1 + - uid: 1254 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 109.5,-16.5 + parent: 1 + - uid: 1255 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 109.5,-17.5 + parent: 1 + - uid: 1256 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 109.5,-18.5 + parent: 1 + - uid: 1257 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 109.5,-19.5 + parent: 1 + - uid: 1258 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 109.5,-20.5 + parent: 1 + - uid: 1260 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 110.5,-16.5 + parent: 1 + - uid: 1261 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 110.5,-17.5 + parent: 1 + - uid: 1262 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 110.5,-18.5 + parent: 1 + - uid: 1263 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 110.5,-19.5 + parent: 1 + - uid: 1264 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 110.5,-20.5 + parent: 1 + - uid: 1265 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 110.5,-21.5 + parent: 1 + - uid: 1266 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 110.5,-22.5 + parent: 1 + - uid: 1267 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 110.5,-23.5 + parent: 1 + - uid: 1291 + components: + - type: Transform + pos: 117.5,-9.5 + parent: 1 + - uid: 1292 + components: + - type: Transform + pos: 116.5,-9.5 + parent: 1 + - uid: 1293 + components: + - type: Transform + pos: 115.5,-9.5 + parent: 1 + - uid: 1309 + components: + - type: Transform + pos: 120.5,1.5 + parent: 1 + - uid: 1310 + components: + - type: Transform + pos: 116.5,1.5 + parent: 1 + - uid: 1311 + components: + - type: Transform + pos: 115.5,1.5 + parent: 1 + - uid: 1328 + components: + - type: Transform + pos: 118.5,1.5 + parent: 1 + - uid: 1329 + components: + - type: Transform + pos: 119.5,1.5 + parent: 1 + - uid: 1330 + components: + - type: Transform + pos: 117.5,1.5 + parent: 1 + - uid: 1336 + components: + - type: Transform + pos: 111.5,-12.5 + parent: 1 + - uid: 1337 + components: + - type: Transform + pos: 112.5,-12.5 + parent: 1 + - uid: 1338 + components: + - type: Transform + pos: 113.5,-12.5 + parent: 1 + - uid: 1339 + components: + - type: Transform + pos: 114.5,-12.5 + parent: 1 + - uid: 1340 + components: + - type: Transform + pos: 115.5,-12.5 + parent: 1 + - uid: 1341 + components: + - type: Transform + pos: 116.5,-12.5 + parent: 1 + - uid: 1342 + components: + - type: Transform + pos: 117.5,-12.5 + parent: 1 + - uid: 1343 + components: + - type: Transform + pos: 118.5,-12.5 + parent: 1 + - uid: 1344 + components: + - type: Transform + pos: 119.5,-12.5 + parent: 1 + - uid: 1345 + components: + - type: Transform + pos: 120.5,-12.5 + parent: 1 + - uid: 1347 + components: + - type: Transform + pos: 122.5,-12.5 + parent: 1 + - uid: 1348 + components: + - type: Transform + pos: 123.5,-12.5 + parent: 1 + - uid: 1349 + components: + - type: Transform + pos: 124.5,-12.5 + parent: 1 + - uid: 1351 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 111.5,-24.5 + parent: 1 + - uid: 1352 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 112.5,-24.5 + parent: 1 + - uid: 1353 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 113.5,-24.5 + parent: 1 + - uid: 1354 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 114.5,-24.5 + parent: 1 + - uid: 1355 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 115.5,-24.5 + parent: 1 + - uid: 1356 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 116.5,-24.5 + parent: 1 + - uid: 1357 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 117.5,-24.5 + parent: 1 + - uid: 1358 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 118.5,-24.5 + parent: 1 + - uid: 1359 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 119.5,-24.5 + parent: 1 + - uid: 1360 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 120.5,-24.5 + parent: 1 + - uid: 1361 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 121.5,-24.5 + parent: 1 + - uid: 1362 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 122.5,-24.5 + parent: 1 + - uid: 1363 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 123.5,-24.5 + parent: 1 + - uid: 1364 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 124.5,-24.5 + parent: 1 + - uid: 1420 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 121.5,-12.5 + parent: 1 + - uid: 2124 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 79.5,-15.5 + parent: 1 +- proto: WallShuttleDiagonal + entities: + - uid: 259 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 47.5,7.5 + parent: 1 + - uid: 494 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 54.5,4.5 + parent: 1 + - uid: 620 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 47.5,-30.5 + parent: 1 + - uid: 950 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 82.5,1.5 + parent: 1 + - uid: 1120 + components: + - type: Transform + pos: 110.5,1.5 + parent: 1 + - uid: 1181 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 82.5,-24.5 + parent: 1 + - uid: 1268 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 110.5,-24.5 + parent: 1 + - uid: 1314 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 125.5,1.5 + parent: 1 + - uid: 1315 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 125.5,-9.5 + parent: 1 + - uid: 1350 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 125.5,-12.5 + parent: 1 + - uid: 1365 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 125.5,-24.5 + parent: 1 +- proto: WardrobeEngineeringFilled + entities: + - uid: 132 + components: + - type: Transform + pos: 12.5,-1.5 + parent: 1 + - uid: 133 + components: + - type: Transform + pos: 13.5,-1.5 + parent: 1 + - uid: 134 + components: + - type: Transform + pos: 14.5,-1.5 + parent: 1 +- proto: WaterTankFull + entities: + - uid: 391 + components: + - type: Transform + pos: 29.5,-3.5 + parent: 1 + - uid: 392 + components: + - type: Transform + pos: 29.5,-4.5 + parent: 1 + - uid: 393 + components: + - type: Transform + pos: 28.5,-3.5 + parent: 1 + - uid: 394 + components: + - type: Transform + pos: 28.5,-4.5 + parent: 1 +- proto: WeaponSubMachineGunWt550 + entities: + - uid: 1699 + components: + - type: Transform + pos: 112.5164,-0.47590828 + parent: 1 +- proto: WeaponTurretHostile + entities: + - uid: 992 + components: + - type: Transform + pos: 98.5,-2.5 + parent: 1 + - uid: 1004 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 86.5,-19.5 + parent: 1 + - uid: 1017 + components: + - type: Transform + pos: 94.5,-2.5 + parent: 1 + - uid: 1027 + components: + - type: Transform + pos: 90.5,-2.5 + parent: 1 + - uid: 1029 + components: + - type: Transform + pos: 86.5,-2.5 + parent: 1 + - uid: 1244 + components: + - type: Transform + pos: 102.5,-2.5 + parent: 1 + - uid: 1331 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 106.5,-19.5 + parent: 1 + - uid: 1332 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 102.5,-19.5 + parent: 1 + - uid: 1333 + components: + - type: Transform + pos: 106.5,-2.5 + parent: 1 + - uid: 1472 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 27.5,-11.5 + parent: 1 +- proto: WeldingFuelTankFull + entities: + - uid: 387 + components: + - type: Transform + pos: 31.5,-3.5 + parent: 1 + - uid: 388 + components: + - type: Transform + pos: 31.5,-4.5 + parent: 1 + - uid: 389 + components: + - type: Transform + pos: 30.5,-3.5 + parent: 1 + - uid: 390 + components: + - type: Transform + pos: 30.5,-4.5 + parent: 1 +- proto: WindowReinforcedDirectional + entities: + - uid: 66 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 17.5,-4.5 + parent: 1 + - uid: 100 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 0.5,6.5 + parent: 1 + - uid: 101 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 0.5,5.5 + parent: 1 + - uid: 102 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 0.5,4.5 + parent: 1 + - uid: 103 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 0.5,3.5 + parent: 1 + - uid: 104 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 0.5,1.5 + parent: 1 + - uid: 105 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 0.5,2.5 + parent: 1 + - uid: 106 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 0.5,0.5 + parent: 1 + - uid: 107 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 0.5,-0.5 + parent: 1 + - uid: 108 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 0.5,-1.5 + parent: 1 + - uid: 464 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 15.5,-3.5 + parent: 1 + - uid: 465 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 17.5,-15.5 + parent: 1 + - uid: 467 + components: + - type: Transform + pos: 17.5,-6.5 + parent: 1 + - uid: 783 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 63.5,-6.5 + parent: 1 + - uid: 784 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 63.5,-7.5 + parent: 1 + - uid: 785 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 63.5,-8.5 + parent: 1 + - uid: 786 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 63.5,-9.5 + parent: 1 + - uid: 787 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 63.5,-10.5 + parent: 1 + - uid: 788 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 63.5,-11.5 + parent: 1 + - uid: 789 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 63.5,-12.5 + parent: 1 + - uid: 790 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 63.5,-13.5 + parent: 1 + - uid: 791 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 63.5,-14.5 + parent: 1 + - uid: 792 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 63.5,-15.5 + parent: 1 + - uid: 793 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 63.5,-16.5 + parent: 1 + - uid: 794 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 63.5,-16.5 + parent: 1 + - uid: 795 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 63.5,-15.5 + parent: 1 + - uid: 796 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 63.5,-14.5 + parent: 1 + - uid: 797 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 63.5,-13.5 + parent: 1 + - uid: 798 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 63.5,-12.5 + parent: 1 + - uid: 799 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 63.5,-11.5 + parent: 1 + - uid: 800 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 63.5,-10.5 + parent: 1 + - uid: 801 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 63.5,-9.5 + parent: 1 + - uid: 802 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 63.5,-8.5 + parent: 1 + - uid: 803 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 63.5,-7.5 + parent: 1 + - uid: 804 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 63.5,-6.5 + parent: 1 + - uid: 993 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 88.5,-1.5 + parent: 1 + - uid: 996 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 91.5,-1.5 + parent: 1 + - uid: 997 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 92.5,-1.5 + parent: 1 + - uid: 1014 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 94.5,-1.5 + parent: 1 + - uid: 1015 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 93.5,-1.5 + parent: 1 + - uid: 1016 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 86.5,-1.5 + parent: 1 + - uid: 1018 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 96.5,-1.5 + parent: 1 + - uid: 1019 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 95.5,-1.5 + parent: 1 + - uid: 1020 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 97.5,-1.5 + parent: 1 + - uid: 1021 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 98.5,-1.5 + parent: 1 + - uid: 1024 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 90.5,-1.5 + parent: 1 + - uid: 1025 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 85.5,-1.5 + parent: 1 + - uid: 1026 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 89.5,-1.5 + parent: 1 + - uid: 1028 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 87.5,-1.5 + parent: 1 + - uid: 1049 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 99.5,-1.5 + parent: 1 + - uid: 1050 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 100.5,-1.5 + parent: 1 + - uid: 1051 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 101.5,-1.5 + parent: 1 + - uid: 1052 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 102.5,-1.5 + parent: 1 + - uid: 1053 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 103.5,-1.5 + parent: 1 + - uid: 1054 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 104.5,-1.5 + parent: 1 + - uid: 1055 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 105.5,-1.5 + parent: 1 + - uid: 1056 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 106.5,-1.5 + parent: 1 + - uid: 1057 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 107.5,-1.5 + parent: 1 + - uid: 1058 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 107.5,-1.5 + parent: 1 + - uid: 1059 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 107.5,-2.5 + parent: 1 + - uid: 1060 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 107.5,-3.5 + parent: 1 + - uid: 1061 + components: + - type: Transform + pos: 107.5,-3.5 + parent: 1 + - uid: 1062 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 107.5,-3.5 + parent: 1 + - uid: 1063 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 107.5,-2.5 + parent: 1 + - uid: 1064 + components: + - type: Transform + pos: 106.5,-1.5 + parent: 1 + - uid: 1065 + components: + - type: Transform + pos: 105.5,-1.5 + parent: 1 + - uid: 1066 + components: + - type: Transform + pos: 104.5,-1.5 + parent: 1 + - uid: 1067 + components: + - type: Transform + pos: 103.5,-1.5 + parent: 1 + - uid: 1068 + components: + - type: Transform + pos: 102.5,-1.5 + parent: 1 + - uid: 1069 + components: + - type: Transform + pos: 101.5,-1.5 + parent: 1 + - uid: 1070 + components: + - type: Transform + pos: 100.5,-1.5 + parent: 1 + - uid: 1071 + components: + - type: Transform + pos: 99.5,-1.5 + parent: 1 + - uid: 1072 + components: + - type: Transform + pos: 98.5,-1.5 + parent: 1 + - uid: 1073 + components: + - type: Transform + pos: 97.5,-1.5 + parent: 1 + - uid: 1074 + components: + - type: Transform + pos: 96.5,-1.5 + parent: 1 + - uid: 1075 + components: + - type: Transform + pos: 95.5,-1.5 + parent: 1 + - uid: 1076 + components: + - type: Transform + pos: 94.5,-1.5 + parent: 1 + - uid: 1077 + components: + - type: Transform + pos: 93.5,-1.5 + parent: 1 + - uid: 1078 + components: + - type: Transform + pos: 92.5,-1.5 + parent: 1 + - uid: 1079 + components: + - type: Transform + pos: 91.5,-1.5 + parent: 1 + - uid: 1080 + components: + - type: Transform + pos: 90.5,-1.5 + parent: 1 + - uid: 1081 + components: + - type: Transform + pos: 89.5,-1.5 + parent: 1 + - uid: 1082 + components: + - type: Transform + pos: 88.5,-1.5 + parent: 1 + - uid: 1083 + components: + - type: Transform + pos: 87.5,-1.5 + parent: 1 + - uid: 1084 + components: + - type: Transform + pos: 86.5,-1.5 + parent: 1 + - uid: 1085 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 85.5,-2.5 + parent: 1 + - uid: 1086 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 85.5,-3.5 + parent: 1 + - uid: 1087 + components: + - type: Transform + pos: 85.5,-3.5 + parent: 1 + - uid: 1221 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 123.5,-5.5 + parent: 1 + - uid: 1222 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 123.5,-4.5 + parent: 1 + - uid: 1278 + components: + - type: Transform + pos: 85.5,-20.5 + parent: 1 + - uid: 1279 + components: + - type: Transform + pos: 86.5,-20.5 + parent: 1 + - uid: 1280 + components: + - type: Transform + pos: 87.5,-20.5 + parent: 1 + - uid: 1281 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 123.5,-7.5 + parent: 1 + - uid: 1294 + components: + - type: Transform + pos: 101.5,-20.5 + parent: 1 + - uid: 1295 + components: + - type: Transform + pos: 102.5,-20.5 + parent: 1 + - uid: 1296 + components: + - type: Transform + pos: 103.5,-20.5 + parent: 1 + - uid: 1297 + components: + - type: Transform + pos: 104.5,-20.5 + parent: 1 + - uid: 1298 + components: + - type: Transform + pos: 105.5,-20.5 + parent: 1 + - uid: 1299 + components: + - type: Transform + pos: 106.5,-20.5 + parent: 1 + - uid: 1300 + components: + - type: Transform + pos: 107.5,-20.5 + parent: 1 + - uid: 1301 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 107.5,-18.5 + parent: 1 + - uid: 1302 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 107.5,-19.5 + parent: 1 + - uid: 1303 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 85.5,-18.5 + parent: 1 + - uid: 1304 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 85.5,-19.5 + parent: 1 + - uid: 1305 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 86.5,-20.5 + parent: 1 + - uid: 1306 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 87.5,-20.5 + parent: 1 + - uid: 1307 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 123.5,-8.5 + parent: 1 + - uid: 1320 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 101.5,-20.5 + parent: 1 + - uid: 1321 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 102.5,-20.5 + parent: 1 + - uid: 1322 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 103.5,-20.5 + parent: 1 + - uid: 1323 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 104.5,-20.5 + parent: 1 + - uid: 1324 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 105.5,-20.5 + parent: 1 + - uid: 1325 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 106.5,-20.5 + parent: 1 + - uid: 1326 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 107.5,-18.5 + parent: 1 + - uid: 1327 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 85.5,-18.5 + parent: 1 + - uid: 1378 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 123.5,-13.5 + parent: 1 + - uid: 1379 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 123.5,-14.5 + parent: 1 + - uid: 1380 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 123.5,-16.5 + parent: 1 + - uid: 1381 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 123.5,-17.5 + parent: 1 + - uid: 1382 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 123.5,-18.5 + parent: 1 + - uid: 1383 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 123.5,-19.5 + parent: 1 + - uid: 1384 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 123.5,-20.5 + parent: 1 + - uid: 1385 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 123.5,-22.5 + parent: 1 + - uid: 1386 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 123.5,-23.5 + parent: 1 + - uid: 1387 + components: + - type: Transform + pos: 123.5,-14.5 + parent: 1 + - uid: 1388 + components: + - type: Transform + pos: 123.5,-20.5 + parent: 1 + - uid: 1389 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 123.5,-22.5 + parent: 1 + - uid: 1390 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 123.5,-16.5 + parent: 1 + - uid: 1391 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 123.5,-13.5 + parent: 1 + - uid: 1392 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 123.5,-14.5 + parent: 1 + - uid: 1393 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 123.5,-16.5 + parent: 1 + - uid: 1394 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 123.5,-17.5 + parent: 1 + - uid: 1395 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 123.5,-18.5 + parent: 1 + - uid: 1396 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 123.5,-19.5 + parent: 1 + - uid: 1397 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 123.5,-20.5 + parent: 1 + - uid: 1398 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 123.5,-22.5 + parent: 1 + - uid: 1399 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 123.5,-23.5 + parent: 1 + - uid: 1403 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 123.5,-2.5 + parent: 1 + - uid: 1404 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 123.5,-2.5 + parent: 1 + - uid: 1406 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 123.5,-4.5 + parent: 1 + - uid: 1407 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 123.5,-5.5 + parent: 1 + - uid: 1408 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 123.5,0.5 + parent: 1 + - uid: 1409 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 123.5,-0.5 + parent: 1 + - uid: 1410 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 123.5,0.5 + parent: 1 + - uid: 1411 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 123.5,-0.5 + parent: 1 + - uid: 1412 + components: + - type: Transform + pos: 123.5,-0.5 + parent: 1 + - uid: 1413 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 123.5,-2.5 + parent: 1 + - uid: 1414 + components: + - type: Transform + pos: 123.5,-5.5 + parent: 1 + - uid: 1415 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 123.5,-7.5 + parent: 1 + - uid: 1416 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 123.5,-7.5 + parent: 1 + - uid: 1417 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 123.5,-8.5 + parent: 1 +... diff --git a/Resources/Maps/Ruins/relaystation.yml b/Resources/Maps/Ruins/relaystation.yml deleted file mode 100644 index 9588a0771d..0000000000 --- a/Resources/Maps/Ruins/relaystation.yml +++ /dev/null @@ -1,760 +0,0 @@ -meta: - format: 6 - postmapinit: false -tilemap: - 0: Space - 29: FloorDark - 54: FloorGreenCircuit - 120: Lattice - 121: Plating -entities: -- proto: "" - entities: - - uid: 2 - components: - - type: MetaData - - type: Transform - parent: invalid - - type: MapGrid - chunks: - -1,-1: - ind: -1,-1 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAHQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAHQAAAAAANgAAAAAAHQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAHQAAAAAANgAAAAAAHQAAAAAA - version: 6 - -1,0: - ind: -1,0 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAHQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - version: 6 - 0,0: - ind: 0,0 - tiles: HQAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - version: 6 - 0,-1: - ind: 0,-1 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANgAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANgAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - version: 6 - - type: Broadphase - - type: Physics - bodyStatus: InAir - angularDamping: 0.05 - linearDamping: 0.05 - fixedRotation: False - bodyType: Dynamic - - type: Fixtures - fixtures: {} - - type: BecomesStation - id: Empty - - type: OccluderTree - - type: Shuttle - - type: GridPathfinding - - type: Gravity - gravityShakeSound: !type:SoundPathSpecifier - path: /Audio/Effects/alert.ogg - - type: DecalGrid - chunkCollection: - version: 2 - nodes: - - node: - color: '#FFFFFFFF' - id: WarnLineN - decals: - 0: 0,0 - 1: -2,0 - - node: - color: '#FFFFFFFF' - id: WarnLineW - decals: - 2: -2,-3 - 3: 0,-3 - - type: SpreaderGrid - - type: GridAtmosphere - version: 2 - data: - tiles: - -1,-1: - 0: 65535 - -1,0: - 0: 65535 - 0,0: - 0: 65535 - 0,-1: - 0: 65527 - -2,-1: - 0: 34944 - -1,-2: - 0: 65514 - -1,-3: - 0: 32768 - -2,0: - 0: 34952 - -2,1: - 0: 8 - -1,1: - 0: 18090 - -1,2: - 0: 34956 - 0,1: - 0: 4906 - 0,2: - 0: 1 - 0,-2: - 0: 30514 - uniqueMixes: - - volume: 2500 - temperature: 293.15 - moles: - - 21.824879 - - 82.10312 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - chunkSize: 4 - - type: GasTileOverlay - - type: RadiationGridResistance -- proto: AirlockExternalGlassLocked - entities: - - uid: 35 - components: - - type: Transform - pos: -0.5,-6.5 - parent: 2 - - type: DeviceLinkSink - links: - - 34 - - type: DeviceLinkSource - linkedPorts: - 34: - - DoorStatus: DoorBolt -- proto: AirlockExternalLocked - entities: - - uid: 34 - components: - - type: Transform - pos: -0.5,-4.5 - parent: 2 - - type: DeviceLinkSink - links: - - 35 - - type: DeviceLinkSource - linkedPorts: - 35: - - DoorStatus: DoorBolt -- proto: APCBasic - entities: - - uid: 64 - components: - - type: Transform - pos: 2.5,1.5 - parent: 2 -- proto: BaseComputer - entities: - - uid: 89 - components: - - type: Transform - pos: -0.5,2.5 - parent: 2 -- proto: CableApcExtension - entities: - - uid: 65 - components: - - type: Transform - pos: 2.5,1.5 - parent: 2 - - uid: 66 - components: - - type: Transform - pos: 2.5,0.5 - parent: 2 - - uid: 67 - components: - - type: Transform - pos: 1.5,0.5 - parent: 2 - - uid: 68 - components: - - type: Transform - pos: 0.5,0.5 - parent: 2 - - uid: 69 - components: - - type: Transform - pos: -0.5,0.5 - parent: 2 - - uid: 70 - components: - - type: Transform - pos: -0.5,-0.5 - parent: 2 - - uid: 71 - components: - - type: Transform - pos: -0.5,-1.5 - parent: 2 - - uid: 72 - components: - - type: Transform - pos: -0.5,-2.5 - parent: 2 - - uid: 73 - components: - - type: Transform - pos: -0.5,-3.5 - parent: 2 - - uid: 74 - components: - - type: Transform - pos: -0.5,-4.5 - parent: 2 - - uid: 75 - components: - - type: Transform - pos: -0.5,-5.5 - parent: 2 - - uid: 76 - components: - - type: Transform - pos: -1.5,0.5 - parent: 2 -- proto: CableHV - entities: - - uid: 46 - components: - - type: Transform - pos: -3.5,-1.5 - parent: 2 - - uid: 47 - components: - - type: Transform - pos: -3.5,-0.5 - parent: 2 - - uid: 48 - components: - - type: Transform - pos: -3.5,0.5 - parent: 2 - - uid: 51 - components: - - type: Transform - pos: -2.5,0.5 - parent: 2 - - uid: 52 - components: - - type: Transform - pos: -1.5,0.5 - parent: 2 - - uid: 53 - components: - - type: Transform - pos: -0.5,0.5 - parent: 2 - - uid: 54 - components: - - type: Transform - pos: 0.5,0.5 - parent: 2 - - uid: 55 - components: - - type: Transform - pos: 1.5,0.5 - parent: 2 - - uid: 56 - components: - - type: Transform - pos: 2.5,0.5 - parent: 2 - - uid: 58 - components: - - type: Transform - pos: 2.5,-0.5 - parent: 2 - - uid: 59 - components: - - type: Transform - pos: 2.5,-1.5 - parent: 2 -- proto: CableMV - entities: - - uid: 60 - components: - - type: Transform - pos: 2.5,-1.5 - parent: 2 - - uid: 61 - components: - - type: Transform - pos: 2.5,-0.5 - parent: 2 - - uid: 62 - components: - - type: Transform - pos: 2.5,0.5 - parent: 2 - - uid: 63 - components: - - type: Transform - pos: 2.5,1.5 - parent: 2 -- proto: CableTerminal - entities: - - uid: 49 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -3.5,-0.5 - parent: 2 -- proto: Catwalk - entities: - - uid: 77 - components: - - type: Transform - pos: 2.5,-0.5 - parent: 2 - - uid: 78 - components: - - type: Transform - pos: 2.5,0.5 - parent: 2 -- proto: ChairOfficeDark - entities: - - uid: 95 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -0.5,1.5 - parent: 2 -- proto: EncryptionKeyCargo - entities: - - uid: 82 - components: - - type: Transform - parent: 81 - - type: Physics - canCollide: False -- proto: EncryptionKeyCommand - entities: - - uid: 86 - components: - - type: Transform - parent: 85 - - type: Physics - canCollide: False -- proto: EncryptionKeyEngineering - entities: - - uid: 80 - components: - - type: Transform - parent: 79 - - type: Physics - canCollide: False -- proto: EncryptionKeySecurity - entities: - - uid: 84 - components: - - type: Transform - parent: 83 - - type: Physics - canCollide: False -- proto: FaxMachineBase - entities: - - uid: 99 - components: - - type: Transform - pos: -1.5,2.5 - parent: 2 - - type: FaxMachine - name: Relay Station -- proto: GeneratorBasic - entities: - - uid: 45 - components: - - type: Transform - pos: -3.5,-1.5 - parent: 2 -- proto: Grille - entities: - - uid: 39 - components: - - type: Transform - pos: 0.5,-6.5 - parent: 2 - - uid: 40 - components: - - type: Transform - pos: 0.5,-5.5 - parent: 2 - - uid: 41 - components: - - type: Transform - pos: -1.5,-6.5 - parent: 2 - - uid: 42 - components: - - type: Transform - pos: -1.5,-5.5 - parent: 2 -- proto: PosterLegitNanotrasenLogo - entities: - - uid: 96 - components: - - type: Transform - pos: -2.5,2.5 - parent: 2 -- proto: PottedPlantBioluminscent - entities: - - uid: 87 - components: - - type: Transform - pos: -2.5,0.5 - parent: 2 -- proto: PowerDrill - entities: - - uid: 100 - components: - - type: Transform - pos: 0.53125,2.5 - parent: 2 -- proto: Poweredlight - entities: - - uid: 92 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 2.5,-0.5 - parent: 2 - - uid: 97 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -3.5,-0.5 - parent: 2 -- proto: ReinforcedWindow - entities: - - uid: 29 - components: - - type: Transform - pos: -1.5,-5.5 - parent: 2 - - uid: 30 - components: - - type: Transform - pos: -1.5,-6.5 - parent: 2 - - uid: 36 - components: - - type: Transform - pos: 0.5,-6.5 - parent: 2 - - uid: 37 - components: - - type: Transform - pos: 0.5,-5.5 - parent: 2 -- proto: SalvageLootSpawner - entities: - - uid: 98 - components: - - type: Transform - pos: 1.5,1.5 - parent: 2 -- proto: SignSpace - entities: - - uid: 43 - components: - - type: Transform - pos: -1.5,-4.5 - parent: 2 -- proto: SignTelecomms - entities: - - uid: 44 - components: - - type: Transform - pos: 0.5,-4.5 - parent: 2 -- proto: SMESBasic - entities: - - uid: 50 - components: - - type: Transform - pos: -3.5,0.5 - parent: 2 -- proto: SubstationBasic - entities: - - uid: 57 - components: - - type: Transform - pos: 2.5,-1.5 - parent: 2 -- proto: TableReinforced - entities: - - uid: 88 - components: - - type: Transform - pos: -1.5,2.5 - parent: 2 - - uid: 90 - components: - - type: Transform - pos: 0.5,2.5 - parent: 2 - - uid: 91 - components: - - type: Transform - pos: 0.5,2.5 - parent: 2 - - uid: 93 - components: - - type: Transform - pos: -2.5,1.5 - parent: 2 - - uid: 94 - components: - - type: Transform - pos: 1.5,1.5 - parent: 2 -- proto: TelecomServer - entities: - - uid: 79 - components: - - type: Transform - pos: -1.5,-1.5 - parent: 2 - - type: ContainerContainer - containers: - key_slots: !type:Container - showEnts: False - occludes: True - ents: - - 80 - machine_board: !type:Container - showEnts: False - occludes: True - ents: [] - machine_parts: !type:Container - showEnts: False - occludes: True - ents: [] - - uid: 81 - components: - - type: Transform - pos: -1.5,-0.5 - parent: 2 - - type: ContainerContainer - containers: - key_slots: !type:Container - showEnts: False - occludes: True - ents: - - 82 - machine_board: !type:Container - showEnts: False - occludes: True - ents: [] - machine_parts: !type:Container - showEnts: False - occludes: True - ents: [] - - uid: 83 - components: - - type: Transform - pos: 0.5,-1.5 - parent: 2 - - type: ContainerContainer - containers: - key_slots: !type:Container - showEnts: False - occludes: True - ents: - - 84 - machine_board: !type:Container - showEnts: False - occludes: True - ents: [] - machine_parts: !type:Container - showEnts: False - occludes: True - ents: [] - - uid: 85 - components: - - type: Transform - pos: 0.5,-0.5 - parent: 2 - - type: ContainerContainer - containers: - key_slots: !type:Container - showEnts: False - occludes: True - ents: - - 86 - machine_board: !type:Container - showEnts: False - occludes: True - ents: [] - machine_parts: !type:Container - showEnts: False - occludes: True - ents: [] -- proto: WallRiveted - entities: - - uid: 1 - components: - - type: Transform - pos: 2.5,-3.5 - parent: 2 - - uid: 3 - components: - - type: Transform - pos: 2.5,-2.5 - parent: 2 - - uid: 4 - components: - - type: Transform - pos: 3.5,-2.5 - parent: 2 - - uid: 5 - components: - - type: Transform - pos: 3.5,-1.5 - parent: 2 - - uid: 6 - components: - - type: Transform - pos: 3.5,-0.5 - parent: 2 - - uid: 7 - components: - - type: Transform - pos: 3.5,0.5 - parent: 2 - - uid: 8 - components: - - type: Transform - pos: 3.5,1.5 - parent: 2 - - uid: 9 - components: - - type: Transform - pos: 2.5,1.5 - parent: 2 - - uid: 10 - components: - - type: Transform - pos: 2.5,2.5 - parent: 2 - - uid: 11 - components: - - type: Transform - pos: 1.5,2.5 - parent: 2 - - uid: 12 - components: - - type: Transform - pos: 1.5,3.5 - parent: 2 - - uid: 13 - components: - - type: Transform - pos: 0.5,3.5 - parent: 2 - - uid: 14 - components: - - type: Transform - pos: -0.5,3.5 - parent: 2 - - uid: 15 - components: - - type: Transform - pos: -1.5,3.5 - parent: 2 - - uid: 16 - components: - - type: Transform - pos: -2.5,3.5 - parent: 2 - - uid: 17 - components: - - type: Transform - pos: -2.5,2.5 - parent: 2 - - uid: 18 - components: - - type: Transform - pos: -3.5,2.5 - parent: 2 - - uid: 19 - components: - - type: Transform - pos: -3.5,1.5 - parent: 2 - - uid: 20 - components: - - type: Transform - pos: -4.5,1.5 - parent: 2 - - uid: 21 - components: - - type: Transform - pos: -4.5,0.5 - parent: 2 - - uid: 22 - components: - - type: Transform - pos: -4.5,-0.5 - parent: 2 - - uid: 23 - components: - - type: Transform - pos: -4.5,-1.5 - parent: 2 - - uid: 24 - components: - - type: Transform - pos: -4.5,-2.5 - parent: 2 - - uid: 25 - components: - - type: Transform - pos: -3.5,-2.5 - parent: 2 - - uid: 26 - components: - - type: Transform - pos: -3.5,-3.5 - parent: 2 - - uid: 27 - components: - - type: Transform - pos: -2.5,-3.5 - parent: 2 - - uid: 28 - components: - - type: Transform - pos: -2.5,-4.5 - parent: 2 - - uid: 31 - components: - - type: Transform - pos: -1.5,-4.5 - parent: 2 - - uid: 32 - components: - - type: Transform - pos: 1.5,-4.5 - parent: 2 - - uid: 33 - components: - - type: Transform - pos: 1.5,-3.5 - parent: 2 - - uid: 38 - components: - - type: Transform - pos: 0.5,-4.5 - parent: 2 -... diff --git a/Resources/Prototypes/Entities/Stations/base.yml b/Resources/Prototypes/Entities/Stations/base.yml index 130d8f02d5..6a1abdfbe3 100644 --- a/Resources/Prototypes/Entities/Stations/base.yml +++ b/Resources/Prototypes/Entities/Stations/base.yml @@ -69,11 +69,12 @@ maxCount: 2 stationGrid: false paths: + - /Maps/Ruins/chunked_tcomms.yml - /Maps/Ruins/biodome_satellite.yml - /Maps/Ruins/derelict.yml - /Maps/Ruins/djstation.yml + - /Maps/Ruins/empty_flagship.yml - /Maps/Ruins/old_ai_sat.yml - - /Maps/Ruins/relaystation.yml - /Maps/Ruins/syndicate_dropship.yml - /Maps/Ruins/whiteship_ancient.yml - /Maps/Ruins/whiteship_bluespacejumper.yml From 62b9e423c9e1812a3ad801a3719893af005a0f58 Mon Sep 17 00:00:00 2001 From: PJBot Date: Sat, 15 Jun 2024 06:04:02 +0000 Subject: [PATCH 064/142] 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 ef08bf29eb..a7db0a71b1 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: EmoGarbage404 - changes: - - message: The revenant essence alert now displays the exact amount of essence. - type: Add - id: 6244 - time: '2024-03-28T06:32:56.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/25452 - author: deltanedas changes: - message: Voicemasks can now mimic speech verbs, like flutters or growls. @@ -3857,3 +3850,10 @@ id: 6743 time: '2024-06-15T05:20:43.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/29010 +- author: Flareguy + changes: + - message: Replaced RelayStation with a more fair ruin. + type: Remove + id: 6744 + time: '2024-06-15T06:02:56.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/28971 From bb61191b24509cc0a5e65c87226c69634f8137dd Mon Sep 17 00:00:00 2001 From: LankLTE <135308300+LankLTE@users.noreply.github.com> Date: Fri, 14 Jun 2024 23:35:34 -0700 Subject: [PATCH 065/142] Set ahelp new player icon to use minutes, not seconds (#29014) Replace seconds with minutes --- Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml.cs b/Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml.cs index af977f763c..0f5f72cc27 100644 --- a/Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml.cs +++ b/Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml.cs @@ -75,7 +75,7 @@ namespace Content.Client.Administration.UI.Bwoink if (info.Antag && info.ActiveThisRound) sb.Append(new Rune(0x1F5E1)); // 🗡 - if (info.OverallPlaytime <= TimeSpan.FromSeconds(_cfg.GetCVar(CCVars.NewPlayerThreshold))) + if (info.OverallPlaytime <= TimeSpan.FromMinutes(_cfg.GetCVar(CCVars.NewPlayerThreshold))) sb.Append(new Rune(0x23F2)); // ⏲ sb.AppendFormat("\"{0}\"", text); @@ -226,7 +226,7 @@ namespace Content.Client.Administration.UI.Bwoink if (pl.Antag) sb.Append(new Rune(0x1F5E1)); // 🗡 - if (pl.OverallPlaytime <= TimeSpan.FromSeconds(_cfg.GetCVar(CCVars.NewPlayerThreshold))) + if (pl.OverallPlaytime <= TimeSpan.FromMinutes(_cfg.GetCVar(CCVars.NewPlayerThreshold))) sb.Append(new Rune(0x23F2)); // ⏲ sb.AppendFormat("\"{0}\"", pl.CharacterName); From a3d9f7291d55ca9bff37162ad35c8f7ec516bf67 Mon Sep 17 00:00:00 2001 From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com> Date: Sat, 15 Jun 2024 18:42:25 +1200 Subject: [PATCH 066/142] Fix IComponentFactory mock in benchmark (#29015) --- Content.Benchmarks/EntityManagerGetAllComponents.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/Content.Benchmarks/EntityManagerGetAllComponents.cs b/Content.Benchmarks/EntityManagerGetAllComponents.cs index 0b9683a4ab..8e02b8d71d 100644 --- a/Content.Benchmarks/EntityManagerGetAllComponents.cs +++ b/Content.Benchmarks/EntityManagerGetAllComponents.cs @@ -47,6 +47,7 @@ namespace Content.Benchmarks var componentFactory = new Mock(); componentFactory.Setup(p => p.GetComponent()).Returns(new DummyComponent()); + componentFactory.Setup(m => m.GetIndex(typeof(DummyComponent))).Returns(CompIdx.Index()); componentFactory.Setup(p => p.GetRegistration(It.IsAny())).Returns(dummyReg); componentFactory.Setup(p => p.GetAllRegistrations()).Returns(new[] { dummyReg }); componentFactory.Setup(p => p.GetAllRefTypes()).Returns(new[] { CompIdx.Index() }); From f0fbedd6408e4a8f7b4e2614961cc94c3f946d84 Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Sat, 15 Jun 2024 16:52:49 +1000 Subject: [PATCH 067/142] Fix RoleLoadout equality (#28737) * Fix RoleLoadout equality Knew it was janky but thought SequenceEqual was better than it is so we just do it manually. * Also implement this --- .../Preferences/Loadouts/Loadout.cs | 19 +++++++++++++++++- .../Preferences/Loadouts/RoleLoadout.cs | 20 ++++++++++++++++++- 2 files changed, 37 insertions(+), 2 deletions(-) diff --git a/Content.Shared/Preferences/Loadouts/Loadout.cs b/Content.Shared/Preferences/Loadouts/Loadout.cs index dbe440f58b..c1d20cd3de 100644 --- a/Content.Shared/Preferences/Loadouts/Loadout.cs +++ b/Content.Shared/Preferences/Loadouts/Loadout.cs @@ -7,8 +7,25 @@ namespace Content.Shared.Preferences.Loadouts; /// Specifies the selected prototype and custom data for a loadout. /// [Serializable, NetSerializable, DataDefinition] -public sealed partial class Loadout +public sealed partial class Loadout : IEquatable { [DataField] public ProtoId Prototype; + + public bool Equals(Loadout? other) + { + if (ReferenceEquals(null, other)) return false; + if (ReferenceEquals(this, other)) return true; + return Prototype.Equals(other.Prototype); + } + + public override bool Equals(object? obj) + { + return ReferenceEquals(this, obj) || obj is Loadout other && Equals(other); + } + + public override int GetHashCode() + { + return Prototype.GetHashCode(); + } } diff --git a/Content.Shared/Preferences/Loadouts/RoleLoadout.cs b/Content.Shared/Preferences/Loadouts/RoleLoadout.cs index 5f8e24621a..d2fc8df559 100644 --- a/Content.Shared/Preferences/Loadouts/RoleLoadout.cs +++ b/Content.Shared/Preferences/Loadouts/RoleLoadout.cs @@ -295,7 +295,25 @@ public sealed partial class RoleLoadout : IEquatable { if (ReferenceEquals(null, other)) return false; if (ReferenceEquals(this, other)) return true; - return Role.Equals(other.Role) && SelectedLoadouts.SequenceEqual(other.SelectedLoadouts) && Points == other.Points; + + if (!Role.Equals(other.Role) || + SelectedLoadouts.Count != other.SelectedLoadouts.Count || + Points != other.Points) + { + return false; + } + + // Tried using SequenceEqual but it stinky so. + foreach (var (key, value) in SelectedLoadouts) + { + if (!other.SelectedLoadouts.TryGetValue(key, out var otherValue) || + !otherValue.SequenceEqual(value)) + { + return false; + } + } + + return true; } public override bool Equals(object? obj) From 8f12e90b90a6749d783b1f2c8588241749ceeeb2 Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Sat, 15 Jun 2024 16:53:42 +1000 Subject: [PATCH 068/142] Don't use invalid defaults for loadouts (#28740) * Don't use invalid defaults for loadouts At the time it made more sense but now with species specific stuff it's better to have nothing. * Loadout SetDefault only applies valid loadouts --- Content.Client/Lobby/LobbyUIController.cs | 4 +-- .../Lobby/UI/HumanoidProfileEditor.xaml.cs | 2 +- .../Station/Systems/StationSpawningSystem.cs | 19 ++++++------- Content.Shared/Clothing/LoadoutSystem.cs | 16 ++++++++++- .../Preferences/HumanoidCharacterProfile.cs | 6 ++--- .../Loadouts/Effects/GroupLoadoutEffect.cs | 2 +- .../Effects/JobRequirementLoadoutEffect.cs | 8 +++++- .../Loadouts/Effects/LoadoutEffect.cs | 2 +- .../Effects/PointsCostLoadoutEffect.cs | 2 +- .../Loadouts/Effects/SpeciesLoadoutEffect.cs | 2 +- .../Preferences/Loadouts/RoleLoadout.cs | 27 +++++++++++++++---- 11 files changed, 64 insertions(+), 26 deletions(-) diff --git a/Content.Client/Lobby/LobbyUIController.cs b/Content.Client/Lobby/LobbyUIController.cs index aa66b7731d..e4a13ed8c6 100644 --- a/Content.Client/Lobby/LobbyUIController.cs +++ b/Content.Client/Lobby/LobbyUIController.cs @@ -294,7 +294,7 @@ public sealed class LobbyUIController : UIController, IOnStateEntered(LoadoutSystem.GetJobPrototype(job.ID))) { - var loadout = profile.GetLoadoutOrDefault(LoadoutSystem.GetJobPrototype(job.ID), profile.Species, EntityManager, _prototypeManager); + var loadout = profile.GetLoadoutOrDefault(LoadoutSystem.GetJobPrototype(job.ID), _playerManager.LocalSession, profile.Species, EntityManager, _prototypeManager); GiveDummyLoadout(dummy, loadout); } } @@ -414,7 +414,7 @@ public sealed class LobbyUIController : UIController, IOnStateEntered(LoadoutSystem.GetJobPrototype(job.ID))) { - var loadout = humanoid.GetLoadoutOrDefault(LoadoutSystem.GetJobPrototype(job.ID), humanoid.Species, EntityManager, _prototypeManager); + var loadout = humanoid.GetLoadoutOrDefault(LoadoutSystem.GetJobPrototype(job.ID), _playerManager.LocalSession, humanoid.Species, EntityManager, _prototypeManager); GiveDummyLoadout(dummyEnt, loadout); } } diff --git a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs index 18f986fc7d..e8e619ae6d 100644 --- a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs +++ b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs @@ -946,7 +946,7 @@ namespace Content.Client.Lobby.UI if (loadout == null) { loadout = new RoleLoadout(roleLoadoutProto.ID); - loadout.SetDefault(_prototypeManager); + loadout.SetDefault(Profile, _playerManager.LocalSession, _prototypeManager); } OpenLoadout(job, loadout, roleLoadoutProto); diff --git a/Content.Server/Station/Systems/StationSpawningSystem.cs b/Content.Server/Station/Systems/StationSpawningSystem.cs index d30c9fc111..e960a2bbbe 100644 --- a/Content.Server/Station/Systems/StationSpawningSystem.cs +++ b/Content.Server/Station/Systems/StationSpawningSystem.cs @@ -26,6 +26,7 @@ using Content.Shared.StatusIcon; using JetBrains.Annotations; using Robust.Shared.Configuration; using Robust.Shared.Map; +using Robust.Shared.Player; using Robust.Shared.Prototypes; using Robust.Shared.Random; using Robust.Shared.Utility; @@ -39,18 +40,18 @@ namespace Content.Server.Station.Systems; [PublicAPI] public sealed class StationSpawningSystem : SharedStationSpawningSystem { + [Dependency] private readonly IConfigurationManager _configurationManager = default!; [Dependency] private readonly IPrototypeManager _prototypeManager = default!; [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly IConfigurationManager _configurationManager = default!; - [Dependency] private readonly HumanoidAppearanceSystem _humanoidSystem = default!; - [Dependency] private readonly IdCardSystem _cardSystem = default!; - [Dependency] private readonly PdaSystem _pdaSystem = default!; - [Dependency] private readonly SharedAccessSystem _accessSystem = default!; - [Dependency] private readonly IdentitySystem _identity = default!; - [Dependency] private readonly MetaDataSystem _metaSystem = default!; - + [Dependency] private readonly ActorSystem _actors = default!; [Dependency] private readonly ArrivalsSystem _arrivalsSystem = default!; [Dependency] private readonly ContainerSpawnPointSystem _containerSpawnPointSystem = default!; + [Dependency] private readonly HumanoidAppearanceSystem _humanoidSystem = default!; + [Dependency] private readonly IdCardSystem _cardSystem = default!; + [Dependency] private readonly IdentitySystem _identity = default!; + [Dependency] private readonly MetaDataSystem _metaSystem = default!; + [Dependency] private readonly PdaSystem _pdaSystem = default!; + [Dependency] private readonly SharedAccessSystem _accessSystem = default!; private bool _randomizeCharacters; @@ -198,7 +199,7 @@ public sealed class StationSpawningSystem : SharedStationSpawningSystem if (loadout == null) { loadout = new RoleLoadout(jobLoadout); - loadout.SetDefault(_prototypeManager); + loadout.SetDefault(profile, _actors.GetSession(entity), _prototypeManager); } EquipRoleLoadout(entity.Value, loadout, roleProto); diff --git a/Content.Shared/Clothing/LoadoutSystem.cs b/Content.Shared/Clothing/LoadoutSystem.cs index 3136b4b4b3..f1b1dc36d9 100644 --- a/Content.Shared/Clothing/LoadoutSystem.cs +++ b/Content.Shared/Clothing/LoadoutSystem.cs @@ -1,8 +1,11 @@ using System.Linq; using Content.Shared.Clothing.Components; +using Content.Shared.Humanoid; +using Content.Shared.Preferences; using Content.Shared.Preferences.Loadouts; using Content.Shared.Roles; using Content.Shared.Station; +using Robust.Shared.Player; using Robust.Shared.Prototypes; using Robust.Shared.Random; @@ -15,6 +18,7 @@ public sealed class LoadoutSystem : EntitySystem { // Shared so we can predict it for placement manager. + [Dependency] private readonly ActorSystem _actors = default!; [Dependency] private readonly SharedStationSpawningSystem _station = default!; [Dependency] private readonly IPrototypeManager _protoMan = default!; [Dependency] private readonly IRobustRandom _random = default!; @@ -125,7 +129,17 @@ public sealed class LoadoutSystem : EntitySystem var id = _random.Pick(component.RoleLoadout); var proto = _protoMan.Index(id); var loadout = new RoleLoadout(id); - loadout.SetDefault(_protoMan, true); + loadout.SetDefault(GetProfile(uid), _actors.GetSession(uid), _protoMan, true); _station.EquipRoleLoadout(uid, loadout, proto); } + + public HumanoidCharacterProfile GetProfile(EntityUid? uid) + { + if (TryComp(uid, out HumanoidAppearanceComponent? appearance)) + { + return HumanoidCharacterProfile.DefaultWithSpecies(appearance.Species); + } + + return HumanoidCharacterProfile.Random(); + } } diff --git a/Content.Shared/Preferences/HumanoidCharacterProfile.cs b/Content.Shared/Preferences/HumanoidCharacterProfile.cs index fd95848d2c..22b4ed9815 100644 --- a/Content.Shared/Preferences/HumanoidCharacterProfile.cs +++ b/Content.Shared/Preferences/HumanoidCharacterProfile.cs @@ -690,15 +690,15 @@ namespace Content.Shared.Preferences return profile; } - public RoleLoadout GetLoadoutOrDefault(string id, ProtoId? species, IEntityManager entManager, IPrototypeManager protoManager) + public RoleLoadout GetLoadoutOrDefault(string id, ICommonSession? session, ProtoId? species, IEntityManager entManager, IPrototypeManager protoManager) { if (!_loadouts.TryGetValue(id, out var loadout)) { loadout = new RoleLoadout(id); - loadout.SetDefault(protoManager, force: true); + loadout.SetDefault(this, session, protoManager, force: true); } - loadout.SetDefault(protoManager); + loadout.SetDefault(this, session, protoManager); return loadout; } diff --git a/Content.Shared/Preferences/Loadouts/Effects/GroupLoadoutEffect.cs b/Content.Shared/Preferences/Loadouts/Effects/GroupLoadoutEffect.cs index 258d9a4dbb..47e3bea771 100644 --- a/Content.Shared/Preferences/Loadouts/Effects/GroupLoadoutEffect.cs +++ b/Content.Shared/Preferences/Loadouts/Effects/GroupLoadoutEffect.cs @@ -13,7 +13,7 @@ public sealed partial class GroupLoadoutEffect : LoadoutEffect [DataField(required: true)] public ProtoId Proto; - public override bool Validate(HumanoidCharacterProfile profile, RoleLoadout loadout, ICommonSession session, IDependencyCollection collection, [NotNullWhen(false)] out FormattedMessage? reason) + public override bool Validate(HumanoidCharacterProfile profile, RoleLoadout loadout, ICommonSession? session, IDependencyCollection collection, [NotNullWhen(false)] out FormattedMessage? reason) { var effectsProto = collection.Resolve().Index(Proto); diff --git a/Content.Shared/Preferences/Loadouts/Effects/JobRequirementLoadoutEffect.cs b/Content.Shared/Preferences/Loadouts/Effects/JobRequirementLoadoutEffect.cs index 54576d3a53..4a40e2c65e 100644 --- a/Content.Shared/Preferences/Loadouts/Effects/JobRequirementLoadoutEffect.cs +++ b/Content.Shared/Preferences/Loadouts/Effects/JobRequirementLoadoutEffect.cs @@ -15,8 +15,14 @@ public sealed partial class JobRequirementLoadoutEffect : LoadoutEffect [DataField(required: true)] public JobRequirement Requirement = default!; - public override bool Validate(HumanoidCharacterProfile profile, RoleLoadout loadout, ICommonSession session, IDependencyCollection collection, [NotNullWhen(false)] out FormattedMessage? reason) + public override bool Validate(HumanoidCharacterProfile profile, RoleLoadout loadout, ICommonSession? session, IDependencyCollection collection, [NotNullWhen(false)] out FormattedMessage? reason) { + if (session == null) + { + reason = FormattedMessage.Empty; + return true; + } + var manager = collection.Resolve(); var playtimes = manager.GetPlayTimes(session); return JobRequirements.TryRequirementMet(Requirement, playtimes, out reason, diff --git a/Content.Shared/Preferences/Loadouts/Effects/LoadoutEffect.cs b/Content.Shared/Preferences/Loadouts/Effects/LoadoutEffect.cs index f35b14e2e0..a9cbfc5fd5 100644 --- a/Content.Shared/Preferences/Loadouts/Effects/LoadoutEffect.cs +++ b/Content.Shared/Preferences/Loadouts/Effects/LoadoutEffect.cs @@ -13,7 +13,7 @@ public abstract partial class LoadoutEffect public abstract bool Validate( HumanoidCharacterProfile profile, RoleLoadout loadout, - ICommonSession session, + ICommonSession? session, IDependencyCollection collection, [NotNullWhen(false)] out FormattedMessage? reason); diff --git a/Content.Shared/Preferences/Loadouts/Effects/PointsCostLoadoutEffect.cs b/Content.Shared/Preferences/Loadouts/Effects/PointsCostLoadoutEffect.cs index 842b4cfc03..734dc25ba4 100644 --- a/Content.Shared/Preferences/Loadouts/Effects/PointsCostLoadoutEffect.cs +++ b/Content.Shared/Preferences/Loadouts/Effects/PointsCostLoadoutEffect.cs @@ -13,7 +13,7 @@ public sealed partial class PointsCostLoadoutEffect : LoadoutEffect public override bool Validate( HumanoidCharacterProfile profile, RoleLoadout loadout, - ICommonSession session, + ICommonSession? session, IDependencyCollection collection, [NotNullWhen(false)] out FormattedMessage? reason) { diff --git a/Content.Shared/Preferences/Loadouts/Effects/SpeciesLoadoutEffect.cs b/Content.Shared/Preferences/Loadouts/Effects/SpeciesLoadoutEffect.cs index 8f886dd2ab..4ec46a8348 100644 --- a/Content.Shared/Preferences/Loadouts/Effects/SpeciesLoadoutEffect.cs +++ b/Content.Shared/Preferences/Loadouts/Effects/SpeciesLoadoutEffect.cs @@ -11,7 +11,7 @@ public sealed partial class SpeciesLoadoutEffect : LoadoutEffect [DataField(required: true)] public List> Species = new(); - public override bool Validate(HumanoidCharacterProfile profile, RoleLoadout loadout, ICommonSession session, IDependencyCollection collection, + public override bool Validate(HumanoidCharacterProfile profile, RoleLoadout loadout, ICommonSession? session, IDependencyCollection collection, [NotNullWhen(false)] out FormattedMessage? reason) { if (Species.Contains(profile.Species)) diff --git a/Content.Shared/Preferences/Loadouts/RoleLoadout.cs b/Content.Shared/Preferences/Loadouts/RoleLoadout.cs index d2fc8df559..d02929cd96 100644 --- a/Content.Shared/Preferences/Loadouts/RoleLoadout.cs +++ b/Content.Shared/Preferences/Loadouts/RoleLoadout.cs @@ -166,12 +166,15 @@ public sealed partial class RoleLoadout : IEquatable /// /// Resets the selected loadouts to default if no data is present. /// - /// Clear existing data first - public void SetDefault(IPrototypeManager protoManager, bool force = false) + public void SetDefault(HumanoidCharacterProfile? profile, ICommonSession? session, IPrototypeManager protoManager, bool force = false) { + if (profile == null) + return; + if (force) SelectedLoadouts.Clear(); + var collection = IoCManager.Instance!; var roleProto = protoManager.Index(Role); for (var i = roleProto.Groups.Count - 1; i >= 0; i--) @@ -184,14 +187,28 @@ public sealed partial class RoleLoadout : IEquatable if (SelectedLoadouts.ContainsKey(group)) continue; - SelectedLoadouts[group] = new List(); + var loadouts = new List(); + SelectedLoadouts[group] = loadouts; if (groupProto.MinLimit > 0) { // Apply any loadouts we can. for (var j = 0; j < Math.Min(groupProto.MinLimit, groupProto.Loadouts.Count); j++) { - AddLoadout(group, groupProto.Loadouts[j], protoManager); + if (!protoManager.TryIndex(groupProto.Loadouts[j], out var loadoutProto)) + continue; + + var defaultLoadout = new Loadout() + { + Prototype = loadoutProto.ID, + }; + + // Not valid so don't default to it anyway. + if (!IsValid(profile, session, defaultLoadout.Prototype, collection, out _)) + continue; + + loadouts.Add(defaultLoadout); + Apply(loadoutProto); } } } @@ -200,7 +217,7 @@ public sealed partial class RoleLoadout : IEquatable /// /// Returns whether a loadout is valid or not. /// - public bool IsValid(HumanoidCharacterProfile profile, ICommonSession session, ProtoId loadout, IDependencyCollection collection, [NotNullWhen(false)] out FormattedMessage? reason) + public bool IsValid(HumanoidCharacterProfile profile, ICommonSession? session, ProtoId loadout, IDependencyCollection collection, [NotNullWhen(false)] out FormattedMessage? reason) { reason = null; From 7b6e30d68846354be9c3a82fc1fc92952e10a7d5 Mon Sep 17 00:00:00 2001 From: PJBot Date: Sat, 15 Jun 2024 06:53:55 +0000 Subject: [PATCH 069/142] Automatic changelog update --- Resources/Changelog/Changelog.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index a7db0a71b1..b8440617ec 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: deltanedas - changes: - - message: Voicemasks can now mimic speech verbs, like flutters or growls. - type: Tweak - id: 6245 - time: '2024-03-28T06:36:43.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/25768 - author: EmoGarbage404 changes: - message: Electrocution damage is no longer based on the power supplied and is @@ -3857,3 +3850,11 @@ id: 6744 time: '2024-06-15T06:02:56.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/28971 +- author: metalgearsloth + changes: + - message: Fix the character profile sometimes thinking there's changes to save + even if the loadouts haven't changed. + type: Fix + id: 6745 + time: '2024-06-15T06:52:49.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/28737 From 9b8c5441919cdb9edfce7b7fbe4ad70aaa125aa8 Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Sat, 15 Jun 2024 17:18:48 +1000 Subject: [PATCH 070/142] Update submodule to 225.0.0 (#29016) --- RobustToolbox | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RobustToolbox b/RobustToolbox index fcd507d1f9..2fa83181e2 160000 --- a/RobustToolbox +++ b/RobustToolbox @@ -1 +1 @@ -Subproject commit fcd507d1f9e6fffb96bc4228d7f3d78577f0ff2e +Subproject commit 2fa83181e2f4472120fe280f4598197f436faf22 From 9dc9e22d13e261346ad67328c70819181f085b91 Mon Sep 17 00:00:00 2001 From: nikthechampiongr <32041239+nikthechampiongr@users.noreply.github.com> Date: Sat, 15 Jun 2024 11:25:42 +0000 Subject: [PATCH 071/142] Bwoink fix (#28899) * Fix incorrect usage of loc string * Make it so you can no longer ahelp someone who is no longer selected --- Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml.cs | 2 +- Content.Client/Administration/UI/Bwoink/BwoinkWindow.xaml.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml.cs b/Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml.cs index 0f5f72cc27..ddd66623bd 100644 --- a/Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml.cs +++ b/Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml.cs @@ -243,9 +243,9 @@ namespace Content.Client.Administration.UI.Bwoink { UpdateButtons(); + AHelpHelper.HideAllPanels(); if (ch != null) { - AHelpHelper.HideAllPanels(); var panel = AHelpHelper.EnsurePanel(ch.Value); panel.Visible = true; } diff --git a/Content.Client/Administration/UI/Bwoink/BwoinkWindow.xaml.cs b/Content.Client/Administration/UI/Bwoink/BwoinkWindow.xaml.cs index 999eba4d29..30f9d24df1 100644 --- a/Content.Client/Administration/UI/Bwoink/BwoinkWindow.xaml.cs +++ b/Content.Client/Administration/UI/Bwoink/BwoinkWindow.xaml.cs @@ -18,7 +18,7 @@ namespace Content.Client.Administration.UI.Bwoink { if (sel is null) { - Title = Loc.GetString("bwoink-none-selected"); + Title = Loc.GetString("bwoink-title-none-selected"); return; } From e16bf41da16fe99d2da228c5871528b0a1a5a1fb Mon Sep 17 00:00:00 2001 From: PJBot Date: Sat, 15 Jun 2024 11:26:48 +0000 Subject: [PATCH 072/142] Automatic changelog update --- Resources/Changelog/Admin.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Resources/Changelog/Admin.yml b/Resources/Changelog/Admin.yml index 1a46012bed..0ef47a775b 100644 --- a/Resources/Changelog/Admin.yml +++ b/Resources/Changelog/Admin.yml @@ -305,5 +305,13 @@ Entries: id: 37 time: '2024-06-13T06:38:44.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/28876 +- author: nikthechampiongr + changes: + - message: The ahelp panel properly deselects a player when they are no longer on + the player list. + type: Fix + id: 38 + time: '2024-06-15T11:25:42.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/28899 Name: Admin Order: 1 From 31d1d3b6e792d6edc6550211ad71fc78ddbe898c Mon Sep 17 00:00:00 2001 From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> Date: Sat, 15 Jun 2024 09:19:23 -0400 Subject: [PATCH 073/142] fix borgs getting deleted by salvage magnets (#29006) --- Content.Server/Salvage/SalvageSystem.Magnet.cs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Content.Server/Salvage/SalvageSystem.Magnet.cs b/Content.Server/Salvage/SalvageSystem.Magnet.cs index 4b7291298b..3fe4baca8b 100644 --- a/Content.Server/Salvage/SalvageSystem.Magnet.cs +++ b/Content.Server/Salvage/SalvageSystem.Magnet.cs @@ -130,17 +130,20 @@ public sealed partial class SalvageSystem } // Uhh yeah don't delete mobs or whatever - var mobQuery = AllEntityQuery(); + var mobQuery = AllEntityQuery(); _detachEnts.Clear(); - while (mobQuery.MoveNext(out var mobUid, out _, out _, out var xform)) + while (mobQuery.MoveNext(out var mobUid, out _, out var xform)) { if (xform.GridUid == null || !data.Comp.ActiveEntities.Contains(xform.GridUid.Value) || xform.MapUid == null) continue; + if (_salvMobQuery.HasComp(mobUid)) + continue; + // Can't parent directly to map as it runs grid traversal. _detachEnts.Add(((mobUid, xform), xform.MapUid.Value, _transform.GetWorldPosition(xform))); - _transform.DetachParentToNull(mobUid, xform); + _transform.DetachEntity(mobUid, xform); } // Go and cleanup the active ents. From 7e4c7607e6d46c2792924c004f7f40117dcdb3e9 Mon Sep 17 00:00:00 2001 From: PJBot Date: Sat, 15 Jun 2024 13:20:29 +0000 Subject: [PATCH 074/142] Automatic changelog update --- Resources/Changelog/Changelog.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index b8440617ec..35503f2ac5 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,12 +1,4 @@ Entries: -- author: EmoGarbage404 - changes: - - message: Electrocution damage is no longer based on the power supplied and is - instead based on the wire voltage (LV, MV, or HV). - type: Tweak - id: 6246 - time: '2024-03-28T20:44:44.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/26455 - author: Jake Huxell changes: - message: Late join menu correctly respects client role restrictions. @@ -3858,3 +3850,11 @@ id: 6745 time: '2024-06-15T06:52:49.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/28737 +- author: EmoGarbage404 + changes: + - message: Fixed borgs and other non-humans getting deleted by salvage magnet wrecks + disappearing. + type: Fix + id: 6746 + time: '2024-06-15T13:19:23.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/29006 From 71eb4d91786b1b3eccbcd61dd5e10dff184fe197 Mon Sep 17 00:00:00 2001 From: TsjipTsjip <19798667+TsjipTsjip@users.noreply.github.com> Date: Sat, 15 Jun 2024 16:03:20 +0200 Subject: [PATCH 075/142] CVarify meteor behavior (#29030) * CVarify meteor behavior * Cache value to reduce CVar calls, hook into OnValueChanged * _cfg is still null at construction time, fixed by just making it set up on Started instead * Invoke immediately! Learning more every step of the way. * Move cached value initialisation to Initialize call * Add explicit supercall --- .../Components/MeteorSchedulerComponent.cs | 11 ----------- .../StationEvents/MeteorSchedulerSystem.cs | 19 +++++++++++++++++-- Content.Shared/CCVar/CCVars.cs | 12 ++++++++++++ 3 files changed, 29 insertions(+), 13 deletions(-) diff --git a/Content.Server/StationEvents/Components/MeteorSchedulerComponent.cs b/Content.Server/StationEvents/Components/MeteorSchedulerComponent.cs index e71a284a89..23337f9261 100644 --- a/Content.Server/StationEvents/Components/MeteorSchedulerComponent.cs +++ b/Content.Server/StationEvents/Components/MeteorSchedulerComponent.cs @@ -21,15 +21,4 @@ public sealed partial class MeteorSchedulerComponent : Component [DataField, AutoPausedField] public TimeSpan NextSwarmTime = TimeSpan.Zero; - /// - /// The minimum time between swarms - /// - [DataField] - public TimeSpan MinSwarmDelay = TimeSpan.FromMinutes(7.5f); - - /// - /// The maximum time between swarms - /// - [DataField] - public TimeSpan MaxSwarmDelay = TimeSpan.FromMinutes(12.5f); } diff --git a/Content.Server/StationEvents/MeteorSchedulerSystem.cs b/Content.Server/StationEvents/MeteorSchedulerSystem.cs index 3ad88a7d89..c516229360 100644 --- a/Content.Server/StationEvents/MeteorSchedulerSystem.cs +++ b/Content.Server/StationEvents/MeteorSchedulerSystem.cs @@ -1,7 +1,9 @@ using Content.Server.GameTicking.Rules; using Content.Server.StationEvents.Components; +using Content.Shared.CCVar; using Content.Shared.GameTicking.Components; using Content.Shared.Random.Helpers; +using Robust.Shared.Configuration; using Robust.Shared.Prototypes; namespace Content.Server.StationEvents; @@ -13,12 +15,24 @@ namespace Content.Server.StationEvents; public sealed class MeteorSchedulerSystem : GameRuleSystem { [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + [Dependency] private readonly IConfigurationManager _cfg = default!; + + private TimeSpan _meteorMinDelay; + private TimeSpan _meteorMaxDelay; + + public override void Initialize() + { + base.Initialize(); + + _cfg.OnValueChanged(CCVars.MeteorSwarmMinTime, f => { _meteorMinDelay = TimeSpan.FromMinutes(f); }, true); + _cfg.OnValueChanged(CCVars.MeteorSwarmMaxTime, f => { _meteorMaxDelay = TimeSpan.FromMinutes(f); }, true); + } protected override void Started(EntityUid uid, MeteorSchedulerComponent component, GameRuleComponent gameRule, GameRuleStartedEvent args) { base.Started(uid, component, gameRule, args); - component.NextSwarmTime = Timing.CurTime + RobustRandom.Next(component.MinSwarmDelay, component.MaxSwarmDelay); + component.NextSwarmTime = Timing.CurTime + RobustRandom.Next(_meteorMinDelay, _meteorMaxDelay); } protected override void ActiveTick(EntityUid uid, MeteorSchedulerComponent component, GameRuleComponent gameRule, float frameTime) @@ -28,7 +42,8 @@ public sealed class MeteorSchedulerSystem : GameRuleSystem ent) diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs index a9cc2d11da..886ace654d 100644 --- a/Content.Shared/CCVar/CCVars.cs +++ b/Content.Shared/CCVar/CCVars.cs @@ -124,6 +124,18 @@ namespace Content.Shared.CCVar public static readonly CVarDef EventsRampingAverageChaos = CVarDef.Create("events.ramping_average_chaos", 6f, CVar.ARCHIVE | CVar.SERVERONLY); + /// + /// Minimum time between meteor swarms in minutes. + /// + public static readonly CVarDef + MeteorSwarmMinTime = CVarDef.Create("events.meteor_swarm_min_time", 7.5f, CVar.ARCHIVE | CVar.SERVERONLY); + + /// + /// Maximum time between meteor swarms in minutes. + /// + public static readonly CVarDef + MeteorSwarmMaxTime = CVarDef.Create("events.meteor_swarm_max_time", 12.5f, CVar.ARCHIVE | CVar.SERVERONLY); + /* * Game */ From 789453adf0cf1b3310f75ef3ac5b1240a09be9b8 Mon Sep 17 00:00:00 2001 From: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com> Date: Sat, 15 Jun 2024 08:17:16 -0700 Subject: [PATCH 076/142] Make firelock warning light not require power and add a PointLight (#29024) * Add a PointLight to firelocks when warnings are active * Remove power requirement for lights --- Content.Client/Doors/FirelockSystem.cs | 15 ++++++--------- Content.Server/Doors/Systems/FirelockSystem.cs | 9 ++++++++- .../Structures/Doors/Firelocks/firelock.yml | 6 ++++++ 3 files changed, 20 insertions(+), 10 deletions(-) diff --git a/Content.Client/Doors/FirelockSystem.cs b/Content.Client/Doors/FirelockSystem.cs index f64b4c8e52..ad869391f4 100644 --- a/Content.Client/Doors/FirelockSystem.cs +++ b/Content.Client/Doors/FirelockSystem.cs @@ -25,15 +25,12 @@ public sealed class FirelockSystem : SharedFirelockSystem if (!_appearanceSystem.TryGetData(uid, DoorVisuals.State, out var state, args.Component)) state = DoorState.Closed; - if (_appearanceSystem.TryGetData(uid, DoorVisuals.Powered, out var powered, args.Component) && powered) - { - boltedVisible = _appearanceSystem.TryGetData(uid, DoorVisuals.BoltLights, out var lights, args.Component) && lights; - unlitVisible = - state == DoorState.Closing - || state == DoorState.Opening - || state == DoorState.Denying - || (_appearanceSystem.TryGetData(uid, DoorVisuals.ClosedLights, out var closedLights, args.Component) && closedLights); - } + boltedVisible = _appearanceSystem.TryGetData(uid, DoorVisuals.BoltLights, out var lights, args.Component) && lights; + unlitVisible = + state == DoorState.Closing + || state == DoorState.Opening + || state == DoorState.Denying + || (_appearanceSystem.TryGetData(uid, DoorVisuals.ClosedLights, out var closedLights, args.Component) && closedLights); args.Sprite.LayerSetVisible(DoorVisualLayers.BaseUnlit, unlitVisible && !boltedVisible); args.Sprite.LayerSetVisible(DoorVisualLayers.BaseBolted, boltedVisible); diff --git a/Content.Server/Doors/Systems/FirelockSystem.cs b/Content.Server/Doors/Systems/FirelockSystem.cs index c7da404fe8..7cb31b5b4e 100644 --- a/Content.Server/Doors/Systems/FirelockSystem.cs +++ b/Content.Server/Doors/Systems/FirelockSystem.cs @@ -6,9 +6,9 @@ using Content.Server.Power.EntitySystems; using Content.Server.Shuttles.Components; using Content.Shared.Atmos; using Content.Shared.Atmos.Monitor; -using Content.Shared.Doors; using Content.Shared.Doors.Components; using Content.Shared.Doors.Systems; +using Robust.Server.GameObjects; using Robust.Shared.Map.Components; namespace Content.Server.Doors.Systems @@ -20,6 +20,7 @@ namespace Content.Server.Doors.Systems [Dependency] private readonly AtmosphereSystem _atmosSystem = default!; [Dependency] private readonly SharedAppearanceSystem _appearance = default!; [Dependency] private readonly SharedMapSystem _mapping = default!; + [Dependency] private readonly PointLightSystem _pointLight = default!; private const int UpdateInterval = 30; private int _accumulatedTicks; @@ -53,6 +54,7 @@ namespace Content.Server.Doors.Systems var airtightQuery = GetEntityQuery(); var appearanceQuery = GetEntityQuery(); var xformQuery = GetEntityQuery(); + var pointLightQuery = GetEntityQuery(); var query = EntityQueryEnumerator(); while (query.MoveNext(out var uid, out var firelock, out var door)) @@ -74,6 +76,11 @@ namespace Content.Server.Doors.Systems firelock.Temperature = fire; firelock.Pressure = pressure; Dirty(uid, firelock); + + if (pointLightQuery.TryComp(uid, out var pointLight)) + { + _pointLight.SetEnabled(uid, fire | pressure, pointLight); + } } } } diff --git a/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml b/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml index d6815abcdc..e4b2424301 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml @@ -109,6 +109,12 @@ access: [ [ "Engineering" ] ] - type: PryUnpowered pryModifier: 0.5 + - type: PointLight + energy: 0.5 + radius: 1.75 + color: Red + enabled: false + castShadows: false - type: entity id: Firelock From ba16cd19b201febe36b096ed21ed43b2445f3377 Mon Sep 17 00:00:00 2001 From: PJBot Date: Sat, 15 Jun 2024 15:18:22 +0000 Subject: [PATCH 077/142] Automatic changelog update --- Resources/Changelog/Changelog.yml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 35503f2ac5..f01608a2ee 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Jake Huxell - changes: - - message: Late join menu correctly respects client role restrictions. - type: Fix - id: 6247 - time: '2024-03-29T02:30:23.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/26498 - author: Jake Huxell changes: - message: Reduced game build warning count. @@ -3858,3 +3851,12 @@ id: 6746 time: '2024-06-15T13:19:23.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/29006 +- author: ShadowCommander + changes: + - message: Added a red light to firelocks when their warning lights are active. + type: Add + - message: Firelocks no longer require power to show warning lights. + type: Tweak + id: 6747 + time: '2024-06-15T15:17:16.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/29024 From ca58811bdb68a62c8702a56914d766d0a021fec5 Mon Sep 17 00:00:00 2001 From: Ian Date: Sat, 15 Jun 2024 17:44:56 +0200 Subject: [PATCH 078/142] make the donk microwave drop the correct board on normal deconstruction (#29037) * make the donk microwave drop the correct board on normal deconstruction * removed the unnecessary SyndicateMicrowaveMachineBoard tag --- .../Devices/Circuitboards/Machine/production.yml | 14 ++++++++++++++ .../Entities/Structures/Machines/microwave.yml | 4 ++-- Resources/Prototypes/tags.yml | 2 +- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml index d41923b569..b25c394f82 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml @@ -1021,6 +1021,20 @@ tags: - MicrowaveMachineBoard +- type: entity + id: SyndicateMicrowaveMachineCircuitboard + parent: BaseMachineCircuitboard + name: donk co. microwave machine board + components: + - type: Sprite + state: service + - type: MachineBoard + prototype: SyndicateMicrowave + stackRequirements: + Capacitor: 1 + Glass: 2 + Cable: 2 + - type: entity id: FatExtractorMachineCircuitboard parent: BaseMachineCircuitboard diff --git a/Resources/Prototypes/Entities/Structures/Machines/microwave.yml b/Resources/Prototypes/Entities/Structures/Machines/microwave.yml index 3b6fbf7f5f..314a5c1ce5 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/microwave.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/microwave.yml @@ -121,5 +121,5 @@ sprite: Structures/Machines/microwave_syndie.rsi drawdepth: SmallObjects snapCardinals: true - - + - type: Machine + board: SyndicateMicrowaveMachineCircuitboard diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index d60b632986..0857f601e2 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -254,7 +254,7 @@ - type: Tag id: CableCoil - + - type: Tag id: Candle From 5dbee6fc413d11544da7e98f6231c28a7f76f56f Mon Sep 17 00:00:00 2001 From: PJBot Date: Sat, 15 Jun 2024 15:46:02 +0000 Subject: [PATCH 079/142] 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 f01608a2ee..8cc6791c9a 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Jake Huxell - changes: - - message: Reduced game build warning count. - type: Fix - id: 6248 - time: '2024-03-29T05:28:16.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/26518 - author: wafehling changes: - message: Added a chemistry recipe to make crystal shards. @@ -3860,3 +3853,10 @@ id: 6747 time: '2024-06-15T15:17:16.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/29024 +- author: Ian321 + changes: + - message: Donk co. microwaves now have their own machine board. + type: Fix + id: 6748 + time: '2024-06-15T15:44:56.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/29037 From 81e41f8e8d000f6d420ce67134dc7eb49b0034ca Mon Sep 17 00:00:00 2001 From: BombasterDS <115770678+BombasterDS@users.noreply.github.com> Date: Sun, 16 Jun 2024 03:50:55 +1000 Subject: [PATCH 080/142] Mannequin (#29004) * Mannequin * rsi license fix * damage container fix * container fix hope this works * layers fix + appearance comp (mb it help?) * maybe fixed? * one day it will work... * can't even understand why test failing... (maybe fix?) * last try? --- .../Medical/SuitSensors/SuitSensorSystem.cs | 2 +- .../Structures/Decoration/mannequin.yml | 95 ++++++++++++++++++ .../mannequin_inventory_template.yml | 64 ++++++++++++ .../Graphs/furniture/mannequin.yml | 31 ++++++ .../Recipes/Construction/furniture.yml | 18 ++++ .../Decoration/mannequin.rsi/mannequin.png | Bin 0 -> 1274 bytes .../Decoration/mannequin.rsi/meta.json | 15 +++ 7 files changed, 224 insertions(+), 1 deletion(-) create mode 100644 Resources/Prototypes/Entities/Structures/Decoration/mannequin.yml create mode 100644 Resources/Prototypes/InventoryTemplates/mannequin_inventory_template.yml create mode 100644 Resources/Prototypes/Recipes/Construction/Graphs/furniture/mannequin.yml create mode 100644 Resources/Textures/Structures/Decoration/mannequin.rsi/mannequin.png create mode 100644 Resources/Textures/Structures/Decoration/mannequin.rsi/meta.json diff --git a/Content.Server/Medical/SuitSensors/SuitSensorSystem.cs b/Content.Server/Medical/SuitSensors/SuitSensorSystem.cs index 1acbf292f0..e0917f32a8 100644 --- a/Content.Server/Medical/SuitSensors/SuitSensorSystem.cs +++ b/Content.Server/Medical/SuitSensors/SuitSensorSystem.cs @@ -308,7 +308,7 @@ public sealed class SuitSensorSystem : EntitySystem return null; // check if sensor is enabled and worn by user - if (sensor.Mode == SuitSensorMode.SensorOff || sensor.User == null || transform.GridUid == null) + if (sensor.Mode == SuitSensorMode.SensorOff || sensor.User == null || !HasComp(sensor.User) || transform.GridUid == null) return null; // try to get mobs id from ID slot diff --git a/Resources/Prototypes/Entities/Structures/Decoration/mannequin.yml b/Resources/Prototypes/Entities/Structures/Decoration/mannequin.yml new file mode 100644 index 0000000000..4a2b0d3c3f --- /dev/null +++ b/Resources/Prototypes/Entities/Structures/Decoration/mannequin.yml @@ -0,0 +1,95 @@ +- type: entity + id: Mannequin + parent: BaseStructureDynamic + name: mannequin + description: It can wear any clothing with style. + components: + - type: Appearance + - type: Sprite + sprite: Structures/Decoration/mannequin.rsi + state: mannequin + noRot: true + layers: + - map: [ "mannequin" ] + sprite: Structures/Decoration/mannequin.rsi + state: mannequin + - map: [ "jumpsuit" ] + - map: [ "outerClothing" ] + - map: [ "eyes" ] + - map: [ "neck" ] + - map: [ "back" ] + - map: [ "mask" ] + - map: [ "head" ] + - type: Rotatable + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeCircle + radius: 0.2 + density: 200 + mask: + - MachineMask + layer: + - MidImpassable + - BulletImpassable + - type: InteractionOutline + - type: Construction + graph: Mannequin + node: mannequin + - type: Damageable + damageContainer: Inorganic + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 200 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: WoodDestroy + - !type:EmptyAllContainersBehaviour + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: ContainerContainer + containers: + jumpsuit: !type:ContainerSlot + showEnts: False + occludes: False + ent: null + outerClothing: !type:ContainerSlot + showEnts: False + occludes: False + ent: null + neck: !type:ContainerSlot + showEnts: False + occludes: False + ent: null + mask: !type:ContainerSlot + showEnts: False + occludes: False + ent: null + eyes: !type:ContainerSlot + showEnts: False + occludes: False + ent: null + head: !type:ContainerSlot + showEnts: False + occludes: False + ent: null + suitstorage: !type:ContainerSlot + showEnts: False + occludes: False + ent: null + back: !type:ContainerSlot + showEnts: False + occludes: False + ent: null + - type: Inventory + templateId: mannequin + - type: InventorySlots + - type: Strippable + - type: UserInterface + interfaces: + enum.StrippingUiKey.Key: + type: StrippableBoundUserInterface \ No newline at end of file diff --git a/Resources/Prototypes/InventoryTemplates/mannequin_inventory_template.yml b/Resources/Prototypes/InventoryTemplates/mannequin_inventory_template.yml new file mode 100644 index 0000000000..80b9c6eea4 --- /dev/null +++ b/Resources/Prototypes/InventoryTemplates/mannequin_inventory_template.yml @@ -0,0 +1,64 @@ +- type: inventoryTemplate + id: mannequin + slots: + - name: jumpsuit + slotTexture: uniform + slotFlags: INNERCLOTHING + stripTime: 3 + uiWindowPos: 0,1 + strippingWindowPos: 1,2 + displayName: Jumpsuit + - name: outerClothing + slotTexture: suit + slotFlags: OUTERCLOTHING + stripTime: 3 + uiWindowPos: 1,1 + strippingWindowPos: 2,2 + displayName: Suit + - name: neck + slotTexture: neck + slotFlags: NECK + stripTime: 3 + uiWindowPos: 0,2 + strippingWindowPos: 0,1 + displayName: Neck + - name: mask + stripTime: 3 + slotTexture: mask + slotFlags: MASK + uiWindowPos: 1,2 + strippingWindowPos: 1,1 + displayName: Mask + - name: eyes + slotTexture: glasses + slotFlags: EYES + stripTime: 3 + uiWindowPos: 0,3 + strippingWindowPos: 0,0 + displayName: Eyes + - name: head + slotTexture: head + slotFlags: HEAD + stripTime: 3 + uiWindowPos: 1,3 + strippingWindowPos: 1,0 + displayName: Head + - name: suitstorage + slotTexture: suit_storage + slotFlags: SUITSTORAGE + slotGroup: MainHotbar + stripTime: 3 + uiWindowPos: 2,0 + strippingWindowPos: 1,3 + dependsOn: outerClothing + dependsOnComponents: + - type: AllowSuitStorage + displayName: Suit Storage + - name: back + slotTexture: back + fullTextureName: template_small + slotFlags: BACK + stripTime: 3 + uiWindowPos: 3,0 + strippingWindowPos: 0,2 + displayName: Back diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/mannequin.yml b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/mannequin.yml new file mode 100644 index 0000000000..f83a3b1e95 --- /dev/null +++ b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/mannequin.yml @@ -0,0 +1,31 @@ +- type: constructionGraph + id: Mannequin + start: start + graph: + - node: start + actions: + - !type:DestroyEntity {} + edges: + - to: mannequin + completed: + - !type:SnapToGrid { } + steps: + - material: WoodPlank + amount: 5 + - material: MetalRod + amount: 2 + doAfter: 2 + - node: mannequin + entity: Mannequin + edges: + - to: start + completed: + - !type:SpawnPrototype + prototype: MaterialWoodPlank + amount: 5 + - !type:SpawnPrototype + prototype: PartRodMetal + amount: 2 + steps: + - tool: Screwing + doAfter: 3 diff --git a/Resources/Prototypes/Recipes/Construction/furniture.yml b/Resources/Prototypes/Recipes/Construction/furniture.yml index 5f7ec9c92d..ea11a09b96 100644 --- a/Resources/Prototypes/Recipes/Construction/furniture.yml +++ b/Resources/Prototypes/Recipes/Construction/furniture.yml @@ -902,3 +902,21 @@ canBuildInImpassable: false conditions: - !type:TileNotBlocked + +- type: construction + id: Mannequin + name: mannequin + description: Wooden mannequin designed for clothing displaying + graph: Mannequin + startNode: start + targetNode: mannequin + category: construction-category-furniture + icon: + sprite: Structures/Decoration/mannequin.rsi + state: mannequin + objectType: Structure + placementMode: SnapgridCenter + canRotate: true + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked \ No newline at end of file diff --git a/Resources/Textures/Structures/Decoration/mannequin.rsi/mannequin.png b/Resources/Textures/Structures/Decoration/mannequin.rsi/mannequin.png new file mode 100644 index 0000000000000000000000000000000000000000..3f362c698ba49c09b3391db5fc4814a982e0e6d2 GIT binary patch literal 1274 zcmVPx(v`IukRCt{2TEB1GMil-;(}aG6m2DLcVhBMbw-ykfj^H9g5oC}(Ws^MyNHQ9& zHUr*_OhqTJ9{OK2e}LP;=+?BZJ2hxwr%)BAjw(|WDMq4r9TX~}NU6G`cyergfFSZj z@_YB`-FwG-2TU-*l}3p5#;x@n0RT;@;M?yHnV-XoufKXkjGBtG;)ySQk(K;T`X-vn z85(a&06=((u)F;w$y}dWNx^!nyMANkr}6+zsi0AL?dm*l zva#wSc%JKxtU``MAV2 z6O59dDh2?+&cg>pmSq5d(y#ykVhDkc|6YEzVWC(vp*AdE{8Xy#JbXYhi5Mc&Q>a#} z_(wM}9~BXuo`T+N;ra0^?Cl5V2|@4=eQ`IrS#Jj+z1c!^da83xkRk-dKlBhVw3>q) zfP>sVHv<|7LGe??fNt_};7vtwoSz%!!1G}+v;e!$4njYbl!4bAya+B8?mjyR{qe8X zx0C0FiQoP@rRJyd0993Ci%`}Zoe$8?!$G-!H-EPXGvW3;?%Xi(%ga+He(HCDdQC-H zk0241I&EdW0WpNY1+e)s7jw0<@>6+$EX%l^oOg5{01{CNx0CY_1D*=WvW)vn$<9A- zVNxL>2Z4J)~H^a2(*(ouIpB2;|&<}=b z1wI7oHFaPXVBu$45z?D2S6f&VxCFtOu;|DF-N!8a)S4C6oG%@Qg^uz(-U!FdKhPN7 z7zID|>+og6M1XM{@WH|!f8&Y+qvB`wfWHmrH*buJe=-DUk-wKE`Fl>c^J=@S{1Z%Y z$-q2!-rmTOh#W_`cme={)&soo^huu7RRy|I@x{+{(>H}jNT*&I3SP60m%0fy<<*xAT7asRfw5k%aYDcU5QO5}zqW_?qll z9%tpJzN_-8IMVt&6MwxnvONma0_aM`-WTM6T`A@Pug16O(V0$A+KAQa)O|6R9JKwRtSq-2? zVJ%B+!Fz3pC+4Ybp!R@IrFw_ZM(;Tfc-gR=@UB`70+j&vv~w7Pg2X7fuKa=swE#Tx zJr6K@fMz<6HGWe87oQ()Y61Gqxj)nx!1O5198cu$hnU#5$+YN)C({tPh-r|e^8kYY z2QP}QF{hdBc3ul2UN(q=fTI)lOWOZ|N&v48@(g~%a0j+kwi{m4O`dCl{ieIT*Cj8+ z{(!O71}_UH0*u>$af4Za!djNJS7*k%KcM%R7R*zai?Tn!FRuI$pw63i9sau?-{)Mf kwxH0x55VU0Y8w{+0jj;5&U!?FnE(I)07*qoM6N<$f=H@g6951J literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Decoration/mannequin.rsi/meta.json b/Resources/Textures/Structures/Decoration/mannequin.rsi/meta.json new file mode 100644 index 0000000000..8edc1539e9 --- /dev/null +++ b/Resources/Textures/Structures/Decoration/mannequin.rsi/meta.json @@ -0,0 +1,15 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made By BombasterDS", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "mannequin", + "directions": 4 + } + ] +} From 30cdb90ac217c4e599c53eed10e693af098df1f6 Mon Sep 17 00:00:00 2001 From: PJBot Date: Sat, 15 Jun 2024 17:52:01 +0000 Subject: [PATCH 081/142] 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 8cc6791c9a..15928df188 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: wafehling - changes: - - message: Added a chemistry recipe to make crystal shards. - type: Add - id: 6249 - time: '2024-03-29T06:13:52.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/26269 - author: Crotalus changes: - message: Reagent grinder auto-modes @@ -3860,3 +3853,10 @@ id: 6748 time: '2024-06-15T15:44:56.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/29037 +- author: BombasterDS + changes: + - message: Added craftable mannequin that you can hang clothing on! + type: Add + id: 6749 + time: '2024-06-15T17:50:55.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/29004 From 6835e6b4aa40967ca7263a2ae8391a33ab2d0b2d Mon Sep 17 00:00:00 2001 From: Partmedia Date: Sat, 15 Jun 2024 13:05:57 -0800 Subject: [PATCH 082/142] Adjust TEG efficiency curve, remove heat transfer limit (#29050) The TEG used to limit hot-cold energy transfer based on actual power drawn, and had maximum efficiency at whatever temperature difference. This PR adjusts the hot-cold energy transfer to be uncapped, "venting" the excess heat that is not used to generate power, and adds an efficiency curve that limits efficiency at low thermal temperatures. People have been cheesing the TEG by hooking up the hot end to the CO2 miner (which produces infinite, room-temperature gas) and the cold end to a space radiator. With this change, you will actually need to set up a burn chamber in order to get appreciable power out of the TEG (see below). If you build a gas holding chamber, you will have to throttle the gas flowing into the TEG instead of constantly cycling the gas through over and over again. --- .../Power/Generation/Teg/TegSystem.cs | 30 ++++++++++++------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/Content.Server/Power/Generation/Teg/TegSystem.cs b/Content.Server/Power/Generation/Teg/TegSystem.cs index 540bd6c483..bc1bff052c 100644 --- a/Content.Server/Power/Generation/Teg/TegSystem.cs +++ b/Content.Server/Power/Generation/Teg/TegSystem.cs @@ -128,7 +128,6 @@ public sealed class TegSystem : EntitySystem // Shift ramp position based on demand and generation from previous tick. var curRamp = component.RampPosition; var lastDraw = supplier.CurrentSupply; - // Limit amount lost/gained based on power factor. curRamp = MathHelper.Clamp(lastDraw, curRamp / component.RampFactor, curRamp * component.RampFactor); curRamp = MathF.Max(curRamp, component.RampMinimum); component.RampPosition = curRamp; @@ -138,17 +137,28 @@ public sealed class TegSystem : EntitySystem if (airA.Pressure > 0 && airB.Pressure > 0) { var hotA = airA.Temperature > airB.Temperature; - var cHot = hotA ? cA : cB; - - // Calculate maximum amount of energy to generate this tick based on ramping above. - // This clamps the thermal energy transfer as well. - var targetEnergy = curRamp / _atmosphere.AtmosTickRate; - var transferMax = targetEnergy / (component.ThermalEfficiency * component.PowerFactor); // Calculate thermal and electrical energy transfer between the two sides. - var δT = MathF.Abs(airA.Temperature - airB.Temperature); - var transfer = Math.Min(δT * cA * cB / (cA + cB - cHot * component.ThermalEfficiency), transferMax); - electricalEnergy = transfer * component.ThermalEfficiency * component.PowerFactor; + // Assume temperature equalizes, i.e. Ta*cA + Tb*cB = Tf*(cA+cB) + var Tf = (airA.Temperature * cA + airB.Temperature * cB) / (cA + cB); + // The maximum energy we can extract is (Ta - Tf)*cA, which is equal to (Tf - Tb)*cB + var Wmax = MathF.Abs(airA.Temperature - Tf) * cA; + + var N = component.ThermalEfficiency; + + // Calculate Carnot efficiency + var Thot = hotA ? airA.Temperature : airB.Temperature; + var Tcold = hotA ? airB.Temperature : airA.Temperature; + var Nmax = 1 - Tcold / Thot; + N = MathF.Min(N, Nmax); // clamp by Carnot efficiency + + // Reduce efficiency at low temperature differences to encourage burn chambers (instead + // of just feeding the TEG room temperature gas from an infinite gas miner). + var dT = Thot - Tcold; + N *= MathF.Tanh(dT/700); // https://www.wolframalpha.com/input?i=tanh(x/700)+from+0+to+1000 + + var transfer = Wmax * N; + electricalEnergy = transfer * component.PowerFactor; var outTransfer = transfer * (1 - component.ThermalEfficiency); // Adjust thermal energy in transferred gas mixtures. From a9610d4f850c7227ef298de535153c3746462b2a Mon Sep 17 00:00:00 2001 From: PJBot Date: Sat, 15 Jun 2024 21:07:04 +0000 Subject: [PATCH 083/142] 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 15928df188..7609a56048 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Crotalus - changes: - - message: Reagent grinder auto-modes - type: Add - id: 6250 - time: '2024-03-29T06:30:51.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/26290 - author: deltanedas changes: - message: Multiple bombs exploding at once on a tile now combine to have a larger @@ -3860,3 +3853,10 @@ id: 6749 time: '2024-06-15T17:50:55.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/29004 +- author: notafet + changes: + - message: The TEG must now be operated at higher temperatures to generate power. + type: Tweak + id: 6750 + time: '2024-06-15T21:05:57.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/29050 From 6d3d92cd50fc36e45437bd899152269cf380a56e Mon Sep 17 00:00:00 2001 From: lzk <124214523+lzk228@users.noreply.github.com> Date: Sat, 15 Jun 2024 23:32:49 +0200 Subject: [PATCH 084/142] Fix mime mask loadout minlimit (#29056) --- Resources/Prototypes/Loadouts/loadout_groups.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index 7f8a9ff4e4..cf9866faae 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -402,7 +402,6 @@ - type: loadoutGroup id: MimeMask name: loadout-group-mime-mask - minLimit: 0 loadouts: - MimeMask - MimeMaskSad From b70f222cf1d564838fb81ea830adfad312338087 Mon Sep 17 00:00:00 2001 From: PJBot Date: Sat, 15 Jun 2024 21:33:56 +0000 Subject: [PATCH 085/142] 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 7609a56048..5ccd6cc516 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,12 +1,4 @@ Entries: -- author: deltanedas - changes: - - message: Multiple bombs exploding at once on a tile now combine to have a larger - explosion rather than stacking the same small explosion. - type: Tweak - id: 6251 - time: '2024-03-29T23:46:06.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/25664 - author: Mephisto72 changes: - message: Ion Storms are now more likely to alter a Borg's laws. @@ -3860,3 +3852,10 @@ id: 6750 time: '2024-06-15T21:05:57.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/29050 +- author: lzk228 + changes: + - message: Fixed ability for mime to not choose any mask. + type: Fix + id: 6751 + time: '2024-06-15T21:32:49.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/29056 From 2ddebba0e9a2889c8b2623aad6d6fa6c2b384b2a Mon Sep 17 00:00:00 2001 From: DrSmugleaf <10968691+DrSmugleaf@users.noreply.github.com> Date: Sat, 15 Jun 2024 14:35:05 -0700 Subject: [PATCH 086/142] Fix speech bubble occlusion being checked from the player's position instead of the eye's (#29012) --- .../UserInterface/Systems/Chat/ChatUIController.cs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs b/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs index 334ba60873..904b922baa 100644 --- a/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs +++ b/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs @@ -16,9 +16,8 @@ using Content.Client.UserInterface.Systems.Gameplay; using Content.Shared.Administration; using Content.Shared.CCVar; using Content.Shared.Chat; -using Content.Shared.Decals; using Content.Shared.Damage.ForceSay; -using Content.Shared.Examine; +using Content.Shared.Decals; using Content.Shared.Input; using Content.Shared.Radio; using Robust.Client.GameObjects; @@ -626,7 +625,7 @@ public sealed class ChatUIController : UIController var predicate = static (EntityUid uid, (EntityUid compOwner, EntityUid? attachedEntity) data) => uid == data.compOwner || uid == data.attachedEntity; var playerPos = player != null - ? _transform?.GetMapCoordinates(player.Value) ?? MapCoordinates.Nullspace + ? _eye.CurrentEye.Position : MapCoordinates.Nullspace; var occluded = player != null && _examine.IsOccluded(player.Value); From a2affe3d000c2476259ba5ef7f525bbf7de12ec9 Mon Sep 17 00:00:00 2001 From: icekot8 <93311212+icekot8@users.noreply.github.com> Date: Sun, 16 Jun 2024 00:36:25 +0300 Subject: [PATCH 087/142] =?UTF-8?q?=20add=20=F0=9F=91=B7=20JobCondition=20?= =?UTF-8?q?system=20for=20reagents=20(#29023)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * hell :skull: * you're right i'm dumb * use the beautiful protoid and or in localization :cut_of_meat: * :pray: --- .../ReagentEffectConditions/JobCondition.cs | 49 +++++++++++++++++++ .../ContentLocalizationManager.cs | 16 +++++- .../en-US/guidebook/chemistry/conditions.ftl | 3 ++ 3 files changed, 67 insertions(+), 1 deletion(-) create mode 100644 Content.Server/Chemistry/ReagentEffectConditions/JobCondition.cs diff --git a/Content.Server/Chemistry/ReagentEffectConditions/JobCondition.cs b/Content.Server/Chemistry/ReagentEffectConditions/JobCondition.cs new file mode 100644 index 0000000000..0ede690049 --- /dev/null +++ b/Content.Server/Chemistry/ReagentEffectConditions/JobCondition.cs @@ -0,0 +1,49 @@ +using System.Linq; +using Content.Shared.Chemistry.Reagent; +using Content.Shared.Mobs; +using Content.Shared.Mobs.Components; +using Content.Shared.Localizations; +using Robust.Shared.Prototypes; +using Content.Shared.Mind; +using Content.Shared.Mind.Components; +using Content.Shared.Roles; +using Content.Shared.Roles.Jobs; +using Content.Shared.Station; +using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; +using Robust.Shared.IoC; + +namespace Content.Server.Chemistry.ReagentEffectConditions +{ + public sealed partial class JobCondition : ReagentEffectCondition + { + [DataField(required: true)] public List> Job; + + public override bool Condition(ReagentEffectArgs args) + { + args.EntityManager.TryGetComponent(args.SolutionEntity, out var mindContainer); + if (mindContainer != null && mindContainer.Mind != null) + { + var prototypeManager = IoCManager.Resolve(); + if (args.EntityManager.TryGetComponent(mindContainer?.Mind, out var comp) && prototypeManager.TryIndex(comp.Prototype, out var prototype)) + { + foreach (var jobId in Job) + { + if (prototype.ID == jobId) + { + return true; + } + } + } + } + + return false; + } + + public override string GuidebookExplanation(IPrototypeManager prototype) + { + var localizedNames = Job.Select(jobId => prototype.Index(jobId).LocalizedName).ToList(); + return Loc.GetString("reagent-effect-condition-guidebook-job-condition", ("job", ContentLocalizationManager.FormatListToOr(localizedNames))); + } + } +} + diff --git a/Content.Shared/Localizations/ContentLocalizationManager.cs b/Content.Shared/Localizations/ContentLocalizationManager.cs index 7d40182f6c..ad8890ae0f 100644 --- a/Content.Shared/Localizations/ContentLocalizationManager.cs +++ b/Content.Shared/Localizations/ContentLocalizationManager.cs @@ -1,4 +1,4 @@ -using System.Globalization; +using System.Globalization; using System.Linq; using System.Text.RegularExpressions; using Robust.Shared.Utility; @@ -119,6 +119,20 @@ namespace Content.Shared.Localizations }; } + /// + /// Formats a list as per english grammar rules, but uses or instead of and. + /// + public static string FormatListToOr(List list) + { + return list.Count switch + { + <= 0 => string.Empty, + 1 => list[0], + 2 => $"{list[0]} or {list[1]}", + _ => $"{string.Join(" or ", list)}" + }; + } + /// /// Formats a direction struct as a human-readable string. /// diff --git a/Resources/Locale/en-US/guidebook/chemistry/conditions.ftl b/Resources/Locale/en-US/guidebook/chemistry/conditions.ftl index 6cbfc13a79..95aaf9126d 100644 --- a/Resources/Locale/en-US/guidebook/chemistry/conditions.ftl +++ b/Resources/Locale/en-US/guidebook/chemistry/conditions.ftl @@ -28,6 +28,9 @@ reagent-effect-condition-guidebook-reagent-threshold = reagent-effect-condition-guidebook-mob-state-condition = the mob is { $state } +reagent-effect-condition-guidebook-job-condition = + the target's job is { $job } + reagent-effect-condition-guidebook-solution-temperature = the solution's temperature is { $max -> [2147483648] at least {NATURALFIXED($min, 2)}k From 6d6da1267a666cc155b2682260939d7198ef252d Mon Sep 17 00:00:00 2001 From: FunTust <49007663+FunTust@users.noreply.github.com> Date: Sun, 16 Jun 2024 00:42:13 +0300 Subject: [PATCH 088/142] ToggleVisualLayers hair disappeared fix (#28949) * Update ClothingSystem.cs * did it in a better way * Update ClothingSystem.cs --- .../Clothing/EntitySystems/ClothingSystem.cs | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs b/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs index e8bfb78961..1e2825a49a 100644 --- a/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs +++ b/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs @@ -92,26 +92,29 @@ public abstract class ClothingSystem : EntitySystem InventorySystem.InventorySlotEnumerator enumerator = _invSystem.GetSlotEnumerator(equipee); bool shouldLayerShow = true; - while (enumerator.NextItem(out EntityUid item)) + while (enumerator.NextItem(out EntityUid item, out SlotDefinition? slot)) { if (TryComp(item, out HideLayerClothingComponent? comp)) { if (comp.Slots.Contains(layer)) { - //Checks for mask toggling. TODO: Make a generic system for this - if (comp.HideOnToggle && TryComp(item, out MaskComponent? mask) && TryComp(item, out ClothingComponent? clothing)) + if (TryComp(item, out ClothingComponent? clothing) && clothing.Slots == slot.SlotFlags) { - if (clothing.EquippedPrefix != mask.EquippedPrefix) + //Checks for mask toggling. TODO: Make a generic system for this + if (comp.HideOnToggle && TryComp(item, out MaskComponent? mask)) + { + if (clothing.EquippedPrefix != mask.EquippedPrefix) + { + shouldLayerShow = false; + break; + } + } + else { shouldLayerShow = false; break; } } - else - { - shouldLayerShow = false; - break; - } } } } From 2a710ee4f69c7b86d9a5e2c7a8699ab4ab6aa27a Mon Sep 17 00:00:00 2001 From: PJBot Date: Sat, 15 Jun 2024 21:43:19 +0000 Subject: [PATCH 089/142] 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 5ccd6cc516..dba15544fd 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Mephisto72 - changes: - - message: Ion Storms are now more likely to alter a Borg's laws. - type: Tweak - id: 6252 - time: '2024-03-30T00:01:39.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/26539 - author: arimah changes: - message: Holoparasites, holoclowns and other guardians correctly transfer damage @@ -3859,3 +3852,10 @@ id: 6751 time: '2024-06-15T21:32:49.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/29056 +- author: FunTust + changes: + - message: Fixed hair disappearing when hats are tucked away in a pocket. + type: Fix + id: 6752 + time: '2024-06-15T21:42:13.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/28949 From 280b0a1c249e329a0f9a311cb04651ac5ec3bfb5 Mon Sep 17 00:00:00 2001 From: Cojoke <83733158+Cojoke-dot@users.noreply.github.com> Date: Sat, 15 Jun 2024 17:38:28 -0500 Subject: [PATCH 090/142] Adds New Shoes to Sec loadouts (#29018) * Adds New Shoes to Sec loadouts * Remove Cowboy stuff from sec drobe(bye sheriff) + requested changed --- .../Prototypes/Catalog/Fills/Items/misc.yml | 34 +++++++++++++++---- .../VendingMachines/Inventories/secdrobe.yml | 4 +-- .../Clothing/Shoes/base_clothingshoes.yml | 10 ++++++ .../Entities/Clothing/Shoes/boots.yml | 2 +- .../Jobs/Security/security_officer.yml | 11 +++++- .../Prototypes/Loadouts/loadout_groups.yml | 1 + 6 files changed, 50 insertions(+), 12 deletions(-) diff --git a/Resources/Prototypes/Catalog/Fills/Items/misc.yml b/Resources/Prototypes/Catalog/Fills/Items/misc.yml index 543cd604a2..816f3ba8d4 100644 --- a/Resources/Prototypes/Catalog/Fills/Items/misc.yml +++ b/Resources/Prototypes/Catalog/Fills/Items/misc.yml @@ -1,12 +1,32 @@ - type: entity id: ClothingShoesBootsCombatFilled - parent: ClothingShoesBootsCombat - suffix: Filled - components: - - type: ContainerFill - containers: - item: - - CombatKnife + parent: + - ClothingShoesBootsCombat + - ClothingShoesBootsSecFilled + +- type: entity + id: ClothingShoesBootsJackFilled + parent: + - ClothingShoesBootsJack + - ClothingShoesBootsSecFilled + +- type: entity + id: ClothingShoesBootsWinterSecFilled + parent: + - ClothingShoesBootsWinterSec + - ClothingShoesBootsSecFilled + +- type: entity + id: ClothingShoesBootsCowboyBlackFilled + parent: + - ClothingShoesBootsCowboyBlack + - ClothingShoesBootsSecFilled + +- type: entity + id: ClothingShoesHighheelBootsFilled + parent: + - ClothingShoesHighheelBoots + - ClothingShoesBootsSecFilled - type: entity id: ClothingShoesBootsMercFilled diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml index c4d937b841..5b733f0d35 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml @@ -19,9 +19,7 @@ ClothingOuterWinterSec: 2 ClothingOuterArmorBasic: 2 ClothingNeckScarfStripedRed: 3 - ClothingOuterArmorBasicSlim: 2 + ClothingOuterArmorBasicSlim: 2 ClothingEyesBlindfold: 1 ClothingShoesBootsCombat: 1 ClothingShoesBootsWinterSec: 2 - ClothingShoesBootsCowboyBlack: 1 - ClothingHeadHatCowboyBlack: 1 \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml b/Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml index a0f56966bb..d096ee3ff1 100644 --- a/Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml +++ b/Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml @@ -52,6 +52,16 @@ - Knife - Sidearm +- type: entity + abstract: true + id: ClothingShoesBootsSecFilled + suffix: Filled + components: + - type: ContainerFill + containers: + item: + - CombatKnife + - type: entity abstract: true parent: ClothingShoesBaseButcherable diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml b/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml index af32fa5818..33f5d36e36 100644 --- a/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml +++ b/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml @@ -143,7 +143,7 @@ sprite: Clothing/Shoes/Boots/winterbootssci.rsi - type: entity - parent: ClothingShoesBaseWinterBoots + parent: [ClothingShoesBaseWinterBoots, ClothingShoesMilitaryBase] id: ClothingShoesBootsWinterSec name: security winter boots components: diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml b/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml index 321cc46feb..dfce25809f 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml @@ -187,6 +187,15 @@ equipment: shoes: ClothingShoesBootsCombatFilled +- type: loadout + id: JackBoots + equipment: JackBoots + +- type: startingGear + id: JackBoots + equipment: + shoes: ClothingShoesBootsJackFilled + - type: loadout id: SecurityWinterBoots equipment: SecurityWinterBoots @@ -194,7 +203,7 @@ - type: startingGear id: SecurityWinterBoots equipment: - shoes: ClothingShoesBootsWinterSec + shoes: ClothingShoesBootsWinterSecFilled # PDA - type: loadout diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index cf9866faae..0fab367fc9 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -882,6 +882,7 @@ name: loadout-group-security-shoes loadouts: - CombatBoots + - JackBoots - SecurityWinterBoots - type: loadoutGroup From 904f15fed7bad9cf35afc8464f4f26be92867d04 Mon Sep 17 00:00:00 2001 From: PJBot Date: Sat, 15 Jun 2024 22:39:34 +0000 Subject: [PATCH 091/142] Automatic changelog update --- Resources/Changelog/Changelog.yml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index dba15544fd..0a127c4684 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,12 +1,4 @@ Entries: -- author: arimah - changes: - - message: Holoparasites, holoclowns and other guardians correctly transfer damage - to their hosts again. - type: Fix - id: 6253 - time: '2024-03-30T01:25:43.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/26541 - author: Boaz1111 changes: - message: Added an industrial reagent grinder to the basic hydroponics research. @@ -3859,3 +3851,12 @@ id: 6752 time: '2024-06-15T21:42:13.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/28949 +- author: Cojoke-dot + changes: + - message: You can now find Jackboots in the security load-outs + type: Add + - message: The Sec drobe no longer has a Cowboy hat or boots + type: Remove + id: 6753 + time: '2024-06-15T22:38:29.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/29018 From c063347ed697c1441812766e9008cd031dadc8f5 Mon Sep 17 00:00:00 2001 From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> Date: Sat, 15 Jun 2024 19:24:15 -0400 Subject: [PATCH 092/142] fix meteor announcement color (#29058) --- Content.Server/StationEvents/Events/MeteorSwarmSystem.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Server/StationEvents/Events/MeteorSwarmSystem.cs b/Content.Server/StationEvents/Events/MeteorSwarmSystem.cs index e085a2e159..6a67930c4d 100644 --- a/Content.Server/StationEvents/Events/MeteorSwarmSystem.cs +++ b/Content.Server/StationEvents/Events/MeteorSwarmSystem.cs @@ -29,7 +29,7 @@ public sealed class MeteorSwarmSystem : GameRuleSystem component.WaveCounter = component.Waves.Next(RobustRandom); if (component.Announcement is { } locId) - _chat.DispatchGlobalAnnouncement(Loc.GetString(locId), playSound: false, colorOverride: Color.Yellow); + _chat.DispatchGlobalAnnouncement(Loc.GetString(locId), playSound: false, colorOverride: Color.Gold); _audio.PlayGlobal(component.AnnouncementSound, Filter.Broadcast(), true); } From 97761e49cabe4da259459ea90c400e3b2aeb0bbc Mon Sep 17 00:00:00 2001 From: Keer-Sar <144283718+Keer-Sar@users.noreply.github.com> Date: Sat, 15 Jun 2024 20:24:29 -0400 Subject: [PATCH 093/142] Change "they're" to "their" in the lungs cargo bounty: Fixes #29051 (#29064) change they're to their --- Resources/Locale/en-US/cargo/bounties.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Locale/en-US/cargo/bounties.ftl b/Resources/Locale/en-US/cargo/bounties.ftl index b332517c70..09424e4909 100644 --- a/Resources/Locale/en-US/cargo/bounties.ftl +++ b/Resources/Locale/en-US/cargo/bounties.ftl @@ -89,7 +89,7 @@ bounty-description-instrument = The hottest new band in the galaxy, Cindy Kate a bounty-description-knife = One of our top commanders recently won a brand new set of knives on an official Nanotrasen gameshow. Unforunately, we don't have a set on hand. Send us a bunch of sharp things so we can throw something together, bounty-description-lemon = Dr Jones's kid is starting up a lemonade stand. Small issue: lemons don't get shipped to this sector. Fix that for a nice reward. bounty-description-lime = After a heavy drinking session, Admiral Pastich developed a strong addiction to fresh lime wedges. Send us some limes so we can prepare him his new favorite snack. -bounty-description-lung = The pro-smoking league has been fighting to keep cigarettes on our stations for millennia. Unfortunately, they're lungs aren't fighting so hard anymore. Send them some new ones. +bounty-description-lung = The pro-smoking league has been fighting to keep cigarettes on our stations for millennia. Unfortunately, their lungs aren't fighting so hard anymore. Send them some new ones. bounty-description-monkey-cube = Due to a recent genetics accident, Central Command is in serious need of monkeys. Your mission is to ship monkey cubes. bounty-description-mouse = Station 13 ran out of freeze-dried mice. Ship some fresh ones so their janitor doesn't go on strike. bounty-description-pancake = Here at Nanotrasen we consider employees to be family. And you know what families love? Pancakes. Ship a baker's dozen. From ddd7008bfe146967fdf01ec58df29051f96f6c2c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 15 Jun 2024 20:25:34 -0400 Subject: [PATCH 094/142] Update Credits (#29065) Co-authored-by: PJBot --- Resources/Credits/GitHub.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Credits/GitHub.txt b/Resources/Credits/GitHub.txt index f240c95247..15d75d4487 100644 --- a/Resources/Credits/GitHub.txt +++ b/Resources/Credits/GitHub.txt @@ -1 +1 @@ -0x6273, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 4dplanner, 612git, 778b, Ablankmann, Acruid, actioninja, adamsong, Admiral-Obvious-001, Adrian16199, Aerocrux, Aexxie, Afrokada, Agoichi, Ahion, AJCM-git, AjexRose, Alekshhh, AlexMorgan3817, AlexUm418, AlmondFlour, AlphaQwerty, Altoids1, amylizzle, ancientpower, ArchPigeon, Arendian, arimah, Arteben, AruMoon, as334, AsikKEsel, asperger-sind, aspiringLich, avghdev, AzzyIsNotHere, BananaFlambe, Baptr0b0t, BasedUser, beck-thompson, BellwetherLogic, BGare, bhenrich, BingoJohnson-zz, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, blueDev2, Boaz1111, BobdaBiscuit, brainfood1183, Brandon-Huu, Bright0, brndd, BubblegumBlue, BYONDFuckery, c4llv07e, CakeQ, Callmore, CaptainSqrBeard, Carbonhell, CatTheSystem, Centronias, chairbender, Charlese2, Cheackraze, cheesePizza2, Chief-Engineer, chromiumboy, Chronophylos, Ciac32, clement-or, Clyybber, Cojoke-dot, ColdAutumnRain, collinlunn, ComicIronic, coolmankid12345, corentt, crazybrain23, creadth, CrigCrag, Crotalus, CrudeWax, CrzyPotato, Cyberboss, d34d10cc, Daemon, daerSeebaer, dahnte, dakamakat, dakimasu, DamianX, DangerRevolution, daniel-cr, Darkenson, DawBla, dch-GH, Deahaka, DEATHB4DEFEAT, DeathCamel58, deathride58, DebugOk, Decappi, deepdarkdepths, deepy, Delete69, deltanedas, DerbyX, DexlerXD, Doctor-Cpu, DoctorBeard, DogZeroX, dontbetank, Doru991, DoubleRiceEddiedd, DoutorWhite, DrMelon, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, Duddino, DuskyJay, Dutch-VanDerLinde, Easypoller, eclips_e, EdenTheLiznerd, EEASAS, Efruit, ElectroSR, elthundercloud, Emisse, EmoGarbage404, Endecc, enumerate0, eoineoineoin, ERORR404V1, Errant-4, estacaoespacialpirata, exincore, exp111, Fahasor, FairlySadPanda, ficcialfaint, Fildrance, FillerVK, Fishfish458, Flareguy, FluffiestFloof, FluidRock, FoLoKe, fooberticus, Fortune117, freeman2651, Froffy025, Fromoriss, FungiFellow, GalacticChimp, gbasood, Geekyhobo, Genkail, Ghagliiarghii, Git-Nivrak, github-actions[bot], gituhabu, GNF54, Golinth, GoodWheatley, Gotimanga, graevy, GreyMario, gusxyz, Gyrandola, h3half, Hanzdegloker, Hardly3D, harikattar, Hebiman, Henry12116, HerCoyote23, hitomishirichan, Hmeister-real, HoofedEar, hord-brayden, hubismal, Hugal31, Huxellberger, Hyenh, iacore, IamVelcroboy, icekot8, igorsaux, ike709, Illiux, Ilya246, IlyaElDunaev, Injazz, Insineer, IntegerTempest, Interrobang01, IProduceWidgets, ItsMeThom, j-giebel, Jackal298, Jackrost, jamessimo, janekvap, Jark255, JerryImMouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JoeHammad1844, joelhed, JohnGinnane, johnku1, joshepvodka, jproads, Jrpl, juliangiebel, JustArt1m, JustCone14, JustinTether, JustinTrotter, K-Dynamic, KaiShibaa, kalane15, kalanosh, Kelrak, kerisargit, keronshb, KIBORG04, Killerqu00, KingFroozy, kira-er, Kit0vras, KittenColony, Ko4ergaPunk, komunre, koteq, Krunklehorn, Kukutis96513, kxvvv, Lamrr, LankLTE, lapatison, Leander-0, LetterN, Level10Cybermancer, lever1209, liltenhead, LittleBuilderJane, Lomcastar, LordCarve, LordEclipse, luckyshotpictures, Lukasz825700516, lunarcomets, luringens, lvvova1, lzimann, lzk228, MACMAN2003, Macoron, MagnusCrowe, ManelNavola, Mangohydra, Matz05, MehimoNemo, MeltedPixel, MemeProof, Menshin, Mervill, metalgearsloth, mhamsterr, MilenVolf, Minty642, Mirino97, mirrorcult, misandrie, MishaUnity, MisterMecky, Mith-randalf, Moneyl, Moomoobeef, moony, Morb0, Mr0maks, musicmanvr, Myakot, Myctai, N3X15, Nairodian, Naive817, namespace-Memory, NickPowers43, nikthechampiongr, Nimfar11, Nirnael, nmajask, nok-ko, Nopey, notafet, notquitehadouken, noudoit, noverd, nuke-haus, NULL882, OctoRocket, OldDanceJacket, onoira, osjarw, Owai-Seek, pali6, Pangogie, patrikturi, PaulRitter, Peptide90, peptron1, Phantom-Lily, pigeonpeas, pissdemon, PixelTheKermit, PJB3005, Plykiya, pofitlo, pointer-to-null, PolterTzi, PoorMansDreams, potato1234x, ProfanedBane, PrPleGoo, ps3moira, Psychpsyo, psykzz, PuroSlavKing, PursuitInAshes, quatre, QuietlyWhisper, qwerltaz, Radosvik, Radrark, Rainbeon, Rainfey, RamZ, Rane, ravage123321, rbertoche, Redict, RedlineTriad, RednoWCirabrab, RemberBM, RemieRichards, RemTim, rene-descartes2021, RiceMar1244, RieBi, Rinkashikachi, Rockdtben, rolfero, rosieposieeee, RumiTiger, Saakra, Samsterious, SaphireLattice, ScalyChimp, scrato, Scribbles0, Serkket, SethLafuente, ShadowCommander, Shadowtheprotogen546, shampunj, SignalWalker, Simyon264, Sirionaut, siyengar04, Skarletto, Skrauz, Skyedra, SlamBamActionman, slarticodefast, Slava0135, snebl, Snowni, snowsignal, SonicHDC, SoulFN, SoulSloth, SpaceManiac, SpeltIncorrectyl, SphiraI, spoogemonster, ssdaniel24, Stealthbomber16, StrawberryMoses, superjj18, SweptWasTaken, Szunti, takemysoult, TaralGit, Tayrtahn, tday93, TekuNut, TemporalOroboros, tentekal, Terraspark4941, tgrkzus, thatrandomcanadianguy, TheArturZh, theashtronaut, thedraccx, themias, theomund, theOperand, TheShuEd, TimrodDX, Titian3, tkdrg, tmtmtl30, TokenStyle, tom-leys, tomasalves8, Tomeno, Tornado-Technology, tosatur, TsjipTsjip, Tunguso4ka, TurboTrackerss14, Tyler-IN, Tyzemol, UbaserB, UBlueberry, UKNOWH, Uriende, UristMcDorf, Vaaankas, Varen, VasilisThePikachu, veliebm, Veritius, Vermidia, Verslebas, VigersRay, Visne, volundr-, Voomra, Vordenburg, vulppine, wafehling, waylon531, weaversam8, whateverusername0, Willhelm53, wixoaGit, WlarusFromDaSpace, wrexbe, xRiriq, yathxyz, Ygg01, YotaXP, YuriyKiss, zach-hill, Zandario, Zap527, Zealith-Gamer, ZelteHonor, zerorulez, zionnBE, zlodo, ZNixian, ZoldorfTheWizard, Zumorica, Zymem +0x6273, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 4dplanner, 612git, 778b, Ablankmann, Acruid, actioninja, adamsong, Admiral-Obvious-001, Adrian16199, Aerocrux, Aeshus, Aexxie, Afrokada, Agoichi, Ahion, AJCM-git, AjexRose, Alekshhh, AlexMorgan3817, AlexUm418, AlmondFlour, AlphaQwerty, Altoids1, amylizzle, ancientpower, ArchPigeon, Arendian, arimah, Arteben, AruMoon, as334, AsikKEsel, asperger-sind, aspiringLich, avghdev, AzzyIsNotHere, BananaFlambe, Baptr0b0t, BasedUser, beck-thompson, BellwetherLogic, BGare, bhenrich, BingoJohnson-zz, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, blueDev2, Boaz1111, BobdaBiscuit, brainfood1183, Brandon-Huu, Bright0, brndd, BubblegumBlue, BYONDFuckery, c4llv07e, CakeQ, Callmore, CaptainSqrBeard, Carbonhell, CatTheSystem, Centronias, chairbender, Charlese2, Cheackraze, cheesePizza2, Chief-Engineer, chromiumboy, Chronophylos, Ciac32, clement-or, Clyybber, Cojoke-dot, ColdAutumnRain, collinlunn, ComicIronic, coolmankid12345, corentt, crazybrain23, creadth, CrigCrag, Crotalus, CrudeWax, CrzyPotato, Cyberboss, d34d10cc, Daemon, daerSeebaer, dahnte, dakamakat, dakimasu, DamianX, DangerRevolution, daniel-cr, Darkenson, DawBla, dch-GH, Deahaka, DEATHB4DEFEAT, DeathCamel58, deathride58, DebugOk, Decappi, deepdarkdepths, deepy, Delete69, deltanedas, DerbyX, DexlerXD, dffdff2423, Doctor-Cpu, DoctorBeard, DogZeroX, dontbetank, Doomsdrayk, Doru991, DoubleRiceEddiedd, DoutorWhite, DrMelon, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, Duddino, Dutch-VanDerLinde, Easypoller, eclips_e, EdenTheLiznerd, EEASAS, Efruit, ElectroSR, elthundercloud, Emisse, EmoGarbage404, Endecc, enumerate0, eoineoineoin, ERORR404V1, Errant-4, estacaoespacialpirata, exincore, exp111, Fahasor, FairlySadPanda, ficcialfaint, Fildrance, FillerVK, Fishfish458, Flareguy, FluffiestFloof, FluidRock, FoLoKe, fooberticus, Fortune117, freeman2651, Froffy025, Fromoriss, FungiFellow, GalacticChimp, gbasood, Geekyhobo, Genkail, Ghagliiarghii, Git-Nivrak, github-actions[bot], gituhabu, GNF54, Golinth, GoodWheatley, Gotimanga, graevy, GreyMario, gusxyz, Gyrandola, h3half, Hanzdegloker, Hardly3D, harikattar, Hebiman, Henry12116, HerCoyote23, hitomishirichan, Hmeister-real, HoofedEar, hord-brayden, hubismal, Hugal31, Huxellberger, Hyenh, iacore, IamVelcroboy, icekot8, igorsaux, ike709, Illiux, Ilya246, IlyaElDunaev, Injazz, Insineer, IntegerTempest, Interrobang01, IProduceWidgets, ItsMeThom, Jackal298, Jackrost, jamessimo, janekvap, Jark255, JerryImMouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JoeHammad1844, JohnGinnane, johnku1, joshepvodka, jproads, Jrpl, juliangiebel, JustArt1m, JustCone14, JustinTrotter, K-Dynamic, KaiShibaa, kalane15, kalanosh, Kelrak, kerisargit, keronshb, KIBORG04, Killerqu00, KingFroozy, kira-er, Kit0vras, KittenColony, Ko4ergaPunk, komunre, koteq, Krunklehorn, Kukutis96513, kxvvv, Lamrr, LankLTE, lapatison, Leander-0, LetterN, Level10Cybermancer, lever1209, liltenhead, LittleBuilderJane, Lomcastar, LordCarve, LordEclipse, luckyshotpictures, Lukasz825700516, lunarcomets, luringens, lvvova1, lzimann, lzk228, MACMAN2003, Macoron, MagnusCrowe, ManelNavola, Mangohydra, Matz05, MehimoNemo, MeltedPixel, MemeProof, Menshin, Mervill, metalgearsloth, mhamsterr, MilenVolf, Minty642, Mirino97, mirrorcult, misandrie, MishaUnity, MisterMecky, Mith-randalf, MjrLandWhale, Moneyl, Moomoobeef, moony, Morb0, Mr0maks, musicmanvr, Myakot, Myctai, N3X15, Nairodian, Naive817, namespace-Memory, NickPowers43, nikthechampiongr, Nimfar11, Nirnael, nmajask, nok-ko, Nopey, notafet, notquitehadouken, noudoit, noverd, nuke-haus, NULL882, OctoRocket, OldDanceJacket, onoira, osjarw, Owai-Seek, pali6, Pangogie, patrikturi, PaulRitter, Peptide90, peptron1, Phantom-Lily, pigeonpeas, pissdemon, PixelTheKermit, PJB3005, Plykiya, pofitlo, pointer-to-null, PolterTzi, PoorMansDreams, potato1234x, ProfanedBane, PrPleGoo, ps3moira, Psychpsyo, psykzz, PuroSlavKing, PursuitInAshes, quatre, QuietlyWhisper, qwerltaz, Radosvik, Radrark, Rainbeon, Rainfey, RamZ, Rane, ravage123321, rbertoche, Redict, RedlineTriad, RednoWCirabrab, RemberBM, RemieRichards, RemTim, rene-descartes2021, RiceMar1244, RieBi, Rinkashikachi, Rockdtben, rolfero, rosieposieeee, RumiTiger, Saakra, Samsterious, SaphireLattice, ScalyChimp, scrato, Scribbles0, Serkket, SethLafuente, ShadowCommander, Shadowtheprotogen546, shampunj, SignalWalker, Simyon264, Sirionaut, siyengar04, Skarletto, Skrauz, Skyedra, SlamBamActionman, slarticodefast, Slava0135, snebl, Snowni, snowsignal, SonicHDC, SoulFN, SoulSloth, SpaceManiac, SpeltIncorrectyl, SphiraI, spoogemonster, ssdaniel24, Stealthbomber16, StrawberryMoses, superjj18, SweptWasTaken, Szunti, takemysoult, TaralGit, Tayrtahn, tday93, TekuNut, TemporalOroboros, tentekal, Terraspark4941, tgrkzus, thatrandomcanadianguy, TheArturZh, theashtronaut, thedraccx, themias, theomund, theOperand, TheShuEd, TimrodDX, Titian3, tkdrg, tmtmtl30, TokenStyle, tom-leys, tomasalves8, Tomeno, Tornado-Technology, tosatur, TsjipTsjip, Tunguso4ka, TurboTrackerss14, Tyler-IN, Tyzemol, UbaserB, UBlueberry, UKNOWH, Uriende, UristMcDorf, Vaaankas, Varen, VasilisThePikachu, veliebm, Veritius, Vermidia, Verslebas, VigersRay, Visne, volundr-, Voomra, Vordenburg, vulppine, wafehling, waylon531, weaversam8, whateverusername0, Willhelm53, wixoaGit, WlarusFromDaSpace, wrexbe, xRiriq, yathxyz, Ygg01, YotaXP, YuriyKiss, zach-hill, Zandario, Zap527, Zealith-Gamer, ZelteHonor, zerorulez, zionnBE, zlodo, ZNixian, ZoldorfTheWizard, Zonespace27, Zumorica, Zymem From 17aa1f98a1f779eecb3c4f8b9198ca3e1935f604 Mon Sep 17 00:00:00 2001 From: PJBot Date: Sun, 16 Jun 2024 00:25:34 +0000 Subject: [PATCH 095/142] 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 0a127c4684..b5522bd050 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,12 +1,4 @@ Entries: -- author: Boaz1111 - changes: - - message: Added an industrial reagent grinder to the basic hydroponics research. - It grinds things into reagents like a recycler. - type: Add - id: 6254 - time: '2024-03-30T02:46:20.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/25020 - author: SonicHDC changes: - message: Added unzipping for lab coats! @@ -3860,3 +3852,10 @@ id: 6753 time: '2024-06-15T22:38:29.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/29018 +- author: Keer-Sar + changes: + - message: Fixed a spelling error in the cargo bounty for lungs. + type: Fix + id: 6754 + time: '2024-06-16T00:24:29.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/29064 From e633fe801bb4755aa6015612b432571b687ce6ca Mon Sep 17 00:00:00 2001 From: Partmedia Date: Sat, 15 Jun 2024 17:06:54 -0800 Subject: [PATCH 096/142] Widen power monitoring widget (#29062) --- Content.Client/Power/PowerMonitoringWindow.xaml.Widgets.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Client/Power/PowerMonitoringWindow.xaml.Widgets.cs b/Content.Client/Power/PowerMonitoringWindow.xaml.Widgets.cs index 1427df0515..74752ddc53 100644 --- a/Content.Client/Power/PowerMonitoringWindow.xaml.Widgets.cs +++ b/Content.Client/Power/PowerMonitoringWindow.xaml.Widgets.cs @@ -482,7 +482,7 @@ public sealed class PowerMonitoringButton : Button { HorizontalAlignment = HAlignment.Right, Align = Label.AlignMode.Right, - SetWidth = 72f, + SetWidth = 80f, Margin = new Thickness(10, 0, 0, 0), ClipText = true, }; From c2f88b2e17981bfa5f11ffc9807b61e7197a6a8f Mon Sep 17 00:00:00 2001 From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> Date: Sat, 15 Jun 2024 21:10:21 -0400 Subject: [PATCH 097/142] fix exclusive borg module bug (#29038) --- Content.Server/Silicons/Borgs/BorgSystem.Modules.cs | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/Content.Server/Silicons/Borgs/BorgSystem.Modules.cs b/Content.Server/Silicons/Borgs/BorgSystem.Modules.cs index f372f7df1a..8f43635ccc 100644 --- a/Content.Server/Silicons/Borgs/BorgSystem.Modules.cs +++ b/Content.Server/Silicons/Borgs/BorgSystem.Modules.cs @@ -281,15 +281,13 @@ public sealed partial class BorgSystem if (!TryComp(containedModuleUid, out var containedItemModuleComp)) continue; - for (int i = 0; i < itemModuleComp.Items.Count; i++) + if (containedItemModuleComp.Items.All(itemModuleComp.Items.Contains) && + containedItemModuleComp.Items.Count == itemModuleComp.Items.Count) { - if (itemModuleComp.Items[i] != containedItemModuleComp.Items[i]) - continue; + if (user != null) + Popup.PopupEntity(Loc.GetString("borg-module-duplicate"), uid, user.Value); + return false; } - - if (user != null) - Popup.PopupEntity(Loc.GetString("borg-module-duplicate"), uid, user.Value); - return false; } } From 2fde5ac580c63637004c7fe24cb6fa64ba5c9830 Mon Sep 17 00:00:00 2001 From: Cojoke <83733158+Cojoke-dot@users.noreply.github.com> Date: Sat, 15 Jun 2024 20:25:51 -0500 Subject: [PATCH 098/142] Cleans up ClothingShoesBootsMagSyndie in magboots.yml (#28653) * Remove Explosive Component from ClothingShoesBootsMagSyndie * Makes BaseJetpack a parent of ClothingShoesBootsMagSyndie * fix boots in hand looking like jetpack bug * make syndicate magboots child of magboots --- .../Entities/Clothing/Shoes/magboots.yml | 26 +++---------------- 1 file changed, 4 insertions(+), 22 deletions(-) diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml b/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml index e80ed74305..d934a8b97e 100644 --- a/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml +++ b/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml @@ -81,7 +81,7 @@ price: 3000 - type: entity - parent: ClothingShoesBase + parent: [ClothingShoesBootsMag, BaseJetpack] id: ClothingShoesBootsMagSyndie name: blood-red magboots description: Reverse-engineered magnetic boots that have a heavy magnetic pull and integrated thrusters. @@ -106,27 +106,9 @@ moles: - 0.153853429 # oxygen - 0.153853429 # nitrogen - - type: ActivatableUI - key: enum.SharedGasTankUiKey.Key - - type: UserInterface - interfaces: - enum.SharedGasTankUiKey.Key: - type: GasTankBoundUserInterface - - type: Explosive - explosionType: Default - maxIntensity: 20 - - type: Jetpack - moleUsage: 0.00085 - - type: CanMoveInAir - - type: InputMover - toParent: true - - type: MovementSpeedModifier - weightlessAcceleration: 1 - weightlessFriction: 0.3 - weightlessModifier: 1.2 - - type: Tag - tags: - - WhitelistChameleon + - type: Item + sprite: null + size: Normal - type: entity id: ActionBaseToggleMagboots From dfe9d5264c9d2aa706b97e3dcfb4ad1eb7c5aa14 Mon Sep 17 00:00:00 2001 From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> Date: Sat, 15 Jun 2024 21:32:01 -0400 Subject: [PATCH 099/142] Slightly speed up borgsystem module check (#29070) --- Content.Server/Silicons/Borgs/BorgSystem.Modules.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Content.Server/Silicons/Borgs/BorgSystem.Modules.cs b/Content.Server/Silicons/Borgs/BorgSystem.Modules.cs index 8f43635ccc..746d75f0d8 100644 --- a/Content.Server/Silicons/Borgs/BorgSystem.Modules.cs +++ b/Content.Server/Silicons/Borgs/BorgSystem.Modules.cs @@ -281,8 +281,8 @@ public sealed partial class BorgSystem if (!TryComp(containedModuleUid, out var containedItemModuleComp)) continue; - if (containedItemModuleComp.Items.All(itemModuleComp.Items.Contains) && - containedItemModuleComp.Items.Count == itemModuleComp.Items.Count) + if (containedItemModuleComp.Items.Count == itemModuleComp.Items.Count && + containedItemModuleComp.Items.All(itemModuleComp.Items.Contains)) { if (user != null) Popup.PopupEntity(Loc.GetString("borg-module-duplicate"), uid, user.Value); From 65af00afc4fec803288f819ca4cdc45d2193adf3 Mon Sep 17 00:00:00 2001 From: Keer-Sar <144283718+Keer-Sar@users.noreply.github.com> Date: Sat, 15 Jun 2024 22:06:12 -0400 Subject: [PATCH 100/142] Fixes capitalization mistake when non-humanoids insert things into machines: Fixes #28997 (#29071) add CAPITALIZE() --- Resources/Locale/en-US/machine/machine.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Locale/en-US/machine/machine.ftl b/Resources/Locale/en-US/machine/machine.ftl index ce8873df6f..13d9e76b9d 100644 --- a/Resources/Locale/en-US/machine/machine.ftl +++ b/Resources/Locale/en-US/machine/machine.ftl @@ -1,4 +1,4 @@ -machine-insert-item = {THE($user)} inserted {THE($item)} into {THE($machine)}. +machine-insert-item = {CAPITALIZE(THE($user))} inserted {THE($item)} into {THE($machine)}. machine-upgrade-examinable-verb-text = Upgrades machine-upgrade-examinable-verb-message = Examine the machine upgrades. From a341c3a1e93545af8e63b0802e2ef68a406117eb Mon Sep 17 00:00:00 2001 From: PJBot Date: Sun, 16 Jun 2024 02:07:18 +0000 Subject: [PATCH 101/142] Automatic changelog update --- Resources/Changelog/Changelog.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index b5522bd050..fca8bcdaad 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: SonicHDC - changes: - - message: Added unzipping for lab coats! - type: Add - id: 6255 - time: '2024-03-30T03:31:32.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/26494 - author: Zealith-Gamer changes: - message: Items being pulled no longer spin when being thrown. @@ -3859,3 +3852,11 @@ id: 6754 time: '2024-06-16T00:24:29.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/29064 +- author: Keer-Sar + changes: + - message: Non-humanoids' names are now capitalized when inserting materials into + machines. + type: Fix + id: 6755 + time: '2024-06-16T02:06:12.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/29071 From 3644602fb830004428464eb35b80cc71520838d2 Mon Sep 17 00:00:00 2001 From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> Date: Sat, 15 Jun 2024 23:38:17 -0400 Subject: [PATCH 102/142] Fix magboots not needing a grid to work (#29034) * Fix magboots not needing a grid to work * ok fix it for realsies --- Content.Shared/Clothing/MagbootsComponent.cs | 6 ++++ .../Clothing/SharedMagbootsSystem.cs | 5 +++ Content.Shared/Gravity/SharedGravitySystem.cs | 32 ++++++++++++++++--- 3 files changed, 39 insertions(+), 4 deletions(-) diff --git a/Content.Shared/Clothing/MagbootsComponent.cs b/Content.Shared/Clothing/MagbootsComponent.cs index 0d074ff38b..b3fb607a38 100644 --- a/Content.Shared/Clothing/MagbootsComponent.cs +++ b/Content.Shared/Clothing/MagbootsComponent.cs @@ -20,4 +20,10 @@ public sealed partial class MagbootsComponent : Component [DataField] public ProtoId MagbootsAlert = "Magboots"; + + /// + /// If true, the user must be standing on a grid or planet map to experience the weightlessness-canceling effect + /// + [DataField] + public bool RequiresGrid = true; } diff --git a/Content.Shared/Clothing/SharedMagbootsSystem.cs b/Content.Shared/Clothing/SharedMagbootsSystem.cs index bb3b05074f..6814593615 100644 --- a/Content.Shared/Clothing/SharedMagbootsSystem.cs +++ b/Content.Shared/Clothing/SharedMagbootsSystem.cs @@ -17,6 +17,7 @@ public sealed class SharedMagbootsSystem : EntitySystem [Dependency] private readonly AlertsSystem _alerts = default!; [Dependency] private readonly ClothingSpeedModifierSystem _clothingSpeedModifier = default!; [Dependency] private readonly ClothingSystem _clothing = default!; + [Dependency] private readonly SharedGravitySystem _gravity = default!; [Dependency] private readonly InventorySystem _inventory = default!; [Dependency] private readonly SharedActionsSystem _sharedActions = default!; [Dependency] private readonly SharedActionsSystem _actionContainer = default!; @@ -147,6 +148,10 @@ public sealed class SharedMagbootsSystem : EntitySystem if (!ent.Comp.On) return; + // do not cancel weightlessness if the person is in off-grid. + if (ent.Comp.RequiresGrid && !_gravity.EntityOnGravitySupportingGridOrMap(ent.Owner)) + return; + args.Args.IsWeightless = false; args.Args.Handled = true; } diff --git a/Content.Shared/Gravity/SharedGravitySystem.cs b/Content.Shared/Gravity/SharedGravitySystem.cs index 42a6d5d1f8..2f532d0f1d 100644 --- a/Content.Shared/Gravity/SharedGravitySystem.cs +++ b/Content.Shared/Gravity/SharedGravitySystem.cs @@ -17,6 +17,8 @@ namespace Content.Shared.Gravity [ValidatePrototypeId] public const string WeightlessAlert = "Weightless"; + private EntityQuery _gravityQuery; + public bool IsWeightless(EntityUid uid, PhysicsComponent? body = null, TransformComponent? xform = null) { Resolve(uid, ref body, false); @@ -36,15 +38,35 @@ namespace Content.Shared.Gravity return true; // If grid / map has gravity - if (TryComp(xform.GridUid, out var gravity) && gravity.Enabled || - TryComp(xform.MapUid, out var mapGravity) && mapGravity.Enabled) - { + if (EntityGridOrMapHaveGravity((uid, xform))) return false; - } return true; } + /// + /// Checks if a given entity is currently standing on a grid or map that supports having gravity at all. + /// + public bool EntityOnGravitySupportingGridOrMap(Entity entity) + { + entity.Comp ??= Transform(entity); + + return _gravityQuery.HasComp(entity.Comp.GridUid) || + _gravityQuery.HasComp(entity.Comp.MapUid); + } + + + /// + /// Checks if a given entity is currently standing on a grid or map that has gravity of some kind. + /// + public bool EntityGridOrMapHaveGravity(Entity entity) + { + entity.Comp ??= Transform(entity); + + return _gravityQuery.TryComp(entity.Comp.GridUid, out var gravity) && gravity.Enabled || + _gravityQuery.TryComp(entity.Comp.MapUid, out var mapGravity) && mapGravity.Enabled; + } + public override void Initialize() { base.Initialize(); @@ -54,6 +76,8 @@ namespace Content.Shared.Gravity SubscribeLocalEvent(OnGravityChange); SubscribeLocalEvent(OnGetState); SubscribeLocalEvent(OnHandleState); + + _gravityQuery = GetEntityQuery(); } public override void Update(float frameTime) From 732576b518e0baf156868e7241a6f79cd518e009 Mon Sep 17 00:00:00 2001 From: PJBot Date: Sun, 16 Jun 2024 03:39:23 +0000 Subject: [PATCH 103/142] 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 fca8bcdaad..8ceaead435 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Zealith-Gamer - changes: - - message: Items being pulled no longer spin when being thrown. - type: Fix - id: 6256 - time: '2024-03-30T03:35:43.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/26504 - author: Plykiya changes: - message: Hyposprays can now be toggled to draw from solution containers like jugs @@ -3860,3 +3853,10 @@ id: 6755 time: '2024-06-16T02:06:12.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/29071 +- author: EmoGarbage404 + changes: + - message: Magboots no longer work when off-grid. + type: Fix + id: 6756 + time: '2024-06-16T03:38:18.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/29034 From 9348a5cea609f6ccb5045341bd83422a20cc0e8c Mon Sep 17 00:00:00 2001 From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> Date: Sun, 16 Jun 2024 06:43:22 -0400 Subject: [PATCH 104/142] Apc & Substation resprite (#28998) * substation * apcs * top pixels * new screens --- .../Power/APC/ApcVisualizerComponent.cs | 2 +- .../Entities/Structures/Power/apc.yml | 15 +- .../Entities/Structures/Power/substation.yml | 11 +- .../Structures/Power/apc.rsi/base.png | Bin 370 -> 676 bytes .../Structures/Power/apc.rsi/broken.png | Bin 673 -> 1061 bytes .../Power/apc.rsi/channel0-auto_off.png | Bin 154 -> 0 bytes .../Power/apc.rsi/channel0-auto_on.png | Bin 156 -> 0 bytes .../Power/apc.rsi/channel0-manual_off.png | Bin 157 -> 0 bytes .../Power/apc.rsi/channel0-manual_on.png | Bin 158 -> 0 bytes .../Power/apc.rsi/channel1-auto_off.png | Bin 154 -> 0 bytes .../Power/apc.rsi/channel1-auto_on.png | Bin 156 -> 0 bytes .../Power/apc.rsi/channel1-manual_off.png | Bin 157 -> 0 bytes .../Power/apc.rsi/channel1-manual_on.png | Bin 158 -> 0 bytes .../Power/apc.rsi/channel2-auto_off.png | Bin 154 -> 0 bytes .../Power/apc.rsi/channel2-auto_on.png | Bin 156 -> 0 bytes .../Power/apc.rsi/channel2-manual_off.png | Bin 157 -> 0 bytes .../Power/apc.rsi/channel2-manual_on.png | Bin 158 -> 0 bytes .../Power/apc.rsi/display-charging.png | Bin 434 -> 809 bytes .../Structures/Power/apc.rsi/display-full.png | Bin 275 -> 381 bytes .../Structures/Power/apc.rsi/display-lack.png | Bin 282 -> 557 bytes .../Power/apc.rsi/display-remote.png | Bin 337 -> 510 bytes .../Structures/Power/apc.rsi/emag-unlit.png | Bin 387 -> 436 bytes .../Structures/Power/apc.rsi/frame.png | Bin 436 -> 610 bytes .../Structures/Power/apc.rsi/lock0-locked.png | Bin 155 -> 131 bytes .../Power/apc.rsi/lock0-unlocked.png | Bin 158 -> 0 bytes .../Structures/Power/apc.rsi/lock1-locked.png | Bin 154 -> 131 bytes .../Power/apc.rsi/lock1-unlocked.png | Bin 158 -> 0 bytes .../Structures/Power/apc.rsi/meta.json | 166 ++++++++++++------ .../Structures/Power/apc.rsi/panel.png | Bin 142 -> 162 bytes .../Structures/Power/apc.rsi/static.png | Bin 384 -> 452 bytes .../Power/substation.rsi/charging.png | Bin 1105 -> 197 bytes .../Structures/Power/substation.rsi/dead.png | Bin 1110 -> 162 bytes .../Structures/Power/substation.rsi/full.png | Bin 1108 -> 124 bytes .../Structures/Power/substation.rsi/meta.json | 65 +++++-- .../Power/substation.rsi/screen.png | Bin 1652 -> 182 bytes .../Power/substation.rsi/screen_wall.png | Bin 0 -> 330 bytes .../Power/substation.rsi/substation.png | Bin 2291 -> 657 bytes .../substation.rsi/substation_static.png | Bin 2444 -> 650 bytes .../Power/substation.rsi/substation_wall.png | Bin 1364 -> 588 bytes .../substation.rsi/substation_wall_static.png | Bin 1504 -> 339 bytes 40 files changed, 186 insertions(+), 73 deletions(-) delete mode 100644 Resources/Textures/Structures/Power/apc.rsi/channel0-auto_off.png delete mode 100644 Resources/Textures/Structures/Power/apc.rsi/channel0-auto_on.png delete mode 100644 Resources/Textures/Structures/Power/apc.rsi/channel0-manual_off.png delete mode 100644 Resources/Textures/Structures/Power/apc.rsi/channel0-manual_on.png delete mode 100644 Resources/Textures/Structures/Power/apc.rsi/channel1-auto_off.png delete mode 100644 Resources/Textures/Structures/Power/apc.rsi/channel1-auto_on.png delete mode 100644 Resources/Textures/Structures/Power/apc.rsi/channel1-manual_off.png delete mode 100644 Resources/Textures/Structures/Power/apc.rsi/channel1-manual_on.png delete mode 100644 Resources/Textures/Structures/Power/apc.rsi/channel2-auto_off.png delete mode 100644 Resources/Textures/Structures/Power/apc.rsi/channel2-auto_on.png delete mode 100644 Resources/Textures/Structures/Power/apc.rsi/channel2-manual_off.png delete mode 100644 Resources/Textures/Structures/Power/apc.rsi/channel2-manual_on.png delete mode 100644 Resources/Textures/Structures/Power/apc.rsi/lock0-unlocked.png delete mode 100644 Resources/Textures/Structures/Power/apc.rsi/lock1-unlocked.png create mode 100644 Resources/Textures/Structures/Power/substation.rsi/screen_wall.png diff --git a/Content.Client/Power/APC/ApcVisualizerComponent.cs b/Content.Client/Power/APC/ApcVisualizerComponent.cs index 87cb70019f..e356a80177 100644 --- a/Content.Client/Power/APC/ApcVisualizerComponent.cs +++ b/Content.Client/Power/APC/ApcVisualizerComponent.cs @@ -87,7 +87,7 @@ public sealed partial class ApcVisualsComponent : Component /// [DataField("screenColors")] [ViewVariables(VVAccess.ReadWrite)] - public Color[] ScreenColors = new Color[(byte)ApcChargeState.NumStates]{Color.FromHex("#d1332e"), Color.FromHex("#2e8ad1"), Color.FromHex("#3db83b"), Color.FromHex("#ffac1c")}; + public Color[] ScreenColors = new Color[(byte)ApcChargeState.NumStates]{Color.FromHex("#d1332e"), Color.FromHex("#dcdc28"), Color.FromHex("#82ff4c"), Color.FromHex("#ffac1c")}; /// /// The sprite state of the unlit overlay used for the APC screen when the APC has been emagged. diff --git a/Resources/Prototypes/Entities/Structures/Power/apc.yml b/Resources/Prototypes/Entities/Structures/Power/apc.yml index 71e4506495..1621ac858c 100644 --- a/Resources/Prototypes/Entities/Structures/Power/apc.yml +++ b/Resources/Prototypes/Entities/Structures/Power/apc.yml @@ -35,21 +35,26 @@ - state: display-charging shader: unshaded map: ["enum.ApcVisualLayers.ChargeState"] - - state: lock0-unlocked + - state: lock0-locked shader: unshaded map: ["enum.ApcVisualLayers.InterfaceLock"] - - state: lock1-unlocked + visible: false + - state: lock1-locked shader: unshaded map: ["enum.ApcVisualLayers.PanelLock"] - - state: channel0-auto_on + visible: false + - state: lock1-locked #when these are implemented get actual sprites. shader: unshaded map: ["enum.ApcVisualLayers.Equipment"] - - state: channel1-auto_on + visible: false + - state: lock1-locked shader: unshaded map: ["enum.ApcVisualLayers.Lighting"] - - state: channel2-auto_on + visible: false + - state: lock1-locked shader: unshaded map: ["enum.ApcVisualLayers.Environment"] + visible: false - type: Appearance - type: ApcVisuals - type: Battery diff --git a/Resources/Prototypes/Entities/Structures/Power/substation.yml b/Resources/Prototypes/Entities/Structures/Power/substation.yml index 347b18ecae..692f027386 100644 --- a/Resources/Prototypes/Entities/Structures/Power/substation.yml +++ b/Resources/Prototypes/Entities/Structures/Power/substation.yml @@ -23,8 +23,8 @@ - type: ExaminableBattery - type: PointLight radius: 1.5 - energy: 1.6 - color: "#3db83b" + energy: 1 + color: "#ff6900" castShadows: false - type: NodeContainer examinable: true @@ -126,10 +126,11 @@ path: /Audio/Ambience/Objects/buzzing.ogg - type: PointLight radius: 1.5 - energy: 1.6 - color: "#3db83b" + energy: 1 + color: "#ff6900" netsync: false castShadows: false + offset: 0, -0.2 - type: Clickable - type: AccessReader access: [["Engineering"]] @@ -151,7 +152,7 @@ sprite: Structures/Power/substation.rsi layers: - state: substation_wall - - state: screen + - state: screen_wall shader: unshaded - type: Battery maxCharge: 2000000 diff --git a/Resources/Textures/Structures/Power/apc.rsi/base.png b/Resources/Textures/Structures/Power/apc.rsi/base.png index 2b42c54935a53e44d836c54983a944700b94b17d..68b83101d21fc74be03e53fcb4682cefeba232d7 100644 GIT binary patch literal 676 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-HD>V2bl}aSW-L z^LCbD_8|v}ws`M@sz*KZ!rVK%7k`tt_$r^GSyK8!{>3}{j>XjnbssFbuvFws*o6yA z1*|;t3pWKX-D0})$)~$tUwrpzteJCi`tAySe}-rE!JBItBY*6xUy(G&qR;={^GZ>B zhm$Erj=S%+J+J&=^FC$n6rmumobAzHs%#k!RP8-hVRKIA|9Nu;2CKP!MY$rb0_IF- z%M;3^pI)=R$iN`r^yJ!-OfH6uea!jivmVcT88aobN#Q`&Rws!zjwXh$Re!JVI?esS ztI#Jsje&uu-I<52`OhJD2K}sLD^uoar@oD zjeqObhfM!k{!=zx>ch{r^-}6m8*b)s<+d!Daw^$+qv*S`-5Fb>)L&0hv7Gn6%4Ys~ zMvFb7eUEpjwOI7HDS!E0Ya-PvZ@T*~A4A`B@$RD^E3D=!`CdNLKIbNbaH31AiszK` z&#%_0e?C-m-#$dptwc(pbc>T$q5#; zlYM1y$bjcC2=$0^y}!INXQD25=qcWy+FfpcJ@4dCnYK7&+lei$mo^;+(o0$|{d4O$ zB{p+Yz^(i20XLO`#k{K7AoOlVpn@r_m*SWpbQZ%@U8Br}Ugixz_1glLZa)-yTPa#> z)d!vhn_Rc)guGOBNbUBCUJ-Py?UdNY)+C9xM2TZ6@_ygWM2RYL+yo{&22WQ%mvv4F FO#t9gD2)IB literal 370 zcmV-&0ge8NP)VQ!Pj5=V{0R$ajXyg8$QcKPs*~v(@13Zl$9a#G@88abZvsiR2Px&-$_J4RCt{2n!igUX&A>pImgTpJfq?=K|%y;)0~Q=xWaDW4i;`(!AiU9x3s+G z{(%cyq&O=r7F@70g@`K}@8G%=6HXHF<%*!0hy%i0k(*f;*U99^JCp3qr^%biJ8$0i z$@9+hJo&y5^ZzCh^#uIL=kpGLrfJ@_hlhu*_s!4Gdu_|IxVX4@ah=LQGYo;<-CeTT zEU8qAR4N5PCX;#A&$28m%i`qZ1VvG3x7%2j#o^(h@AxBcfa&RJ*4Nj)_vv){S)be6 zTd#d^aKM}2-|(shZ;fA>oSgI>f8-6|QYaKKP4kPNX_|(rs$5@R1MsQ^|5U-=u)B`? z%}{44kw&9|VHhkeEq!)fRaF2sHa38c$9(@S`~=L*%+PE$ea9Ue1K74rxm@P#>v$wbBZI_oA=_rs)CJ{maolxh7yHct2tgq`4 zuE#W+P1@}?M@L7#-!ak#a48mxsH#dPlVN#z*}HyobK|wArlzng3)3{I*X!7}&Gz;- z#bVKS?2%4|*VfjYWHQO(;-Z)RO-xLnC<>2{k6yoey-qfpMNt%LwHgZx3jmy-p964u zdivrzN7?`Yx~@Ay2y|WNgAn}iUuYBJHE_lL{#z=Q3M(rsq|<4RkB`0f=H@0s2;VjO zZhmoW$x5aMg8z-3S~7WECSpS-AvOJMF|O3HWU& z;|5NIWECSp=`4Eq1U7)IVkByMN`++L{0rLs#~sT$c2)KFF}Qawn-)3z!e^s>VW zBJ;M3NB;wF!-GeK9d_Aqh|=R&D?2!UAa21eTBL&#qLNvNPD~5E)jZF5LqwOPztls& zP@X*R`;zbHee&jM4&fhb05AX;01N;E0WM5jYjtb#_C+z$F#sud@lwa;&oy_e4cL1c1W{snwC@7c9?sztv<(#6bs=SU&mzNiL zJ|2%FI+W}lK#0up`8+C>3g?Dlu!$FnG&_46=57UvcmkUn8@&UdosxMblR>FeI&ht+ zz{v10wl(d*1K2hI?UZ&*l4Y4I@F!6PY}3{xa^(#p^dYan&7r z{%XtjzM%jfE-a#73Iy2sphl=2r^aM#t82L4u<`ix4McXH@H`#L>FHb0w3kSwQqXms zkK=ejP$0d$QDebNgQYZjw#|>Dx7X|J{ zld!+7BkAdI@87AY*X!8QsvIc~t55*+7|xtkTI)Y-#L{VecgAAJBo~fUtJNaTPh9sF z0K#zZ6JIB-*G@&8_k2`FVl;*?y9PQ{TaD=Hk&_r1im|DXBuRe;p}$-4 zIQj}e=fDZAbLSP;ST`jx-hTiuL@$gx0`NfeO#lB^aliEw>ZkBEYp;2j6))`IJQz8yUO$r7lTfk8mnAmsVI rJhiK~w(L``O_CA&%mfw(5)HG(PMzQs*>mIBR*;aVtDnm{r-UW|8(uC3 diff --git a/Resources/Textures/Structures/Power/apc.rsi/channel0-auto_on.png b/Resources/Textures/Structures/Power/apc.rsi/channel0-auto_on.png deleted file mode 100644 index 6cce72f795f187e080345f39b4b5a6e9535b9b2c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 156 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5DCp%t!6k@D=*di|ena_m6W3=IERZag`D sD{fYZ{8uZ5-3vC|oG%U*2N82j7=6_^m7e&ye*kekUHx3vIVCg!0K)?-FaQ7m diff --git a/Resources/Textures/Structures/Power/apc.rsi/channel0-manual_off.png b/Resources/Textures/Structures/Power/apc.rsi/channel0-manual_off.png deleted file mode 100644 index 61ae057d5085bb2a6c165614501c52abdf490ffe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 157 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5DCqC$ z;uumf=k3LfybJ;&t{3$;wx5fz3if=nXjAh!hI+OnW+|ba+biFC&YOCi5vZP_!Jg6f t=f-UzQzu-FVc&71C+FL9R**OtsQbQ|#POi8Amks2>*?y}vd$@?2>`gKFL(d| diff --git a/Resources/Textures/Structures/Power/apc.rsi/channel0-manual_on.png b/Resources/Textures/Structures/Power/apc.rsi/channel0-manual_on.png deleted file mode 100644 index 6cc48bd1a558767f688af4a78c0bf534ee09ea7c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 158 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5C>Y@B z;uumf=k3KnUIqaP*N6AjIyIbDC^ZXkaVR&;%sgcBp!Mvz%AM=)mu58YJL&AdJz#MV@n8w(H+hbuTrIOQKwM8(KbLh*2~7YMBQbOU diff --git a/Resources/Textures/Structures/Power/apc.rsi/channel1-auto_off.png b/Resources/Textures/Structures/Power/apc.rsi/channel1-auto_off.png deleted file mode 100644 index b31bed6c6ba591c8660a9e211dd27d4db3d469b0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 154 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5DCpzq z;uumf=k3LfoD2#)tQR@@9vMX*biI4fZf>Yp;2j6))`IJQz8yUO$r7j-2o%&3R-D^= q*Jo9A6`#ghRZE>`tPlx?hS_3jTAU(@U(S?*L_A&nT-G@yGywn(LoBNR diff --git a/Resources/Textures/Structures/Power/apc.rsi/channel1-auto_on.png b/Resources/Textures/Structures/Power/apc.rsi/channel1-auto_on.png deleted file mode 100644 index 959a05cde084609af24c0ab328d3801f3c99a511..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 156 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5DCp%t!6k@D=*di|ena_m6WK=6li!^!@w rdrel_y()Dmb4=ZAuMd%6V3=dVI4hP@=|aSUwICr+S3j3^P6Y1uO tCFicxQe3^0uVAC(%{S+{ArcG>>b^BG91k>gZ-b0x@O1TaS?83{1OQgvEN=h+ diff --git a/Resources/Textures/Structures/Power/apc.rsi/channel1-manual_on.png b/Resources/Textures/Structures/Power/apc.rsi/channel1-manual_on.png deleted file mode 100644 index bd8b013310c1d9c9f962be5514144a43fa8e4d49..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 158 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5C>Y@B z;uumf=k3KnUIqaP*N6AjIyIbDC^ZXkaVR&;%sgcBp!Mvz%AM=)mug>Ojj1U=y2TM2?%5xl*wb88viFmsDxvXYp;2j6))`IJQz8yUO$r7j-1RQ)01kA18 pJu~F{7ny)4@1lq^+z^R|*%t!6k@D=*di|ena_m6WAn-#tVX}O7 qb!JfQmDde#nogzF$3Y|*=9n-(pTeoMUew?rNW|0C&t;ucLK6UwsVd|E diff --git a/Resources/Textures/Structures/Power/apc.rsi/channel2-manual_off.png b/Resources/Textures/Structures/Power/apc.rsi/channel2-manual_off.png deleted file mode 100644 index 5ac134cb54b5c3e8c1e8e04cc5059eb8eb7e741e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 157 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5DCqC$ z;uumf=k3LfybJ;&t{3$;wx5fz3if=nXjAh!hI+OnW+|ba+biFC&YOCi5vU#n{;_;{ sa{N|Ms8d+6?1LoZO*iL@LnIi~eRY@B z;uumf=k3KnUIqaP*N6AjIyIbDC^ZXkaVR&;%sgcBp!Mvz%AM=)muyWa~%D0H}Momz|+;wWt~$(69A*fFO2{I diff --git a/Resources/Textures/Structures/Power/apc.rsi/display-charging.png b/Resources/Textures/Structures/Power/apc.rsi/display-charging.png index 67e3b3df19b80ff3a55403d46b12617316b41bcb..0f26ba31bd31de4d7dcedb7a37e94fbac440a1a3 100644 GIT binary patch literal 809 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58aUX1(0r%WME)=?CIhd zQZeW4UE82f4h#(suP&Sb`MR{&%<3TXHtw`*U)?!Vvn#n`nzEh_v}Gc8o{{Cwxw{jFDDZT(ce> z>;L|H^nCi8TJiYxll$HMYj5v;@%s3?d^3H;7J*A9otMskuKj;ukK6v^><6yb*M0u> z+2Pni`Tg-Czr$v!1^zl4)>9Yx?)~zYHOKyc+|IrwPW||c8})zIe(7FhHIK#cS7g{+ zo*!5KZsIvU`GMT=`o6#Cj2m{{+v?Z&s_Oge<`=i}XEXU;%&%iU@?!qw>+-kcYXm-mw*!N!jHWbkDA_S^OEPd^Qg&=XfbpB^dt>5t`=uh9`} zK&X0Mg_yXnq-|I7O=|Mg$DS@6}$((U-a$N5X+MXr8S z>9}}))2oyN%im2;wV229-Qr*UUi%ETfa|-jX$Hi;Z`)J5yzaJ0MpxZuX$80cbN1EE z|ED3&$p0}y+!5ri_srNl1QvU)mnUt~UVHxQ*RSHm&OI>f$@TJ8}1ruv>4>#Rlh|FCsjv|qm7-fjPN*8|Qq?|#n% hhEcIRit~1;{%7RxoaJMay;lh&;pyt^s+d%^$! literal 434 zcmeAS@N?(olHy`uVBq!ia0vp^2|(?c^ovTa+^IhvZX^Yb?vx$2l@rImepd-&=9 z)sxOnGM_wsf@T^I&|C(F1@^8vmtMTs6j|o~*P^p-e~97FeE#csKOaBVp8j+F@q0UV zmS$A{w%)(*pH21FTWTwRUQGIATY1)gSHsTV-FM#~e}4JayK`=3Ri7VO{ZxFeE-v8o zzv^9X#?Nd`^Z7mVC#_o_b%OK$jvIxQPq!bRFnRtT?u!3EVs?~mxM;b5@;8ZJ=eA#y zDEbu1>iQ{)btiAc!pv!PZtJ>~{yz5k#ed*cV1oo}2RX!z1!c!9^GzPtG<>RYIPkN9 z@maB*!<_jc4ma52r#*G5*imPF`<#@=^gll(ru=ja4W0XWbC_dd{~!P7tiP6=JAYJ5 kV_wNWaQHAVeCVHfQ{38TwjER2t4D%0W^={ zkAC-+=KTBX|9(o8oF_NG-ZuNY?+d=ziu#`(|Mo2`dfr~|yZhbYbc@N`{8nt=9>2T$byeuxcUM#f${~6t%&(G%YNYcNp1crx?d&T62BXa80% z3e`z`H~-bEikf%D|3fY^O)>cHFM5~%gl+kGkfjbU>li{-AJ&OCeCQ0)?dj_0vd$@? F2>@!9sZ0O> delta 260 zcmV+f0sH>_0+Rxe7k?lK1^@s6qMd$(0002mNkl^F_}-3RWAgG+beE1OMO)N$^}SA=isjsR*IUX zDh-!Yx`~TcI9C+;tO8oK#@m_v#9%x!7|Sf*w0u?p-k`F5dJg|dLHTm;ZqCsckSS(g z_LJ?*KNp%GFwOVQT+KI?3%Kr1wC+2aG3LIV4*&oF0000#gNPn&21IoY-A3mC0000< KMNUMnLSTZ}9CMKX diff --git a/Resources/Textures/Structures/Power/apc.rsi/display-lack.png b/Resources/Textures/Structures/Power/apc.rsi/display-lack.png index c4c103eeb9637ba3dd9fa8325d5cfc68a16a8bb1..e360f9c6bb03889b661d04fb010294d449fd8beb 100644 GIT binary patch literal 557 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSjKx9jP7LeL$-D%zpL@DEhE&XX zd&e;Aj)Mr>gXs?%93*O5WYVR>6+;W&E9c4wv4-c>%#l${U}4sLbf_ZmNu<%e$jT*m z->(*PdojH%y|wFm91GA`FetFHn0{ohf?`u|5A zm3~ktQPw}F_I2^BXa4J#rUGrer&_O*YrZ@CMV>t0IsH0zpnLv3)7y1s@w2C@DSns# ze6(Ls`fvX1-IMp%LwphD;dw*w)6^DC&S0T3J=MsypQpB@+HF4T>Vbugod`5cKQbdE5QV-tWJ1?^{9b|JUz+>rcJQ@ay08``_cWe)BDOAAjE- bV%&x@f6mDT`gvbNjX?sQu6{1-oD!M;@Vm)1VnF3^p7%gG|T$=iK!B zmAgCc&UfzN5&!@I0Kk9JSZ}?xth(>aKFgTv@!HvTZ~h_Ax$||_gJaXAiR-@oevV__ zY%ZV5XCAzUvJiC2(tOyFQ9xiZO<2OfQ#o-)$K^3T`3h+xY+h g00000@H2?$1|ncVj%3iX=>Px#07*qoM6N<$f-?Ji%>V!Z diff --git a/Resources/Textures/Structures/Power/apc.rsi/display-remote.png b/Resources/Textures/Structures/Power/apc.rsi/display-remote.png index be343a987b0cc7cde7d68596c08969209dccc843..089eb9345e78d51c68b75681f40f1d1ebb87f34d 100644 GIT binary patch literal 510 zcmeAS@N?(olHy`uVBq!ia0vp^3xK$RgAGXbBqvD&DaPU;cPEB*=VV?2**iR4978JR zyuIt_ci2FHH6Yw6hFR}|?00*|$il`VUbDnTt;k%Cjgu>UKHXauDE_z5GS*V+nJyJuUx%jN$%&l^^-r(PrHAhhk4$;XaD0gfBrsGueERT^XbRm z@3ZT!Uv^9Pe~s_U$EJGr$H;R*C*-M zm;a3Vl>NEb{q*%o_2sokru}$Pqx-WFC>Xw2b-!A?w;jy&$aKkpS4_|2tNyuuj{UyN z%As!epHGq(ldB?RCrrA^JMrh#)za5A55$GBKe_H6Ggn}4{Kj30bD7>GmO7Q}yUH61 zlzVaUukDlQyU1pO*aa-l?pfBa{@l+ec=PZb%b)+1>#HmR`HPjE={PU}$`1_*I+Ry%-HH~esJ#)AFocZ_s;LEHMw%^yb*A)MUncNV$kMYOCfK56+ Qf|4LHPgg&ebxsLQ0H*We{Qv*} literal 337 zcmV-X0j~auP)fFDZ*Bkp zc$`yKaB_9`^iy#0_2eo`Eh^5;&r`5fFwryM;w;ZhDainGjE%TBGg33tGfE(w;*!LY zR3K9+u^>6$Sl3vIi!&v&s2C_>$iJ`a59%3GQY)wNEBst*-oiXVyuN{hje&t-cVm7QkYX$ja(7}_cTVOdke%o0;uumf=j|<9FXli2h6jQn z0!&ISZ+OBO{TIe&aqB;n-P3yQn%K&>k2EjcIASC*#lb;9F|5nJbKi7dkFvk})NbBA zkkeLq_KXYAWQKs4^*3eWW#9Bq|0}0?Ex7(hM(O`Q&fn|J+p`4)x9guTG?x*pT<`R; zSVdhyDQSIN_vXvX<-hB%D_>+UQ5z$lo9CM2e&lh@rX89|N)g8Im-S9iWqU3q@h2CHxl zM!~1?bG7F*bQG;WC+g>LGyFN%+O469rRxedyk3EWje&t-(cHQg1_nkiPZ!6KjK*XM*2M`TJxzfITy6(7K%5jNx1?I# zEQ^o!il*z&Jr&HATj_8nL&))W{QUFkH|xZbM2k9i8+CMlcrc~@=QHjZdOB;8Ey`bN zHNS1$`#;!KRpLqhodsSC1hVZ{HoRbHXneEbyF^lOIOn4J53VjQ66~Jgh^tW4HmyW*Lq(xN90G*Z*f*ja96>Vh)_}sLD%Tv`x9}@9$6dPv7l! zbiY2MF*>5<*0EsO09%H%{dEUFytwII;AjC0C0LLtu=4QmFg!kzZFMp3pa(E`89ZJ6 KT-G@yGywn&NS)*W diff --git a/Resources/Textures/Structures/Power/apc.rsi/frame.png b/Resources/Textures/Structures/Power/apc.rsi/frame.png index 7d3529f63f585d058a609a523196e357fe83a8d1..4f8ba4d56effeee7f96e45ec924337bb6f6d9b2b 100644 GIT binary patch literal 610 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-HD>V3P54aSW-L z^LCbD-XRA8*ZM^z5sU6f1uN}V{CCOx@x%UdgYn~Cqjt!~p&w|?9!z`*dxVqLH1 z=}jMZ?G-#A(R}&kmk)n3Og=?@ziPhle-p=nxeVreE7=+To!{AekE6gwZf^3{Yv(rZ z6?jl!VUpFN$0Xt!xVub0>fz0twv#EJ4A!k$_4?=S$8XEH58UIj-^#$SV2V}t+K;>s zWakHDF|V~>aD|OwL)`j_&n=&QwmkOOux$6;uN5039I|uwy1!PwaMa+@DRG7e&)4s% zUza-Xx#g-=yN=zJ+nwO6<2k8V`mjd_gV)Lh@`@{%^aA*lORwB@&^Y&>DdaGR`8lQl zUgbMH`$WYUcL+aN7N~va`tv(&n;AfIeoR2ccdnE*F}yW6Ys<>E&D; zI}dCQZ&2W90wJC$$7-#nMjv_VRJrqTNc8m;+mGBmd|PgLQTML0g-zes19rN`?h0^Z zg3!(1SzQ?3vFzZyr{elltn{f9E2jgHe(6-n4Wi#VRc=3&yW2HJZ_0J^YOU=Zhg-R- qphnyi6(|afW(`=Q4Ys(TKVG!?@I}9CHM+n=!{F)a=d#Wzp$P!LVGZ2? literal 436 zcmV;l0ZaagP)Px$Zb?KzR9J=Wl)p;?VHn3hMT3Z87eQc$6>kJC9+A{gkW)dUOARgl18p^gThb5& z{t^8XIXTqO5P^#j9C2a?!j(uCZZ?F6zs@^Pp@#RfJP$n2`#fKshxY-AL?ZcPrrZ)X zb`M(PHhI3kbL=zYrNCZd3n5hh3XW1OU9XVKUG@oa74Y?L0if$851nQaLM4+q?~A0< zrvqPjnn2mC5{(2Y6bb++ibAbc>++MyBxSRT5GsK{U|Ol z%_qr70tRt)@&-VC|Iyd`kynsP9ov2)c*Di*5-Vp-!uf6Ld;`#EG$tz`8d(HB(KM~= zH|QLqX+XX+51P%ULk*t-0ECFS=ID9_fNb{KG1iOgC0vhfj(rJVN>7e`Tm``IIbMw{ zJB|^cSbQKJ-?44ktnz9aL(edbuma1nhQCDa*wfX|Wt~$(69A9_B_03( literal 155 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!pn<20V@QPi+hYp_85DRJHp<=JXtl2|_CQIa w+=(N9*cll9YmdKI;Vst0Nr^n-2eap diff --git a/Resources/Textures/Structures/Power/apc.rsi/lock0-unlocked.png b/Resources/Textures/Structures/Power/apc.rsi/lock0-unlocked.png deleted file mode 100644 index f6377a36b127b33b6209ce3c8704f33b2c08f5d5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 158 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!ps}ZmV@QPi+hZFA83Y6v4$AAU^q4v;pd~_B z<$irD0oy&cRiBUv8jg_@oLYG?3t^>bP0l+XkK6U{F8 diff --git a/Resources/Textures/Structures/Power/apc.rsi/lock1-locked.png b/Resources/Textures/Structures/Power/apc.rsi/lock1-locked.png index f92c04aac46374de8c4d906075a9c0e424b7c63c..3dfeb215d2ff01d79fb46bf242d484906ca36ce3 100644 GIT binary patch literal 131 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|Y&~5ZLn`LH zz3IpcRK@Ig=fVApmW-lLoMr@G$lol;z;J*~e{)?vP$gfH8;}G7z1gc=wM2k26WF%3 Va%^2SnQI?N*wfX|Wt~$(6999eBoqJu literal 154 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!puVSzV@QPi+hYp_85DRJHp<=JXtl2|_CQHP v*Qq0a*cljnc31DeH7!)O*yuIGi;f@XeOR8P^-Em>YGv?r^>bP0l+XkKsT40S diff --git a/Resources/Textures/Structures/Power/apc.rsi/lock1-unlocked.png b/Resources/Textures/Structures/Power/apc.rsi/lock1-unlocked.png deleted file mode 100644 index 44f9af733faa8274b9eed4cb3bd2add8b2d10d28..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 158 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!ps}ZmV@QPi+hc};3<^998|9`2w0QX_G)W3? y2ytLPmhzLIf#Jv6^@YXWQQu}8m&-AT3i2O{WO=+I&R{!GJA*+#TaGXscmE#u_{vKib)d=*p?lTm=ER1E&-*S@Jln7pS=_$>FMg{vd$@? F2>|c6G7A6z literal 142 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJP)`@fkcie~3D(64B0Wuk23&3j zH6&P-c8#2y0nP3Ql}17Wb;P!w70iEe0O)Z%FJe-86H;?jvqgLKs$wf mn?#E{NEgtE02T=e35F}-TufZmLFPaU7(8A5T-G@yGywocj4ZkU diff --git a/Resources/Textures/Structures/Power/apc.rsi/static.png b/Resources/Textures/Structures/Power/apc.rsi/static.png index 43089d0d81144d506157dafe4d56335d3d60f0a3..7275cfc9feb5182fb6fd1c14eaf65a667ea4a70f 100644 GIT binary patch delta 427 zcmV;c0aX5g1H=Q6BYyw^b5ch_0Itp)=>Px$en~_@R9J=Wl|5_1P!xtAp{SJn9>HqelFR0}&KC~S^TmwiYKh(G z15ld6*QXq?8~~8Z=4gGm(Y$GxJP&%&yrJDkKA{0p^R@uPfff=8IVrd+(TliRXEj16Zz>0I{2JqqyJoJb*UX z?Y>;a2kGAO0K?(%q=QHZAq^mP6l@ zL9tjo@JuEXfGF>}ZZz(8yM$pFyGW@|5CnmAKFPbUSR^_CRaO6VBPP9pRH;&>`Ub7& ViNA_R8r=W@002ovPDHLkV1k@l%Zva3 delta 358 zcmV-s0h#{91AqgNBYy!$Nkl`lxVl$B-3vV7jkb$I0oI^gTuHw+963=GXTW)rk5iq(@rSy_hR?%gLC`Y8&5N6%g| zu41BOSJUot2w%P<^{fjHpp-)s znsWyje!cpNqRw^+EV^VEwlO@To&%yhyfMT=j2sx2?bwPUMzaurS;QvB4YwQ{pjikA z>x!W8cRoD{7k~BS3++NcPD-5N$cu9fkLO<|sE%eKP^*zjPz@~mky2(5<$!HFw+&oT z3@eTmrR3p3j9(2Lj(NghyF>;~KYI3(;r_FSc#C0@qTtON{3Y6}?GG3pJ!6H_gw&H1 z0&1GZ1S_PE@18L53(3G~7`S!)EF;4x7zLwX6bxnn00FUl$Y5zb(*OVf07*qoM6N<$ Ef-a$)!Tzopr0K*kYegFUf literal 1105 zcmZ`&J8aWH7Ru-7;_w#$?;~1=}jY5IBNY2w_(($qUl&o<#zlI24 zi_WPd&&r<}=AdgLXCFxF^*9@l)dB5!jEZLXHu??}t`fbZblAqxMghbBN3^+D` z;8upK7K-em<3aWsFYp4FO|UF0dqzVlDa$=N`O0wX7`qYx-ENofUgjOI2~z2F8VDi~ z#Uw!_(R~|he$qx~Lnr%w6o_=sbg}8!EcL6^oes`$91YYTVV;KGkK=YcD~Mv~09vpO zZHz#QPl0hfY&HfN+NdW75eCpdgeHuosV>&95T%xUl25NblBgcUMc4ol01yS?dQuRR zVjA@8Bk9YAE@2Z}Fc7X^PoQAV!oyaIrxI8uRaUYzyP4tqqyZaR$HH6|b?OLfR4EyR zxM6;19d;{&F&W6TZfUIqkz;kJzij%d9EdSw99%(2sE#8YUQ)8Dt3zO$06%e{)cj^^u71OKh z;yae>Ur=CLT01(c9zcRQ)ETk+keP5fyyh3%--ku-{j*otg6jok-0?9(`3@|b^RGxXWZ2q zB7j{wC#IgS|6rJtu34$#YVnq&J1t%_oCf5BmK(C z*bsuZa$L1oVwW5bve$Tl7dR!svaIYGO{rYC(WR5G9Jh(FD*@p9KJQ=V9d84qv)L>V zL?DVOf=HozHr9fajm}3-j{OuM(mm6~rem|zuhwwdILC1`P;W$e8hS5|+xDz5ilGB& z!4|YJ0%<-CM)9!O>}P1Bt{g-dK>rY$Fp{RaSieG)S`J7)-TRS5^)N2N28aQGCygOek$S*dZ0=nYwCY z=(!%Lt}ve14L2S!?5iL9wryhN*ujuF#)`d;l=rajcw3e5CE_xU1$7-olE!K@YJgCF z(g8|B2EA@l5;xz?Pm&gcY9U{#&gk{zF~#Dg=Pw|9TOqCKrH LuNC$d>-UcUeh*F) diff --git a/Resources/Textures/Structures/Power/substation.rsi/full.png b/Resources/Textures/Structures/Power/substation.rsi/full.png index d179742669917dc41f20ab033580a2627040ed23..d0b9726cacf1f8b56586214f2694b0c88393ffb7 100644 GIT binary patch delta 81 zcmV-X0IvVk2z-z+OEyVFK~z|U?ai?b03Zwl!7tcWFmgB|r$Jb0T2J&Ww%LC=C9xcXkw^^5kw`^Z1P-~Z$H-v3#7eQhD0h%*ec zP%LN_va@u~T_!6!IQUJr8B|%zGsmBoev*%?uvTo8O3W>Co+FcvFB?Z>o%afLL;$bp zoVoIH;~T@oJgZv6wbDb`aGShty4#QsnqJ6K0+}3}5bJEvv>hY|SuRA#`i6AS@>Cj6AR^Qz5r&Q9gz~P7UGk!Q%P2Y+`kqf- zR~S$1g`18T_ce&U=~!63a4=>bVh!Dnobz$p_4lgbO$^I871VPSNjmgKqXr1&Cmo>1 z70~Y{HU8lJ(ky8)qp0PowRvM}arRA8NL-q-bdsH?r;pyQo^`vwzJL6&_;3F_lQ?ipiHqqFWO;7Ru1o7ZFY!bws~bn?&T4~Ij|GP|m{6xS>_xKJGTXXlA_C36;_au8Tx7MoWrb@*dh z#_i9~_bKg<`S&3t;<-t`chvExt6!9VI{oA|L+|tN{;jW%-#s4or}lo(`*qAG*uh%! Y)H&8$t@*seG#|wEboFyt=akR{0GeS&g8%>k literal 1652 zcmeAS@N?(olHy`uVBq!ia0vp^2Y^_CgAGW!%qVXKQjEnx?oJHr&dIz4a`;jsJkxxA z8MJ_G4j=}BOTm+YBxiv~WHAGS#w-wK6t_~`#K6Ful^GII65;D(m7Jfemza{Dl&V*e zTL9K&Q(*;U=BAb;Dpcg=MLA$w zQj+ykb5e6t^Gb^K4fPE5vFR(xOhdRZuNWE}z<|*Q$pEz(VAbYXP?Br{3@O(NpnIVH z13EMrY;SQ%iawG8eIo+{3ta;vT_a0oQqvMkb4rx#fB}`7nrEXAQG==%B8qCHjXoCJZ9smuiVR9E z&d(_Yg}R-QnTZWJBv3>V;SbRffmH{xD7ub-jQo;(V0tRbO!mwxNi8ZU0;Vm9jZph= zt3WpkVR>j?W{I5<)BrSLBwa{xW93*>Ql4Lw9RiLASRmq505t>>ph&3`lJvoW4@~=Z zTsHdfd}PP@W4-g&}~0uI@4EG7uXG;nmXm~n_5;ov;T^-ZSn z@PSYZrVXv4r!9o!4>C0}vOZJE zz`$nEz{r!pz>LNWyX7F5@_mPlhw>hgnmQYS%CNab&IRB1&p&Xy{?V`79IHxp>wWE( z-c}REc}I5dzGVMP_v-Glg5Q_?{~f#j{iXcBrv2;wy^o#x?|j^pfBfm6+n=*- zx;|s&>rFeAx4!*+sq$CYlTiJdv}f=B@A%;GbNkfw+-FNZ|M6D-_xi-2XPQ6lFaAmX z{642^P7Bkqf59J$pUd4dk=U2y5Fb8R$mK$Y4hJAc*eoar>!pTGhgR=zJB2! zm$N&>j{jW#Ap4{A^`xME&oW}VSD)eE?r>Sw#`OH`4nObo10ipDKKxy9z2>@U{p(ku z=jz`vypaF)C+GdQyXztqXH2+p@yD^P60@`K=l@wdd-~Gf|J=9z@!uEzZ)(xg{Fv@% z>Sb^C{CV>F{0_0?g2TEOIs&%t`=Px3%g!*f^1t)#JwN5|U@xnVzc^JveE*FrKNZ#Y zue&>W;{4O~m9M+jZxZ>lQ@eqA_oM9*vM(Aq>ZiNPvR!qo{`B{h@7ehWzG^Vrm;c-O zQ}gfnSjHyt72-kf-m1hh%H-cM`jGqd^ZN;n^R55i`BQj*ck_vV>ER5qMZ16BFL}DQ zH|b$G^LHiBSJu5rVm@BV^0dmq6Noz{xB|UYPx>(f6XCKiSOy^=d#Wzp$P!kmv_$q diff --git a/Resources/Textures/Structures/Power/substation.rsi/screen_wall.png b/Resources/Textures/Structures/Power/substation.rsi/screen_wall.png new file mode 100644 index 0000000000000000000000000000000000000000..c1dfb87b1c1fd33618dd05d25aa959fdd005fd18 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSjKx9jP7LeL$-D%zSv*}FLn`LH zy>pPa$v~tb(d69&wN32Jo7(dpiBuU0G`?cIb?EoLZYifagJt5Uv!#Igp`h&jmXZf$ zxp6Cn<`dgZ95kKfkhhe*B&9*&<8dn;-w4 z$9jPsVgTRC`v(vH-qykjR+Y=?tx>ywTgyxF*UT^*pmadz{$)N>=7lZXA8T)^nxk{* z$eNB?ZHEtaMP4^%bS9R5xxSB2yTJ}c*KecBWoy0^XZ))Cz4u6Y9#TH2@(b@;%i(wd3`IzM?2%0*o;X1_P+7 z8p~SOb&N(M5JJ%Hb|FbptbPE;aWI`uBeDnqLI_k~0qM%l*B|6P5 z1D0ha1_yG?fTn4woQ}uiurJyV!ZQEf#w;K3dEaE+Y zR{+010UtgBzkULfuTgTj)xi4L007Uxk7u#oRWraCgRbiUfG^dL(vD|fB$x9d5!r; z>D>u|n<4lGk+*rJQt?}@R<42P^EoJ`VcatUxkf*NC-4Ufo(>}r6%T0u0000!A1s9;GP7E=-8dvv%CNKzW@LC+x=%Y zCx}5a(A%a50DuAA&o>wv5$dk95&BA!lU2|FlLXT!K>eWQ3us};Wzu5<0su#7t^;*- z8wx3ezPcj62nhrzS9h3pQOIKe&=T=NnIJR3pTHKzqgfnb3>Phn7im~T83CHcb3qnD z7S9(*2r?2Sx|CE)Ya$`bf2!4VQthT?EzS&4iQNtPtWNI;faDI#VC_db8c z`o3Et<|7#p)%zwy1al=qexlkR8ShHei1D8B-4U!1m>(moH-1P6Iw}N((2WxF*mMEN z6^q2s?b5`E$6G=eBOS3Ec}N8=Kkh z9UYA9?Ciju)y$dBPN2A`=wuz!sE>%J9ZpRxf4jIifZNeu(Q4{w$B&DPbDin!g?nmK zw|ET<3@~8TpIt6sZBi?AAMciV^#tyl^X!#2qdz* z?wnkjlyvjQt5-W+P$)T%%iU$&Iy;+$vgqy8_nV^_0G(}0rAaBxv4Hx0Tie^Dm>6W$ zl`HaNs@d7#fB<>eCcfMD9DjaoZLN9TCg8yI-pR?yi1JgXxN@5YD42)w<$1@m`%#;mQa z%L4MVbb?!a54t4kduZ!OT01(D`nQt$1_n06JTmk%7Z=kS$4W0E_4M^s=CGr0^1Y56 zx%fw&ogprIBypi?$@NMJXBofY!aUIsh8%dc^y;*;d}q&{sGeDyoTtn`&A!aaI`vpE zS?SJhzg@98@Ik$x(LSAGmX}5KIJBU5>DTYbZ_6ty3zc(YKYmT2P(;!c5(Rhc*n>93 z`1oP@`7u*fNhF|U3Om$hqx-aZI94?>zhv4zH?uV|b*bDnBskc^cp#P@GOVI9Jw`+C z2WbcGnZ9r^I@)!I&uba>-^o_CU!1MX*oPT=%McdXF}%g%#@NDzS);~FCW4H4t9wF{ zpex}Ms638xxmjK_uZlMoEi_Df+ng|{;N<-`J-`h`172@o2^3AU3R=ffYs48OE>`~ors~tNAk)hW%nvU(M zOs@`qN;dJ&7;Rge>v~o;Y^#vIWd59*eG`6|+`o{Jno5*ks!2Dm&&ASZ>m@gL_m*pIZMTd5X+fn@86GcQytr4hFr{oYDt8P_SEkEOr!?&Jt`1t<;{j!dN diff --git a/Resources/Textures/Structures/Power/substation.rsi/substation_static.png b/Resources/Textures/Structures/Power/substation.rsi/substation_static.png index 9d5b8598f4b8d92b0a1af88b799a6f72c26186c4..eee995843f194939f7b115fd33950de15b7016e1 100644 GIT binary patch delta 613 zcmV-r0-F7d6N&|pFnNklbLtBDyhu}8mc_;Xl&+}HNdms_!?G;+zMrWp>VI<%|Hmh&M1rpCv5}a% zNS~$?@m!znc6%c&pzAsh!;ptz$b%r@0C*4tnL4pO$44Yn5lJw{;CWs=7G+h}ZntCI zX0yrd!x)q1DhX?0aWRNECk8Cy1Dq&A00_e{m#(N!A_KN;$hT(7s z!!R;go2H5Jcnm@a`u#pMP0O^8Kq9#bh#x<+PKNb_&iC_#T|1mBe5$xZEj-aPI%@x^66&Rs-*=RlEZ53&7_e0A2&| zfZw+=xzcLDJ2U|J=>Tx{^2=Md0KMp{@(lG|_A}K?o_F0qHh$ z9Or6xL0;-@`1Dl8!^6I!A0PK@)$#p(_Iw`udcB_9+2Ntc0r2_PeJg7$K1y#C0#`%y z38c4qqtW2KUa!=^i^T##5X5m41WJv5fJopEs)!0GE2M_400000NkvXXu0mjf1NJ8< literal 2444 zcmZ`*3pkYN9-j<~jN70@Ok+3M&dfJP4Q9tg2%Si#GO7u4!Dw#H_sLK+;-og!lv25F zxx^Y;CFN9-TQ1wEwB^!J_T)B&9AZ=2nbDSd+V^?h+yDFh{+HkTzR&X=_V@Eb=q}NP z!C(j->up(qiT!vl#T z7ql8dRIXKK0F6>Zpj|F#s;@uFoiAje2v{5zhbHTyP$-g+8Ac57Soe{x+_|75AV@$2 zfavIGY_tQGFAN9lot>Ql93H^qF-immjNw6{A`B0-nRW8F9}gDD5V8djo6ke3{D#u` zQIHE7tqSz1&F0Bue2OE85^~g0m<)i$VR2bJ2n6i0_Q1Dz5IgL1hCJ}297+SljUTX<}U{I`Rz%yU?CPKW3wgrfPvU7OV>F;~Wa1buWgE9sm&I{N_B z@+)5eS(gNSdQD{A^_7-dFql?`kB8f4s*XI6?|nLO@dtS^S5d&YhhjX-A(#|Zu-Uj& zbNw|_$?xtb(^DQKSN~{xf}>}00by20x1ePnsA(kFGA~RyKJah8gSd(@y{30#xlI>s zMO5YEp|`^^*8K)z{bGUxm<5hRfyh3*Zg8zC2+`Vq#)v5#?giA`_EC$L3)G zfWLgghP8L>e?IJm;?B-(7#EkN3D^+U&R6zBh=; zWUlDA-P_jIHah*@V$1rNhF7m%tysA-F}=)45+!JI4Gy-Z)9F&;VDai}TTV*iihub9 zny5`S_}&Rzt~Kzo<4U?lo&}}0T=Rv^s{7h;&PVq=e}hC!R0exBPLA|k;$zb***a3O zRJI%@!f4ySE^9wKt)1q@8+?~9Z@QnhcEL<9^24qtr8=!mO-AwK1Dl-pAP@+nff8}u zozZaZQ3Wz-k4D09PhC=Ftxm*|Wln@P;}cePVqIy2^S&wE+v({|!NGtlcE@#bbMyLJ zW+IXm?c%=XmKH6kd9}@0&;!H3^aR)ba#>>Twc2>8?GkfyqwI`~m6^>4BpMB{%^9YL z4<9Zdw=DiwA`TvM6zz^TH>8BTJ18)v62~1Kz=eUOJKRD;&mW46jQq8{Jnzx7ncm(D zCT0FBlG@v;QmOP%w^?Moq6UpW3yz9`wrQBTibg1vN_td=%N8k4mS>4?`H+5-9 z2J-f>^3kIAgdOL)>YbcsZU}aT7(KMUG_kFm+eNS>iToX}Xc^udZbLXB?VIPiAJ`Pj6iWE;Gh(t6tb!{|7YAv5_SVniv{-T4uUY?H22GHlJRqC}GN~ zbIKj|T7!>sAJ)`pJU#D?JkxSDQoB9&p5Bf(JAShK9sNAZFKQ|9II}v*bF#-F#9VL{ zo7lLUeEa63bA7%IwMvK@<)37w+aEVXeaXZ zYy4K%+*^@g=6nOIpNoooJTy>ba`wn@p_exzr1$h)qeY7@9vPsOm2RunFVHJA8h%=t zo38jH$Lj8hOI3FUN@?`l;jLDq>&gQfo*8!gv}+i!jw)bJ4B{z%etzl4m$_I;t2Rw% zULCp8U3UUp(`y+d9L@T1kQleFqksQ_)W@BBUoxI0n{5|d)+FZ`Ad$!r84&E5@~}Nn z*e7LJ$DceJKSd^K_J*gk55;dF{qbgUEZ?`@ZK^X0#W{A|EOM0Ad!{v3d}9*ngb$Wf z5oR2Rev%Cke=n?~+@wh^g;)PucUMXIb}Mih+BP<1t;K%5{T0FZ8jIr68bb*gnH{f4 z;3ragUhmWU^DV7J{}e($_trC-Cihr`CTz7$pPikZah=@VyfHRAp)5&$eSD~89fkdW zZHJwN{@@Pum_gc%26pGEiV6KPtx?Z6;RSbm`N-F(j3oALuF-U6@)xxb2urIGBKIRePM|LfQ`A)7i6ia dsa&9AKWtwQgnW_xQb+YCW diff --git a/Resources/Textures/Structures/Power/substation.rsi/substation_wall.png b/Resources/Textures/Structures/Power/substation.rsi/substation_wall.png index 155ced7128aadd1cd7719d655ee751d5741d5e57..ab250c6747ddcc8bb5486ae9b54352e4557df9c9 100644 GIT binary patch literal 588 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-HD>U}E!haSW-L z^LD1~rX~l0mfxX!Cm5-=F-N4XnP~p;x!Am;Q<5ce^Rk|#O;DR>I`EDvTlkYKQ5^;|!7h68Dv3*#QYWvNK5 zkItTdZ^71Uk@eP$4X^*zZQI^B&(Gmtfknx+@4sv7)fXg~%}(4IleGQzL5XIa(*-+Y z^1jCTGZg%NDb;^`>(_h!4j-fA-QTM#oHk0|dtKOI{`rZ|EgxB|vthEG&v5&V zM70GICAl))R;|nJIry<+jjejuqT9b4){A>w7O9-qZtT49%n9Z8!;G1;%wn&d-g1jc z5y%g{A2fZ7kirpXk6Du#a*UOHpRyR7?J(II-H__Gq|lC8BF#l=IRlTeQg1Lro8-h} znhb|~Jc6|uPQ%Hnw<)s)GrhRG9`BfV`SU|r)&LRLKp@&T_1gMnv27|nagK{Nu5%J{ zTc2<W8u_b(XcnWmXdu0TS@L~4gRx5Dw@+d~u0eGr z_W>Ty8GHAzCbX%XiHl=0a26_4c&rLi!fxc}e2B+$36tbvvz79 UQXQ2>tmIipR1RclAn~SSCLx) z)@4&+1!U%?mLw`v zE(HYzo1&C7s~{IQsCFRFRw<*Tq`*pFzr4I$uiRKKzbIYb(9+UU-@r)U$VeBcLbtdw zuOzWTH?LS3VhGF}m(=3qqRfJl%=|nBkhzIT`K2YcN=hJ$-~i&zlw`O)1*JtfU|Uj> z^;2_Fb5rw5iuDck4E3?;E6GelxG=968XUlY(Fe%@wHaX5=2=jZYyu1^*9xF}p#B3o zG#PAfaY>3kk^+4r0|N_P10!7{OMSTifX=r`NwzA8(5=(PRlD1c~)z@`CN5M4t+Mt(^?Fhvz*CVS?Uq!twv0aF*)J|n1g zxK*H=g|Is`FSEoBW&oNnk}jm!v2rXbDbFv;4gtpmaxmgl1T_c}q)2HLk^#WM56l5} zTsHdf++@e)wNr)_m~E3iT^vIqINyfu?rnAuknKCo>ENW-$mX%)z$P851&q5G1(gLS zTQsrBI52y(_$jzHRlHAIy756mE}up0CgrthdyPNedpwiBf#>A`d+P-X^&+lkHm&gu zTD6Ml{&&lBVh#Q>r#{PsgvQQE?`d4r@v*SXzkrctf(mEGEI0e~ov*Dv*yNY(d!C@g z!0B^YQ!rgBH;lV-F1C%^xeEszy7X6F#ex7ouu z{ZQeYrH_5no!ILp_0Mm){g!Pj%(w{6^3y7B$bxqs`n-TYbe%r|n{!|rF1(*AMl t!^?KY-22v>{v^&yL3RS42Ya052iEn!3SOO+k+lSsXr8WqF6*2UngGcE#qIzA diff --git a/Resources/Textures/Structures/Power/substation.rsi/substation_wall_static.png b/Resources/Textures/Structures/Power/substation.rsi/substation_wall_static.png index e810e6a5a4a1f05b179ffa3ce073d8b35b632e6d..f4cc933b4a505d373702a5af5eb4eac868e92d88 100644 GIT binary patch delta 300 zcmV+{0n`5A3)2FSFn<9JNkl1up9W7SR<^YvEWnrRommZ;B9X{{=OH9WYrPAJYno5kd?!%d*Kl!3_WuMS)Uk@f&L`RaMRI-_(Foihn%M0Z5W$u-A1R0Cin2 z<`^|_&HY+y&la%OUe^HZ@Aur@!b%Q!UY_J);K$eZdJcF#Uysk5?Qy-??sZiMP7BSg z@8W27skG#s?nJ7WxO+s+0FArAk8 yOJ_lvra0$D^(96xq?AFE?h>XNh(schKj#N`LZQP8e1RAM0000XQ2>tmIipR1RclAn~SSCLx) z)@4&+1!U%?mLw`v zE(HYzo1&C7s~{IQsCFRFRw<*Tq`*pFzr4I$uiRKKzbIYb(9+UU-@r)U$VeBcLbtdw zuOzWTH?LS3VhGF}m(=3qqRfJl%=|nBkhzIT`K2YcN=hJ$-~i&zlw`O)1*JtfU|Uj> z^;2_Fb5rw5iuDck4E3?;E6GelxG=968XUlY(Fe%@wHaX5=2=jZYyu1^*9xF}p#B3o zG#PAfaY>3kk^+4r0|N_P10!7{OMSTifX=r`NwzA8(5=(PRlD1c~)z@`CN5M4t+Mt(^?Fhvz*CVS?Uq!twv0aF*)J|n1g zxK*H=g|Is`FSEoBW&oNnk}jm!v2rXbDbFv;4gtpmaxmgl1T_c}q)2HLk^#WM56l5} zTsHdf++@e)wNr)_m~G#Cx;TbJaJ~&W=*1K$VtZL+$`z#&W!+O56E7@dGXKn~^eCU@ z(K7zbM2^}P>COurx6V3gt~HzHaZ726+13>+HEQ>kzkbQ%t7a^m`|Qx;xM%mO&pkXd zoAJ*F*&pfbA_wQ6ei~sSRjRTyZoTqcKjA*%2G5NlT2mLSTJ_d0nWyWM@xB|S!YU3- zIWKP?xN<(FBKgMUvL`##Zz?fxYhBstc_u@<;@a$Ho4q?ZzFlZ8yry=^YpIi^Socn` zMA3qOZTF-;R1|m~P|_A=*!|vd=JWL(-#4;UIO^u;9GG>Auh58{^drW~v4+ z3|L?^)$62t-{!RpNzW%V_Hy(@aW{TVRWeu=K4q`Mw60uMiLKk-Ocq;QrfYifbB$fU z-|}W3HRCzO5s~^2#XS;ijaq_5-#N7G{`j&fgX2?yh0UD8z}oVL_nv;Y9g%--r+uuL)7EuV>BsrB3�slRc+-sMO6h ke*a_Z`vx#Ppuuj(uuE|MhnTxx_kl`RPgg&ebxsLQ08&vLBme*a From 32e1d1a3b5bac3b81ad4f580d1001459ed7e2556 Mon Sep 17 00:00:00 2001 From: DrSmugleaf <10968691+DrSmugleaf@users.noreply.github.com> Date: Sun, 16 Jun 2024 04:20:54 -0700 Subject: [PATCH 105/142] Use EntityQuery for mob state system resolves (#29021) --- .../Systems/MobStateSystem.StateMachine.cs | 7 ++++--- Content.Shared/Mobs/Systems/MobStateSystem.cs | 18 ++++++++---------- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/Content.Shared/Mobs/Systems/MobStateSystem.StateMachine.cs b/Content.Shared/Mobs/Systems/MobStateSystem.StateMachine.cs index 2fa522dea5..5928b3871f 100644 --- a/Content.Shared/Mobs/Systems/MobStateSystem.StateMachine.cs +++ b/Content.Shared/Mobs/Systems/MobStateSystem.StateMachine.cs @@ -16,7 +16,8 @@ public partial class MobStateSystem /// If the entity can be set to that MobState public bool HasState(EntityUid entity, MobState mobState, MobStateComponent? component = null) { - return Resolve(entity, ref component, false) && component.AllowedStates.Contains(mobState); + return _mobStateQuery.Resolve(entity, ref component, false) && + component.AllowedStates.Contains(mobState); } /// @@ -27,7 +28,7 @@ public partial class MobStateSystem /// Entity that caused the state update (if applicable) public void UpdateMobState(EntityUid entity, MobStateComponent? component = null, EntityUid? origin = null) { - if (!Resolve(entity, ref component)) + if (!_mobStateQuery.Resolve(entity, ref component)) return; var ev = new UpdateMobStateEvent {Target = entity, Component = component, Origin = origin}; @@ -46,7 +47,7 @@ public partial class MobStateSystem public void ChangeMobState(EntityUid entity, MobState mobState, MobStateComponent? component = null, EntityUid? origin = null) { - if (!Resolve(entity, ref component)) + if (!_mobStateQuery.Resolve(entity, ref component)) return; ChangeState(entity, component, mobState, origin: origin); diff --git a/Content.Shared/Mobs/Systems/MobStateSystem.cs b/Content.Shared/Mobs/Systems/MobStateSystem.cs index a3886dd42e..323efa2242 100644 --- a/Content.Shared/Mobs/Systems/MobStateSystem.cs +++ b/Content.Shared/Mobs/Systems/MobStateSystem.cs @@ -2,7 +2,6 @@ using Content.Shared.ActionBlocker; using Content.Shared.Administration.Logs; using Content.Shared.Mobs.Components; using Content.Shared.Standing; -using Robust.Shared.GameStates; using Robust.Shared.Physics.Systems; using Robust.Shared.Timing; @@ -20,9 +19,12 @@ public partial class MobStateSystem : EntitySystem [Dependency] private readonly IGameTiming _timing = default!; private ISawmill _sawmill = default!; + private EntityQuery _mobStateQuery; + public override void Initialize() { _sawmill = _logManager.GetSawmill("MobState"); + _mobStateQuery = GetEntityQuery(); base.Initialize(); SubscribeEvents(); } @@ -37,7 +39,7 @@ public partial class MobStateSystem : EntitySystem /// If the entity is alive public bool IsAlive(EntityUid target, MobStateComponent? component = null) { - if (!Resolve(target, ref component, false)) + if (!_mobStateQuery.Resolve(target, ref component, false)) return false; return component.CurrentState == MobState.Alive; } @@ -50,7 +52,7 @@ public partial class MobStateSystem : EntitySystem /// If the entity is Critical public bool IsCritical(EntityUid target, MobStateComponent? component = null) { - if (!Resolve(target, ref component, false)) + if (!_mobStateQuery.Resolve(target, ref component, false)) return false; return component.CurrentState == MobState.Critical; } @@ -63,7 +65,7 @@ public partial class MobStateSystem : EntitySystem /// If the entity is Dead public bool IsDead(EntityUid target, MobStateComponent? component = null) { - if (!Resolve(target, ref component, false)) + if (!_mobStateQuery.Resolve(target, ref component, false)) return false; return component.CurrentState == MobState.Dead; } @@ -76,7 +78,7 @@ public partial class MobStateSystem : EntitySystem /// If the entity is Critical or Dead public bool IsIncapacitated(EntityUid target, MobStateComponent? component = null) { - if (!Resolve(target, ref component, false)) + if (!_mobStateQuery.Resolve(target, ref component, false)) return false; return component.CurrentState is MobState.Critical or MobState.Dead; } @@ -89,14 +91,10 @@ public partial class MobStateSystem : EntitySystem /// If the entity is in an Invalid State public bool IsInvalidState(EntityUid target, MobStateComponent? component = null) { - if (!Resolve(target, ref component, false)) + if (!_mobStateQuery.Resolve(target, ref component, false)) return false; return component.CurrentState is MobState.Invalid; } #endregion - - #region Private Implementation - - #endregion } From 4954b6d79e194a4dd8b7f2d9942fa707e259493d Mon Sep 17 00:00:00 2001 From: DrSmugleaf <10968691+DrSmugleaf@users.noreply.github.com> Date: Sun, 16 Jun 2024 04:21:16 -0700 Subject: [PATCH 106/142] Add cvar to disable ghosting killing your crit mob (#28945) * Add cvar to disable ghosting killing your crit mob * Update Content.Shared/CCVar/CCVars.cs Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com> --------- Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com> --- Content.Server/GameTicking/GameTicker.GamePreset.cs | 4 +++- Content.Shared/CCVar/CCVars.cs | 6 ++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Content.Server/GameTicking/GameTicker.GamePreset.cs b/Content.Server/GameTicking/GameTicker.GamePreset.cs index fffacb59de..6e29778952 100644 --- a/Content.Server/GameTicking/GameTicker.GamePreset.cs +++ b/Content.Server/GameTicking/GameTicker.GamePreset.cs @@ -251,7 +251,9 @@ namespace Content.Server.GameTicking // (If the mob survives, that's a bug. Ghosting is kept regardless.) var canReturn = canReturnGlobal && _mind.IsCharacterDeadPhysically(mind); - if (canReturnGlobal && TryComp(playerEntity, out MobStateComponent? mobState)) + if (_configurationManager.GetCVar(CCVars.GhostKillCrit) && + canReturnGlobal && + TryComp(playerEntity, out MobStateComponent? mobState)) { if (_mobState.IsCritical(playerEntity.Value, mobState)) { diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs index 886ace654d..7cc1b341a9 100644 --- a/Content.Shared/CCVar/CCVars.cs +++ b/Content.Shared/CCVar/CCVars.cs @@ -1948,6 +1948,12 @@ namespace Content.Shared.CCVar public static readonly CVarDef GhostRoleTime = CVarDef.Create("ghost.role_time", 3f, CVar.REPLICATED | CVar.SERVER); + /// + /// Whether or not to kill the player's mob on ghosting, when it is in a critical health state. + /// + public static readonly CVarDef GhostKillCrit = + CVarDef.Create("ghost.kill_crit", true, CVar.REPLICATED | CVar.SERVER); + /* * Fire alarm */ From f730d120c72e26e39f4e776622c6e29a676330f6 Mon Sep 17 00:00:00 2001 From: deltanedas <39013340+deltanedas@users.noreply.github.com> Date: Sun, 16 Jun 2024 11:26:59 +0000 Subject: [PATCH 107/142] give spiders unique venom reagent (#29066) * add mechanotoxin * make tarantulas use mechanotoxin * trolled --------- Co-authored-by: deltanedas <@deltanedas:kde.org> --- .../Locale/en-US/reagents/meta/toxins.ftl | 3 ++ .../Prototypes/Entities/Mobs/NPCs/animals.yml | 2 +- Resources/Prototypes/Reagents/toxins.yml | 43 +++++++++++++++++++ 3 files changed, 47 insertions(+), 1 deletion(-) diff --git a/Resources/Locale/en-US/reagents/meta/toxins.ftl b/Resources/Locale/en-US/reagents/meta/toxins.ftl index 09b135e7f5..85dd9a3b6f 100644 --- a/Resources/Locale/en-US/reagents/meta/toxins.ftl +++ b/Resources/Locale/en-US/reagents/meta/toxins.ftl @@ -78,3 +78,6 @@ reagent-desc-tazinide = A highly dangerous metallic mixture which can interfere reagent-name-lipolicide = lipolicide reagent-desc-lipolicide = A powerful toxin that will destroy fat cells, massively reducing body weight in a short time. Deadly to those without nutriment in their body. + +reagent-name-mechanotoxin = mechanotoxin +reagent-desc-mechanotoxin = A neurotoxin used as venom by some species of spider. Degrades movement when built up. diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index f216e05cf9..9143589dcf 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml @@ -2229,7 +2229,7 @@ solution: melee generated: reagents: - - ReagentId: Toxin + - ReagentId: Mechanotoxin Quantity: 1 - type: MeleeChemicalInjector transferAmount: 0.75 diff --git a/Resources/Prototypes/Reagents/toxins.yml b/Resources/Prototypes/Reagents/toxins.yml index 9665de7b09..7f4ebc1a75 100644 --- a/Resources/Prototypes/Reagents/toxins.yml +++ b/Resources/Prototypes/Reagents/toxins.yml @@ -662,3 +662,46 @@ Poison: 2 - !type:SatiateHunger factor: -6 + +# inspired by the spider neurotoxin GsMtx-4 +# poisons non-spiders and slows you down at high doses +- type: reagent + id: Mechanotoxin + name: reagent-name-mechanotoxin + group: Toxins + desc: reagent-desc-mechanotoxin + flavor: sweet + color: "#00b408" + physicalDesc: reagent-physical-desc-nondescript + metabolisms: + Poison: + metabolismRate: 0.2 # Slower metabolism so it can build up over time for slowdown + effects: + - !type:HealthChange + conditions: + - !type:OrganType + type: Arachnid + shouldHave: false + damage: + types: + Poison: 1.6 + - !type:MovespeedModifier + conditions: + - !type:ReagentThreshold + reagent: Mechanotoxin + min: 2 + - !type:OrganType + type: Arachnid + shouldHave: false + walkSpeedModifier: 0.8 + sprintSpeedModifier: 0.8 + - !type:MovespeedModifier + conditions: + - !type:ReagentThreshold + reagent: Mechanotoxin + min: 4 + - !type:OrganType + type: Arachnid + shouldHave: false + walkSpeedModifier: 0.4 + sprintSpeedModifier: 0.4 From 26f809aebf10d6e2139061c4332caa9ffa76d878 Mon Sep 17 00:00:00 2001 From: Cojoke <83733158+Cojoke-dot@users.noreply.github.com> Date: Sun, 16 Jun 2024 06:27:35 -0500 Subject: [PATCH 108/142] Instruments for Musician lodouts (#29059) * Musician Instruments to Musician lodouts * Move instruments to their own file, fix instruments spawning on the floor, Found bug of Loadout dropping items on the floor rather than sorting inventory * Whoops, I removed bagpipes for some reason --- .../en-US/preferences/loadout-groups.ftl | 1 + .../Loadouts/Jobs/Civilian/musician.yml | 2 +- .../Loadouts/Miscellaneous/instruments.yml | 280 ++++++++++++++++++ .../Prototypes/Loadouts/loadout_groups.yml | 35 +++ .../Prototypes/Loadouts/role_loadouts.yml | 1 + .../Roles/Jobs/Civilian/musician.yml | 2 - 6 files changed, 318 insertions(+), 3 deletions(-) create mode 100644 Resources/Prototypes/Loadouts/Miscellaneous/instruments.yml diff --git a/Resources/Locale/en-US/preferences/loadout-groups.ftl b/Resources/Locale/en-US/preferences/loadout-groups.ftl index 28863268df..a107ee24f8 100644 --- a/Resources/Locale/en-US/preferences/loadout-groups.ftl +++ b/Resources/Locale/en-US/preferences/loadout-groups.ftl @@ -2,6 +2,7 @@ loadout-group-trinkets = Trinkets loadout-group-glasses = Glasses loadout-group-backpack = Backpack +loadout-group-instruments = Instruments # Command loadout-group-captain-head = Captain head diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/musician.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/musician.yml index c26da03628..486ff25d47 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Civilian/musician.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/musician.yml @@ -6,4 +6,4 @@ - type: startingGear id: MusicianWintercoat equipment: - outerClothing: ClothingOuterWinterMusician \ No newline at end of file + outerClothing: ClothingOuterWinterMusician diff --git a/Resources/Prototypes/Loadouts/Miscellaneous/instruments.yml b/Resources/Prototypes/Loadouts/Miscellaneous/instruments.yml new file mode 100644 index 0000000000..5b7e46151f --- /dev/null +++ b/Resources/Prototypes/Loadouts/Miscellaneous/instruments.yml @@ -0,0 +1,280 @@ +# Instruments +- type: loadout + id: Glockenspiel + equipment: Glockenspiel + +- type: startingGear + id: Glockenspiel + storage: + back: + - GlockenspielInstrument + +- type: loadout + id: MusicBox + equipment: MusicBox + +- type: startingGear + id: MusicBox + storage: + back: + - MusicBoxInstrument + +- type: loadout + id: Xylophone + equipment: Xylophone + +- type: startingGear + id: Xylophone + storage: + back: + - XylophoneInstrument + +- type: loadout + id: Microphone + equipment: Microphone + +- type: startingGear + id: Microphone + storage: + back: + - MicrophoneInstrument + +- type: loadout + id: Synthesizer + equipment: Synthesizer + +- type: startingGear + id: Synthesizer + storage: + back: + - SynthesizerInstrument + +- type: loadout + id: Kalimba + equipment: Kalimba + +- type: startingGear + id: Kalimba + storage: + back: + - KalimbaInstrument + +- type: loadout + id: Woodblock + equipment: Woodblock + +- type: startingGear + id: Woodblock + storage: + back: + - WoodblockInstrument + +- type: loadout + id: ElectricGuitar + equipment: ElectricGuitar + +- type: startingGear + id: ElectricGuitar + storage: + back: + - ElectricGuitarInstrument + +- type: loadout + id: BassGuitar + equipment: BassGuitar + +- type: startingGear + id: BassGuitar + storage: + back: + - BassGuitarInstrument + +- type: loadout + id: RockGuitar + equipment: RockGuitar + +- type: startingGear + id: RockGuitar + storage: + back: + - RockGuitarInstrument + +- type: loadout + id: AcousticGuitar + equipment: AcousticGuitar + +- type: startingGear + id: AcousticGuitar + storage: + back: + - AcousticGuitarInstrument + +- type: loadout + id: Banjo + equipment: Banjo + +- type: startingGear + id: Banjo + storage: + back: + - BanjoInstrument + +- type: loadout + id: Violin + equipment: Violin + +- type: startingGear + id: Violin + storage: + back: + - ViolinInstrument + +- type: loadout + id: Viola + equipment: Viola + +- type: startingGear + id: Viola + storage: + back: + - ViolaInstrument + +- type: loadout + id: Cello + equipment: Cello + +- type: startingGear + id: Cello + storage: + back: + - CelloInstrument + +- type: loadout + id: Trumpet + equipment: Trumpet + +- type: startingGear + id: Trumpet + storage: + back: + - TrumpetInstrument + +- type: loadout + id: Trombone + equipment: Trombone + +- type: startingGear + id: Trombone + storage: + back: + - TromboneInstrument + +- type: loadout + id: FrenchHorn + equipment: FrenchHorn + +- type: startingGear + id: FrenchHorn + storage: + back: + - FrenchHornInstrument + +- type: loadout + id: Euphonium + equipment: Euphonium + +- type: startingGear + id: Euphonium + storage: + back: + - EuphoniumInstrument + +- type: loadout + id: Saxophone + equipment: Saxophone + +- type: startingGear + id: Saxophone + storage: + back: + - SaxophoneInstrument + +- type: loadout + id: Accordion + equipment: Accordion + +- type: startingGear + id: Accordion + storage: + back: + - AccordionInstrument + +- type: loadout + id: Harmonica + equipment: Harmonica + +- type: startingGear + id: Harmonica + storage: + back: + - HarmonicaInstrument + +- type: loadout + id: Clarinet + equipment: Clarinet + +- type: startingGear + id: Clarinet + storage: + back: + - ClarinetInstrument + +- type: loadout + id: Flute + equipment: Flute + +- type: startingGear + id: Flute + storage: + back: + - FluteInstrument + +- type: loadout + id: Recorder + equipment: Recorder + +- type: startingGear + id: Recorder + storage: + back: + - RecorderInstrument + +- type: loadout + id: PanFlute + equipment: PanFlute + +- type: startingGear + id: PanFlute + storage: + back: + - PanFluteInstrument + +- type: loadout + id: Ocarina + equipment: Ocarina + +- type: startingGear + id: Ocarina + storage: + back: + - OcarinaInstrument + +- type: loadout + id: Bagpipe + equipment: Bagpipe + +- type: startingGear + id: Bagpipe + storage: + back: + - BagpipeInstrument diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index 0fab367fc9..cc0aefb69c 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -436,6 +436,41 @@ loadouts: - MusicianWintercoat +- type: loadoutGroup + id: Instruments + name: loadout-group-instruments + minLimit: 0 + maxLimit: 2 + loadouts: + - Glockenspiel + - MusicBox + - Xylophone + - Microphone + - Synthesizer + - Kalimba + - Woodblock + - ElectricGuitar + - BassGuitar + - RockGuitar + - AcousticGuitar + - Banjo + - Violin + - Viola + - Cello + - Trumpet + - Trombone + - FrenchHorn + - Euphonium + - Saxophone + - Accordion + - Harmonica + - Clarinet + - Flute + - Recorder + - PanFlute + - Ocarina + - Bagpipe + # Cargo - type: loadoutGroup id: QuartermasterHead diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml index 4ff2775dfc..0e80113ce3 100644 --- a/Resources/Prototypes/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/Loadouts/role_loadouts.yml @@ -141,6 +141,7 @@ - MusicianOuterClothing - Glasses - Trinkets + - Instruments # Cargo - type: roleLoadout diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml b/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml index 4b508c907d..58335ba52d 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml @@ -25,5 +25,3 @@ storage: back: - BoxSurvival - - AcousticGuitarInstrument - - SaxophoneInstrument \ No newline at end of file From ac979640bf0040c21b27cf3989773917edd21e1a Mon Sep 17 00:00:00 2001 From: PJBot Date: Sun, 16 Jun 2024 11:28:41 +0000 Subject: [PATCH 109/142] Automatic changelog update --- Resources/Changelog/Changelog.yml | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 8ceaead435..8973caeea5 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,20 +1,4 @@ Entries: -- author: Plykiya - changes: - - message: Hyposprays can now be toggled to draw from solution containers like jugs - and beakers. - type: Tweak - id: 6257 - time: '2024-03-30T03:59:17.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/25544 -- author: EdenTheLiznerd - changes: - - message: Amanita toxin now kills you slightly slower, providing you time to seek - charcoal before it's too late - type: Tweak - id: 6258 - time: '2024-03-30T04:00:21.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/25830 - author: liltenhead changes: - message: Changed the syndicate hardbomb to have less of a chance to completely @@ -3860,3 +3844,17 @@ id: 6756 time: '2024-06-16T03:38:18.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/29034 +- author: deltanedas + changes: + - message: Tarantulas now use Mechanotoxin, a venom that slows you down over time. + type: Tweak + id: 6757 + time: '2024-06-16T11:26:59.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/29066 +- author: Cojoke-dot + changes: + - message: Musicians can now select instruments in their loadout + type: Add + id: 6758 + time: '2024-06-16T11:27:35.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/29059 From f121946b123a7b9f23a9e262d2a6362e774fa0cb Mon Sep 17 00:00:00 2001 From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com> Date: Sun, 16 Jun 2024 23:30:35 +1200 Subject: [PATCH 110/142] Fix RotateWhilePulling not working (#29032) --- .../Movement/Components/PullMoverComponent.cs | 13 -------- .../Movement/Systems/PullController.cs | 30 +++++-------------- .../Components/ActivePullerComponent.cs | 7 +++++ .../Pulling/Components/PullerComponent.cs | 2 +- .../Movement/Pulling/Systems/PullingSystem.cs | 13 ++++++++ 5 files changed, 29 insertions(+), 36 deletions(-) delete mode 100644 Content.Server/Movement/Components/PullMoverComponent.cs create mode 100644 Content.Shared/Movement/Pulling/Components/ActivePullerComponent.cs diff --git a/Content.Server/Movement/Components/PullMoverComponent.cs b/Content.Server/Movement/Components/PullMoverComponent.cs deleted file mode 100644 index 19a01c6b17..0000000000 --- a/Content.Server/Movement/Components/PullMoverComponent.cs +++ /dev/null @@ -1,13 +0,0 @@ -namespace Content.Server.Movement.Components; - -/// -/// Added to an entity that is ctrl-click moving their pulled object. -/// -/// -/// This just exists so we don't have MoveEvent subs going off for every single mob constantly. -/// -[RegisterComponent] -public sealed partial class PullMoverComponent : Component -{ - -} diff --git a/Content.Server/Movement/Systems/PullController.cs b/Content.Server/Movement/Systems/PullController.cs index 72110ff67d..f227d9c55c 100644 --- a/Content.Server/Movement/Systems/PullController.cs +++ b/Content.Server/Movement/Systems/PullController.cs @@ -18,6 +18,7 @@ using Robust.Shared.Physics.Controllers; using Robust.Shared.Physics.Dynamics.Joints; using Robust.Shared.Player; using Robust.Shared.Timing; +using Robust.Shared.Utility; namespace Content.Server.Movement.Systems; @@ -91,7 +92,7 @@ public sealed class PullController : VirtualController UpdatesAfter.Add(typeof(MoverController)); SubscribeLocalEvent(OnPullStop); - SubscribeLocalEvent(OnPullerMove); + SubscribeLocalEvent(OnPullerMove); base.Initialize(); } @@ -155,19 +156,22 @@ public sealed class PullController : VirtualController coords = fromUserCoords.WithEntityId(coords.EntityId); } - EnsureComp(player); var moving = EnsureComp(pulled!.Value); moving.MovingTo = coords; return false; } - private void OnPullerMove(EntityUid uid, PullMoverComponent component, ref MoveEvent args) + private void OnPullerMove(EntityUid uid, ActivePullerComponent component, ref MoveEvent args) { if (!_pullerQuery.TryComp(uid, out var puller)) return; if (puller.Pulling is not { } pullable) + { + DebugTools.Assert($"Failed to clean up puller: {ToPrettyString(uid)}"); + RemCompDeferred(uid, component); return; + } UpdatePulledRotation(uid, pullable); @@ -182,13 +186,7 @@ public sealed class PullController : VirtualController if (_physicsQuery.TryComp(uid, out var physics)) PhysicsSystem.WakeBody(uid, body: physics); - StopMove(uid, pullable); - } - - private void StopMove(Entity mover, Entity moving) - { - RemCompDeferred(mover.Owner); - RemCompDeferred(moving.Owner); + RemCompDeferred(pullable); } private void UpdatePulledRotation(EntityUid puller, EntityUid pulled) @@ -302,17 +300,5 @@ public sealed class PullController : VirtualController PhysicsSystem.ApplyLinearImpulse(puller, -impulse); } } - - // Cleanup PullMover - var moverQuery = EntityQueryEnumerator(); - - while (moverQuery.MoveNext(out var uid, out _, out var puller)) - { - if (!HasComp(puller.Pulling)) - { - RemCompDeferred(uid); - continue; - } - } } } diff --git a/Content.Shared/Movement/Pulling/Components/ActivePullerComponent.cs b/Content.Shared/Movement/Pulling/Components/ActivePullerComponent.cs new file mode 100644 index 0000000000..83bfd9f795 --- /dev/null +++ b/Content.Shared/Movement/Pulling/Components/ActivePullerComponent.cs @@ -0,0 +1,7 @@ +namespace Content.Shared.Movement.Pulling.Components; + +/// +/// Component that indicates that an entity is currently pulling some other entity. +/// +[RegisterComponent] +public sealed partial class ActivePullerComponent : Component; diff --git a/Content.Shared/Movement/Pulling/Components/PullerComponent.cs b/Content.Shared/Movement/Pulling/Components/PullerComponent.cs index f47ae32f90..32e4d9b1f3 100644 --- a/Content.Shared/Movement/Pulling/Components/PullerComponent.cs +++ b/Content.Shared/Movement/Pulling/Components/PullerComponent.cs @@ -9,7 +9,7 @@ namespace Content.Shared.Movement.Pulling.Components; /// /// Specifies an entity as being able to pull another entity with /// -[RegisterComponent, NetworkedComponent, AutoGenerateComponentState] +[RegisterComponent, NetworkedComponent, AutoGenerateComponentState(true)] [Access(typeof(PullingSystem))] public sealed partial class PullerComponent : Component { diff --git a/Content.Shared/Movement/Pulling/Systems/PullingSystem.cs b/Content.Shared/Movement/Pulling/Systems/PullingSystem.cs index 161868370e..72b87476bb 100644 --- a/Content.Shared/Movement/Pulling/Systems/PullingSystem.cs +++ b/Content.Shared/Movement/Pulling/Systems/PullingSystem.cs @@ -61,6 +61,7 @@ public sealed class PullingSystem : EntitySystem SubscribeLocalEvent(OnPullableContainerInsert); SubscribeLocalEvent(OnModifyUncuffDuration); + SubscribeLocalEvent(OnAfterState); SubscribeLocalEvent(OnPullerContainerInsert); SubscribeLocalEvent(OnPullerUnpaused); SubscribeLocalEvent(OnVirtualItemDeleted); @@ -72,6 +73,14 @@ public sealed class PullingSystem : EntitySystem .Register(); } + private void OnAfterState(Entity ent, ref AfterAutoHandleStateEvent args) + { + if (ent.Comp.Pulling == null) + RemComp(ent.Owner); + else + EnsureComp(ent.Owner); + } + private void OnDropHandItems(EntityUid uid, PullerComponent pullerComp, DropHandItemsEvent args) { if (pullerComp.Pulling == null || pullerComp.NeedsHands) @@ -228,6 +237,9 @@ public sealed class PullingSystem : EntitySystem } var oldPuller = pullableComp.Puller; + if (oldPuller != null) + RemComp(oldPuller.Value); + pullableComp.PullJointId = null; pullableComp.Puller = null; Dirty(pullableUid, pullableComp); @@ -410,6 +422,7 @@ public sealed class PullingSystem : EntitySystem // Use net entity so it's consistent across client and server. pullableComp.PullJointId = $"pull-joint-{GetNetEntity(pullableUid)}"; + EnsureComp(pullerUid); pullerComp.Pulling = pullableUid; pullableComp.Puller = pullerUid; From 22efc2b4ac3f05c6295497fabb36b8b25b05b6b0 Mon Sep 17 00:00:00 2001 From: PJBot Date: Sun, 16 Jun 2024 11:31:41 +0000 Subject: [PATCH 111/142] Automatic changelog update --- Resources/Changelog/Changelog.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 8973caeea5..0f2ad78a7a 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,12 +1,4 @@ Entries: -- author: liltenhead - changes: - - message: Changed the syndicate hardbomb to have less of a chance to completely - destroy tiles. - type: Tweak - id: 6259 - time: '2024-03-30T04:36:33.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/26548 - author: takemysoult changes: - message: stimulants removes chloral hydrate from body @@ -3858,3 +3850,11 @@ id: 6758 time: '2024-06-16T11:27:35.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/29059 +- author: ElectroJr + changes: + - message: Fixed pianos, office chairs & other objects not rotating while being + pulled. + type: Fix + id: 6759 + time: '2024-06-16T11:30:36.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/29032 From 1cb9f5dbed80fdf4087f855050b436cc448fb427 Mon Sep 17 00:00:00 2001 From: deltanedas <39013340+deltanedas@users.noreply.github.com> Date: Sun, 16 Jun 2024 11:57:57 +0000 Subject: [PATCH 112/142] add carp hardsuit for traitors (#25155) * FactionClothing * swtich carp to the Dragon faction * add carp hardsuit * add carp hardsuit to uplink * fixes * webedit ops 1 * why did i name it that wtf * among --------- Co-authored-by: deltanedas <@deltanedas:kde.org> --- .../Components/FactionClothingComponent.cs | 27 ++++++++++++ .../EntitySystems/FactionClothingSystem.cs | 42 +++++++++++++++++++ .../Locale/en-US/store/uplink-catalog.ftl | 3 ++ .../Prototypes/Catalog/uplink_catalog.yml | 11 +++++ .../Entities/Clothing/Head/hoods.yml | 16 +++++++ .../Entities/Clothing/OuterClothing/suits.yml | 13 ++++++ .../Prototypes/Entities/Mobs/NPCs/carp.yml | 2 +- 7 files changed, 113 insertions(+), 1 deletion(-) create mode 100644 Content.Shared/Clothing/Components/FactionClothingComponent.cs create mode 100644 Content.Shared/Clothing/EntitySystems/FactionClothingSystem.cs diff --git a/Content.Shared/Clothing/Components/FactionClothingComponent.cs b/Content.Shared/Clothing/Components/FactionClothingComponent.cs new file mode 100644 index 0000000000..d49ee4f81d --- /dev/null +++ b/Content.Shared/Clothing/Components/FactionClothingComponent.cs @@ -0,0 +1,27 @@ +using Content.Shared.Clothing.EntitySystems; +using Content.Shared.NPC.Prototypes; +using Robust.Shared.GameStates; +using Robust.Shared.Prototypes; + +namespace Content.Shared.Clothing.Components; + +/// +/// When equipped, adds the wearer to a faction. +/// When removed, removes the wearer from a faction. +/// +[RegisterComponent, NetworkedComponent, Access(typeof(FactionClothingSystem))] +public sealed partial class FactionClothingComponent : Component +{ + /// + /// Faction to add and remove. + /// + [DataField(required: true)] + public ProtoId Faction = string.Empty; + + /// + /// If true, the wearer was already part of the faction. + /// This prevents wrongly removing them after removing the item. + /// + [DataField] + public bool AlreadyMember; +} diff --git a/Content.Shared/Clothing/EntitySystems/FactionClothingSystem.cs b/Content.Shared/Clothing/EntitySystems/FactionClothingSystem.cs new file mode 100644 index 0000000000..76b7b9aa66 --- /dev/null +++ b/Content.Shared/Clothing/EntitySystems/FactionClothingSystem.cs @@ -0,0 +1,42 @@ +using Content.Shared.Clothing.Components; +using Content.Shared.Inventory.Events; +using Content.Shared.NPC.Components; +using Content.Shared.NPC.Systems; + +namespace Content.Shared.Clothing.EntitySystems; + +/// +/// Handles faction adding and removal. +/// +public sealed class FactionClothingSystem : EntitySystem +{ + [Dependency] private readonly NpcFactionSystem _faction = default!; + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnEquipped); + SubscribeLocalEvent(OnUnequipped); + } + + private void OnEquipped(Entity ent, ref GotEquippedEvent args) + { + TryComp(args.Equipee, out var factionComp); + var faction = (args.Equipee, factionComp); + ent.Comp.AlreadyMember = _faction.IsMember(faction, ent.Comp.Faction); + + _faction.AddFaction(faction, ent.Comp.Faction); + } + + private void OnUnequipped(Entity ent, ref GotUnequippedEvent args) + { + if (ent.Comp.AlreadyMember) + { + ent.Comp.AlreadyMember = false; + return; + } + + _faction.RemoveFaction(args.Equipee, ent.Comp.Faction); + } +} diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl index 78c094926f..2598970cef 100644 --- a/Resources/Locale/en-US/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/store/uplink-catalog.ftl @@ -312,6 +312,9 @@ uplink-clothing-shoes-boots-mag-syndie-desc = A pair of boots that prevent slipp uplink-eva-syndie-name = Syndicate EVA Bundle uplink-eva-syndie-desc = A simple EVA suit that offers no protection other than what's needed to survive in space. +uplink-hardsuit-carp-name = Carp Hardsuit +uplink-hardsuit-carp-desc = Looks like an ordinary carp suit, except fully spaceproof and tricks space carp into thinking you are one of them. + uplink-hardsuit-syndie-name = Syndicate Hardsuit uplink-hardsuit-syndie-desc = The Syndicate's well known armored blood red hardsuit, capable of space walks and bullet resistant. diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index d39f900357..0ba83dfe73 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -1276,6 +1276,17 @@ categories: - UplinkWearables +- type: listing + id: UplinkHardsuitCarp + name: uplink-hardsuit-carp-name + description: uplink-hardsuit-carp-desc + icon: { sprite: /Textures/Clothing/OuterClothing/Suits/carpsuit.rsi, state: icon } + productEntity: ClothingOuterHardsuitCarp + cost: + Telecrystal: 4 + categories: + - UplinkWearables + - type: listing id: UplinkHardsuitSyndie name: uplink-hardsuit-syndie-name diff --git a/Resources/Prototypes/Entities/Clothing/Head/hoods.yml b/Resources/Prototypes/Entities/Clothing/Head/hoods.yml index b62834dd98..db18706912 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hoods.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hoods.yml @@ -206,6 +206,22 @@ slots: - Hair +- type: entity + parent: ClothingHeadHatHoodCarp + id: ClothingHeadHelmetHardsuitCarp + noSpawn: true + components: + - type: PressureProtection + highPressureMultiplier: 0.6 + lowPressureMultiplier: 1000 + - type: TemperatureProtection + coefficient: 0.2 + - type: BreathMask + # this is on the hood so you only fool the fish if you wear the whole set + # wear carp suit and security helmet, they'll know you are fake + - type: FactionClothing + faction: Dragon + - type: entity parent: ClothingHeadBase id: ClothingHeadHatHoodMoth diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml index ccf6f09b19..79c116b3ca 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml @@ -257,3 +257,16 @@ - type: ContainerContainer containers: toggleable-clothing: !type:ContainerSlot {} + +- type: entity + parent: ClothingOuterSuitCarp + id: ClothingOuterHardsuitCarp + suffix: Hardsuit, DO NOT MAP + components: + - type: PressureProtection + highPressureMultiplier: 0.6 + lowPressureMultiplier: 1000 + - type: TemperatureProtection + coefficient: 0.01 + - type: ToggleableClothing + clothingPrototype: ClothingHeadHelmetHardsuitCarp diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml index 3a77dbab4c..10bc7861fa 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml @@ -15,7 +15,7 @@ true - type: NpcFactionMember factions: - - SimpleHostile + - Dragon - type: Sprite drawdepth: Mobs sprite: Mobs/Aliens/Carps/space.rsi From c9540db6b48f45e4623d15467a6e2705b18e36e2 Mon Sep 17 00:00:00 2001 From: PJBot Date: Sun, 16 Jun 2024 11:59:03 +0000 Subject: [PATCH 113/142] Automatic changelog update --- Resources/Changelog/Changelog.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 0f2ad78a7a..b3d8fff813 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: takemysoult - changes: - - message: stimulants removes chloral hydrate from body - type: Tweak - id: 6260 - time: '2024-03-30T06:52:27.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/25886 - author: Flareguy changes: - message: Removed SCAF armor. @@ -3858,3 +3851,11 @@ id: 6759 time: '2024-06-16T11:30:36.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/29032 +- author: deltanedas + changes: + - message: Added the Carp Hardsuit to the uplink which is spaceproof and makes carp + think you are one of them. + type: Add + id: 6760 + time: '2024-06-16T11:57:57.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/25155 From 14cd55e765ff7584d72079500660bf491aa70fba Mon Sep 17 00:00:00 2001 From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com> Date: Mon, 17 Jun 2024 03:46:59 +1200 Subject: [PATCH 114/142] Remove ServerAlertsComponentTests (#29027) --- .../Alert/ServerAlertsComponentTests.cs | 83 ------------------- 1 file changed, 83 deletions(-) delete mode 100644 Content.Tests/Shared/Alert/ServerAlertsComponentTests.cs diff --git a/Content.Tests/Shared/Alert/ServerAlertsComponentTests.cs b/Content.Tests/Shared/Alert/ServerAlertsComponentTests.cs deleted file mode 100644 index bcc32e13de..0000000000 --- a/Content.Tests/Shared/Alert/ServerAlertsComponentTests.cs +++ /dev/null @@ -1,83 +0,0 @@ -using System.IO; -using Content.Server.Alert; -using Content.Shared.Alert; -using NUnit.Framework; -using Robust.Shared.GameObjects; -using Robust.Shared.GameStates; -using Robust.Shared.IoC; -using Robust.Shared.Prototypes; -using Robust.Shared.Serialization.Manager; - -namespace Content.Tests.Shared.Alert -{ - [TestFixture] - [TestOf(typeof(AlertsComponent))] - public sealed class ServerAlertsComponentTests : ContentUnitTest - { - const string PROTOTYPES = @" -- type: alertCategory - id: Pressure - -- type: alert - id: LowPressure - category: Pressure - icon: /Textures/Interface/Alerts/Pressure/lowpressure.png - -- type: alert - id: HighPressure - category: Pressure - icon: /Textures/Interface/Alerts/Pressure/highpressure.png -"; - - [Test] - [Ignore("There is no way to load extra Systems in a unit test, fixing RobustUnitTest is out of scope.")] - public void ShowAlerts() - { - // this is kind of unnecessary because there's integration test coverage of Alert components - // but wanted to keep it anyway to see what's possible w.r.t. testing components - // in a unit test - - var entManager = IoCManager.Resolve(); - IoCManager.Resolve().Initialize(); - var prototypeManager = IoCManager.Resolve(); - prototypeManager.Initialize(); - var factory = IoCManager.Resolve(); - factory.RegisterClass(); - prototypeManager.LoadFromStream(new StringReader(PROTOTYPES)); - prototypeManager.ResolveResults(); - - var entSys = entManager.EntitySysManager; - entSys.LoadExtraSystemType(); - - var alertsComponent = new AlertsComponent(); - alertsComponent = IoCManager.InjectDependencies(alertsComponent); - - Assert.That(entManager.System().TryGet("LowPressure", out var lowpressure)); - Assert.That(entManager.System().TryGet("HighPressure", out var highpressure)); - - entManager.System().ShowAlert(alertsComponent.Owner, "LowPressure"); - - var getty = new ComponentGetState(); - entManager.EventBus.RaiseComponentEvent(alertsComponent, getty); - - var alertState = (AlertsComponent.AlertsComponent_AutoState) getty.State!; - Assert.That(alertState, Is.Not.Null); - Assert.That(alertState.Alerts.Count, Is.EqualTo(1)); - Assert.That(alertState.Alerts.ContainsKey(lowpressure!.AlertKey)); - - entManager.System().ShowAlert(alertsComponent.Owner, "HighPressure"); - - // Lazy - entManager.EventBus.RaiseComponentEvent(alertsComponent, getty); - alertState = (AlertsComponent.AlertsComponent_AutoState) getty.State!; - Assert.That(alertState.Alerts.Count, Is.EqualTo(1)); - Assert.That(alertState.Alerts.ContainsKey(highpressure!.AlertKey)); - - entManager.System().ClearAlertCategory(alertsComponent.Owner, "Pressure"); - - entManager.EventBus.RaiseComponentEvent(alertsComponent, getty); - alertState = (AlertsComponent.AlertsComponent_AutoState) getty.State!; - Assert.That(alertState.Alerts.Count, Is.EqualTo(0)); - } - } -} From 6829630d0c7698d0d8adf1fdb55728164d309341 Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Mon, 17 Jun 2024 01:51:08 +1000 Subject: [PATCH 115/142] Update submodule to 226.0.0 (#29100) --- RobustToolbox | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RobustToolbox b/RobustToolbox index 2fa83181e2..a3a8912f42 160000 --- a/RobustToolbox +++ b/RobustToolbox @@ -1 +1 @@ -Subproject commit 2fa83181e2f4472120fe280f4598197f436faf22 +Subproject commit a3a8912f4280efe701958fcd00079fffcfc4efee From fdb487ccfe1337e900f5a0bbc33bf52de5543d72 Mon Sep 17 00:00:00 2001 From: lzk <124214523+lzk228@users.noreply.github.com> Date: Sun, 16 Jun 2024 21:36:11 +0200 Subject: [PATCH 116/142] Update origin (#28342) robotics console --- Resources/Maps/origin.yml | 6260 +++++++++++++------------------------ 1 file changed, 2258 insertions(+), 4002 deletions(-) diff --git a/Resources/Maps/origin.yml b/Resources/Maps/origin.yml index f706550efc..dcd961e34e 100644 --- a/Resources/Maps/origin.yml +++ b/Resources/Maps/origin.yml @@ -67,14 +67,15 @@ entities: - type: MetaData - type: Transform - type: Map + mapPaused: True - type: PhysicsMap + - type: GridTree + - type: MovedGrids - type: Parallax parallax: OriginStation - type: Broadphase - type: OccluderTree - type: LoadedMap - - type: GridTree - - type: MovedGrids - uid: 2 components: - type: MetaData @@ -547,23 +548,23 @@ entities: color: '#FFFFFFFF' id: Arrows decals: - 3436: 6,-71 - 3437: -14,-16 - 3664: -69,-45 - 3677: 1,-2 + 3434: 6,-71 + 3435: -14,-16 + 3662: -69,-45 + 3675: 1,-2 - node: angle: 3.141592653589793 rad color: '#FFFFFFFF' id: Arrows decals: - 3709: -71,-45 + 3707: -71,-45 - node: angle: 4.71238898038469 rad color: '#FFFFFFFF' id: Arrows decals: - 2975: 67,-46 - 2976: 67,-47 + 2973: 67,-46 + 2974: 67,-47 - node: color: '#FFFFFFFF' id: Bot @@ -640,66 +641,66 @@ entities: 541: -38,42 581: -36,-101 582: 67,-16 - 2864: 73,-37 - 2865: 73,-36 - 2866: 72,-36 - 2867: 73,-35 - 2933: -52,-59 - 2954: 68,-69 - 2969: 69,-46 - 2970: 69,-47 - 2971: 70,-46 - 2972: 70,-47 - 3143: -47,-41 - 3148: -12,-14 - 3282: 33,-83 - 3283: 33,-90 - 3284: 30,-95 - 3285: 48,-95 - 3286: 45,-90 - 3287: 45,-83 - 3386: -58,-19 - 3387: -18,69 - 3434: 6,-86 - 3446: -53,43 - 3447: -53,42 - 3448: -50,46 - 3467: 68,-29 - 3472: 68,-28 - 3473: 69,-29 - 3474: 67,-29 - 3475: 68,-30 - 3476: 51,-83 - 3477: 51,-90 - 3560: -77,-32 - 3565: -64,-46 - 3653: -67,-43 - 3671: -47,-40 - 3673: 1,-3 - 3674: 2,-3 - 3675: 3,-3 + 2862: 73,-37 + 2863: 73,-36 + 2864: 72,-36 + 2865: 73,-35 + 2931: -52,-59 + 2952: 68,-69 + 2967: 69,-46 + 2968: 69,-47 + 2969: 70,-46 + 2970: 70,-47 + 3141: -47,-41 + 3146: -12,-14 + 3280: 33,-83 + 3281: 33,-90 + 3282: 30,-95 + 3283: 48,-95 + 3284: 45,-90 + 3285: 45,-83 + 3384: -58,-19 + 3385: -18,69 + 3432: 6,-86 + 3444: -53,43 + 3445: -53,42 + 3446: -50,46 + 3465: 68,-29 + 3470: 68,-28 + 3471: 69,-29 + 3472: 67,-29 + 3473: 68,-30 + 3474: 51,-83 + 3475: 51,-90 + 3558: -77,-32 + 3563: -64,-46 + 3651: -67,-43 + 3669: -47,-40 + 3671: 1,-3 + 3672: 2,-3 + 3673: 3,-3 - node: color: '#FFFFFFFF' id: BotLeft decals: 191: -19,3 192: -21,1 - 2862: 72,-37 - 3468: 67,-28 - 3469: 69,-30 - 3470: 67,-30 - 3471: 69,-28 - 3662: -69,-45 - 3707: -71,-45 + 2860: 72,-37 + 3466: 67,-28 + 3467: 69,-30 + 3468: 67,-30 + 3469: 69,-28 + 3660: -69,-45 + 3705: -71,-45 - node: color: '#FFFFFFFF' id: BotRight decals: 189: -21,3 190: -19,1 - 2863: 72,-35 - 3663: -69,-45 - 3708: -71,-45 + 2861: 72,-35 + 3661: -69,-45 + 3706: -71,-45 - node: color: '#FFFFFFFF' id: Box @@ -709,417 +710,417 @@ entities: 186: -21,2 187: -19,2 188: -20,1 - 3435: 7,-83 + 3433: 7,-83 - node: color: '#FFFFFFFF' id: BoxGreyscale decals: - 3714: 10,23 - 3715: 11,23 + 3712: 10,23 + 3713: 11,23 - node: color: '#D4D4D4D6' id: BrickTileSteelCornerNe decals: - 3168: 30,4 + 3166: 30,4 - node: color: '#D4D4D4D6' id: BrickTileSteelCornerNw decals: - 3167: 28,4 + 3165: 28,4 - node: color: '#D4D4D4D6' id: BrickTileSteelCornerSe decals: - 3166: 30,-1 + 3164: 30,-1 - node: color: '#D4D4D4D6' id: BrickTileSteelEndS decals: - 3163: 28,-3 + 3161: 28,-3 - node: color: '#D4D4D4D6' id: BrickTileSteelInnerNe decals: - 3200: 20,-3 + 3198: 20,-3 - node: color: '#D4D4D4D6' id: BrickTileSteelInnerNw decals: - 3202: 27,-3 + 3200: 27,-3 - node: color: '#D4D4D4D6' id: BrickTileSteelInnerSe decals: - 3174: 28,-1 - 3201: 20,4 + 3172: 28,-1 + 3199: 20,4 - node: color: '#D4D4D4D6' id: BrickTileSteelInnerSw decals: - 3199: 27,4 + 3197: 27,4 - node: color: '#D4D4D4D6' id: BrickTileSteelLineE decals: - 3164: 28,-2 - 3169: 30,3 - 3170: 30,2 - 3171: 30,1 - 3172: 30,0 - 3187: 20,3 - 3188: 20,2 - 3189: 20,1 - 3190: 20,0 - 3191: 20,-1 - 3192: 20,-2 + 3162: 28,-2 + 3167: 30,3 + 3168: 30,2 + 3169: 30,1 + 3170: 30,0 + 3185: 20,3 + 3186: 20,2 + 3187: 20,1 + 3188: 20,0 + 3189: 20,-1 + 3190: 20,-2 - node: color: '#D4D4D4D6' id: BrickTileSteelLineN decals: - 3173: 29,4 - 3193: 21,-3 - 3194: 22,-3 - 3195: 23,-3 - 3196: 24,-3 - 3197: 25,-3 - 3198: 26,-3 + 3171: 29,4 + 3191: 21,-3 + 3192: 22,-3 + 3193: 23,-3 + 3194: 24,-3 + 3195: 25,-3 + 3196: 26,-3 - node: color: '#D4D4D4D6' id: BrickTileSteelLineS decals: - 3165: 29,-1 - 3181: 26,4 - 3182: 25,4 - 3183: 24,4 - 3184: 23,4 - 3185: 22,4 - 3186: 21,4 + 3163: 29,-1 + 3179: 26,4 + 3180: 25,4 + 3181: 24,4 + 3182: 23,4 + 3183: 22,4 + 3184: 21,4 - node: color: '#D4D4D4D6' id: BrickTileSteelLineW decals: - 3157: 28,-2 - 3158: 28,3 - 3159: 28,2 - 3160: 28,1 - 3161: 28,0 - 3162: 28,-1 - 3175: 27,3 - 3176: 27,2 - 3177: 27,1 - 3178: 27,0 - 3179: 27,-1 - 3180: 27,-2 + 3155: 28,-2 + 3156: 28,3 + 3157: 28,2 + 3158: 28,1 + 3159: 28,0 + 3160: 28,-1 + 3173: 27,3 + 3174: 27,2 + 3175: 27,1 + 3176: 27,0 + 3177: 27,-1 + 3178: 27,-2 - node: color: '#334E6DC8' id: BrickTileWhiteBox decals: - 3393: 9,-21 + 3391: 9,-21 - node: color: '#3AB3DAFF' id: BrickTileWhiteBox decals: - 3264: -19,-47 + 3262: -19,-47 - node: color: '#3C44AAFF' id: BrickTileWhiteBox decals: - 3261: -19,-49 + 3259: -19,-49 - node: color: '#52B4E996' id: BrickTileWhiteBox decals: - 3389: 9,-23 + 3387: 9,-23 - node: color: '#80C71FFF' id: BrickTileWhiteBox decals: - 3263: -19,-48 + 3261: -19,-48 - node: color: '#835432FF' id: BrickTileWhiteBox decals: - 3259: -22,-47 + 3257: -22,-47 - node: color: '#9D9D97FF' id: BrickTileWhiteBox decals: - 3262: -19,-46 + 3260: -19,-46 - node: color: '#9FED5896' id: BrickTileWhiteBox decals: - 3391: 11,-23 + 3389: 11,-23 - node: color: '#A4610696' id: BrickTileWhiteBox decals: - 3392: 8,-21 + 3390: 8,-21 - node: color: '#B02E26FF' id: BrickTileWhiteBox decals: - 3260: -22,-49 + 3258: -22,-49 - node: color: '#C74EBDFF' id: BrickTileWhiteBox decals: - 3258: -22,-46 + 3256: -22,-46 - node: color: '#D381C996' id: BrickTileWhiteBox decals: - 3388: 8,-23 + 3386: 8,-23 - node: color: '#D4D4D496' id: BrickTileWhiteBox decals: - 3394: 10,-21 + 3392: 10,-21 - node: color: '#DE3A3A96' id: BrickTileWhiteBox decals: - 3390: 10,-23 + 3388: 10,-23 - node: color: '#EFB34196' id: BrickTileWhiteBox decals: - 3395: 11,-21 + 3393: 11,-21 - node: color: '#FEAC3DFF' id: BrickTileWhiteBox decals: - 3265: -22,-48 + 3263: -22,-48 - node: color: '#FFA5180C' id: BrickTileWhiteBox decals: - 3584: -42,0 + 3582: -42,0 - node: color: '#334E6DC8' id: BrickTileWhiteCornerNe decals: - 3396: 12,-20 + 3394: 12,-20 - node: cleanable: True color: '#334E6DFF' id: BrickTileWhiteCornerNe decals: - 3814: 26,3 + 3812: 26,3 - node: color: '#52B4E9D9' id: BrickTileWhiteCornerNe decals: - 4113: 4,-60 + 4111: 4,-60 - node: color: '#52B4E9DC' id: BrickTileWhiteCornerNe decals: - 4059: 1,-62 + 4057: 1,-62 - node: color: '#334E6DC8' id: BrickTileWhiteCornerNw decals: - 3399: 7,-20 + 3397: 7,-20 - node: cleanable: True color: '#334E6DFF' id: BrickTileWhiteCornerNw decals: - 3815: 21,3 + 3813: 21,3 - node: color: '#52B4E9D9' id: BrickTileWhiteCornerNw decals: - 4112: 2,-60 + 4110: 2,-60 - node: color: '#52B4E9DC' id: BrickTileWhiteCornerNw decals: - 4058: 5,-62 + 4056: 5,-62 - node: color: '#334E6DC8' id: BrickTileWhiteCornerSe decals: - 3397: 12,-24 + 3395: 12,-24 - node: cleanable: True color: '#334E6DFF' id: BrickTileWhiteCornerSe decals: - 3812: 26,-2 + 3810: 26,-2 - node: color: '#52B4E9DC' id: BrickTileWhiteCornerSe decals: - 4056: 1,-59 + 4054: 1,-59 - node: color: '#334E6DC8' id: BrickTileWhiteCornerSw decals: - 3398: 7,-24 + 3396: 7,-24 - node: cleanable: True color: '#334E6DFF' id: BrickTileWhiteCornerSw decals: - 3813: 21,-2 + 3811: 21,-2 - node: color: '#52B4E9DC' id: BrickTileWhiteCornerSw decals: - 4057: 5,-59 + 4055: 5,-59 - node: color: '#52B4E9D9' id: BrickTileWhiteEndS decals: - 4110: 2,-61 - 4111: 4,-61 + 4108: 2,-61 + 4109: 4,-61 - node: color: '#52B4E9DC' id: BrickTileWhiteInnerNe decals: - 4069: 1,-63 - 4070: 0,-62 + 4067: 1,-63 + 4068: 0,-62 - node: color: '#52B4E9DC' id: BrickTileWhiteInnerNw decals: - 4071: 5,-63 - 4072: 6,-62 + 4069: 5,-63 + 4070: 6,-62 - node: color: '#52B4E9D9' id: BrickTileWhiteInnerSe decals: - 4117: 2,-60 + 4115: 2,-60 - node: color: '#52B4E9DC' id: BrickTileWhiteInnerSe decals: - 4068: 0,-59 - 4079: 1,-57 + 4066: 0,-59 + 4077: 1,-57 - node: color: '#52B4E9D9' id: BrickTileWhiteInnerSw decals: - 4116: 4,-60 + 4114: 4,-60 - node: color: '#52B4E9DC' id: BrickTileWhiteInnerSw decals: - 4067: 6,-59 - 4078: 5,-57 + 4065: 6,-59 + 4076: 5,-57 - node: color: '#334E6DC8' id: BrickTileWhiteLineE decals: - 3404: 12,-21 - 3405: 12,-22 - 3406: 12,-23 + 3402: 12,-21 + 3403: 12,-22 + 3404: 12,-23 - node: cleanable: True color: '#334E6DFF' id: BrickTileWhiteLineE decals: - 3816: 26,2 - 3817: 26,1 - 3818: 26,0 - 3819: 26,-1 + 3814: 26,2 + 3815: 26,1 + 3816: 26,0 + 3817: 26,-1 - node: color: '#52B4E9DC' id: BrickTileWhiteLineE decals: - 4063: 0,-60 - 4064: 0,-61 - 4075: 1,-58 + 4061: 0,-60 + 4062: 0,-61 + 4073: 1,-58 - node: color: '#334E6DC8' id: BrickTileWhiteLineN decals: - 3400: 8,-20 - 3401: 9,-20 - 3402: 10,-20 - 3403: 11,-20 + 3398: 8,-20 + 3399: 9,-20 + 3400: 10,-20 + 3401: 11,-20 - node: cleanable: True color: '#334E6DFF' id: BrickTileWhiteLineN decals: - 3808: 22,3 - 3809: 23,3 - 3810: 24,3 - 3811: 25,3 + 3806: 22,3 + 3807: 23,3 + 3808: 24,3 + 3809: 25,3 - node: color: '#52B4E9D9' id: BrickTileWhiteLineN decals: - 4114: 3,-60 + 4112: 3,-60 - node: color: '#52B4E9DC' id: BrickTileWhiteLineN decals: - 4060: 2,-63 - 4061: 3,-63 - 4062: 4,-63 + 4058: 2,-63 + 4059: 3,-63 + 4060: 4,-63 - node: color: '#334E6DC8' id: BrickTileWhiteLineS decals: - 3410: 8,-24 - 3411: 9,-24 - 3412: 10,-24 - 3413: 11,-24 + 3408: 8,-24 + 3409: 9,-24 + 3410: 10,-24 + 3411: 11,-24 - node: cleanable: True color: '#334E6DFF' id: BrickTileWhiteLineS decals: - 3824: 22,-2 - 3825: 23,-2 - 3826: 24,-2 - 3827: 25,-2 + 3822: 22,-2 + 3823: 23,-2 + 3824: 24,-2 + 3825: 25,-2 - node: color: '#52B4E9D9' id: BrickTileWhiteLineS decals: - 4115: 3,-60 + 4113: 3,-60 - node: color: '#52B4E9DC' id: BrickTileWhiteLineS decals: - 4073: 3,-57 - 4076: 2,-57 - 4077: 4,-57 + 4071: 3,-57 + 4074: 2,-57 + 4075: 4,-57 - node: color: '#334E6DC8' id: BrickTileWhiteLineW decals: - 3407: 7,-21 - 3408: 7,-22 - 3409: 7,-23 + 3405: 7,-21 + 3406: 7,-22 + 3407: 7,-23 - node: cleanable: True color: '#334E6DFF' id: BrickTileWhiteLineW decals: - 3820: 21,2 - 3821: 21,1 - 3822: 21,0 - 3823: 21,-1 + 3818: 21,2 + 3819: 21,1 + 3820: 21,0 + 3821: 21,-1 - node: color: '#52B4E9DC' id: BrickTileWhiteLineW decals: - 4065: 6,-60 - 4066: 6,-61 - 4074: 5,-58 + 4063: 6,-60 + 4064: 6,-61 + 4072: 5,-58 - node: color: '#FFFFFFFF' id: Busha1 decals: 480: -8.396269,51.324306 481: -8.978583,51.511806 - 2774: 5.324413,-0.030564666 + 2772: 5.324413,-0.030564666 - node: color: '#FFFFFFFF' id: Busha2 @@ -1155,8 +1156,8 @@ entities: color: '#FFFFFFFF' id: Bushe4 decals: - 2860: -11.957823,6.4384537 - 2861: -4.0984473,3.9853287 + 2858: -11.957823,6.4384537 + 2859: -4.0984473,3.9853287 - node: color: '#FFFFFFFF' id: Bushi1 @@ -1186,7 +1187,7 @@ entities: color: '#FFFFFFFF' id: Caution decals: - 2919: 16.006746,36.692352 + 2917: 16.006746,36.692352 - node: color: '#334E6DC8' id: CheckerNESW @@ -1233,7 +1234,7 @@ entities: color: '#DE3A3A53' id: CheckerNWSE decals: - 2945: 29,32 + 2943: 29,32 - node: color: '#DE3A3A5A' id: CheckerNWSE @@ -1267,8 +1268,8 @@ entities: color: '#FFFFFFFF' id: Delivery decals: - 3676: 4,-3 - 3706: -70,-45 + 3674: 4,-3 + 3704: -70,-45 - node: cleanable: True color: '#DE3A3A96' @@ -1280,66 +1281,66 @@ entities: color: '#0F267C34' id: DiagonalCheckerBOverlay decals: - 3629: -25,-33 - 3630: -25,-34 - 3631: -24,-34 - 3632: -24,-33 - 3633: -26,-33 - 3634: -26,-34 - 3635: -26,-32 - 3636: -25,-32 - 3637: -24,-32 - 3638: -23,-32 - 3639: -23,-33 - 3640: -23,-34 - 3641: -23,-36 - 3642: -23,-35 - 3643: -24,-35 - 3644: -24,-36 - 3645: -24,-37 - 3646: -23,-37 - 3647: -25,-37 - 3648: -26,-37 - 3649: -26,-36 - 3650: -25,-36 - 3651: -25,-35 - 3652: -26,-35 + 3627: -25,-33 + 3628: -25,-34 + 3629: -24,-34 + 3630: -24,-33 + 3631: -26,-33 + 3632: -26,-34 + 3633: -26,-32 + 3634: -25,-32 + 3635: -24,-32 + 3636: -23,-32 + 3637: -23,-33 + 3638: -23,-34 + 3639: -23,-36 + 3640: -23,-35 + 3641: -24,-35 + 3642: -24,-36 + 3643: -24,-37 + 3644: -23,-37 + 3645: -25,-37 + 3646: -26,-37 + 3647: -26,-36 + 3648: -25,-36 + 3649: -25,-35 + 3650: -26,-35 - node: color: '#923A3A93' id: DiagonalCheckerBOverlay decals: - 3480: -1,17 - 3481: -1,18 - 3482: -2,18 - 3483: -2,19 - 3484: -2,20 - 3485: -1,21 - 3486: -1,20 - 3487: -1,19 - 3488: 0,21 - 3489: 0,20 - 3490: 0,18 - 3491: 0,19 - 3492: 0,17 - 3493: 0,16 - 3494: 2,16 - 3495: 1,16 - 3496: 1,17 - 3497: 2,17 - 3498: 2,18 - 3499: 1,18 - 3500: 1,20 - 3501: 1,19 - 3502: 2,19 - 3503: 2,20 - 3504: 2,21 - 3505: 1,21 + 3478: -1,17 + 3479: -1,18 + 3480: -2,18 + 3481: -2,19 + 3482: -2,20 + 3483: -1,21 + 3484: -1,20 + 3485: -1,19 + 3486: 0,21 + 3487: 0,20 + 3488: 0,18 + 3489: 0,19 + 3490: 0,17 + 3491: 0,16 + 3492: 2,16 + 3493: 1,16 + 3494: 1,17 + 3495: 2,17 + 3496: 2,18 + 3497: 1,18 + 3498: 1,20 + 3499: 1,19 + 3500: 2,19 + 3501: 2,20 + 3502: 2,21 + 3503: 1,21 - node: color: '#983A3A93' id: DiagonalCheckerBOverlay decals: - 3506: -1,16 - 3507: -2,21 + 3504: -1,16 + 3505: -2,21 - node: cleanable: True color: '#D4D4D496' @@ -1470,8 +1471,8 @@ entities: color: '#D4D4D4D6' id: DirtLight decals: - 3203: 29,3 - 3204: 29,3 + 3201: 29,3 + 3202: 29,3 - node: color: '#FFFFFFFF' id: DirtLight @@ -1547,8 +1548,8 @@ entities: color: '#D4D4D4D6' id: DirtMedium decals: - 3205: 30,-1 - 3206: 27,-2 + 3203: 30,-1 + 3204: 27,-2 - node: color: '#FFFFFFFF' id: DirtMedium @@ -1611,22 +1612,22 @@ entities: color: '#FFFFFFFF' id: FlowersBROne decals: - 3556: -4.2428155,17.233944 - 3557: -8.086565,18.640194 - 3847: 31.317625,-40.694973 + 3554: -4.2428155,17.233944 + 3555: -8.086565,18.640194 + 3845: 31.317625,-40.694973 - node: color: '#FFFFFFFF' id: FlowersBRThree decals: - 3850: 5.23739,0.5862826 + 3848: 5.23739,0.5862826 - node: color: '#FFFFFFFF' id: Flowersbr1 decals: 4: 23,-20 - 3558: -8.649066,17.499569 - 3559: -5.2115655,18.499569 - 3849: 6.83114,0.4612826 + 3556: -8.649066,17.499569 + 3557: -5.2115655,18.499569 + 3847: 6.83114,0.4612826 - node: color: '#FFFFFFFF' id: Flowersbr2 @@ -1650,44 +1651,44 @@ entities: 457: -3.1144176,47.88133 458: -5.0675426,53.662476 459: -4.1456676,53.1781 - 3839: 14.281914,-83.73461 - 3840: 32.40751,-85.70861 - 3848: 10.92489,0.14878261 + 3837: 14.281914,-83.73461 + 3838: 32.40751,-85.70861 + 3846: 10.92489,0.14878261 - node: color: '#FFFFFFFF' id: Flowersbr3 decals: - 3212: -40.519615,3.8355665 - 3213: -41.269615,3.0543165 - 3214: -40.25399,5.8355665 - 3846: 31.770752,-40.366848 + 3210: -40.519615,3.8355665 + 3211: -41.269615,3.0543165 + 3212: -40.25399,5.8355665 + 3844: 31.770752,-40.366848 - node: color: '#FFFFFFFF' id: Flowerspv1 decals: 6: 26,-20 7: 29,-20 - 3223: -35.06649,3.0386915 - 3224: -36.59774,5.4761915 - 3225: -32.2259,5.128909 - 3226: -32.647774,3.019534 - 3227: -31.054026,2.972659 - 3855: 66.11165,-9.076797 - 3856: 60.79915,-9.326797 + 3221: -35.06649,3.0386915 + 3222: -36.59774,5.4761915 + 3223: -32.2259,5.128909 + 3224: -32.647774,3.019534 + 3225: -31.054026,2.972659 + 3853: 66.11165,-9.076797 + 3854: 60.79915,-9.326797 - node: color: '#FFFFFFFF' id: Flowerspv3 decals: - 3851: 10.26864,0.6175326 + 3849: 10.26864,0.6175326 - node: color: '#FFFFFFFF' id: Flowersy1 decals: 5: 21,-20 8: 28,-20 - 3852: 53.855778,-8.686172 - 3853: 53.418278,-9.420547 - 3854: 66.06477,-8.279921 + 3850: 53.855778,-8.686172 + 3851: 53.418278,-9.420547 + 3852: 66.06477,-8.279921 - node: color: '#FFFFFFFF' id: Flowersy2 @@ -1699,18 +1700,18 @@ entities: 469: -10.65123,52.966118 470: -7.307479,50.772125 471: -9.46373,48.678375 - 3837: 15.688164,-83.59399 - 3838: 14.391289,-84.64086 - 3845: 45.66365,-87.620224 - 3857: 49.854713,-6.2645936 - 3858: 49.979713,-11.498969 + 3835: 15.688164,-83.59399 + 3836: 14.391289,-84.64086 + 3843: 45.66365,-87.620224 + 3855: 49.854713,-6.2645936 + 3856: 49.979713,-11.498969 - node: color: '#2B3F4A22' id: FullTileOverlayGreyscale decals: - 3625: -31,-4 - 3626: -29,-3 - 3627: -31,-7 + 3623: -31,-4 + 3624: -29,-3 + 3625: -31,-7 - node: color: '#D4D4D496' id: FullTileOverlayGreyscale @@ -1746,24 +1747,24 @@ entities: color: '#FFFFFFFF' id: Grassa1 decals: - 3207: -40.269615,3.5386915 - 3208: -41.50399,4.0230665 - 3228: -30.3509,4.378909 - 3229: -29.50715,3.753909 - 3230: -30.429026,5.613284 - 3231: -31.5384,5.925784 - 3232: -32.3509,5.816409 - 3233: -29.6634,5.738284 - 3234: -32.710274,3.2350059 - 3538: -8.570941,18.515194 - 3539: -7.4146905,18.405819 - 3540: -7.0709405,17.405819 - 3541: -7.9771905,18.515194 - 3542: -8.649066,17.233944 - 3543: -5.2115655,17.890194 - 3544: -5.6959405,17.249569 - 3545: -4.1803155,17.265194 - 3546: -5.2115655,18.671444 + 3205: -40.269615,3.5386915 + 3206: -41.50399,4.0230665 + 3226: -30.3509,4.378909 + 3227: -29.50715,3.753909 + 3228: -30.429026,5.613284 + 3229: -31.5384,5.925784 + 3230: -32.3509,5.816409 + 3231: -29.6634,5.738284 + 3232: -32.710274,3.2350059 + 3536: -8.570941,18.515194 + 3537: -7.4146905,18.405819 + 3538: -7.0709405,17.405819 + 3539: -7.9771905,18.515194 + 3540: -8.649066,17.233944 + 3541: -5.2115655,17.890194 + 3542: -5.6959405,17.249569 + 3543: -4.1803155,17.265194 + 3544: -5.2115655,18.671444 - node: color: '#FFFFFFFF' id: Grassa3 @@ -1786,35 +1787,35 @@ entities: color: '#FFFFFFFF' id: Grassa4 decals: - 3215: -36.175865,3.0074415 - 3216: -35.144615,3.8199415 - 3217: -35.394615,4.5855665 - 3218: -34.94149,4.6636915 - 3219: -36.59774,5.5230665 + 3213: -36.175865,3.0074415 + 3214: -35.144615,3.8199415 + 3215: -35.394615,4.5855665 + 3216: -34.94149,4.6636915 + 3217: -36.59774,5.5230665 - node: color: '#FFFFFFFF' id: Grassb2 decals: - 2859: -11.879698,6.0478287 - 3836: 14.491955,-83.73193 + 2857: -11.879698,6.0478287 + 3834: 14.491955,-83.73193 - node: color: '#FFFFFFFF' id: Grassb3 decals: - 3835: 15.3420315,-83.51318 + 3833: 15.3420315,-83.51318 - node: color: '#FFFFFFFF' id: Grassb5 decals: - 3547: -5.8053155,18.655819 - 3548: -7.0553155,18.890194 - 3549: -7.2584405,17.108944 - 3550: -7.2740655,17.937069 - 3551: -8.633441,18.968319 - 3552: -5.8834405,17.124569 - 3553: -5.9303155,19.077694 - 3554: -4.1021905,17.968319 - 3555: -4.9615655,17.671444 + 3545: -5.8053155,18.655819 + 3546: -7.0553155,18.890194 + 3547: -7.2584405,17.108944 + 3548: -7.2740655,17.937069 + 3549: -8.633441,18.968319 + 3550: -5.8834405,17.124569 + 3551: -5.9303155,19.077694 + 3552: -4.1021905,17.968319 + 3553: -4.9615655,17.671444 - node: color: '#FFFFFFFF' id: Grassc1 @@ -1838,19 +1839,19 @@ entities: 417: 5.9810176,54.171776 418: 7.4810176,55.671776 419: 9.465392,55.265526 - 3209: -41.832115,3.1480665 - 3210: -42.082115,4.5074415 - 3211: -40.425865,5.7261915 - 3220: -36.44149,5.3668165 - 3221: -36.644615,3.3824415 - 3222: -35.37899,3.1168165 + 3207: -41.832115,3.1480665 + 3208: -42.082115,4.5074415 + 3209: -40.425865,5.7261915 + 3218: -36.44149,5.3668165 + 3219: -36.644615,3.3824415 + 3220: -35.37899,3.1168165 - node: color: '#FFFFFFFF' id: Grassc4 decals: 355: -5.001564,4.018616 - 2858: -12.004698,6.9072037 - 3834: 15.7170315,-84.54443 + 2856: -12.004698,6.9072037 + 3832: 15.7170315,-84.54443 - node: color: '#FFFFFFFF' id: Grasse2 @@ -1893,14 +1894,14 @@ entities: 528: -8.928438,56.05247 529: -10.678438,55.30247 530: -10.850313,53.86497 - 3526: -8.633441,18.608944 - 3527: -8.617816,17.921444 - 3528: -7.9146905,18.593319 - 3529: -7.3209405,18.265194 - 3530: -4.5709405,18.452694 - 3531: -5.6178155,17.983944 - 3532: -5.7896905,17.421444 - 3533: -4.5084405,17.358944 + 3524: -8.633441,18.608944 + 3525: -8.617816,17.921444 + 3526: -7.9146905,18.593319 + 3527: -7.3209405,18.265194 + 3528: -4.5709405,18.452694 + 3529: -5.6178155,17.983944 + 3530: -5.7896905,17.421444 + 3531: -4.5084405,17.358944 - node: color: '#FFFFFFFF' id: Grasse3 @@ -1912,14 +1913,14 @@ entities: 424: 11.789851,52.392174 425: 12.117976,52.5328 426: 12.852351,53.9703 - 3534: -7.1178155,17.671444 - 3535: -4.1646905,18.749569 + 3532: -7.1178155,17.671444 + 3533: -4.1646905,18.749569 - node: color: '#50AF7F6F' id: HalfTileOverlayGreyscale decals: - 3478: -8,12 - 3479: -10,12 + 3476: -8,12 + 3477: -10,12 - node: color: '#D381C996' id: HalfTileOverlayGreyscale @@ -1929,7 +1930,7 @@ entities: color: '#EFB34150' id: HalfTileOverlayGreyscale decals: - 2854: -16,-5 + 2852: -16,-5 - node: color: '#EFB3415A' id: HalfTileOverlayGreyscale @@ -1940,49 +1941,49 @@ entities: color: '#EFB34160' id: HalfTileOverlayGreyscale decals: - 2829: -24,-5 - 2830: -23,-5 - 2831: -21,-5 - 2832: -20,-5 - 2833: -18,-5 - 2834: -17,-5 + 2827: -24,-5 + 2828: -23,-5 + 2829: -21,-5 + 2830: -20,-5 + 2831: -18,-5 + 2832: -17,-5 - node: color: '#F0F0F073' id: HalfTileOverlayGreyscale decals: - 3917: -7,-60 - 3918: -8,-60 + 3915: -7,-60 + 3916: -8,-60 - node: color: '#F0F0F08F' id: HalfTileOverlayGreyscale decals: - 4045: -11,-62 - 4046: -13,-62 - 4047: -12,-62 - 4048: -14,-62 - 4049: -15,-62 - 4050: -16,-62 + 4043: -11,-62 + 4044: -13,-62 + 4045: -12,-62 + 4046: -14,-62 + 4047: -15,-62 + 4048: -16,-62 - node: color: '#F0F0F0AA' id: HalfTileOverlayGreyscale decals: - 3885: -8,-57 - 3886: -7,-57 - 3887: -6,-57 - 3901: -4,-57 - 3902: -3,-57 + 3883: -8,-57 + 3884: -7,-57 + 3885: -6,-57 + 3899: -4,-57 + 3900: -3,-57 - node: color: '#F0F0F0C3' id: HalfTileOverlayGreyscale decals: - 3911: -6,-61 - 3912: -7,-61 - 3913: -8,-61 + 3909: -6,-61 + 3910: -7,-61 + 3911: -8,-61 - node: color: '#F0F0F0FF' id: HalfTileOverlayGreyscale decals: - 3990: -2,-57 + 3988: -2,-57 - node: color: '#FFFFFF79' id: HalfTileOverlayGreyscale @@ -2008,58 +2009,58 @@ entities: id: HalfTileOverlayGreyscale180 decals: 239: -16,6 - 2156: -21,6 - 2157: -24,6 + 2155: -21,6 + 2156: -24,6 - node: color: '#EFB34160' id: HalfTileOverlayGreyscale180 decals: - 2819: -22,6 - 2820: -23,6 - 2821: -20,6 + 2817: -22,6 + 2818: -23,6 + 2819: -20,6 - node: color: '#EFB34163' id: HalfTileOverlayGreyscale180 decals: - 2779: -19,6 - 2780: -18,6 - 2781: -17,6 + 2777: -19,6 + 2778: -18,6 + 2779: -17,6 - node: color: '#F0F0F05A' id: HalfTileOverlayGreyscale180 decals: - 3903: -8,-57 - 3904: -7,-57 + 3901: -8,-57 + 3902: -7,-57 - node: color: '#F0F0F073' id: HalfTileOverlayGreyscale180 decals: - 3919: -8,-61 - 3920: -7,-61 - 3927: -4,-57 - 3928: -3,-57 + 3917: -8,-61 + 3918: -7,-61 + 3925: -4,-57 + 3926: -3,-57 - node: color: '#F0F0F088' id: HalfTileOverlayGreyscale180 decals: - 3991: -2,-57 + 3989: -2,-57 - node: color: '#F0F0F08F' id: HalfTileOverlayGreyscale180 decals: - 4037: -16,-59 - 4038: -15,-59 - 4039: -14,-59 - 4040: -13,-59 - 4041: -12,-59 - 4042: -11,-59 + 4035: -16,-59 + 4036: -15,-59 + 4037: -14,-59 + 4038: -13,-59 + 4039: -12,-59 + 4040: -11,-59 - node: color: '#F0F0F0C3' id: HalfTileOverlayGreyscale180 decals: - 3914: -6,-60 - 3915: -7,-60 - 3916: -8,-60 + 3912: -6,-60 + 3913: -7,-60 + 3914: -8,-60 - node: color: '#FFFFFF79' id: HalfTileOverlayGreyscale180 @@ -2081,7 +2082,7 @@ entities: color: '#EFB34153' id: HalfTileOverlayGreyscale270 decals: - 2848: -15,5 + 2846: -15,5 - node: color: '#EFB3415A' id: HalfTileOverlayGreyscale270 @@ -2098,39 +2099,39 @@ entities: color: '#EFB34160' id: HalfTileOverlayGreyscale270 decals: - 2827: -15,-4 + 2825: -15,-4 - node: color: '#F0F0F05A' id: HalfTileOverlayGreyscale270 decals: - 3905: -6,-57 - 3906: -6,-58 - 3907: -6,-59 - 3908: -6,-60 - 3909: -6,-61 - 3910: -6,-62 + 3903: -6,-57 + 3904: -6,-58 + 3905: -6,-59 + 3906: -6,-60 + 3907: -6,-61 + 3908: -6,-62 - node: color: '#F0F0F088' id: HalfTileOverlayGreyscale270 decals: - 3992: -6,-63 + 3990: -6,-63 - node: color: '#F0F0F08F' id: HalfTileOverlayGreyscale270 decals: - 4043: -10,-60 - 4044: -10,-61 + 4041: -10,-60 + 4042: -10,-61 - node: color: '#F0F0F0AA' id: HalfTileOverlayGreyscale270 decals: - 3894: -4,-57 - 3895: -4,-58 - 3896: -4,-60 - 3897: -4,-59 - 3898: -4,-61 - 3899: -4,-62 - 3900: -4,-63 + 3892: -4,-57 + 3893: -4,-58 + 3894: -4,-60 + 3895: -4,-59 + 3896: -4,-61 + 3897: -4,-62 + 3898: -4,-63 - node: color: '#334E6DC8' id: HalfTileOverlayGreyscale90 @@ -2151,40 +2152,40 @@ entities: 236: -25,1 237: -25,-3 238: -25,-4 - 2155: -25,-2 + 2154: -25,-2 - node: color: '#EFB34160' id: HalfTileOverlayGreyscale90 decals: - 2823: -25,5 - 2824: -25,4 - 2825: -25,0 - 2826: -25,-1 + 2821: -25,5 + 2822: -25,4 + 2823: -25,0 + 2824: -25,-1 - node: color: '#F0F0F073' id: HalfTileOverlayGreyscale90 decals: - 3921: -4,-58 - 3922: -4,-59 - 3923: -4,-60 - 3924: -4,-61 - 3925: -4,-62 - 3926: -4,-63 + 3919: -4,-58 + 3920: -4,-59 + 3921: -4,-60 + 3922: -4,-61 + 3923: -4,-62 + 3924: -4,-63 - node: color: '#F0F0F0AA' id: HalfTileOverlayGreyscale90 decals: - 3888: -6,-57 - 3889: -6,-58 - 3890: -6,-59 - 3891: -6,-60 - 3892: -6,-61 - 3893: -6,-62 + 3886: -6,-57 + 3887: -6,-58 + 3888: -6,-59 + 3889: -6,-60 + 3890: -6,-61 + 3891: -6,-62 - node: color: '#F0F0F0FF' id: HalfTileOverlayGreyscale90 decals: - 3993: -6,-63 + 3991: -6,-63 - node: color: '#FFFFFF79' id: HalfTileOverlayGreyscale90 @@ -2194,7 +2195,7 @@ entities: color: '#FFFFFFFF' id: HatchSmall decals: - 2974: 51,-56 + 2972: 51,-56 - node: angle: 3.141592653589793 rad color: '#FFFFFFFF' @@ -2208,69 +2209,69 @@ entities: color: '#EFB34196' id: MiniTileCheckerAOverlay decals: - 3073: -38,-9 - 3074: -37,-9 - 3075: -37,-10 - 3076: -38,-10 - 3077: -38,-11 - 3078: -37,-11 - 3079: -38,-12 - 3080: -37,-12 - 3081: -38,-8 - 3082: -37,-8 - 3083: -38,-7 - 3084: -37,-7 + 3071: -38,-9 + 3072: -37,-9 + 3073: -37,-10 + 3074: -38,-10 + 3075: -38,-11 + 3076: -37,-11 + 3077: -38,-12 + 3078: -37,-12 + 3079: -38,-8 + 3080: -37,-8 + 3081: -38,-7 + 3082: -37,-7 - node: color: '#D4D4D406' id: MiniTileOverlay decals: - 3734: -41,15 - 3735: -40,15 - 3736: -40,14 - 3737: -41,14 - 3738: -37,15 - 3739: -36,15 - 3740: -36,14 - 3741: -37,14 - 3742: -37,13 - 3743: -36,13 - 3744: -41,13 - 3745: -40,13 + 3732: -41,15 + 3733: -40,15 + 3734: -40,14 + 3735: -41,14 + 3736: -37,15 + 3737: -36,15 + 3738: -36,14 + 3739: -37,14 + 3740: -37,13 + 3741: -36,13 + 3742: -41,13 + 3743: -40,13 - node: color: '#D4D4D4C7' id: MiniTileSteelBox decals: - 2835: -20,-6 - 2836: -16,-6 - 2837: -20,7 + 2833: -20,-6 + 2834: -16,-6 + 2835: -20,7 - node: color: '#D4D4D4D3' id: MiniTileSteelBox decals: - 2118: -24,7 - 2119: -26,3 - 2120: -26,-2 - 2121: -24,-6 - 2122: -14,-2 - 2123: -14,3 - 2124: -16,7 - 2129: 6,-27 - 2130: 3,-27 - 2131: 4,-43 - 2132: 0,-43 - 2133: -10,-43 - 2134: -14,-43 - 2135: -5,-27 + 2117: -24,7 + 2118: -26,3 + 2119: -26,-2 + 2120: -24,-6 + 2121: -14,-2 + 2122: -14,3 + 2123: -16,7 + 2128: 6,-27 + 2129: 3,-27 + 2130: 4,-43 + 2131: 0,-43 + 2132: -10,-43 + 2133: -14,-43 + 2134: -5,-27 - node: color: '#C8C8C8FF' id: MiniTileSteelCornerNe decals: - 3731: -19,-10 + 3729: -19,-10 - node: color: '#D4D4D4CD' id: MiniTileSteelCornerNe decals: - 3032: 18,7 + 3030: 18,7 - node: color: '#D4D4D4D3' id: MiniTileSteelCornerNe @@ -2313,41 +2314,41 @@ entities: 1857: 16,-21 1915: 9,-26 1916: 36,-21 - 1965: -3,-41 - 1970: -4,-26 - 2043: 14,1 - 2044: 4,1 - 2045: -3,1 + 1964: -3,-41 + 1969: -4,-26 + 2042: 14,1 + 2043: 4,1 + 2044: -3,1 - node: color: '#DE3A3A96' id: MiniTileSteelCornerNe decals: - 2599: 18,23 + 2598: 18,23 - node: color: '#88EFB1D9' id: MiniTileSteelCornerNw decals: - 2855: -28,-78 + 2853: -28,-78 - node: color: '#C8C8C8FF' id: MiniTileSteelCornerNw decals: - 3730: -21,-10 + 3728: -21,-10 - node: color: '#D4D4D4AE' id: MiniTileSteelCornerNw decals: - 3035: 33,-40 + 3033: 33,-40 - node: color: '#D4D4D4B4' id: MiniTileSteelCornerNw decals: - 3141: -7,-41 + 3139: -7,-41 - node: color: '#D4D4D4CD' id: MiniTileSteelCornerNw decals: - 3033: 16,7 + 3031: 16,7 - node: color: '#D4D4D4D3' id: MiniTileSteelCornerNw @@ -2390,20 +2391,20 @@ entities: 1856: 14,-21 1914: 0,-26 1917: 34,-21 - 1969: -6,-26 - 2042: 13,1 - 2046: -1,1 - 2047: -11,1 + 1968: -6,-26 + 2041: 13,1 + 2045: -1,1 + 2046: -11,1 - node: color: '#DE3A3A96' id: MiniTileSteelCornerNw decals: - 2600: 14,23 + 2599: 14,23 - node: color: '#C8C8C8FF' id: MiniTileSteelCornerSe decals: - 3726: -19,-23 + 3724: -19,-23 - node: color: '#D4D4D4D3' id: MiniTileSteelCornerSe @@ -2446,31 +2447,31 @@ entities: 1861: 16,-38 1913: 9,-28 1924: 36,-38 - 1967: -3,-44 - 1968: -4,-28 - 2038: 4,0 - 2039: -3,0 - 2040: 14,0 + 1966: -3,-44 + 1967: -4,-28 + 2037: 4,0 + 2038: -3,0 + 2039: 14,0 - node: color: '#DE3A3A96' id: MiniTileSteelCornerSe decals: - 2591: 18,19 + 2590: 18,19 - node: color: '#88EFB1D9' id: MiniTileSteelCornerSw decals: - 2856: -28,-81 + 2854: -28,-81 - node: color: '#C8C8C8FF' id: MiniTileSteelCornerSw decals: - 3727: -21,-23 + 3725: -21,-23 - node: color: '#D4D4D4C3' id: MiniTileSteelCornerSw decals: - 3150: -27,-7 + 3148: -27,-7 - node: color: '#D4D4D4D3' id: MiniTileSteelCornerSw @@ -2519,21 +2520,21 @@ entities: 1859: 14,-38 1912: 0,-28 1925: 34,-38 - 1966: -7,-44 - 1971: -6,-28 - 2041: 13,0 - 2048: -11,0 - 2049: -1,0 + 1965: -7,-44 + 1970: -6,-28 + 2040: 13,0 + 2047: -11,0 + 2048: -1,0 - node: color: '#DE3A3A96' id: MiniTileSteelCornerSw decals: - 2592: 14,19 + 2591: 14,19 - node: color: '#D4D4D4C7' id: MiniTileSteelInnerNe decals: - 2841: -19,7 + 2839: -19,7 - node: color: '#D4D4D4D3' id: MiniTileSteelInnerNe @@ -2548,36 +2549,36 @@ entities: 1447: -22,51 1848: 53,-6 1849: 52,-11 - 1955: 36,-26 + 1954: 36,-26 - node: color: '#D4D4D4D6' id: MiniTileSteelInnerNe decals: - 2850: -25.018312,-5.498596 - 2851: -25.283937,-5.498596 - 2852: -25.502687,-5.498596 + 2848: -25.018312,-5.498596 + 2849: -25.283937,-5.498596 + 2850: -25.502687,-5.498596 - node: color: '#D4D4D4FF' id: MiniTileSteelInnerNe decals: - 3114: -39,-13 + 3112: -39,-13 - node: color: '#D4D4D4AE' id: MiniTileSteelInnerNw decals: - 3040: 33,-42 + 3038: 33,-42 - node: color: '#D4D4D4C0' id: MiniTileSteelInnerNw decals: - 2813: -14.760899,-5.480981 - 2814: -15.010899,-5.480981 - 2815: -14.526524,-5.480981 + 2811: -14.760899,-5.480981 + 2812: -15.010899,-5.480981 + 2813: -14.526524,-5.480981 - node: color: '#D4D4D4C7' id: MiniTileSteelInnerNw decals: - 2842: -17,7 + 2840: -17,7 - node: color: '#D4D4D4D3' id: MiniTileSteelInnerNw @@ -2596,19 +2597,19 @@ entities: color: '#D4D4D4FF' id: MiniTileSteelInnerNw decals: - 3112: -36,-13 + 3110: -36,-13 - node: color: '#D4D4D4C0' id: MiniTileSteelInnerSe decals: - 2816: -25.008694,6.5088334 - 2817: -25.274319,6.5088334 - 2818: -25.508694,6.5088334 + 2814: -25.008694,6.5088334 + 2815: -25.274319,6.5088334 + 2816: -25.508694,6.5088334 - node: color: '#D4D4D4C7' id: MiniTileSteelInnerSe decals: - 2840: -23,-6 + 2838: -23,-6 - node: color: '#D4D4D4D3' id: MiniTileSteelInnerSe @@ -2622,20 +2623,20 @@ entities: 1772: 53,-2 1844: 52,-7 1845: 59,-14 - 1954: 36,-27 + 1953: 36,-27 - node: color: '#D4D4D4FF' id: MiniTileSteelInnerSe decals: - 3113: -39,-6 + 3111: -39,-6 - node: color: '#D4D4D4C7' id: MiniTileSteelInnerSw decals: - 2839: -21,-6 - 2844: -14.7582035,6.5086117 - 2845: -14.5238285,6.5086117 - 2846: -15.0082035,6.5086117 + 2837: -21,-6 + 2842: -14.7582035,6.5086117 + 2843: -14.5238285,6.5086117 + 2844: -15.0082035,6.5086117 - node: color: '#D4D4D4D3' id: MiniTileSteelInnerSw @@ -2660,33 +2661,33 @@ entities: color: '#D4D4D4FF' id: MiniTileSteelInnerSw decals: - 3111: -36,-6 + 3109: -36,-6 - node: color: '#C8C8C89E' id: MiniTileSteelLineE decals: - 3441: 18,0 - 3442: 18,1 + 3439: 18,0 + 3440: 18,1 - node: color: '#CACFD6C1' id: MiniTileSteelLineE decals: - 3832: -15,36 + 3830: -15,36 - node: color: '#D4D4D4C0' id: MiniTileSteelLineE decals: - 2802: -25.510418,5.5102654 - 2803: -25.510418,4.5102654 - 2804: -25.510418,3.5239472 - 2805: -25.510418,2.5239472 - 2806: -25.510418,1.5420241 - 2807: -25.510418,0.5198039 - 2808: -25.510418,-0.4823848 - 2809: -25.510418,-1.4980098 - 2810: -25.510418,-2.4674516 - 2811: -25.510418,-3.5051284 - 2812: -25.510418,-4.481826 + 2800: -25.510418,5.5102654 + 2801: -25.510418,4.5102654 + 2802: -25.510418,3.5239472 + 2803: -25.510418,2.5239472 + 2804: -25.510418,1.5420241 + 2805: -25.510418,0.5198039 + 2806: -25.510418,-0.4823848 + 2807: -25.510418,-1.4980098 + 2808: -25.510418,-2.4674516 + 2809: -25.510418,-3.5051284 + 2810: -25.510418,-4.481826 - node: color: '#D4D4D4D3' id: MiniTileSteelLineE @@ -2942,70 +2943,70 @@ entities: 1937: 36,-24 1938: 36,-23 1939: 36,-22 - 1956: -3,-42 - 1957: -3,-43 - 1973: -4,-27 + 1955: -3,-42 + 1956: -3,-43 + 1972: -4,-27 - node: color: '#D4D4D4FF' id: MiniTileSteelLineE decals: - 3097: -39,-7 - 3098: -39,-8 - 3099: -39,-9 - 3100: -39,-10 - 3101: -39,-11 - 3102: -39,-12 + 3095: -39,-7 + 3096: -39,-8 + 3097: -39,-9 + 3098: -39,-10 + 3099: -39,-11 + 3100: -39,-12 - node: color: '#DE3A3A96' id: MiniTileSteelLineE decals: - 2601: 18,22 - 2602: 18,21 - 2603: 18,20 + 2600: 18,22 + 2601: 18,21 + 2602: 18,20 - node: color: '#C8C8C8FF' id: MiniTileSteelLineN decals: - 3729: -20,-10 + 3727: -20,-10 - node: color: '#D4D4D4AE' id: MiniTileSteelLineN decals: - 3037: 32,-42 - 3038: 31,-42 - 3039: 30,-42 + 3035: 32,-42 + 3036: 31,-42 + 3037: 30,-42 - node: color: '#D4D4D4B4' id: MiniTileSteelLineN decals: - 3142: -6,-41 + 3140: -6,-41 - node: color: '#D4D4D4C0' id: MiniTileSteelLineN decals: - 2789: -18.018867,-5.48975 - 2790: -17.019917,-5.49304 - 2791: -19.00948,-5.49304 - 2792: -20.010675,-5.49304 - 2793: -21.010675,-5.49304 - 2794: -22.0263,-5.49304 - 2795: -23.028214,-5.497755 - 2796: -24.012589,-5.497755 + 2787: -18.018867,-5.48975 + 2788: -17.019917,-5.49304 + 2789: -19.00948,-5.49304 + 2790: -20.010675,-5.49304 + 2791: -21.010675,-5.49304 + 2792: -22.0263,-5.49304 + 2793: -23.028214,-5.497755 + 2794: -24.012589,-5.497755 - node: color: '#D4D4D4C7' id: MiniTileSteelLineN decals: - 2838: -18,7 + 2836: -18,7 - node: color: '#D4D4D4CA' id: MiniTileSteelLineN decals: - 2849: -16.015686,-5.492559 + 2847: -16.015686,-5.492559 - node: color: '#D4D4D4CD' id: MiniTileSteelLineN decals: - 3034: 17,7 + 3032: 17,7 - node: color: '#D4D4D4D3' id: MiniTileSteelLineN @@ -3210,59 +3211,59 @@ entities: 1918: 35,-21 1919: 37,-26 1920: 38,-26 - 1958: -5,-41 - 1959: -4,-41 - 1972: -5,-26 - 2050: 3,1 - 2051: 1,1 - 2052: 0,1 - 2053: 2,1 - 2054: -4,1 - 2055: -5,1 - 2056: -7,1 - 2057: -6,1 - 2058: -8,1 - 2059: -9,1 - 2060: -10,1 - 2127: -16,8 - 2128: -24,8 + 1957: -5,-41 + 1958: -4,-41 + 1971: -5,-26 + 2049: 3,1 + 2050: 1,1 + 2051: 0,1 + 2052: 2,1 + 2053: -4,1 + 2054: -5,1 + 2055: -7,1 + 2056: -6,1 + 2057: -8,1 + 2058: -9,1 + 2059: -10,1 + 2126: -16,8 + 2127: -24,8 - node: color: '#D4D4D4FF' id: MiniTileSteelLineN decals: - 3109: -38,-13 - 3110: -37,-13 + 3107: -38,-13 + 3108: -37,-13 - node: color: '#DE3A3A96' id: MiniTileSteelLineN decals: - 2593: 17,23 - 2594: 16,23 - 2595: 15,23 + 2592: 17,23 + 2593: 16,23 + 2594: 15,23 - node: color: '#C8C8C8FF' id: MiniTileSteelLineS decals: - 3728: -20,-23 + 3726: -20,-23 - node: color: '#D4D4D4C0' id: MiniTileSteelLineS decals: - 2797: -20.013802,6.514251 - 2798: -21.019838,6.510408 - 2799: -22.019838,6.510408 - 2800: -23.019838,6.510408 - 2801: -24.019838,6.510408 - 3144: -25,-7 + 2795: -20.013802,6.514251 + 2796: -21.019838,6.510408 + 2797: -22.019838,6.510408 + 2798: -23.019838,6.510408 + 2799: -24.019838,6.510408 + 3142: -25,-7 - node: color: '#D4D4D4C3' id: MiniTileSteelLineS decals: - 2775: -18.011988,6.5150476 - 2776: -19.02412,6.5150476 - 2777: -16.008495,6.503191 - 2778: -17.022287,6.5092306 - 3153: -26,-7 + 2773: -18.011988,6.5150476 + 2774: -19.02412,6.5150476 + 2775: -16.008495,6.503191 + 2776: -17.022287,6.5092306 + 3151: -26,-7 - node: color: '#D4D4D4D3' id: MiniTileSteelLineS @@ -3476,86 +3477,86 @@ entities: 1921: 38,-27 1922: 37,-27 1923: 35,-38 - 1960: -4,-44 - 1961: -5,-44 - 1962: -6,-44 - 1975: -5,-28 - 2027: 3,0 - 2028: 2,0 - 2029: 1,0 - 2030: 0,0 - 2031: -4,0 - 2032: -5,0 - 2033: -6,0 - 2034: -7,0 - 2035: -8,0 - 2036: -9,0 - 2037: -10,0 + 1959: -4,-44 + 1960: -5,-44 + 1961: -6,-44 + 1974: -5,-28 + 2026: 3,0 + 2027: 2,0 + 2028: 1,0 + 2029: 0,0 + 2030: -4,0 + 2031: -5,0 + 2032: -6,0 + 2033: -7,0 + 2034: -8,0 + 2035: -9,0 + 2036: -10,0 - node: color: '#D4D4D4FF' id: MiniTileSteelLineS decals: - 3115: -38,-6 - 3116: -37,-6 + 3113: -38,-6 + 3114: -37,-6 - node: color: '#DE3A3A96' id: MiniTileSteelLineS decals: - 2596: 17,19 - 2597: 16,19 - 2598: 15,19 + 2595: 17,19 + 2596: 16,19 + 2597: 15,19 - node: color: '#C3C3C3BC' id: MiniTileSteelLineW decals: - 3710: 32,-4 - 3711: 32,-5 + 3708: 32,-4 + 3709: 32,-5 - node: color: '#D4D4D496' id: MiniTileSteelLineW decals: - 3829: -14.533487,-3.5022268 - 3830: -14.517862,-2.4866018 - 3831: -14.533487,0.5134914 + 3827: -14.533487,-3.5022268 + 3828: -14.517862,-2.4866018 + 3829: -14.533487,0.5134914 - node: color: '#D4D4D4AE' id: MiniTileSteelLineW decals: - 3036: 33,-41 + 3034: 33,-41 - node: color: '#D4D4D4BA' id: MiniTileSteelLineW decals: - 3828: -27,7 + 3826: -27,7 - node: color: '#D4D4D4C0' id: MiniTileSteelLineW decals: - 2782: -14.526791,4.511916 - 2783: -14.526791,3.535493 - 2784: -14.526791,2.535493 - 2785: -14.526791,1.5321715 - 2786: -14.526791,-0.47854245 - 2787: -14.526791,-1.4661165 - 2788: -14.526791,-4.4806275 + 2780: -14.526791,4.511916 + 2781: -14.526791,3.535493 + 2782: -14.526791,2.535493 + 2783: -14.526791,1.5321715 + 2784: -14.526791,-0.47854245 + 2785: -14.526791,-1.4661165 + 2786: -14.526791,-4.4806275 - node: color: '#D4D4D4C3' id: MiniTileSteelLineW decals: - 2723: -17,38 - 2724: -17,37 - 3151: -27,-5 - 3152: -27,-6 + 2722: -17,38 + 2723: -17,37 + 3149: -27,-5 + 3150: -27,-6 - node: color: '#D4D4D4C7' id: MiniTileSteelLineW decals: - 2843: -14.529805,5.530867 + 2841: -14.529805,5.530867 - node: color: '#D4D4D4CD' id: MiniTileSteelLineW decals: - 3833: 27,-83 + 3831: 27,-83 - node: color: '#D4D4D4D3' id: MiniTileSteelLineW @@ -3789,49 +3790,49 @@ entities: 1944: 34,-27 1945: 34,-28 1946: 34,-29 - 1948: 34,-32 - 1949: 34,-33 - 1950: 34,-34 - 1951: 34,-35 - 1952: 34,-36 - 1953: 34,-37 - 1963: -7,-42 - 1964: -7,-43 - 1974: -6,-27 - 2125: -27,3 - 2126: -27,-1 - 3438: -21,-17 - 3439: -21,-18 - 3440: -21,-19 + 1947: 34,-32 + 1948: 34,-33 + 1949: 34,-34 + 1950: 34,-35 + 1951: 34,-36 + 1952: 34,-37 + 1962: -7,-42 + 1963: -7,-43 + 1973: -6,-27 + 2124: -27,3 + 2125: -27,-1 + 3436: -21,-17 + 3437: -21,-18 + 3438: -21,-19 - node: color: '#D4D4D4DF' id: MiniTileSteelLineW decals: - 4119: 34,-31 - 4120: 34,-30 + 4116: 34,-31 + 4117: 34,-30 - node: color: '#D4D4D4FF' id: MiniTileSteelLineW decals: - 3103: -36,-7 - 3104: -36,-8 - 3105: -36,-9 - 3106: -36,-10 - 3107: -36,-11 - 3108: -36,-12 + 3101: -36,-7 + 3102: -36,-8 + 3103: -36,-9 + 3104: -36,-10 + 3105: -36,-11 + 3106: -36,-12 - node: color: '#DE3A3A96' id: MiniTileSteelLineW decals: - 2604: 14,22 - 2605: 14,21 - 2606: 14,20 + 2603: 14,22 + 2604: 14,21 + 2605: 14,20 - node: color: '#9FED58C0' id: MiniTileWhiteBox decals: - 4108: 3,-58 - 4109: 3,-61 + 4106: 3,-58 + 4107: 3,-61 - node: color: '#FFFFFFFF' id: MiniTileWhiteBox @@ -3842,13 +3843,13 @@ entities: color: '#258CC0EA' id: MiniTileWhiteCornerNe decals: - 3461: -23,-58 + 3459: -23,-58 - node: color: '#334E6DC8' id: MiniTileWhiteCornerNe decals: - 2755: 32,-21 - 2756: 19,-21 + 2754: 32,-21 + 2755: 19,-21 - node: color: '#478C5DDC' id: MiniTileWhiteCornerNe @@ -3861,13 +3862,13 @@ entities: color: '#52B4E963' id: MiniTileWhiteCornerNe decals: - 3015: 73,-48 + 3013: 73,-48 - node: color: '#52B4E9B7' id: MiniTileWhiteCornerNe decals: - 3431: 47,7 - 3432: 46,8 + 3429: 47,7 + 3430: 46,8 - node: color: '#52B4E9CD' id: MiniTileWhiteCornerNe @@ -3878,70 +3879,70 @@ entities: color: '#52B4E9D3' id: MiniTileWhiteCornerNe decals: - 4035: -4,-65 + 4033: -4,-65 - node: color: '#52B4E9D6' id: MiniTileWhiteCornerNe decals: - 3983: 0,-53 + 3981: 0,-53 - node: color: '#52B4E9DC' id: MiniTileWhiteCornerNe decals: - 4080: 6,-56 + 4078: 6,-56 - node: color: '#52B4E9DF' id: MiniTileWhiteCornerNe decals: - 4018: -12,-53 + 4016: -12,-53 - node: color: '#52B4E9E6' id: MiniTileWhiteCornerNe decals: - 3879: 7,-46 + 3877: 7,-46 - node: color: '#707070B7' id: MiniTileWhiteCornerNe decals: - 3266: 31,-72 - 3267: 28,-71 - 3268: 27,-70 + 3264: 31,-72 + 3265: 28,-71 + 3266: 27,-70 - node: color: '#73C2A496' id: MiniTileWhiteCornerNe decals: - 2427: -23,-32 - 2435: -32,-32 - 2436: -31,-33 - 2456: -36,-33 - 2465: -32,-38 - 2506: -34,-44 + 2426: -23,-32 + 2434: -32,-32 + 2435: -31,-33 + 2455: -36,-33 + 2464: -32,-38 + 2505: -34,-44 - node: color: '#787878B7' id: MiniTileWhiteCornerNe decals: - 3301: 31,-78 - 3341: 50,-72 - 3353: 49,-78 + 3299: 31,-78 + 3339: 50,-72 + 3351: 49,-78 - node: color: '#88C598FF' id: MiniTileWhiteCornerNe decals: - 3766: 17,-82 + 3764: 17,-82 - node: color: '#9FED58E9' id: MiniTileWhiteCornerNe decals: - 4022: -13,-54 + 4020: -13,-54 - node: color: '#A4610696' id: MiniTileWhiteCornerNe decals: - 2189: -31,26 - 2190: -23,25 - 2192: -28,19 - 2212: -47,22 - 2225: -47,33 + 2188: -31,26 + 2189: -23,25 + 2191: -28,19 + 2211: -47,22 + 2224: -47,33 - node: color: '#D381C996' id: MiniTileWhiteCornerNe @@ -3954,100 +3955,100 @@ entities: 802: 52,-51 803: 53,-52 831: 46,-46 - 2869: 74,-32 - 2873: 73,-38 - 2988: 73,-44 - 2997: 68,-48 - 3003: 77,-44 - 3236: 64,-32 - 3237: 65,-33 + 2867: 74,-32 + 2871: 73,-38 + 2986: 73,-44 + 2995: 68,-48 + 3001: 77,-44 + 3234: 64,-32 + 3235: 65,-33 - node: color: '#D381C9C0' id: MiniTileWhiteCornerNe decals: - 2935: 65,-44 - 2942: 63,-43 + 2933: 65,-44 + 2940: 63,-43 - node: color: '#D4D4D406' id: MiniTileWhiteCornerNe decals: - 3748: -40,15 - 3749: -36,15 + 3746: -40,15 + 3747: -36,15 - node: color: '#D4D4D40F' id: MiniTileWhiteCornerNe decals: - 2949: 55,-35 + 2947: 55,-35 - node: color: '#D4D4D428' id: MiniTileWhiteCornerNe decals: - 2289: -46,-9 + 2288: -46,-9 - node: color: '#D4D4D4D3' id: MiniTileWhiteCornerNe decals: - 2018: 14,3 - 2061: 14,-1 - 2083: 3,-1 - 2084: 9,-1 - 2107: -3,-1 - 2108: -3,3 + 2017: 14,3 + 2060: 14,-1 + 2082: 3,-1 + 2083: 9,-1 + 2106: -3,-1 + 2107: -3,3 - node: color: '#DE3A3A96' id: MiniTileWhiteCornerNe decals: - 2538: 26,13 - 2542: 26,18 - 2561: 18,17 - 2565: 13,17 - 2575: 8,17 - 2609: 42,16 - 2896: -16,-21 - 2961: 22,-46 - 3124: -15,27 + 2537: 26,13 + 2541: 26,18 + 2560: 18,17 + 2564: 13,17 + 2574: 8,17 + 2608: 42,16 + 2894: -16,-21 + 2959: 22,-46 + 3122: -15,27 - node: color: '#DE3A3AA7' id: MiniTileWhiteCornerNe decals: - 3713: 30,22 + 3711: 30,22 - node: color: '#EFB34196' id: MiniTileWhiteCornerNe decals: - 2246: -23,-9 - 2250: -28,-17 - 2278: -42,-10 - 2317: -45,-6 - 2341: -51,-6 - 2345: -51,-17 - 2346: -53,-13 - 2405: -71,-24 - 3060: -28,-10 - 3085: -35,-6 - 3118: -42,-6 - 3155: -32,-10 + 2245: -23,-9 + 2249: -28,-17 + 2277: -42,-10 + 2316: -45,-6 + 2340: -51,-6 + 2344: -51,-17 + 2345: -53,-13 + 2404: -71,-24 + 3058: -28,-10 + 3083: -35,-6 + 3116: -42,-6 + 3153: -32,-10 - node: color: '#EFB341A7' id: MiniTileWhiteCornerNe decals: - 3732: -32,-22 + 3730: -32,-22 - node: color: '#EFB341B1' id: MiniTileWhiteCornerNe decals: - 3722: -51,-23 + 3720: -51,-23 - node: color: '#258CC0EA' id: MiniTileWhiteCornerNw decals: - 3462: -27,-58 + 3460: -27,-58 - node: color: '#334E6DC8' id: MiniTileWhiteCornerNw decals: - 2753: 18,-21 - 2754: 31,-21 + 2752: 18,-21 + 2753: 31,-21 - node: color: '#478C5DDC' id: MiniTileWhiteCornerNw @@ -4060,12 +4061,12 @@ entities: color: '#52B4E963' id: MiniTileWhiteCornerNw decals: - 3019: 69,-48 + 3017: 69,-48 - node: color: '#52B4E9B7' id: MiniTileWhiteCornerNw decals: - 3430: 44,8 + 3428: 44,8 - node: color: '#52B4E9CD' id: MiniTileWhiteCornerNw @@ -4076,69 +4077,69 @@ entities: color: '#52B4E9D3' id: MiniTileWhiteCornerNw decals: - 4032: -6,-65 + 4030: -6,-65 - node: color: '#52B4E9D6' id: MiniTileWhiteCornerNw decals: - 3964: -10,-53 + 3962: -10,-53 - node: color: '#52B4E9DC' id: MiniTileWhiteCornerNw decals: - 4081: 0,-56 + 4079: 0,-56 - node: color: '#52B4E9DF' id: MiniTileWhiteCornerNw decals: - 4017: -16,-53 + 4015: -16,-53 - node: color: '#52B4E9E6' id: MiniTileWhiteCornerNw decals: - 3880: 2,-46 + 3878: 2,-46 - node: color: '#707070B7' id: MiniTileWhiteCornerNw decals: - 3270: 22,-72 - 3271: 23,-71 - 3272: 24,-70 + 3268: 22,-72 + 3269: 23,-71 + 3270: 24,-70 - node: color: '#73C2A496' id: MiniTileWhiteCornerNw decals: - 2428: -26,-32 - 2437: -33,-32 - 2438: -34,-33 - 2457: -41,-33 - 2466: -33,-38 + 2427: -26,-32 + 2436: -33,-32 + 2437: -34,-33 + 2456: -41,-33 + 2465: -33,-38 - node: color: '#787878B7' id: MiniTileWhiteCornerNw decals: - 3302: 29,-78 - 3335: 27,-81 - 3342: 47,-72 - 3352: 47,-78 + 3300: 29,-78 + 3333: 27,-81 + 3340: 47,-72 + 3350: 47,-78 - node: color: '#88C598FF' id: MiniTileWhiteCornerNw decals: - 3767: 13,-82 + 3765: 13,-82 - node: color: '#9FED58E9' id: MiniTileWhiteCornerNw decals: - 4021: -15,-54 + 4019: -15,-54 - node: color: '#A4610696' id: MiniTileWhiteCornerNw decals: - 2188: -35,26 - 2191: -26,25 - 2211: -49,22 - 2224: -49,33 + 2187: -35,26 + 2190: -26,25 + 2210: -49,22 + 2223: -49,33 - node: color: '#D381C996' id: MiniTileWhiteCornerNw @@ -4149,91 +4150,91 @@ entities: 799: 48,-50 800: 45,-57 833: 41,-46 - 2868: 71,-32 - 2874: 70,-33 - 2987: 67,-44 - 2996: 67,-48 - 3001: 74,-48 - 3002: 76,-44 - 3235: 60,-32 + 2866: 71,-32 + 2872: 70,-33 + 2985: 67,-44 + 2994: 67,-48 + 2999: 74,-48 + 3000: 76,-44 + 3233: 60,-32 - node: color: '#D381C9C0' id: MiniTileWhiteCornerNw decals: - 2934: 59,-44 - 2941: 61,-43 + 2932: 59,-44 + 2939: 61,-43 - node: color: '#D4D4D406' id: MiniTileWhiteCornerNw decals: - 3752: -41,15 - 3753: -37,15 + 3750: -41,15 + 3751: -37,15 - node: color: '#D4D4D40F' id: MiniTileWhiteCornerNw decals: - 2947: 53,-35 + 2945: 53,-35 - node: color: '#D4D4D428' id: MiniTileWhiteCornerNw decals: - 2309: -48,-9 + 2308: -48,-9 - node: color: '#D4D4D4D3' id: MiniTileWhiteCornerNw decals: - 2021: -11,3 - 2022: -1,3 - 2068: -1,-1 - 2069: -11,-1 - 2081: 11,-1 - 2082: 5,-1 + 2020: -11,3 + 2021: -1,3 + 2067: -1,-1 + 2068: -11,-1 + 2080: 11,-1 + 2081: 5,-1 - node: color: '#DE3A3A96' id: MiniTileWhiteCornerNw decals: - 2537: 24,13 - 2544: 20,18 - 2564: 15,17 - 2571: 10,17 - 2576: 4,17 - 2608: 28,22 - 2894: -17,-21 - 2960: 19,-46 - 3123: -17,27 - 3137: 28,16 + 2536: 24,13 + 2543: 20,18 + 2563: 15,17 + 2570: 10,17 + 2575: 4,17 + 2607: 28,22 + 2892: -17,-21 + 2958: 19,-46 + 3121: -17,27 + 3135: 28,16 - node: color: '#EFB34196' id: MiniTileWhiteCornerNw decals: - 2249: -26,-9 - 2279: -43,-10 - 2318: -49,-6 - 2336: -56,-7 - 2337: -55,-6 - 2382: -55,-23 - 2384: -63,-24 - 2404: -75,-24 - 3059: -30,-10 - 3086: -40,-6 - 3119: -43,-6 - 3154: -33,-10 + 2248: -26,-9 + 2278: -43,-10 + 2317: -49,-6 + 2335: -56,-7 + 2336: -55,-6 + 2381: -55,-23 + 2383: -63,-24 + 2403: -75,-24 + 3057: -30,-10 + 3084: -40,-6 + 3117: -43,-6 + 3152: -33,-10 - node: color: '#EFB341A7' id: MiniTileWhiteCornerNw decals: - 3733: -33,-22 + 3731: -33,-22 - node: color: '#258CC0EA' id: MiniTileWhiteCornerSe decals: - 3465: -23,-63 + 3463: -23,-63 - node: color: '#334E6DC8' id: MiniTileWhiteCornerSe decals: - 2759: 32,-23 - 2760: 30,-26 + 2758: 32,-23 + 2759: 30,-26 - node: color: '#478C5DDC' id: MiniTileWhiteCornerSe @@ -4245,12 +4246,12 @@ entities: color: '#52B4E963' id: MiniTileWhiteCornerSe decals: - 3021: 73,-50 + 3019: 73,-50 - node: color: '#52B4E9B7' id: MiniTileWhiteCornerSe decals: - 3429: 47,4 + 3427: 47,4 - node: color: '#52B4E9CD' id: MiniTileWhiteCornerSe @@ -4262,71 +4263,71 @@ entities: color: '#52B4E9D3' id: MiniTileWhiteCornerSe decals: - 4033: -4,-67 + 4031: -4,-67 - node: color: '#52B4E9D6' id: MiniTileWhiteCornerSe decals: - 3962: -4,-63 - 3963: 0,-54 + 3960: -4,-63 + 3961: 0,-54 - node: color: '#52B4E9DC' id: MiniTileWhiteCornerSe decals: - 3994: -2,-57 - 4099: 5,-64 - 4100: 6,-63 + 3992: -2,-57 + 4097: 5,-64 + 4098: 6,-63 - node: color: '#52B4E9DF' id: MiniTileWhiteCornerSe decals: - 4015: -12,-57 + 4013: -12,-57 - node: color: '#52B4E9E6' id: MiniTileWhiteCornerSe decals: - 3881: 7,-51 - 3882: 6,-54 + 3879: 7,-51 + 3880: 6,-54 - node: color: '#73C2A496' id: MiniTileWhiteCornerSe decals: - 2421: -23,-37 - 2441: -31,-36 - 2451: -36,-37 - 2467: -32,-42 - 2507: -34,-57 - 2508: -35,-58 + 2420: -23,-37 + 2440: -31,-36 + 2450: -36,-37 + 2466: -32,-42 + 2506: -34,-57 + 2507: -35,-58 - node: color: '#787878AB' id: MiniTileWhiteCornerSe decals: - 3291: 31,-76 + 3289: 31,-76 - node: color: '#787878B7' id: MiniTileWhiteCornerSe decals: - 3325: 31,-93 - 3338: 49,-76 - 3339: 50,-74 - 3354: 49,-93 + 3323: 31,-93 + 3336: 49,-76 + 3337: 50,-74 + 3352: 49,-93 - node: color: '#88C598FF' id: MiniTileWhiteCornerSe decals: - 3771: 17,-86 + 3769: 17,-86 - node: color: '#9FED58E9' id: MiniTileWhiteCornerSe decals: - 4019: -13,-56 + 4017: -13,-56 - node: color: '#A4610696' id: MiniTileWhiteCornerSe decals: - 2193: -28,17 - 2213: -47,20 - 2222: -47,31 + 2192: -28,17 + 2212: -47,20 + 2221: -47,31 - node: color: '#D381C996' id: MiniTileWhiteCornerSe @@ -4340,88 +4341,88 @@ entities: 797: 52,-56 798: 53,-54 829: 46,-50 - 2871: 73,-34 - 2872: 73,-39 - 2986: 73,-45 - 2995: 68,-50 - 3004: 77,-48 - 3005: 76,-50 - 3238: 65,-36 - 3239: 64,-37 + 2869: 73,-34 + 2870: 73,-39 + 2984: 73,-45 + 2993: 68,-50 + 3002: 77,-48 + 3003: 76,-50 + 3236: 65,-36 + 3237: 64,-37 - node: color: '#D4D4D406' id: MiniTileWhiteCornerSe decals: - 3750: -40,13 - 3751: -36,13 + 3748: -40,13 + 3749: -36,13 - node: color: '#D4D4D40F' id: MiniTileWhiteCornerSe decals: - 2948: 55,-37 + 2946: 55,-37 - node: color: '#D4D4D428' id: MiniTileWhiteCornerSe decals: - 2290: -46,-18 + 2289: -46,-18 - node: color: '#D4D4D4D3' id: MiniTileWhiteCornerSe decals: - 2019: 14,-2 - 2024: -3,-2 - 2070: -3,2 - 2071: 14,2 - 2073: 3,2 - 2076: 9,2 + 2018: 14,-2 + 2023: -3,-2 + 2069: -3,2 + 2070: 14,2 + 2072: 3,2 + 2075: 9,2 - node: color: '#DE3A3A96' id: MiniTileWhiteCornerSe decals: - 2539: 26,9 - 2543: 26,16 - 2562: 18,16 - 2566: 13,16 - 2581: 8,12 - 2607: 42,4 - 2897: -16,-24 - 2962: 22,-48 - 3126: -15,23 - 3138: 42,14 + 2538: 26,9 + 2542: 26,16 + 2561: 18,16 + 2565: 13,16 + 2580: 8,12 + 2606: 42,4 + 2895: -16,-24 + 2960: 22,-48 + 3124: -15,23 + 3136: 42,14 - node: color: '#EFB34196' id: MiniTileWhiteCornerSe decals: - 2244: -28,-15 - 2268: -35,-14 - 2281: -42,-14 - 2316: -45,-7 - 2320: -32,-30 - 2342: -51,-7 - 2373: -51,-21 - 2403: -71,-27 - 3055: -32,-19 - 3056: -24,-18 - 3057: -23,-16 - 3063: -28,-18 - 3117: -42,-8 + 2243: -28,-15 + 2267: -35,-14 + 2280: -42,-14 + 2315: -45,-7 + 2319: -32,-30 + 2341: -51,-7 + 2372: -51,-21 + 2402: -71,-27 + 3053: -32,-19 + 3054: -24,-18 + 3055: -23,-16 + 3061: -28,-18 + 3115: -42,-8 - node: color: '#EFB341B1' id: MiniTileWhiteCornerSe decals: - 3716: -51,-26 + 3714: -51,-26 - node: color: '#258CC0EA' id: MiniTileWhiteCornerSw decals: - 3463: -27,-62 - 3464: -26,-63 + 3461: -27,-62 + 3462: -26,-63 - node: color: '#334E6DC8' id: MiniTileWhiteCornerSw decals: - 2757: 20,-26 - 2758: 18,-23 + 2756: 20,-26 + 2757: 18,-23 - node: color: '#478C5DDC' id: MiniTileWhiteCornerSw @@ -4432,18 +4433,18 @@ entities: color: '#52B4E963' id: MiniTileWhiteCornerSw decals: - 3020: 69,-50 + 3018: 69,-50 - node: color: '#52B4E9B7' id: MiniTileWhiteCornerSw decals: - 3428: 44,4 + 3426: 44,4 - node: color: '#52B4E9CA' id: MiniTileWhiteCornerSw decals: - 4053: -16,-51 - 4054: -17,-50 + 4051: -16,-51 + 4052: -17,-50 - node: color: '#52B4E9CD' id: MiniTileWhiteCornerSw @@ -4454,74 +4455,74 @@ entities: color: '#52B4E9D3' id: MiniTileWhiteCornerSw decals: - 4034: -6,-67 + 4032: -6,-67 - node: color: '#52B4E9D6' id: MiniTileWhiteCornerSw decals: - 3965: -10,-57 + 3963: -10,-57 - node: color: '#52B4E9DC' id: MiniTileWhiteCornerSw decals: - 3995: -6,-63 - 4101: 0,-63 - 4102: 1,-64 + 3993: -6,-63 + 4099: 0,-63 + 4100: 1,-64 - node: color: '#52B4E9DF' id: MiniTileWhiteCornerSw decals: - 4016: -16,-57 + 4014: -16,-57 - node: color: '#52B4E9E6' id: MiniTileWhiteCornerSw decals: - 3883: 2,-54 + 3881: 2,-54 - node: color: '#707070B7' id: MiniTileWhiteCornerSw decals: - 3269: 22,-74 + 3267: 22,-74 - node: color: '#73C2A496' id: MiniTileWhiteCornerSw decals: - 2422: -26,-37 - 2442: -34,-36 - 2452: -41,-37 - 2468: -33,-42 + 2421: -26,-37 + 2441: -34,-36 + 2451: -41,-37 + 2467: -33,-42 - node: color: '#787878AB' id: MiniTileWhiteCornerSw decals: - 3292: 24,-75 - 3293: 29,-76 + 3290: 24,-75 + 3291: 29,-76 - node: color: '#787878B7' id: MiniTileWhiteCornerSw decals: - 3326: 29,-93 - 3334: 27,-87 - 3340: 47,-76 - 3355: 47,-93 + 3324: 29,-93 + 3332: 27,-87 + 3338: 47,-76 + 3353: 47,-93 - node: color: '#88C598FF' id: MiniTileWhiteCornerSw decals: - 3775: 13,-86 + 3773: 13,-86 - node: color: '#9FED58E9' id: MiniTileWhiteCornerSw decals: - 4020: -15,-56 + 4018: -15,-56 - node: color: '#A4610696' id: MiniTileWhiteCornerSw decals: - 2186: -26,17 - 2187: -35,17 - 2214: -49,20 - 2223: -49,31 + 2185: -26,17 + 2186: -35,17 + 2213: -49,20 + 2222: -49,31 - node: color: '#D381C996' id: MiniTileWhiteCornerSw @@ -4532,81 +4533,81 @@ entities: 778: 59,-50 830: 42,-50 832: 41,-48 - 2977: 67,-45 - 2978: 67,-50 - 2979: 74,-50 - 3243: 60,-37 + 2975: 67,-45 + 2976: 67,-50 + 2977: 74,-50 + 3241: 60,-37 - node: color: '#D381C9AB' id: MiniTileWhiteCornerSw decals: - 2956: 70,-39 + 2954: 70,-39 - node: color: '#D4D4D406' id: MiniTileWhiteCornerSw decals: - 3746: -41,13 - 3747: -37,13 + 3744: -41,13 + 3745: -37,13 - node: color: '#D4D4D40F' id: MiniTileWhiteCornerSw decals: - 2946: 53,-37 + 2944: 53,-37 - node: color: '#D4D4D428' id: MiniTileWhiteCornerSw decals: - 2291: -48,-18 + 2290: -48,-18 - node: color: '#D4D4D4D3' id: MiniTileWhiteCornerSw decals: - 2020: -11,-2 - 2023: -1,-2 - 2072: -1,2 - 2074: 5,2 - 2075: 11,2 - 2109: -11,2 + 2019: -11,-2 + 2022: -1,-2 + 2071: -1,2 + 2073: 5,2 + 2074: 11,2 + 2108: -11,2 - node: color: '#DE3A3A96' id: MiniTileWhiteCornerSw decals: - 2540: 24,9 - 2541: 20,16 - 2563: 15,16 - 2572: 10,16 - 2579: 4,12 - 2631: 40,4 - 2653: 28,14 - 2895: -17,-24 - 2959: 19,-48 - 3125: -17,23 + 2539: 24,9 + 2540: 20,16 + 2562: 15,16 + 2571: 10,16 + 2578: 4,12 + 2630: 40,4 + 2652: 28,14 + 2893: -17,-24 + 2957: 19,-48 + 3123: -17,23 - node: color: '#EFB34196' id: MiniTileWhiteCornerSw decals: - 2245: -30,-15 - 2251: -33,-19 - 2269: -40,-14 - 2280: -43,-14 - 2319: -49,-7 - 2335: -33,-30 - 2343: -56,-19 - 2344: -55,-21 - 2383: -63,-26 - 2406: -75,-27 - 3058: -26,-18 - 3120: -43,-8 + 2244: -30,-15 + 2250: -33,-19 + 2268: -40,-14 + 2279: -43,-14 + 2318: -49,-7 + 2334: -33,-30 + 2342: -56,-19 + 2343: -55,-21 + 2382: -63,-26 + 2405: -75,-27 + 3056: -26,-18 + 3118: -43,-8 - node: color: '#D381C996' id: MiniTileWhiteEndE decals: - 2870: 75,-33 + 2868: 75,-33 - node: color: '#334E6DC8' id: MiniTileWhiteInnerNe decals: - 2763: 19,-22 + 2762: 19,-22 - node: color: '#478C5DDC' id: MiniTileWhiteInnerNe @@ -4616,38 +4617,38 @@ entities: color: '#52B4E9B7' id: MiniTileWhiteInnerNe decals: - 3433: 46,7 + 3431: 46,7 - node: color: '#52B4E9D6' id: MiniTileWhiteInnerNe decals: - 3985: -6,-63 + 3983: -6,-63 - node: color: '#52B4E9DC' id: MiniTileWhiteInnerNe decals: - 3996: -6,-63 + 3994: -6,-63 - node: color: '#707070B7' id: MiniTileWhiteInnerNe decals: - 3279: 27,-71 + 3277: 27,-71 - node: color: '#73C2A496' id: MiniTileWhiteInnerNe decals: - 2446: -32,-33 - 2510: -35,-44 + 2445: -32,-33 + 2509: -35,-44 - node: color: '#787878AB' id: MiniTileWhiteInnerNe decals: - 3288: 28,-72 + 3286: 28,-72 - node: color: '#A4610696' id: MiniTileWhiteInnerNe decals: - 2210: -31,19 + 2209: -31,19 - node: color: '#D381C996' id: MiniTileWhiteInnerNe @@ -4655,41 +4656,41 @@ entities: 763: 51,-40 815: 52,-52 825: 51,-51 - 2890: 74,-33 - 3257: 64,-33 + 2888: 74,-33 + 3255: 64,-33 - node: color: '#D381C9AB' id: MiniTileWhiteInnerNe decals: - 2958: 71,-38 + 2956: 71,-38 - node: color: '#D381C9C0' id: MiniTileWhiteInnerNe decals: - 2943: 63,-44 + 2941: 63,-44 - node: color: '#D4D4D4D3' id: MiniTileWhiteInnerNe decals: - 2114: 9,-2 - 2115: 3,-2 + 2113: 9,-2 + 2114: 3,-2 - node: color: '#EFB34196' id: MiniTileWhiteInnerNe decals: - 2263: -32,-17 - 2378: -54,-13 - 2379: -53,-17 + 2262: -32,-17 + 2377: -54,-13 + 2378: -53,-17 - node: color: '#F0F0F0FF' id: MiniTileWhiteInnerNe decals: - 3935: -10,-56 + 3933: -10,-56 - node: color: '#334E6DC8' id: MiniTileWhiteInnerNw decals: - 2764: 31,-22 + 2763: 31,-22 - node: color: '#478C5DDC' id: MiniTileWhiteInnerNw @@ -4700,60 +4701,60 @@ entities: color: '#52B4E9D6' id: MiniTileWhiteInnerNw decals: - 3984: -6,-60 - 3986: -4,-63 + 3982: -6,-60 + 3984: -4,-63 - node: color: '#707070B7' id: MiniTileWhiteInnerNw decals: - 3280: 23,-72 - 3281: 24,-71 + 3278: 23,-72 + 3279: 24,-71 - node: color: '#73C2A496' id: MiniTileWhiteInnerNw decals: - 2445: -33,-33 - 2512: -36,-54 - 2513: -36,-42 + 2444: -33,-33 + 2511: -36,-54 + 2512: -36,-42 - node: color: '#787878B7' id: MiniTileWhiteInnerNw decals: - 3336: 29,-81 + 3334: 29,-81 - node: color: '#D381C996' id: MiniTileWhiteInnerNw decals: 822: 48,-57 - 2891: 71,-33 - 3013: 76,-48 + 2889: 71,-33 + 3011: 76,-48 - node: color: '#D381C9C0' id: MiniTileWhiteInnerNw decals: - 2944: 61,-44 + 2942: 61,-44 - node: color: '#D4D4D4D3' id: MiniTileWhiteInnerNw decals: - 2116: 11,-2 - 2117: 5,-2 + 2115: 11,-2 + 2116: 5,-2 - node: color: '#EFB34196' id: MiniTileWhiteInnerNw decals: - 2381: -55,-7 - 2401: -55,-24 + 2380: -55,-7 + 2400: -55,-24 - node: color: '#F0F0F0FF' id: MiniTileWhiteInnerNw decals: - 3936: -8,-56 + 3934: -8,-56 - node: color: '#334E6DC8' id: MiniTileWhiteInnerSe decals: - 2761: 30,-23 + 2760: 30,-23 - node: color: '#52B4E9CD' id: MiniTileWhiteInnerSe @@ -4763,29 +4764,29 @@ entities: color: '#52B4E9D6' id: MiniTileWhiteInnerSe decals: - 3979: -4,-57 - 3980: -2,-54 - 3987: -6,-57 + 3977: -4,-57 + 3978: -2,-54 + 3985: -6,-57 - node: color: '#52B4E9DC' id: MiniTileWhiteInnerSe decals: - 4107: 5,-63 + 4105: 5,-63 - node: color: '#52B4E9E6' id: MiniTileWhiteInnerSe decals: - 3884: 6,-51 + 3882: 6,-51 - node: color: '#73C2A496' id: MiniTileWhiteInnerSe decals: - 2509: -35,-57 + 2508: -35,-57 - node: color: '#787878B7' id: MiniTileWhiteInnerSe decals: - 3351: 49,-74 + 3349: 49,-74 - node: color: '#D381C996' id: MiniTileWhiteInnerSe @@ -4793,76 +4794,76 @@ entities: 764: 51,-46 814: 52,-54 824: 51,-56 - 2888: 73,-33 - 2889: 71,-34 - 3014: 76,-48 - 3256: 64,-36 + 2886: 73,-33 + 2887: 71,-34 + 3012: 76,-48 + 3254: 64,-36 - node: color: '#D4D4D4D3' id: MiniTileWhiteInnerSe decals: - 2112: 3,3 - 2113: 9,3 + 2111: 3,3 + 2112: 9,3 - node: color: '#EFB34196' id: MiniTileWhiteInnerSe decals: - 2377: -54,-7 - 3067: -32,-18 - 3072: -24,-16 + 2376: -54,-7 + 3065: -32,-18 + 3070: -24,-16 - node: color: '#F0F0F0FF' id: MiniTileWhiteInnerSe decals: - 3933: -10,-54 + 3931: -10,-54 - node: color: '#258CC0EA' id: MiniTileWhiteInnerSw decals: - 3466: -26,-62 + 3464: -26,-62 - node: color: '#334E6DC8' id: MiniTileWhiteInnerSw decals: - 2762: 20,-23 + 2761: 20,-23 - node: color: '#52B4E9CA' id: MiniTileWhiteInnerSw decals: - 4055: -16,-50 + 4053: -16,-50 - node: color: '#52B4E9CD' id: MiniTileWhiteInnerSw decals: - 2857: -2,-48 + 2855: -2,-48 - node: color: '#52B4E9D6' id: MiniTileWhiteInnerSw decals: - 3978: -6,-57 - 3988: -5,-57 - 3989: -4,-57 + 3976: -6,-57 + 3986: -5,-57 + 3987: -4,-57 - node: color: '#52B4E9DC' id: MiniTileWhiteInnerSw decals: - 4002: -6,-61 - 4106: 1,-63 + 4000: -6,-61 + 4104: 1,-63 - node: color: '#73C2A496' id: MiniTileWhiteInnerSw decals: - 2511: -36,-47 + 2510: -36,-47 - node: color: '#787878AB' id: MiniTileWhiteInnerSw decals: - 3300: 29,-75 + 3298: 29,-75 - node: color: '#787878B7' id: MiniTileWhiteInnerSw decals: - 3337: 29,-87 + 3335: 29,-87 - node: color: '#D381C996' id: MiniTileWhiteInnerSw @@ -4872,35 +4873,35 @@ entities: color: '#D4D4D4D3' id: MiniTileWhiteInnerSw decals: - 2110: 11,3 - 2111: 5,3 + 2109: 11,3 + 2110: 5,3 - node: color: '#EFB34196' id: MiniTileWhiteInnerSw decals: - 2380: -55,-19 + 2379: -55,-19 - node: color: '#F0F0F0FF' id: MiniTileWhiteInnerSw decals: - 3934: -8,-54 + 3932: -8,-54 - node: color: '#258CC0EA' id: MiniTileWhiteLineE decals: - 3457: -23,-59 - 3458: -23,-60 - 3459: -23,-61 - 3460: -23,-62 + 3455: -23,-59 + 3456: -23,-60 + 3457: -23,-61 + 3458: -23,-62 - node: color: '#334E6DC8' id: MiniTileWhiteLineE decals: - 2750: 32,-22 - 2751: 30,-25 - 2752: 30,-24 - 2767: 16,-26 - 2768: 16,-25 + 2749: 32,-22 + 2750: 30,-25 + 2751: 30,-24 + 2766: 16,-26 + 2767: 16,-25 - node: color: '#478C5DDC' id: MiniTileWhiteLineE @@ -4919,13 +4920,13 @@ entities: color: '#52B4E963' id: MiniTileWhiteLineE decals: - 3026: 73,-49 + 3024: 73,-49 - node: color: '#52B4E9B7' id: MiniTileWhiteLineE decals: - 3426: 47,6 - 3427: 47,5 + 3424: 47,6 + 3425: 47,5 - node: color: '#52B4E9CD' id: MiniTileWhiteLineE @@ -4942,163 +4943,163 @@ entities: color: '#52B4E9D3' id: MiniTileWhiteLineE decals: - 4029: -4,-66 + 4027: -4,-66 - node: color: '#52B4E9D6' id: MiniTileWhiteLineE decals: - 3957: -4,-58 - 3958: -4,-59 - 3959: -4,-60 - 3960: -4,-61 - 3961: -4,-62 - 3973: -6,-58 - 3974: -6,-59 - 3975: -6,-60 - 3976: -6,-61 - 3977: -6,-62 - 3981: -2,-55 - 3982: -2,-56 + 3955: -4,-58 + 3956: -4,-59 + 3957: -4,-60 + 3958: -4,-61 + 3959: -4,-62 + 3971: -6,-58 + 3972: -6,-59 + 3973: -6,-60 + 3974: -6,-61 + 3975: -6,-62 + 3979: -2,-55 + 3980: -2,-56 - node: color: '#52B4E9DC' id: MiniTileWhiteLineE decals: - 4087: 6,-57 - 4088: 6,-58 - 4089: 6,-59 - 4090: 6,-60 - 4091: 6,-61 - 4092: 6,-62 + 4085: 6,-57 + 4086: 6,-58 + 4087: 6,-59 + 4088: 6,-60 + 4089: 6,-61 + 4090: 6,-62 - node: color: '#52B4E9DF' id: MiniTileWhiteLineE decals: - 4007: -12,-54 - 4008: -12,-55 - 4009: -12,-56 + 4005: -12,-54 + 4006: -12,-55 + 4007: -12,-56 - node: color: '#52B4E9E6' id: MiniTileWhiteLineE decals: - 3859: 7,-48 - 3860: 7,-47 - 3861: 7,-49 - 3862: 7,-50 - 3863: 6,-52 - 3864: 6,-53 + 3857: 7,-48 + 3858: 7,-47 + 3859: 7,-49 + 3860: 7,-50 + 3861: 6,-52 + 3862: 6,-53 - node: color: '#646464C7' id: MiniTileWhiteLineE decals: - 3585: -46,0 + 3583: -46,0 - node: color: '#707070B7' id: MiniTileWhiteLineE decals: - 3273: 31,-73 + 3271: 31,-73 - node: color: '#73C2A496' id: MiniTileWhiteLineE decals: - 2423: -23,-36 - 2424: -23,-35 - 2425: -23,-34 - 2426: -23,-33 - 2443: -31,-34 - 2444: -31,-35 - 2453: -36,-36 - 2454: -36,-35 - 2455: -36,-34 - 2469: -32,-39 - 2470: -32,-40 - 2471: -32,-41 - 2479: -35,-41 - 2481: -35,-42 - 2482: -35,-43 - 2483: -34,-45 - 2484: -34,-46 - 2485: -34,-47 - 2486: -34,-48 - 2487: -34,-49 - 2488: -34,-50 - 2489: -34,-51 - 2490: -34,-52 - 2491: -34,-53 - 2492: -34,-54 - 2493: -34,-55 - 2494: -34,-56 + 2422: -23,-36 + 2423: -23,-35 + 2424: -23,-34 + 2425: -23,-33 + 2442: -31,-34 + 2443: -31,-35 + 2452: -36,-36 + 2453: -36,-35 + 2454: -36,-34 + 2468: -32,-39 + 2469: -32,-40 + 2470: -32,-41 + 2478: -35,-41 + 2480: -35,-42 + 2481: -35,-43 + 2482: -34,-45 + 2483: -34,-46 + 2484: -34,-47 + 2485: -34,-48 + 2486: -34,-49 + 2487: -34,-50 + 2488: -34,-51 + 2489: -34,-52 + 2490: -34,-53 + 2491: -34,-54 + 2492: -34,-55 + 2493: -34,-56 - node: color: '#787878AB' id: MiniTileWhiteLineE decals: - 3289: 31,-74 - 3290: 31,-75 + 3287: 31,-74 + 3288: 31,-75 - node: color: '#787878B7' id: MiniTileWhiteLineE decals: - 3306: 31,-79 - 3307: 31,-80 - 3308: 31,-81 - 3309: 31,-82 - 3310: 31,-83 - 3311: 31,-84 - 3312: 31,-85 - 3313: 31,-86 - 3314: 31,-87 - 3315: 31,-88 - 3316: 31,-89 - 3317: 31,-90 - 3318: 31,-91 - 3319: 31,-92 - 3347: 50,-73 - 3348: 49,-75 - 3356: 49,-92 - 3357: 49,-91 - 3358: 49,-90 - 3359: 49,-89 - 3360: 49,-88 - 3361: 49,-87 - 3362: 49,-86 - 3363: 49,-85 - 3364: 49,-84 - 3365: 49,-83 - 3366: 49,-82 - 3367: 49,-81 - 3368: 49,-80 - 3369: 49,-79 + 3304: 31,-79 + 3305: 31,-80 + 3306: 31,-81 + 3307: 31,-82 + 3308: 31,-83 + 3309: 31,-84 + 3310: 31,-85 + 3311: 31,-86 + 3312: 31,-87 + 3313: 31,-88 + 3314: 31,-89 + 3315: 31,-90 + 3316: 31,-91 + 3317: 31,-92 + 3345: 50,-73 + 3346: 49,-75 + 3354: 49,-92 + 3355: 49,-91 + 3356: 49,-90 + 3357: 49,-89 + 3358: 49,-88 + 3359: 49,-87 + 3360: 49,-86 + 3361: 49,-85 + 3362: 49,-84 + 3363: 49,-83 + 3364: 49,-82 + 3365: 49,-81 + 3366: 49,-80 + 3367: 49,-79 - node: color: '#88C598FF' id: MiniTileWhiteLineE decals: - 3776: 17,-84 - 3777: 17,-83 - 3778: 17,-85 + 3774: 17,-84 + 3775: 17,-83 + 3776: 17,-85 - node: color: '#9FED58E9' id: MiniTileWhiteLineE decals: - 4024: -13,-55 + 4022: -13,-55 - node: color: '#A4610696' id: MiniTileWhiteLineE decals: - 2166: -23,18 - 2167: -23,19 - 2168: -23,20 - 2169: -23,21 - 2170: -23,22 - 2171: -23,23 - 2172: -23,24 - 2173: -31,24 - 2174: -31,23 - 2175: -31,25 - 2176: -31,22 - 2177: -31,21 - 2178: -31,20 - 2194: -28,18 - 2216: -47,21 - 2220: -47,32 + 2165: -23,18 + 2166: -23,19 + 2167: -23,20 + 2168: -23,21 + 2169: -23,22 + 2170: -23,23 + 2171: -23,24 + 2172: -31,24 + 2173: -31,23 + 2174: -31,25 + 2175: -31,22 + 2176: -31,21 + 2177: -31,20 + 2193: -28,18 + 2215: -47,21 + 2219: -47,32 - node: color: '#D381C996' id: MiniTileWhiteLineE @@ -5122,81 +5123,81 @@ entities: 838: 46,-47 839: 46,-48 840: 46,-49 - 2879: 71,-37 - 2880: 71,-36 - 2881: 71,-35 - 2998: 68,-49 - 3006: 76,-49 - 3007: 77,-47 - 3008: 77,-46 - 3009: 77,-45 - 3244: 65,-34 - 3245: 65,-35 + 2877: 71,-37 + 2878: 71,-36 + 2879: 71,-35 + 2996: 68,-49 + 3004: 76,-49 + 3005: 77,-47 + 3006: 77,-46 + 3007: 77,-45 + 3242: 65,-34 + 3243: 65,-35 - node: color: '#D381C9C0' id: MiniTileWhiteLineE decals: - 2936: 65,-45 + 2934: 65,-45 - node: color: '#D4D4D406' id: MiniTileWhiteLineE decals: - 3754: -40,14 - 3755: -36,14 + 3752: -40,14 + 3753: -36,14 - node: color: '#D4D4D40F' id: MiniTileWhiteLineE decals: - 2951: 55,-36 + 2949: 55,-36 - node: color: '#D4D4D428' id: MiniTileWhiteLineE decals: - 2293: -46,-17 - 2294: -46,-16 - 2295: -46,-14 - 2296: -46,-15 - 2297: -46,-13 - 2298: -46,-10 - 2299: -46,-11 - 2300: -46,-12 + 2292: -46,-17 + 2293: -46,-16 + 2294: -46,-14 + 2295: -46,-15 + 2296: -46,-13 + 2297: -46,-10 + 2298: -46,-11 + 2299: -46,-12 - node: color: '#DE3A3A96' id: MiniTileWhiteLineE decals: - 2531: 26,12 - 2532: 26,11 - 2533: 26,10 - 2550: 26,17 - 2582: 8,13 - 2583: 8,14 - 2584: 8,15 - 2585: 8,16 - 2620: 42,15 - 2621: 42,13 - 2622: 42,11 - 2623: 42,12 - 2624: 42,10 - 2625: 42,9 - 2626: 42,8 - 2627: 42,7 - 2628: 42,6 - 2629: 42,5 - 2646: 30,20 - 2654: 30,19 - 2655: 30,18 - 2656: 30,17 - 2898: -16,-22 - 2899: -16,-23 - 2968: 22,-47 - 3132: -15,26 - 3133: -15,25 - 3134: -15,24 + 2530: 26,12 + 2531: 26,11 + 2532: 26,10 + 2549: 26,17 + 2581: 8,13 + 2582: 8,14 + 2583: 8,15 + 2584: 8,16 + 2619: 42,15 + 2620: 42,13 + 2621: 42,11 + 2622: 42,12 + 2623: 42,10 + 2624: 42,9 + 2625: 42,8 + 2626: 42,7 + 2627: 42,6 + 2628: 42,5 + 2645: 30,20 + 2653: 30,19 + 2654: 30,18 + 2655: 30,17 + 2896: -16,-22 + 2897: -16,-23 + 2966: 22,-47 + 3130: -15,26 + 3131: -15,25 + 3132: -15,24 - node: color: '#DE3A3AA7' id: MiniTileWhiteLineE decals: - 3712: 30,21 + 3710: 30,21 - node: color: '#DE3A3AD3' id: MiniTileWhiteLineE @@ -5209,72 +5210,72 @@ entities: color: '#EFB34196' id: MiniTileWhiteLineE decals: - 2227: -23,-14 - 2228: -23,-13 - 2229: -23,-12 - 2230: -23,-11 - 2231: -23,-10 - 2240: -28,-12 - 2241: -28,-13 - 2242: -28,-14 - 2252: -32,-16 - 2253: -32,-14 - 2254: -32,-13 - 2255: -32,-15 - 2270: -35,-13 - 2271: -35,-12 - 2272: -35,-11 - 2273: -35,-10 - 2282: -42,-11 - 2283: -42,-12 - 2284: -42,-13 - 2321: -32,-29 - 2322: -32,-28 - 2323: -32,-27 - 2324: -32,-26 - 2325: -32,-25 - 2326: -32,-23 - 2327: -32,-24 - 2347: -51,-20 - 2348: -51,-19 - 2349: -51,-18 - 2350: -53,-16 - 2351: -53,-15 - 2352: -53,-14 - 2353: -54,-12 - 2354: -54,-11 - 2355: -54,-10 - 2356: -54,-9 - 2357: -54,-8 - 2413: -71,-25 - 2414: -71,-26 - 3050: -32,-11 - 3051: -32,-12 - 3052: -28,-11 - 3053: -23,-15 - 3054: -24,-17 - 3094: -35,-7 - 3095: -35,-8 - 3096: -35,-9 - 3121: -42,-7 + 2226: -23,-14 + 2227: -23,-13 + 2228: -23,-12 + 2229: -23,-11 + 2230: -23,-10 + 2239: -28,-12 + 2240: -28,-13 + 2241: -28,-14 + 2251: -32,-16 + 2252: -32,-14 + 2253: -32,-13 + 2254: -32,-15 + 2269: -35,-13 + 2270: -35,-12 + 2271: -35,-11 + 2272: -35,-10 + 2281: -42,-11 + 2282: -42,-12 + 2283: -42,-13 + 2320: -32,-29 + 2321: -32,-28 + 2322: -32,-27 + 2323: -32,-26 + 2324: -32,-25 + 2325: -32,-23 + 2326: -32,-24 + 2346: -51,-20 + 2347: -51,-19 + 2348: -51,-18 + 2349: -53,-16 + 2350: -53,-15 + 2351: -53,-14 + 2352: -54,-12 + 2353: -54,-11 + 2354: -54,-10 + 2355: -54,-9 + 2356: -54,-8 + 2412: -71,-25 + 2413: -71,-26 + 3048: -32,-11 + 3049: -32,-12 + 3050: -28,-11 + 3051: -23,-15 + 3052: -24,-17 + 3092: -35,-7 + 3093: -35,-8 + 3094: -35,-9 + 3119: -42,-7 - node: color: '#EFB341B1' id: MiniTileWhiteLineE decals: - 3717: -51,-25 - 3718: -51,-24 + 3715: -51,-25 + 3716: -51,-24 - node: color: '#F0F0F0FF' id: MiniTileWhiteLineE decals: - 3931: -10,-55 + 3929: -10,-55 - node: color: '#258CC0EA' id: MiniTileWhiteLineN decals: - 3449: -25,-58 - 3450: -26,-58 - 3451: -24,-58 + 3447: -25,-58 + 3448: -26,-58 + 3449: -24,-58 - node: color: '#334E6DC8' id: MiniTileWhiteLineN @@ -5284,19 +5285,19 @@ entities: 846: 31,-59 847: 30,-59 848: 29,-59 - 2590: 6,17 - 2736: 30,-22 - 2737: 29,-22 - 2738: 28,-22 - 2739: 27,-22 - 2740: 26,-22 - 2741: 25,-22 - 2742: 24,-22 - 2743: 23,-22 - 2744: 22,-22 - 2745: 21,-22 - 2746: 20,-22 - 2771: 32,-17 + 2589: 6,17 + 2735: 30,-22 + 2736: 29,-22 + 2737: 28,-22 + 2738: 27,-22 + 2739: 26,-22 + 2740: 25,-22 + 2741: 24,-22 + 2742: 23,-22 + 2743: 22,-22 + 2744: 21,-22 + 2745: 20,-22 + 2769: 32,-17 - node: color: '#478C5DDC' id: MiniTileWhiteLineN @@ -5319,19 +5320,19 @@ entities: color: '#52B4E963' id: MiniTileWhiteLineN decals: - 3016: 72,-48 - 3017: 71,-48 - 3018: 70,-48 + 3014: 72,-48 + 3015: 71,-48 + 3016: 70,-48 - node: color: '#52B4E996' id: MiniTileWhiteLineN decals: - 2773: -9,-42 + 2771: -9,-42 - node: color: '#52B4E9B7' id: MiniTileWhiteLineN decals: - 3420: 45,8 + 3418: 45,8 - node: color: '#52B4E9CD' id: MiniTileWhiteLineN @@ -5353,92 +5354,92 @@ entities: color: '#52B4E9D3' id: MiniTileWhiteLineN decals: - 4031: -5,-65 + 4029: -5,-65 - node: color: '#52B4E9D6' id: MiniTileWhiteLineN decals: - 3937: -9,-53 - 3938: -8,-53 - 3939: -7,-53 - 3940: -6,-53 - 3941: -5,-53 - 3942: -4,-53 - 3943: -3,-53 - 3944: -2,-53 - 3945: -1,-53 - 3966: -5,-63 + 3935: -9,-53 + 3936: -8,-53 + 3937: -7,-53 + 3938: -6,-53 + 3939: -5,-53 + 3940: -4,-53 + 3941: -3,-53 + 3942: -2,-53 + 3943: -1,-53 + 3964: -5,-63 - node: color: '#52B4E9DC' id: MiniTileWhiteLineN decals: - 3998: -7,-60 - 3999: -8,-60 - 4082: 1,-56 - 4083: 2,-56 - 4084: 3,-56 - 4085: 4,-56 - 4086: 5,-56 + 3996: -7,-60 + 3997: -8,-60 + 4080: 1,-56 + 4081: 2,-56 + 4082: 3,-56 + 4083: 4,-56 + 4084: 5,-56 - node: color: '#52B4E9DF' id: MiniTileWhiteLineN decals: - 4012: -15,-53 - 4013: -14,-53 - 4014: -13,-53 + 4010: -15,-53 + 4011: -14,-53 + 4012: -13,-53 - node: color: '#52B4E9E6' id: MiniTileWhiteLineN decals: - 3875: 6,-46 - 3876: 5,-46 - 3877: 4,-46 - 3878: 3,-46 + 3873: 6,-46 + 3874: 5,-46 + 3875: 4,-46 + 3876: 3,-46 - node: color: '#5D9C7FC1' id: MiniTileWhiteLineN decals: - 3444: -41,-42 + 3442: -41,-42 - node: color: '#707070B7' id: MiniTileWhiteLineN decals: - 3274: 25,-70 - 3275: 26,-70 - 3277: 29,-72 - 3278: 30,-72 + 3272: 25,-70 + 3273: 26,-70 + 3275: 29,-72 + 3276: 30,-72 - node: color: '#73C2A496' id: MiniTileWhiteLineN decals: - 2417: -25,-32 - 2418: -24,-32 - 2458: -38,-33 - 2459: -39,-33 - 2460: -40,-33 - 2461: -37,-33 - 2475: -42,-42 - 2476: -40,-42 - 2477: -39,-42 - 2478: -38,-42 - 2497: -37,-54 - 2514: -37,-42 + 2416: -25,-32 + 2417: -24,-32 + 2457: -38,-33 + 2458: -39,-33 + 2459: -40,-33 + 2460: -37,-33 + 2474: -42,-42 + 2475: -40,-42 + 2476: -39,-42 + 2477: -38,-42 + 2496: -37,-54 + 2513: -37,-42 - node: color: '#787878B7' id: MiniTileWhiteLineN decals: - 3303: 30,-78 - 3329: 28,-81 - 3349: 48,-72 - 3350: 49,-72 - 3385: 48,-78 + 3301: 30,-78 + 3327: 28,-81 + 3347: 48,-72 + 3348: 49,-72 + 3383: 48,-78 - node: color: '#88C598FF' id: MiniTileWhiteLineN decals: - 3763: 16,-82 - 3764: 15,-82 - 3765: 14,-82 + 3761: 16,-82 + 3762: 15,-82 + 3763: 14,-82 - node: color: '#9FED5896' id: MiniTileWhiteLineN @@ -5450,20 +5451,20 @@ entities: color: '#9FED58E9' id: MiniTileWhiteLineN decals: - 4026: -14,-54 + 4024: -14,-54 - node: color: '#A4610696' id: MiniTileWhiteLineN decals: - 2179: -29,19 - 2180: -30,19 - 2181: -33,26 - 2182: -32,26 - 2183: -34,26 - 2184: -25,25 - 2185: -24,25 - 2215: -48,22 - 2226: -48,33 + 2178: -29,19 + 2179: -30,19 + 2180: -33,26 + 2181: -32,26 + 2182: -34,26 + 2183: -25,25 + 2184: -24,25 + 2214: -48,22 + 2225: -48,33 - node: color: '#D381C996' id: MiniTileWhiteLineN @@ -5484,179 +5485,179 @@ entities: 835: 44,-46 836: 42,-46 837: 43,-46 - 2885: 72,-38 - 2886: 72,-32 - 2887: 73,-32 - 2989: 68,-44 - 2990: 69,-44 - 2991: 70,-44 - 2992: 71,-44 - 2993: 72,-44 - 2994: 75,-48 - 3250: 61,-32 - 3251: 62,-32 - 3252: 63,-32 + 2883: 72,-38 + 2884: 72,-32 + 2885: 73,-32 + 2987: 68,-44 + 2988: 69,-44 + 2989: 70,-44 + 2990: 71,-44 + 2991: 72,-44 + 2992: 75,-48 + 3248: 61,-32 + 3249: 62,-32 + 3250: 63,-32 - node: color: '#D381C9C0' id: MiniTileWhiteLineN decals: - 2938: 60,-44 - 2939: 64,-44 - 2940: 62,-43 + 2936: 60,-44 + 2937: 64,-44 + 2938: 62,-43 - node: color: '#D4D4D40F' id: MiniTileWhiteLineN decals: - 2950: 54,-35 + 2948: 54,-35 - node: color: '#D4D4D428' id: MiniTileWhiteLineN decals: - 2288: -47,-9 + 2287: -47,-9 - node: color: '#D4D4D4D3' id: MiniTileWhiteLineN decals: - 1997: -10,3 - 1998: -9,3 - 1999: -8,3 - 2000: -6,3 - 2001: -7,3 - 2002: -5,3 - 2003: -4,3 - 2004: 0,3 - 2005: 1,3 - 2006: 2,3 - 2007: 3,3 - 2008: 4,3 - 2009: 5,3 - 2010: 6,3 - 2011: 7,3 - 2012: 8,3 - 2013: 9,3 - 2014: 10,3 - 2015: 11,3 - 2016: 12,3 - 2017: 13,3 - 2025: 13,-1 - 2026: 12,-1 - 2062: 8,-1 - 2063: 7,-1 - 2064: 6,-1 - 2065: 2,-1 - 2066: 0,-1 - 2067: 1,-1 - 2079: 10,-2 - 2080: 4,-2 - 2100: -4,-1 - 2101: -5,-1 - 2102: -7,-1 - 2103: -6,-1 - 2104: -8,-1 - 2105: -9,-1 - 2106: -10,-1 + 1996: -10,3 + 1997: -9,3 + 1998: -8,3 + 1999: -6,3 + 2000: -7,3 + 2001: -5,3 + 2002: -4,3 + 2003: 0,3 + 2004: 1,3 + 2005: 2,3 + 2006: 3,3 + 2007: 4,3 + 2008: 5,3 + 2009: 6,3 + 2010: 7,3 + 2011: 8,3 + 2012: 9,3 + 2013: 10,3 + 2014: 11,3 + 2015: 12,3 + 2016: 13,3 + 2024: 13,-1 + 2025: 12,-1 + 2061: 8,-1 + 2062: 7,-1 + 2063: 6,-1 + 2064: 2,-1 + 2065: 0,-1 + 2066: 1,-1 + 2078: 10,-2 + 2079: 4,-2 + 2099: -4,-1 + 2100: -5,-1 + 2101: -7,-1 + 2102: -6,-1 + 2103: -8,-1 + 2104: -9,-1 + 2105: -10,-1 - node: color: '#DE3A3A96' id: MiniTileWhiteLineN decals: - 2526: 26,8 - 2527: 25,8 - 2528: 24,8 - 2530: 25,13 - 2545: 21,18 - 2546: 22,18 - 2547: 23,18 - 2548: 24,18 - 2549: 25,18 - 2559: 17,17 - 2560: 16,17 - 2567: 12,17 - 2568: 11,17 - 2573: 7,17 - 2574: 5,17 - 2610: 29,22 - 2611: 33,16 - 2612: 34,16 - 2613: 35,16 - 2614: 36,16 - 2615: 37,16 - 2616: 38,16 - 2617: 39,16 - 2618: 40,16 - 2619: 41,16 - 2657: 32,16 - 2658: 31,16 - 2770: 20,-17 - 2965: 21,-46 - 2966: 20,-46 - 3127: -16,27 - 3135: 30,16 - 3136: 29,16 + 2525: 26,8 + 2526: 25,8 + 2527: 24,8 + 2529: 25,13 + 2544: 21,18 + 2545: 22,18 + 2546: 23,18 + 2547: 24,18 + 2548: 25,18 + 2558: 17,17 + 2559: 16,17 + 2566: 12,17 + 2567: 11,17 + 2572: 7,17 + 2573: 5,17 + 2609: 29,22 + 2610: 33,16 + 2611: 34,16 + 2612: 35,16 + 2613: 36,16 + 2614: 37,16 + 2615: 38,16 + 2616: 39,16 + 2617: 40,16 + 2618: 41,16 + 2656: 32,16 + 2657: 31,16 + 2768: 20,-17 + 2963: 21,-46 + 2964: 20,-46 + 3125: -16,27 + 3133: 30,16 + 3134: 29,16 - node: color: '#EFB34196' id: MiniTileWhiteLineN decals: - 2247: -24,-9 - 2248: -25,-9 - 2260: -29,-17 - 2261: -30,-17 - 2262: -31,-17 - 2310: -46,-6 - 2311: -47,-6 - 2312: -48,-6 - 2338: -54,-6 - 2339: -53,-6 - 2340: -52,-6 - 2374: -52,-17 - 2385: -56,-24 - 2386: -57,-24 - 2387: -58,-24 - 2388: -59,-24 - 2389: -60,-24 - 2390: -61,-24 - 2391: -62,-24 - 2407: -72,-24 - 2408: -73,-24 - 2409: -74,-24 - 3061: -29,-10 - 3087: -39,-6 - 3088: -38,-6 - 3089: -37,-6 - 3090: -36,-6 + 2246: -24,-9 + 2247: -25,-9 + 2259: -29,-17 + 2260: -30,-17 + 2261: -31,-17 + 2309: -46,-6 + 2310: -47,-6 + 2311: -48,-6 + 2337: -54,-6 + 2338: -53,-6 + 2339: -52,-6 + 2373: -52,-17 + 2384: -56,-24 + 2385: -57,-24 + 2386: -58,-24 + 2387: -59,-24 + 2388: -60,-24 + 2389: -61,-24 + 2390: -62,-24 + 2406: -72,-24 + 2407: -73,-24 + 2408: -74,-24 + 3059: -29,-10 + 3085: -39,-6 + 3086: -38,-6 + 3087: -37,-6 + 3088: -36,-6 - node: color: '#EFB341B1' id: MiniTileWhiteLineN decals: - 3719: -54,-23 - 3720: -53,-23 - 3721: -52,-23 + 3717: -54,-23 + 3718: -53,-23 + 3719: -52,-23 - node: color: '#F0F0F0FF' id: MiniTileWhiteLineN decals: - 3932: -9,-56 + 3930: -9,-56 - node: color: '#258CC0EA' id: MiniTileWhiteLineS decals: - 3452: -25,-63 - 3453: -24,-63 + 3450: -25,-63 + 3451: -24,-63 - node: color: '#334E6DC8' id: MiniTileWhiteLineS decals: - 2725: 29,-26 - 2726: 28,-26 - 2727: 27,-26 - 2728: 26,-26 - 2729: 25,-26 - 2730: 24,-26 - 2731: 23,-26 - 2732: 22,-26 - 2733: 21,-26 - 2734: 31,-23 - 2735: 19,-23 - 2772: 20,-44 + 2724: 29,-26 + 2725: 28,-26 + 2726: 27,-26 + 2727: 26,-26 + 2728: 25,-26 + 2729: 24,-26 + 2730: 23,-26 + 2731: 22,-26 + 2732: 21,-26 + 2733: 31,-23 + 2734: 19,-23 + 2770: 20,-44 - node: color: '#478C5DDC' id: MiniTileWhiteLineS @@ -5682,9 +5683,9 @@ entities: color: '#52B4E963' id: MiniTileWhiteLineS decals: - 3022: 70,-50 - 3023: 71,-50 - 3024: 72,-50 + 3020: 70,-50 + 3021: 71,-50 + 3022: 72,-50 - node: color: '#52B4E9AE' id: MiniTileWhiteLineS @@ -5699,8 +5700,8 @@ entities: color: '#52B4E9B7' id: MiniTileWhiteLineS decals: - 3421: 45,4 - 3422: 46,4 + 3419: 45,4 + 3420: 46,4 - node: color: '#52B4E9CD' id: MiniTileWhiteLineS @@ -5719,101 +5720,101 @@ entities: color: '#52B4E9D3' id: MiniTileWhiteLineS decals: - 4030: -5,-67 + 4028: -5,-67 - node: color: '#52B4E9D6' id: MiniTileWhiteLineS decals: - 3946: -3,-57 - 3947: -7,-57 - 3948: -8,-57 - 3949: -9,-57 - 3950: -1,-54 - 3967: -5,-57 + 3944: -3,-57 + 3945: -7,-57 + 3946: -8,-57 + 3947: -9,-57 + 3948: -1,-54 + 3965: -5,-57 - node: color: '#52B4E9DC' id: MiniTileWhiteLineS decals: - 3997: -5,-63 - 4000: -7,-61 - 4001: -8,-61 - 4103: 3,-64 - 4104: 2,-64 - 4105: 4,-64 + 3995: -5,-63 + 3998: -7,-61 + 3999: -8,-61 + 4101: 3,-64 + 4102: 2,-64 + 4103: 4,-64 - node: color: '#52B4E9DF' id: MiniTileWhiteLineS decals: - 4004: -13,-57 - 4005: -14,-57 - 4006: -15,-57 + 4002: -13,-57 + 4003: -14,-57 + 4004: -15,-57 - node: color: '#52B4E9E6' id: MiniTileWhiteLineS decals: - 3865: 5,-54 - 3866: 4,-54 - 3867: 3,-54 + 3863: 5,-54 + 3864: 4,-54 + 3865: 3,-54 - node: color: '#73C2A496' id: MiniTileWhiteLineS decals: - 2419: -25,-37 - 2420: -24,-37 - 2439: -33,-36 - 2440: -32,-36 - 2447: -37,-37 - 2448: -38,-37 - 2449: -39,-37 - 2450: -40,-37 - 2495: -36,-58 - 2496: -37,-58 - 2504: -37,-47 - 2505: -38,-47 + 2418: -25,-37 + 2419: -24,-37 + 2438: -33,-36 + 2439: -32,-36 + 2446: -37,-37 + 2447: -38,-37 + 2448: -39,-37 + 2449: -40,-37 + 2494: -36,-58 + 2495: -37,-58 + 2503: -37,-47 + 2504: -38,-47 - node: color: '#787878AB' id: MiniTileWhiteLineS decals: - 3294: 28,-75 - 3295: 26,-75 - 3296: 27,-75 - 3297: 25,-75 - 3298: 23,-74 - 3299: 30,-76 + 3292: 28,-75 + 3293: 26,-75 + 3294: 27,-75 + 3295: 25,-75 + 3296: 23,-74 + 3297: 30,-76 - node: color: '#787878B7' id: MiniTileWhiteLineS decals: - 3327: 30,-93 - 3328: 28,-87 - 3343: 48,-76 - 3384: 48,-93 + 3325: 30,-93 + 3326: 28,-87 + 3341: 48,-76 + 3382: 48,-93 - node: color: '#88C598FF' id: MiniTileWhiteLineS decals: - 3772: 15,-86 - 3773: 16,-86 - 3774: 14,-86 + 3770: 15,-86 + 3771: 16,-86 + 3772: 14,-86 - node: color: '#9FED58E9' id: MiniTileWhiteLineS decals: - 4023: -14,-56 + 4021: -14,-56 - node: color: '#A4610696' id: MiniTileWhiteLineS decals: - 2158: -25,17 - 2159: -24,17 - 2160: -29,17 - 2161: -30,17 - 2162: -31,17 - 2163: -34,17 - 2164: -33,17 - 2165: -32,17 - 2218: -48,20 - 2219: -48,31 + 2157: -25,17 + 2158: -24,17 + 2159: -29,17 + 2160: -30,17 + 2161: -31,17 + 2162: -34,17 + 2163: -33,17 + 2164: -32,17 + 2217: -48,20 + 2218: -48,31 - node: color: '#D381C996' id: MiniTileWhiteLineS @@ -5838,170 +5839,170 @@ entities: 826: 45,-50 827: 44,-50 828: 43,-50 - 2882: 72,-34 - 2883: 72,-39 - 2884: 74,-33 - 2980: 75,-50 - 2981: 68,-45 - 2982: 69,-45 - 2983: 70,-45 - 2984: 71,-45 - 2985: 72,-45 - 3240: 63,-37 - 3241: 62,-37 - 3242: 61,-37 + 2880: 72,-34 + 2881: 72,-39 + 2882: 74,-33 + 2978: 75,-50 + 2979: 68,-45 + 2980: 69,-45 + 2981: 70,-45 + 2982: 71,-45 + 2983: 72,-45 + 3238: 63,-37 + 3239: 62,-37 + 3240: 61,-37 - node: color: '#D381C9AB' id: MiniTileWhiteLineS decals: - 2955: 71,-39 + 2953: 71,-39 - node: color: '#D4D4D40F' id: MiniTileWhiteLineS decals: - 2953: 54,-37 + 2951: 54,-37 - node: color: '#D4D4D428' id: MiniTileWhiteLineS decals: - 2292: -47,-18 + 2291: -47,-18 - node: color: '#D4D4D4D3' id: MiniTileWhiteLineS decals: - 1976: 6,-2 - 1977: 7,-2 - 1978: 8,-2 - 1979: 9,-2 - 1980: 10,-2 - 1981: 11,-2 - 1982: 12,-2 - 1983: 13,-2 - 1984: 5,-2 - 1985: 4,-2 - 1986: 3,-2 - 1987: 2,-2 - 1988: 1,-2 - 1989: 0,-2 - 1990: -4,-2 - 1991: -5,-2 - 1992: -6,-2 - 1993: -7,-2 - 1994: -8,-2 - 1995: -9,-2 - 1996: -10,-2 - 2077: 10,3 - 2078: 4,3 - 2085: 12,2 - 2086: 13,2 - 2087: 8,2 - 2088: 7,2 - 2089: 6,2 - 2090: 2,2 - 2091: 1,2 - 2092: 0,2 - 2093: -4,2 - 2094: -5,2 - 2095: -6,2 - 2096: -7,2 - 2097: -8,2 - 2098: -9,2 - 2099: -10,2 + 1975: 6,-2 + 1976: 7,-2 + 1977: 8,-2 + 1978: 9,-2 + 1979: 10,-2 + 1980: 11,-2 + 1981: 12,-2 + 1982: 13,-2 + 1983: 5,-2 + 1984: 4,-2 + 1985: 3,-2 + 1986: 2,-2 + 1987: 1,-2 + 1988: 0,-2 + 1989: -4,-2 + 1990: -5,-2 + 1991: -6,-2 + 1992: -7,-2 + 1993: -8,-2 + 1994: -9,-2 + 1995: -10,-2 + 2076: 10,3 + 2077: 4,3 + 2084: 12,2 + 2085: 13,2 + 2086: 8,2 + 2087: 7,2 + 2088: 6,2 + 2089: 2,2 + 2090: 1,2 + 2091: 0,2 + 2092: -4,2 + 2093: -5,2 + 2094: -6,2 + 2095: -7,2 + 2096: -8,2 + 2097: -9,2 + 2098: -10,2 - node: color: '#DE3A3A96' id: MiniTileWhiteLineS decals: - 2529: 25,9 - 2551: 25,16 - 2552: 24,16 - 2553: 23,16 - 2554: 21,16 - 2555: 22,16 - 2557: 17,16 - 2558: 16,16 - 2569: 12,16 - 2570: 11,16 - 2577: 6,12 - 2578: 7,12 - 2580: 5,12 - 2630: 41,4 - 2635: 39,14 - 2636: 38,14 - 2637: 37,14 - 2638: 36,14 - 2639: 34,14 - 2640: 35,14 - 2641: 33,14 - 2642: 32,14 - 2643: 31,14 - 2644: 29,14 - 2645: 30,14 - 2963: 21,-48 - 2964: 20,-48 - 3128: -16,23 - 3139: 41,14 - 3140: 40,14 + 2528: 25,9 + 2550: 25,16 + 2551: 24,16 + 2552: 23,16 + 2553: 21,16 + 2554: 22,16 + 2556: 17,16 + 2557: 16,16 + 2568: 12,16 + 2569: 11,16 + 2576: 6,12 + 2577: 7,12 + 2579: 5,12 + 2629: 41,4 + 2634: 39,14 + 2635: 38,14 + 2636: 37,14 + 2637: 36,14 + 2638: 34,14 + 2639: 35,14 + 2640: 33,14 + 2641: 32,14 + 2642: 31,14 + 2643: 29,14 + 2644: 30,14 + 2961: 21,-48 + 2962: 20,-48 + 3126: -16,23 + 3137: 41,14 + 3138: 40,14 - node: color: '#EFB34196' id: MiniTileWhiteLineS decals: - 2243: -29,-15 - 2264: -37,-14 - 2265: -38,-14 - 2266: -39,-14 - 2267: -36,-14 - 2313: -46,-7 - 2314: -48,-7 - 2315: -47,-7 - 2370: -54,-21 - 2371: -53,-21 - 2372: -52,-21 - 2375: -52,-7 - 2376: -53,-7 - 2392: -62,-26 + 2242: -29,-15 + 2263: -37,-14 + 2264: -38,-14 + 2265: -39,-14 + 2266: -36,-14 + 2312: -46,-7 + 2313: -48,-7 + 2314: -47,-7 + 2369: -54,-21 + 2370: -53,-21 + 2371: -52,-21 + 2374: -52,-7 + 2375: -53,-7 + 2391: -62,-26 + 2392: -61,-26 2393: -61,-26 - 2394: -61,-26 - 2395: -60,-26 - 2396: -59,-26 - 2397: -58,-26 - 2398: -57,-26 - 2399: -56,-26 - 2400: -55,-26 - 2410: -72,-27 - 2411: -73,-27 - 2412: -74,-27 - 3064: -29,-18 - 3065: -30,-18 - 3066: -31,-18 - 3068: -25,-18 + 2394: -60,-26 + 2395: -59,-26 + 2396: -58,-26 + 2397: -57,-26 + 2398: -56,-26 + 2399: -55,-26 + 2409: -72,-27 + 2410: -73,-27 + 2411: -74,-27 + 3062: -29,-18 + 3063: -30,-18 + 3064: -31,-18 + 3066: -25,-18 - node: color: '#EFB341B1' id: MiniTileWhiteLineS decals: - 3723: -52,-26 - 3724: -53,-26 - 3725: -54,-26 + 3721: -52,-26 + 3722: -53,-26 + 3723: -54,-26 - node: color: '#F0F0F0FF' id: MiniTileWhiteLineS decals: - 3929: -9,-54 + 3927: -9,-54 - node: color: '#258CC0EA' id: MiniTileWhiteLineW decals: - 3454: -27,-59 - 3455: -27,-60 - 3456: -27,-61 + 3452: -27,-59 + 3453: -27,-60 + 3454: -27,-61 - node: color: '#334E6DC8' id: MiniTileWhiteLineW decals: - 2747: 20,-25 - 2748: 20,-24 - 2749: 18,-22 - 2765: 34,-25 - 2766: 34,-26 + 2746: 20,-25 + 2747: 20,-24 + 2748: 18,-22 + 2764: 34,-25 + 2765: 34,-26 - node: color: '#478C5DDC' id: MiniTileWhiteLineW @@ -6019,14 +6020,14 @@ entities: color: '#52B4E963' id: MiniTileWhiteLineW decals: - 3025: 69,-49 + 3023: 69,-49 - node: color: '#52B4E9B7' id: MiniTileWhiteLineW decals: - 3423: 44,7 - 3424: 44,6 - 3425: 44,5 + 3421: 44,7 + 3422: 44,6 + 3423: 44,5 - node: color: '#52B4E9CD' id: MiniTileWhiteLineW @@ -6042,143 +6043,143 @@ entities: color: '#52B4E9D3' id: MiniTileWhiteLineW decals: - 4027: -16,-56 - 4028: -6,-66 + 4025: -16,-56 + 4026: -6,-66 - node: color: '#52B4E9D6' id: MiniTileWhiteLineW decals: - 3951: -10,-56 - 3952: -10,-55 - 3953: -10,-54 - 3954: -6,-58 - 3955: -6,-59 - 3956: -6,-62 - 3968: -4,-58 - 3969: -4,-59 - 3970: -4,-60 - 3971: -4,-61 - 3972: -4,-62 + 3949: -10,-56 + 3950: -10,-55 + 3951: -10,-54 + 3952: -6,-58 + 3953: -6,-59 + 3954: -6,-62 + 3966: -4,-58 + 3967: -4,-59 + 3968: -4,-60 + 3969: -4,-61 + 3970: -4,-62 - node: color: '#52B4E9DC' id: MiniTileWhiteLineW decals: - 4093: 0,-57 - 4094: 0,-58 - 4095: 0,-59 - 4096: 0,-60 - 4097: 0,-61 - 4098: 0,-62 + 4091: 0,-57 + 4092: 0,-58 + 4093: 0,-59 + 4094: 0,-60 + 4095: 0,-61 + 4096: 0,-62 - node: color: '#52B4E9DF' id: MiniTileWhiteLineW decals: - 4010: -16,-54 - 4011: -16,-55 + 4008: -16,-54 + 4009: -16,-55 - node: color: '#52B4E9E6' id: MiniTileWhiteLineW decals: - 3868: 2,-53 - 3869: 2,-52 - 3870: 2,-51 - 3871: 2,-50 - 3872: 2,-49 - 3873: 2,-48 - 3874: 2,-47 + 3866: 2,-53 + 3867: 2,-52 + 3868: 2,-51 + 3869: 2,-50 + 3870: 2,-49 + 3871: 2,-48 + 3872: 2,-47 - node: color: '#707070B7' id: MiniTileWhiteLineW decals: - 3276: 22,-73 + 3274: 22,-73 - node: color: '#73C2A496' id: MiniTileWhiteLineW decals: - 2429: -26,-33 - 2430: -26,-34 - 2431: -26,-35 - 2432: -26,-36 - 2433: -34,-34 - 2434: -34,-35 - 2462: -41,-34 - 2463: -41,-35 - 2464: -41,-36 - 2472: -33,-39 - 2473: -33,-40 - 2474: -33,-41 - 2480: -36,-41 - 2498: -36,-53 - 2499: -36,-51 - 2500: -36,-50 - 2501: -36,-52 - 2502: -36,-49 - 2503: -36,-48 + 2428: -26,-33 + 2429: -26,-34 + 2430: -26,-35 + 2431: -26,-36 + 2432: -34,-34 + 2433: -34,-35 + 2461: -41,-34 + 2462: -41,-35 + 2463: -41,-36 + 2471: -33,-39 + 2472: -33,-40 + 2473: -33,-41 + 2479: -36,-41 + 2497: -36,-53 + 2498: -36,-51 + 2499: -36,-50 + 2500: -36,-52 + 2501: -36,-49 + 2502: -36,-48 - node: color: '#787878B7' id: MiniTileWhiteLineW decals: - 3304: 29,-79 - 3305: 29,-80 - 3320: 29,-92 - 3321: 29,-91 - 3322: 29,-90 - 3323: 29,-89 - 3324: 29,-88 - 3330: 27,-82 - 3331: 27,-84 - 3332: 27,-85 - 3333: 27,-86 - 3344: 47,-75 - 3345: 47,-74 - 3346: 47,-73 - 3370: 47,-79 - 3371: 47,-80 - 3372: 47,-82 - 3373: 47,-81 - 3374: 47,-83 - 3375: 47,-84 - 3376: 47,-85 - 3377: 47,-86 - 3378: 47,-88 - 3379: 47,-87 - 3380: 47,-89 - 3381: 47,-90 - 3382: 47,-91 - 3383: 47,-92 + 3302: 29,-79 + 3303: 29,-80 + 3318: 29,-92 + 3319: 29,-91 + 3320: 29,-90 + 3321: 29,-89 + 3322: 29,-88 + 3328: 27,-82 + 3329: 27,-84 + 3330: 27,-85 + 3331: 27,-86 + 3342: 47,-75 + 3343: 47,-74 + 3344: 47,-73 + 3368: 47,-79 + 3369: 47,-80 + 3370: 47,-82 + 3371: 47,-81 + 3372: 47,-83 + 3373: 47,-84 + 3374: 47,-85 + 3375: 47,-86 + 3376: 47,-88 + 3377: 47,-87 + 3378: 47,-89 + 3379: 47,-90 + 3380: 47,-91 + 3381: 47,-92 - node: color: '#88C598FF' id: MiniTileWhiteLineW decals: - 3768: 13,-83 - 3769: 13,-84 - 3770: 13,-85 + 3766: 13,-83 + 3767: 13,-84 + 3768: 13,-85 - node: color: '#9FED58E9' id: MiniTileWhiteLineW decals: - 4025: -15,-55 + 4023: -15,-55 - node: color: '#A4610696' id: MiniTileWhiteLineW decals: - 2195: -26,18 - 2196: -26,19 - 2197: -26,20 - 2198: -26,21 - 2199: -26,22 - 2200: -26,23 - 2201: -26,24 - 2202: -35,18 - 2203: -35,19 - 2204: -35,21 - 2205: -35,22 - 2206: -35,20 - 2207: -35,23 - 2208: -35,24 - 2209: -35,25 - 2217: -49,21 - 2221: -49,32 + 2194: -26,18 + 2195: -26,19 + 2196: -26,20 + 2197: -26,21 + 2198: -26,22 + 2199: -26,23 + 2200: -26,24 + 2201: -35,18 + 2202: -35,19 + 2203: -35,21 + 2204: -35,22 + 2205: -35,20 + 2206: -35,23 + 2207: -35,24 + 2208: -35,25 + 2216: -49,21 + 2220: -49,32 - node: color: '#D381C996' id: MiniTileWhiteLineW @@ -6202,203 +6203,203 @@ entities: 823: 48,-56 841: 41,-47 842: 42,-49 - 2875: 70,-34 - 2876: 70,-35 - 2877: 70,-36 - 2878: 70,-37 - 2999: 67,-49 - 3000: 74,-49 - 3010: 76,-47 - 3011: 76,-46 - 3012: 76,-45 - 3246: 60,-33 - 3247: 60,-34 - 3248: 60,-35 - 3249: 60,-36 + 2873: 70,-34 + 2874: 70,-35 + 2875: 70,-36 + 2876: 70,-37 + 2997: 67,-49 + 2998: 74,-49 + 3008: 76,-47 + 3009: 76,-46 + 3010: 76,-45 + 3244: 60,-33 + 3245: 60,-34 + 3246: 60,-35 + 3247: 60,-36 - node: color: '#D381C9AB' id: MiniTileWhiteLineW decals: - 2957: 70,-38 + 2955: 70,-38 - node: color: '#D381C9C0' id: MiniTileWhiteLineW decals: - 2937: 59,-45 + 2935: 59,-45 - node: color: '#D4D4D406' id: MiniTileWhiteLineW decals: - 3756: -41,14 - 3757: -37,14 + 3754: -41,14 + 3755: -37,14 - node: color: '#D4D4D40F' id: MiniTileWhiteLineW decals: - 2952: 53,-36 + 2950: 53,-36 - node: color: '#D4D4D428' id: MiniTileWhiteLineW decals: - 2301: -48,-10 - 2302: -48,-11 - 2303: -48,-12 - 2304: -48,-13 - 2305: -48,-14 - 2306: -48,-15 - 2307: -48,-16 - 2308: -48,-17 + 2300: -48,-10 + 2301: -48,-11 + 2302: -48,-12 + 2303: -48,-13 + 2304: -48,-14 + 2305: -48,-15 + 2306: -48,-16 + 2307: -48,-17 - node: color: '#DE3A3A96' id: MiniTileWhiteLineW decals: - 2534: 24,12 - 2535: 24,11 - 2536: 24,10 - 2556: 20,17 - 2586: 4,16 - 2587: 4,15 - 2588: 4,13 - 2589: 4,14 - 2632: 40,5 - 2633: 40,6 - 2634: 40,7 - 2647: 28,21 - 2648: 28,20 - 2649: 28,19 - 2650: 28,18 - 2651: 28,17 - 2652: 28,15 - 2900: -17,-22 - 2901: -17,-23 - 2967: 19,-47 - 3129: -17,24 - 3130: -17,25 - 3131: -17,26 - 3414: 40,13 - 3415: 40,12 - 3416: 40,11 - 3417: 40,10 - 3418: 40,9 - 3419: 40,8 + 2533: 24,12 + 2534: 24,11 + 2535: 24,10 + 2555: 20,17 + 2585: 4,16 + 2586: 4,15 + 2587: 4,13 + 2588: 4,14 + 2631: 40,5 + 2632: 40,6 + 2633: 40,7 + 2646: 28,21 + 2647: 28,20 + 2648: 28,19 + 2649: 28,18 + 2650: 28,17 + 2651: 28,15 + 2898: -17,-22 + 2899: -17,-23 + 2965: 19,-47 + 3127: -17,24 + 3128: -17,25 + 3129: -17,26 + 3412: 40,13 + 3413: 40,12 + 3414: 40,11 + 3415: 40,10 + 3416: 40,9 + 3417: 40,8 - node: color: '#EFB34196' id: MiniTileWhiteLineW decals: - 2232: -26,-14 - 2233: -26,-13 - 2234: -26,-11 - 2235: -26,-12 - 2236: -26,-10 - 2237: -30,-12 - 2238: -30,-13 - 2239: -30,-14 - 2256: -33,-15 - 2257: -33,-17 - 2258: -33,-16 - 2259: -33,-18 - 2274: -40,-10 - 2275: -40,-11 - 2276: -40,-12 - 2277: -40,-13 - 2285: -43,-11 - 2286: -43,-12 - 2287: -43,-13 - 2328: -33,-23 - 2329: -33,-24 - 2330: -33,-25 - 2331: -33,-26 - 2332: -33,-27 - 2333: -33,-28 - 2334: -33,-29 - 2358: -56,-8 - 2359: -56,-9 - 2360: -56,-10 - 2361: -56,-11 - 2362: -56,-12 - 2363: -56,-14 - 2364: -56,-13 - 2365: -56,-15 - 2366: -56,-16 - 2367: -56,-17 - 2368: -56,-18 - 2369: -55,-20 - 2402: -63,-25 - 2415: -75,-25 - 2416: -75,-26 - 3048: -33,-12 - 3049: -33,-11 - 3062: -30,-11 - 3069: -26,-17 - 3070: -26,-16 - 3071: -26,-15 - 3091: -40,-7 - 3092: -40,-8 - 3093: -40,-9 - 3122: -43,-7 - 3623: -33,-14 - 3624: -33,-13 + 2231: -26,-14 + 2232: -26,-13 + 2233: -26,-11 + 2234: -26,-12 + 2235: -26,-10 + 2236: -30,-12 + 2237: -30,-13 + 2238: -30,-14 + 2255: -33,-15 + 2256: -33,-17 + 2257: -33,-16 + 2258: -33,-18 + 2273: -40,-10 + 2274: -40,-11 + 2275: -40,-12 + 2276: -40,-13 + 2284: -43,-11 + 2285: -43,-12 + 2286: -43,-13 + 2327: -33,-23 + 2328: -33,-24 + 2329: -33,-25 + 2330: -33,-26 + 2331: -33,-27 + 2332: -33,-28 + 2333: -33,-29 + 2357: -56,-8 + 2358: -56,-9 + 2359: -56,-10 + 2360: -56,-11 + 2361: -56,-12 + 2362: -56,-14 + 2363: -56,-13 + 2364: -56,-15 + 2365: -56,-16 + 2366: -56,-17 + 2367: -56,-18 + 2368: -55,-20 + 2401: -63,-25 + 2414: -75,-25 + 2415: -75,-26 + 3046: -33,-12 + 3047: -33,-11 + 3060: -30,-11 + 3067: -26,-17 + 3068: -26,-16 + 3069: -26,-15 + 3089: -40,-7 + 3090: -40,-8 + 3091: -40,-9 + 3120: -43,-7 + 3621: -33,-14 + 3622: -33,-13 - node: color: '#F0F0F0FF' id: MiniTileWhiteLineW decals: - 3930: -8,-55 + 3928: -8,-55 - node: color: '#646C6447' id: MonoOverlay decals: - 3586: -20,-19 - 3587: -20,-23 - 3588: -20,-11 - 3589: -20,-28 - 3590: -16,-27 - 3591: -20,-35 - 3592: -10,-27 - 3593: -5,-33 - 3594: -5,-25 - 3595: 1,-27 - 3596: 8,-27 - 3597: -1,-43 - 3598: -12,-43 - 3599: -19,-43 - 3600: -20,-37 - 3601: 33,-3 - 3602: 43,1 - 3603: 52,-2 - 3604: 32,7 + 3584: -20,-19 + 3585: -20,-23 + 3586: -20,-11 + 3587: -20,-28 + 3588: -16,-27 + 3589: -20,-35 + 3590: -10,-27 + 3591: -5,-33 + 3592: -5,-25 + 3593: 1,-27 + 3594: 8,-27 + 3595: -1,-43 + 3596: -12,-43 + 3597: -19,-43 + 3598: -20,-37 + 3599: 33,-3 + 3600: 43,1 + 3601: 52,-2 + 3602: 32,7 - node: color: '#D4F8D406' id: MonoOverlay decals: - 3758: -5,-11 - 3759: -5,-5 - 3760: -5,-20 - 3761: -20,-13 - 3762: -17,-27 + 3756: -5,-11 + 3757: -5,-5 + 3758: -5,-20 + 3759: -20,-13 + 3760: -17,-27 - node: color: '#646C6447' id: OffsetCheckerAOverlay decals: - 3605: -4,-26 - 3606: -5,-28 + 3603: -4,-26 + 3604: -5,-28 - node: color: '#52B4E9A1' id: OffsetCheckerBOverlay decals: - 4003: -9,-55 + 4001: -9,-55 - node: color: '#8259640C' id: OffsetCheckerBOverlay decals: - 3607: -32,9 - 3608: -33,9 - 3609: -34,9 - 3610: -34,10 - 3611: -31,10 - 3612: -31,9 - 3613: -31,8 - 3614: -30,10 - 3615: -30,9 + 3605: -32,9 + 3606: -33,9 + 3607: -34,9 + 3608: -34,10 + 3609: -31,10 + 3610: -31,9 + 3611: -31,8 + 3612: -30,10 + 3613: -30,9 - node: color: '#FFFFFFFF' id: OriginStationSign1 @@ -6468,52 +6469,52 @@ entities: color: '#3B000098' id: PavementVerticalCheckerAOverlay decals: - 3568: -39,6 - 3569: -39,5 - 3570: -39,4 - 3571: -39,3 - 3572: -38,3 - 3573: -38,4 - 3574: -38,5 - 3575: -38,6 + 3566: -39,6 + 3567: -39,5 + 3568: -39,4 + 3569: -39,3 + 3570: -38,3 + 3571: -38,4 + 3572: -38,5 + 3573: -38,6 - node: color: '#476F6433' id: PavementVerticalCheckerAOverlay decals: - 3616: -42,-13 - 3617: -43,-11 - 3618: -42,-7 - 3619: -43,-8 - 3620: -39,-11 - 3621: -30,-13 - 3622: -29,-15 + 3614: -42,-13 + 3615: -43,-11 + 3616: -42,-7 + 3617: -43,-8 + 3618: -39,-11 + 3619: -30,-13 + 3620: -29,-15 - node: color: '#00000093' id: PavementVerticalCheckerBOverlay decals: - 3576: -39,6 - 3577: -38,6 - 3578: -39,5 - 3579: -38,5 - 3580: -39,4 - 3581: -38,4 - 3582: -39,3 - 3583: -38,3 + 3574: -39,6 + 3575: -38,6 + 3576: -39,5 + 3577: -38,5 + 3578: -39,4 + 3579: -38,4 + 3580: -39,3 + 3581: -38,3 - node: color: '#EFB34160' id: QuarterTileOverlayGreyscale decals: - 2828: -15,-5 + 2826: -15,-5 - node: color: '#F0F0F08F' id: QuarterTileOverlayGreyscale decals: - 4052: -10,-62 + 4050: -10,-62 - node: color: '#EFB34160' id: QuarterTileOverlayGreyscale180 decals: - 2822: -25,6 + 2820: -25,6 - node: color: '#FFFFFF79' id: QuarterTileOverlayGreyscale180 @@ -6523,17 +6524,17 @@ entities: color: '#EFB34153' id: QuarterTileOverlayGreyscale270 decals: - 2847: -15,6 + 2845: -15,6 - node: color: '#F0F0F08F' id: QuarterTileOverlayGreyscale270 decals: - 4051: -10,-59 + 4049: -10,-59 - node: color: '#EFB34150' id: QuarterTileOverlayGreyscale90 decals: - 2853: -25,-5 + 2851: -25,-5 - node: color: '#FFFFFF79' id: QuarterTileOverlayGreyscale90 @@ -6543,8 +6544,8 @@ entities: color: '#FFFFFFFF' id: Rock01 decals: - 3842: 32.28251,-88.02844 - 3844: 45.023026,-87.13585 + 3840: 32.28251,-88.02844 + 3842: 45.023026,-87.13585 - node: color: '#FFFFFFFF' id: Rock02 @@ -6552,9 +6553,9 @@ entities: 460: -10.301918,53.89685 461: -9.380043,53.8031 462: -3.5987926,53.818726 - 3536: -8.789691,17.921444 - 3537: -4.6178155,17.827694 - 3841: 32.90751,-86.01282 + 3534: -8.789691,17.921444 + 3535: -4.6178155,17.827694 + 3839: 32.90751,-86.01282 - node: color: '#FFFFFFFF' id: Rock03 @@ -6564,7 +6565,7 @@ entities: 436: -7.1241894,49.888622 463: -4.3331676,54.14685 464: -8.959863,49.049328 - 3843: 45.491776,-86.3546 + 3841: 45.491776,-86.3546 - node: color: '#FFFFFFFF' id: Rock04 @@ -6574,34 +6575,34 @@ entities: 439: -4.0786057,48.216747 440: -7.6469474,55.2557 441: -6.2719474,53.567944 - 3044: -36,6 - 3045: -32,5 - 3046: -31,3 + 3042: -36,6 + 3043: -32,5 + 3044: -31,3 - node: color: '#FFFFFFFF' id: Rock06 decals: - 3041: -42,3 - 3043: -35,4 - 3047: -33,3 + 3039: -42,3 + 3041: -35,4 + 3045: -33,3 - node: cleanable: True color: '#FFFFFFFF' id: Rock06 decals: - 3805: 53.911736,-9.502742 + 3803: 53.911736,-9.502742 - node: color: '#FFFFFFFF' id: Rock07 decals: - 3042: -40,5 + 3040: -40,5 - node: cleanable: True color: '#FFFFFFFF' id: Rock07 decals: - 3806: 60.067986,-9.424617 - 3807: 66.06798,-9.408992 + 3804: 60.067986,-9.424617 + 3805: 66.06798,-9.408992 - node: color: '#FFFFFFFF' id: SpaceStationSign1 @@ -6643,10 +6644,10 @@ entities: decals: 369: -9,-45 370: -1,-45 - 2927: 77.48695,-34.5492 - 2928: 77.50258,-37.51795 - 3156: -1,-52 - 4036: -9,-52 + 2925: 77.48695,-34.5492 + 2926: 77.50258,-37.51795 + 3154: -1,-52 + 4034: -9,-52 - node: color: '#D381C996' id: ThreeQuarterTileOverlayGreyscale @@ -6682,12 +6683,12 @@ entities: color: '#FFFFFFFF' id: VentSmall decals: - 2973: 62,-44 + 2971: 62,-44 - node: color: '#A46106FF' id: WarnBox decals: - 3146: -13,-13 + 3144: -13,-13 - node: color: '#FFFFFFFF' id: WarnBox @@ -6696,79 +6697,79 @@ entities: 337: -52,20 353: -52,33 354: -52,31 - 3147: -11,-13 - 3149: -41,18 + 3145: -11,-13 + 3147: -41,18 - node: color: '#FFFFFFFF' id: WarnCornerNE decals: - 2892: -40,-59 - 2922: 54,-62 - 2925: 78,-34 - 2926: 78,-37 - 3665: -50,-37 + 2890: -40,-59 + 2920: 54,-62 + 2923: 78,-34 + 2924: 78,-37 + 3663: -50,-37 - node: color: '#FFFFFFFF' id: WarnCornerNW decals: - 2893: -38,-59 - 2921: 56,-61 - 2923: 77,-34 - 2924: 77,-37 + 2891: -38,-59 + 2919: 56,-61 + 2921: 77,-34 + 2922: 77,-37 - node: color: '#FFFFFFFF' id: WarnCornerSE decals: - 2929: 78,-38 - 2930: 78,-35 - 3561: -72,-40 + 2927: 78,-38 + 2928: 78,-35 + 3559: -72,-40 - node: color: '#FFFFFFFF' id: WarnCornerSW decals: - 2931: 77,-35 - 2932: 77,-38 + 2929: 77,-35 + 2930: 77,-38 - node: color: '#FFFFFFFF' id: WarnCornerSmallNE decals: - 2915: 17,36 - 2916: 15,37 - 3660: -78,-43 - 3670: -50,-40 + 2913: 17,36 + 2914: 15,37 + 3658: -78,-43 + 3668: -50,-40 - node: color: '#FFFFFFFF' id: WarnCornerSmallNW decals: - 2917: 15,36 - 2918: 17,37 - 3659: -76,-43 + 2915: 15,36 + 2916: 17,37 + 3657: -76,-43 - node: color: '#FFFFFFFF' id: WarnCornerSmallSE decals: - 2913: 15,39 - 2914: 17,38 - 3658: -78,-41 + 2911: 15,39 + 2912: 17,38 + 3656: -78,-41 - node: color: '#FFFFFFFF' id: WarnCornerSmallSW decals: 306: 47,-58 - 2524: -38,-42 - 2911: 17,39 - 2912: 15,38 - 3661: -76,-41 + 2523: -38,-42 + 2909: 17,39 + 2910: 15,38 + 3659: -76,-41 - node: color: '#FFFFFFFF' id: WarnEndN decals: - 3566: -70,-46 + 3564: -70,-46 - node: color: '#FFFFFFFF' id: WarnEndS decals: - 3567: -70,-47 + 3565: -70,-47 - node: color: '#FFFFFFFF' id: WarnLineE @@ -6776,15 +6777,15 @@ entities: 252: -39,-53 253: -39,-54 254: -39,-55 - 2153: 38,-26 - 2154: 38,-27 - 2905: 15,38 - 2909: 17,37 - 3562: -72,-39 - 3657: -78,-42 - 3668: -50,-38 - 3669: -50,-39 - 3672: -72,-38 + 2152: 38,-26 + 2153: 38,-27 + 2903: 15,38 + 2907: 17,37 + 3560: -72,-39 + 3655: -78,-42 + 3666: -50,-38 + 3667: -50,-39 + 3670: -72,-38 - node: color: '#DE3A3A96' id: WarnLineGreyscaleE @@ -6805,17 +6806,17 @@ entities: 255: -39,-42 256: -40,-42 821: 45,-58 - 2904: 14,38 - 2907: 16,39 - 2908: 18,38 - 3253: 63,-31 - 3254: 62,-31 - 3255: 61,-31 - 3443: -42,-42 - 3445: -41,-42 - 3563: -73,-40 - 3564: -74,-40 - 3656: -77,-41 + 2902: 14,38 + 2905: 16,39 + 2906: 18,38 + 3251: 63,-31 + 3252: 62,-31 + 3253: 61,-31 + 3441: -42,-42 + 3443: -41,-42 + 3561: -73,-40 + 3562: -74,-40 + 3654: -77,-41 - node: color: '#FFFFFFFF' id: WarnLineS @@ -6832,17 +6833,17 @@ entities: 246: -40,-54 247: -40,-55 820: 47,-59 - 2517: -38,-43 - 2518: -38,-44 - 2519: -38,-45 - 2520: -38,-46 - 2521: -38,-47 - 2522: -37,-54 - 2523: -37,-58 - 2525: -42,-42 - 2902: 15,37 - 2906: 17,38 - 3655: -76,-42 + 2516: -38,-43 + 2517: -38,-44 + 2518: -38,-45 + 2519: -38,-46 + 2520: -38,-47 + 2521: -37,-54 + 2522: -37,-58 + 2524: -42,-42 + 2900: 15,37 + 2904: 17,38 + 3653: -76,-42 - node: color: '#FFFFFFFF' id: WarnLineW @@ -6851,358 +6852,358 @@ entities: 213: 53,-62 250: -40,-53 251: -39,-53 - 2515: -36,-41 - 2516: -35,-41 - 2903: 14,36 - 2910: 18,36 - 2920: 16,37 - 3654: -77,-43 - 3666: -49,-40 - 3667: -51,-37 + 2514: -36,-41 + 2515: -35,-41 + 2901: 14,36 + 2908: 18,36 + 2918: 16,37 + 3652: -77,-43 + 3664: -49,-40 + 3665: -51,-37 - node: color: '#A7A5FFFF' id: WoodTrimThinCornerNe decals: - 3681: 29,-35 - 3682: 29,-39 + 3679: 29,-35 + 3680: 29,-39 - node: color: '#AE8C69FF' id: WoodTrimThinCornerNe decals: - 3784: 18,-81 - 3785: 19,-82 + 3782: 18,-81 + 3783: 19,-82 - node: color: '#D4D4D4E3' id: WoodTrimThinCornerNe decals: - 2662: 14,14 - 2688: 18,14 - 2699: 13,-11 - 2700: 12,-4 + 2661: 14,14 + 2687: 18,14 + 2698: 13,-11 + 2699: 12,-4 - node: color: '#FFFFFFFF' id: WoodTrimThinCornerNe decals: - 2144: 34,-54 - 3512: 2,21 + 2143: 34,-54 + 3510: 2,21 - node: color: '#A7A5FFFF' id: WoodTrimThinCornerNw decals: - 3678: 21,-35 + 3676: 21,-35 - node: color: '#AE8C69FF' id: WoodTrimThinCornerNw decals: - 3789: 12,-81 + 3787: 12,-81 - node: color: '#D4D4D4E3' id: WoodTrimThinCornerNw decals: - 2660: 8,10 - 2661: 10,14 - 2689: 16,14 - 2701: 10,-4 + 2659: 8,10 + 2660: 10,14 + 2688: 16,14 + 2700: 10,-4 - node: color: '#FFFFFFFF' id: WoodTrimThinCornerNw decals: - 2145: 28,-54 - 3510: -2,21 + 2144: 28,-54 + 3508: -2,21 - node: color: '#A7A5FFFF' id: WoodTrimThinCornerSe decals: - 3683: 29,-37 - 3684: 29,-40 + 3681: 29,-37 + 3682: 29,-40 - node: color: '#AE8C69FF' id: WoodTrimThinCornerSe decals: - 3786: 18,-87 - 3787: 19,-86 + 3784: 18,-87 + 3785: 19,-86 - node: color: '#D4D4D4E3' id: WoodTrimThinCornerSe decals: - 2659: 14,5 - 2697: 13,-13 + 2658: 14,5 + 2696: 13,-13 - node: color: '#D4D4D4E9' id: WoodTrimThinCornerSe decals: - 3027: 18,9 + 3025: 18,9 - node: color: '#FFFFFFFF' id: WoodTrimThinCornerSe decals: - 2141: 34,-57 - 3511: 2,16 + 2140: 34,-57 + 3509: 2,16 - node: color: '#A7A5FFFF' id: WoodTrimThinCornerSw decals: - 3679: 21,-38 - 3680: 22,-40 + 3677: 21,-38 + 3678: 22,-40 - node: color: '#AE8C69FF' id: WoodTrimThinCornerSw decals: - 3788: 12,-87 + 3786: 12,-87 - node: color: '#D4D4D4E3' id: WoodTrimThinCornerSw decals: - 2663: 8,5 - 2698: 8,-13 + 2662: 8,5 + 2697: 8,-13 - node: color: '#D4D4D4E9' id: WoodTrimThinCornerSw decals: - 3028: 16,9 + 3026: 16,9 - node: color: '#FFFFFFFF' id: WoodTrimThinCornerSw decals: - 2140: 28,-57 - 3508: -1,16 - 3509: -2,17 + 2139: 28,-57 + 3506: -1,16 + 3507: -2,17 - node: color: '#A7A5FFFF' id: WoodTrimThinInnerNe decals: - 3704: 28,-39 + 3702: 28,-39 - node: color: '#AE8C69FF' id: WoodTrimThinInnerNe decals: - 3798: 18,-82 + 3796: 18,-82 - node: color: '#D4D4D4E3' id: WoodTrimThinInnerNe decals: - 2719: 12,-11 + 2718: 12,-11 - node: color: '#D4D4D4E3' id: WoodTrimThinInnerNw decals: - 2686: 10,10 - 2720: 10,-5 + 2685: 10,10 + 2719: 10,-5 - node: color: '#A7A5FFFF' id: WoodTrimThinInnerSe decals: - 3705: 28,-37 + 3703: 28,-37 - node: color: '#AE8C69FF' id: WoodTrimThinInnerSe decals: - 3799: 18,-86 + 3797: 18,-86 - node: color: '#A7A5FFFF' id: WoodTrimThinInnerSw decals: - 3703: 22,-38 + 3701: 22,-38 - node: color: '#D4D4D4E3' id: WoodTrimThinInnerSw decals: - 2687: 10,13 - 2721: 8,-8 + 2686: 10,13 + 2720: 8,-8 - node: color: '#FFFFFFFF' id: WoodTrimThinInnerSw decals: - 3525: -1,17 + 3523: -1,17 - node: color: '#A7A5FFFF' id: WoodTrimThinLineE decals: - 3691: 29,-36 - 3692: 28,-38 + 3689: 29,-36 + 3690: 28,-38 - node: color: '#AE8C69FF' id: WoodTrimThinLineE decals: - 3790: 19,-83 - 3791: 19,-84 - 3792: 19,-85 + 3788: 19,-83 + 3789: 19,-84 + 3790: 19,-85 - node: color: '#D4D4D4E3' id: WoodTrimThinLineE decals: - 2668: 14,6 - 2669: 14,7 - 2670: 14,10 - 2671: 14,11 - 2672: 14,12 - 2673: 14,13 - 2690: 18,11 - 2691: 18,12 - 2692: 18,13 - 2712: 12,-5 - 2713: 12,-6 - 2714: 12,-7 - 2715: 12,-8 - 2716: 12,-9 - 2717: 12,-10 - 2718: 13,-12 + 2667: 14,6 + 2668: 14,7 + 2669: 14,10 + 2670: 14,11 + 2671: 14,12 + 2672: 14,13 + 2689: 18,11 + 2690: 18,12 + 2691: 18,13 + 2711: 12,-5 + 2712: 12,-6 + 2713: 12,-7 + 2714: 12,-8 + 2715: 12,-9 + 2716: 12,-10 + 2717: 13,-12 - node: color: '#D4D4D4E9' id: WoodTrimThinLineE decals: - 3030: 14,8 - 3031: 14,9 + 3028: 14,8 + 3029: 14,9 - node: color: '#FFFFFFFF' id: WoodTrimThinLineE decals: - 2142: 34,-56 - 2143: 34,-55 - 3521: 2,17 - 3522: 2,18 - 3523: 2,19 - 3524: 2,20 + 2141: 34,-56 + 2142: 34,-55 + 3519: 2,17 + 3520: 2,18 + 3521: 2,19 + 3522: 2,20 - node: color: '#A7A5FFFF' id: WoodTrimThinLineN decals: - 3693: 22,-35 - 3694: 23,-35 - 3695: 24,-35 - 3696: 25,-35 - 3697: 26,-35 - 3698: 27,-35 - 3699: 28,-35 + 3691: 22,-35 + 3692: 23,-35 + 3693: 24,-35 + 3694: 25,-35 + 3695: 26,-35 + 3696: 27,-35 + 3697: 28,-35 - node: color: '#AE8C69FF' id: WoodTrimThinLineN decals: - 3800: 13,-81 - 3801: 14,-81 - 3802: 15,-81 - 3803: 16,-81 - 3804: 17,-81 + 3798: 13,-81 + 3799: 14,-81 + 3800: 15,-81 + 3801: 16,-81 + 3802: 17,-81 - node: color: '#D4D4D4E3' id: WoodTrimThinLineN decals: - 2664: 9,10 - 2665: 11,14 - 2666: 12,14 - 2667: 13,14 - 2696: 17,14 - 2709: 7,-5 - 2710: 8,-5 - 2711: 9,-5 - 2722: 11,-4 + 2663: 9,10 + 2664: 11,14 + 2665: 12,14 + 2666: 13,14 + 2695: 17,14 + 2708: 7,-5 + 2709: 8,-5 + 2710: 9,-5 + 2721: 11,-4 - node: color: '#FFFFFFFF' id: WoodTrimThinLineN decals: - 2146: 33,-54 - 2147: 32,-54 - 2148: 31,-54 - 2149: 30,-54 - 2150: 29,-54 - 3513: -1,21 - 3514: 0,21 - 3515: 1,21 + 2145: 33,-54 + 2146: 32,-54 + 2147: 31,-54 + 2148: 30,-54 + 2149: 29,-54 + 3511: -1,21 + 3512: 0,21 + 3513: 1,21 - node: color: '#A7A5FFFF' id: WoodTrimThinLineS decals: - 3685: 23,-40 - 3686: 24,-40 - 3687: 25,-40 - 3688: 26,-40 - 3689: 27,-40 - 3690: 28,-40 + 3683: 23,-40 + 3684: 24,-40 + 3685: 25,-40 + 3686: 26,-40 + 3687: 27,-40 + 3688: 28,-40 - node: color: '#AE8C69FF' id: WoodTrimThinLineS decals: - 3779: 13,-87 - 3780: 14,-87 - 3781: 15,-87 - 3782: 16,-87 - 3783: 17,-87 + 3777: 13,-87 + 3778: 14,-87 + 3779: 15,-87 + 3780: 16,-87 + 3781: 17,-87 - node: color: '#D4D4D4E3' id: WoodTrimThinLineS decals: - 2681: 13,5 - 2682: 12,5 - 2683: 11,5 - 2684: 10,5 - 2685: 9,5 - 2702: 9,-13 - 2703: 10,-13 - 2704: 11,-13 - 2705: 12,-13 + 2680: 13,5 + 2681: 12,5 + 2682: 11,5 + 2683: 10,5 + 2684: 9,5 + 2701: 9,-13 + 2702: 10,-13 + 2703: 11,-13 + 2704: 12,-13 - node: color: '#FFFFFFFF' id: WoodTrimThinLineS decals: - 2136: 32,-57 - 2137: 33,-57 - 2138: 30,-57 - 2139: 29,-57 - 3519: 0,16 - 3520: 1,16 + 2135: 32,-57 + 2136: 33,-57 + 2137: 30,-57 + 2138: 29,-57 + 3517: 0,16 + 3518: 1,16 - node: color: '#A7A5FFFF' id: WoodTrimThinLineW decals: - 3700: 21,-36 - 3701: 21,-37 - 3702: 22,-39 + 3698: 21,-36 + 3699: 21,-37 + 3700: 22,-39 - node: color: '#AE8C69FF' id: WoodTrimThinLineW decals: - 3793: 12,-82 - 3794: 12,-83 - 3795: 12,-84 - 3796: 12,-85 - 3797: 12,-86 + 3791: 12,-82 + 3792: 12,-83 + 3793: 12,-84 + 3794: 12,-85 + 3795: 12,-86 - node: color: '#D4D4D4E3' id: WoodTrimThinLineW decals: - 2674: 10,13 - 2675: 10,12 - 2676: 10,11 - 2677: 8,9 - 2678: 8,8 - 2679: 8,7 - 2680: 8,6 - 2693: 16,13 - 2694: 16,12 - 2695: 16,11 - 2706: 8,-12 - 2707: 8,-11 - 2708: 8,-10 + 2673: 10,13 + 2674: 10,12 + 2675: 10,11 + 2676: 8,9 + 2677: 8,8 + 2678: 8,7 + 2679: 8,6 + 2692: 16,13 + 2693: 16,12 + 2694: 16,11 + 2705: 8,-12 + 2706: 8,-11 + 2707: 8,-10 - node: color: '#D4D4D4E9' id: WoodTrimThinLineW decals: - 3029: 16,10 + 3027: 16,10 - node: color: '#FFFFFFFF' id: WoodTrimThinLineW decals: - 2151: 28,-55 - 2152: 28,-56 - 3516: -2,18 - 3517: -2,19 - 3518: -2,20 + 2150: 28,-55 + 2151: 28,-56 + 3514: -2,18 + 3515: -2,19 + 3516: -2,20 - node: cleanable: True color: '#D03F4A21' id: corgi decals: - 3628: 27,-19 + 3626: 27,-19 - node: color: '#FFFFFFFF' id: grasssnowb2 @@ -7235,7 +7236,7 @@ entities: color: '#EFB341F5' id: shop decals: - 3145: -49,12 + 3143: -49,12 - node: cleanable: True color: '#A4610696' @@ -10538,8 +10539,6 @@ entities: - 15159 - 15158 - 15157 - - type: AtmosDevice - joinedGrid: 2 - uid: 6 components: - type: Transform @@ -10557,8 +10556,6 @@ entities: - 15212 - 15207 - 15449 - - type: AtmosDevice - joinedGrid: 2 - uid: 7 components: - type: Transform @@ -10582,8 +10579,6 @@ entities: - 15181 - 15154 - 15188 - - type: AtmosDevice - joinedGrid: 2 - uid: 8 components: - type: Transform @@ -10610,8 +10605,6 @@ entities: - 20078 - 19844 - 20077 - - type: AtmosDevice - joinedGrid: 2 - uid: 9 components: - type: Transform @@ -10622,8 +10615,6 @@ entities: - 864 - 19934 - 20172 - - type: AtmosDevice - joinedGrid: 2 - uid: 10 components: - type: Transform @@ -10649,8 +10640,6 @@ entities: - 15195 - 15161 - 15351 - - type: AtmosDevice - joinedGrid: 2 - uid: 11 components: - type: Transform @@ -10671,8 +10660,6 @@ entities: - 15216 - 15240 - 15241 - - type: AtmosDevice - joinedGrid: 2 - uid: 12 components: - type: Transform @@ -10684,8 +10671,6 @@ entities: - 20014 - 19816 - 15187 - - type: AtmosDevice - joinedGrid: 2 - uid: 13 components: - type: Transform @@ -10707,8 +10692,6 @@ entities: - 15281 - 15304 - 15305 - - type: AtmosDevice - joinedGrid: 2 - uid: 14 components: - type: Transform @@ -10731,8 +10714,6 @@ entities: - 15173 - 15199 - 15233 - - type: AtmosDevice - joinedGrid: 2 - uid: 15 components: - type: Transform @@ -10750,8 +10731,6 @@ entities: - 15267 - 15364 - 15365 - - type: AtmosDevice - joinedGrid: 2 - uid: 16 components: - type: Transform @@ -10764,8 +10743,6 @@ entities: - 887 - 20096 - 15262 - - type: AtmosDevice - joinedGrid: 2 - uid: 17 components: - type: Transform @@ -10775,15 +10752,11 @@ entities: devices: - 844 - 19869 - - type: AtmosDevice - joinedGrid: 2 - uid: 18 components: - type: Transform pos: 7.5,-31.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 19 components: - type: Transform @@ -10803,8 +10776,6 @@ entities: - 15376 - 15390 - 15389 - - type: AtmosDevice - joinedGrid: 2 - uid: 20 components: - type: Transform @@ -10817,8 +10788,6 @@ entities: - 19930 - 15055 - 15052 - - type: AtmosDevice - joinedGrid: 2 - uid: 21 components: - type: Transform @@ -10844,8 +10813,6 @@ entities: - 15151 - 15143 - 15204 - - type: AtmosDevice - joinedGrid: 2 - uid: 22 components: - type: Transform @@ -10872,8 +10839,6 @@ entities: - 15223 - 15344 - 15007 - - type: AtmosDevice - joinedGrid: 2 - uid: 23 components: - type: Transform @@ -10893,8 +10858,6 @@ entities: - 15140 - 15229 - 15160 - - type: AtmosDevice - joinedGrid: 2 - uid: 24 components: - type: Transform @@ -10917,8 +10880,6 @@ entities: - 15000 - 15013 - 15146 - - type: AtmosDevice - joinedGrid: 2 - uid: 25 components: - type: Transform @@ -10931,8 +10892,6 @@ entities: - 865 - 15299 - 15300 - - type: AtmosDevice - joinedGrid: 2 - uid: 26 components: - type: Transform @@ -10951,8 +10910,6 @@ entities: - 15034 - 15299 - 15300 - - type: AtmosDevice - joinedGrid: 2 - uid: 27 components: - type: Transform @@ -10969,8 +10926,6 @@ entities: - 20061 - 19823 - 870 - - type: AtmosDevice - joinedGrid: 2 - uid: 28 components: - type: Transform @@ -10987,8 +10942,6 @@ entities: - 15422 - 15423 - 15424 - - type: AtmosDevice - joinedGrid: 2 - uid: 29 components: - type: Transform @@ -11003,8 +10956,6 @@ entities: - 843 - 19857 - 20094 - - type: AtmosDevice - joinedGrid: 2 - uid: 30 components: - type: Transform @@ -11028,8 +10979,6 @@ entities: - 15243 - 15244 - 14997 - - type: AtmosDevice - joinedGrid: 2 - uid: 31 components: - type: Transform @@ -11050,8 +10999,6 @@ entities: - 20031 - 871 - 19820 - - type: AtmosDevice - joinedGrid: 2 - uid: 32 components: - type: Transform @@ -11074,8 +11021,6 @@ entities: - 15236 - 15222 - 15164 - - type: AtmosDevice - joinedGrid: 2 - uid: 33 components: - type: Transform @@ -11086,8 +11031,6 @@ entities: - 826 - 20049 - 19818 - - type: AtmosDevice - joinedGrid: 2 - uid: 34 components: - type: Transform @@ -11098,8 +11041,6 @@ entities: - 826 - 20049 - 19818 - - type: AtmosDevice - joinedGrid: 2 - uid: 35 components: - type: Transform @@ -11114,8 +11055,6 @@ entities: - 19815 - 19787 - 20052 - - type: AtmosDevice - joinedGrid: 2 - uid: 36 components: - type: Transform @@ -11136,8 +11075,6 @@ entities: - 15227 - 15155 - 15176 - - type: AtmosDevice - joinedGrid: 2 - uid: 37 components: - type: Transform @@ -11148,8 +11085,6 @@ entities: - 19830 - 816 - 20067 - - type: AtmosDevice - joinedGrid: 2 - uid: 38 components: - type: Transform @@ -11166,8 +11101,6 @@ entities: - 15161 - 15195 - 15150 - - type: AtmosDevice - joinedGrid: 2 - uid: 39 components: - type: Transform @@ -11188,8 +11121,6 @@ entities: - 15399 - 15400 - 15433 - - type: AtmosDevice - joinedGrid: 2 - uid: 40 components: - type: Transform @@ -11208,8 +11139,6 @@ entities: - 874 - 19925 - 20160 - - type: AtmosDevice - joinedGrid: 2 - uid: 41 components: - type: Transform @@ -11225,8 +11154,6 @@ entities: - 15323 - 15324 - 15328 - - type: AtmosDevice - joinedGrid: 2 - uid: 42 components: - type: Transform @@ -11237,8 +11164,6 @@ entities: - 20166 - 19932 - 876 - - type: AtmosDevice - joinedGrid: 2 - uid: 43 components: - type: Transform @@ -11252,8 +11177,6 @@ entities: - 15413 - 15415 - 15189 - - type: AtmosDevice - joinedGrid: 2 - uid: 44 components: - type: Transform @@ -11266,8 +11189,6 @@ entities: - 15413 - 15415 - 15189 - - type: AtmosDevice - joinedGrid: 2 - uid: 45 components: - type: Transform @@ -11278,8 +11199,6 @@ entities: - 19911 - 879 - 20154 - - type: AtmosDevice - joinedGrid: 2 - uid: 46 components: - type: Transform @@ -11299,8 +11218,6 @@ entities: - 15318 - 15319 - 15320 - - type: AtmosDevice - joinedGrid: 2 - uid: 47 components: - type: Transform @@ -11318,8 +11235,6 @@ entities: - 15308 - 15062 - 15282 - - type: AtmosDevice - joinedGrid: 2 - uid: 48 components: - type: Transform @@ -11335,8 +11250,6 @@ entities: - 20132 - 15312 - 15355 - - type: AtmosDevice - joinedGrid: 2 - uid: 49 components: - type: Transform @@ -11351,8 +11264,6 @@ entities: - 15040 - 15302 - 15301 - - type: AtmosDevice - joinedGrid: 2 - uid: 50 components: - type: Transform @@ -11368,8 +11279,6 @@ entities: - 15313 - 15339 - 15036 - - type: AtmosDevice - joinedGrid: 2 - uid: 51 components: - type: Transform @@ -11381,8 +11290,6 @@ entities: - 15089 - 15303 - 15136 - - type: AtmosDevice - joinedGrid: 2 - uid: 52 components: - type: Transform @@ -11393,8 +11300,6 @@ entities: - 886 - 20130 - 19889 - - type: AtmosDevice - joinedGrid: 2 - uid: 53 components: - type: Transform @@ -11415,8 +11320,6 @@ entities: - 15273 - 15362 - 15363 - - type: AtmosDevice - joinedGrid: 2 - uid: 54 components: - type: Transform @@ -11430,8 +11333,6 @@ entities: - 848 - 15272 - 15273 - - type: AtmosDevice - joinedGrid: 2 - uid: 55 components: - type: Transform @@ -11443,8 +11344,6 @@ entities: - 20103 - 19865 - 899 - - type: AtmosDevice - joinedGrid: 2 - uid: 56 components: - type: Transform @@ -11456,8 +11355,6 @@ entities: - 20104 - 19866 - 15267 - - type: AtmosDevice - joinedGrid: 2 - uid: 57 components: - type: Transform @@ -11470,8 +11367,6 @@ entities: - 20150 - 15401 - 15402 - - type: AtmosDevice - joinedGrid: 2 - uid: 58 components: - type: Transform @@ -11482,8 +11377,6 @@ entities: - 20173 - 19935 - 893 - - type: AtmosDevice - joinedGrid: 2 - uid: 59 components: - type: Transform @@ -11506,8 +11399,6 @@ entities: - 15172 - 15400 - 15399 - - type: AtmosDevice - joinedGrid: 2 - uid: 60 components: - type: Transform @@ -11523,8 +11414,6 @@ entities: - 15347 - 15346 - 15250 - - type: AtmosDevice - joinedGrid: 2 - uid: 61 components: - type: Transform @@ -11544,8 +11433,6 @@ entities: - 15202 - 15218 - 15059 - - type: AtmosDevice - joinedGrid: 2 - uid: 62 components: - type: Transform @@ -11559,8 +11446,6 @@ entities: - 15191 - 15234 - 15361 - - type: AtmosDevice - joinedGrid: 2 - uid: 63 components: - type: Transform @@ -11574,8 +11459,6 @@ entities: - 15354 - 15234 - 15191 - - type: AtmosDevice - joinedGrid: 2 - uid: 64 components: - type: Transform @@ -11586,8 +11469,6 @@ entities: - 847 - 20122 - 19883 - - type: AtmosDevice - joinedGrid: 2 - uid: 65 components: - type: Transform @@ -11597,15 +11478,11 @@ entities: devices: - 927 - 15314 - - type: AtmosDevice - joinedGrid: 2 - uid: 66 components: - type: Transform pos: -29.5,-68.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 67 components: - type: Transform @@ -11618,15 +11495,11 @@ entities: - 20224 - 15432 - 15431 - - type: AtmosDevice - joinedGrid: 2 - uid: 68 components: - type: Transform pos: 43.5,49.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 69 components: - type: Transform @@ -11654,8 +11527,6 @@ entities: - 15369 - 15370 - 15060 - - type: AtmosDevice - joinedGrid: 2 - uid: 70 components: - type: Transform @@ -11675,8 +11546,6 @@ entities: - 15383 - 15384 - 15382 - - type: AtmosDevice - joinedGrid: 2 - uid: 71 components: - type: Transform @@ -11696,8 +11565,6 @@ entities: - 15431 - 15388 - 15366 - - type: AtmosDevice - joinedGrid: 2 - uid: 72 components: - type: Transform @@ -11714,8 +11581,6 @@ entities: - 15397 - 15391 - 15392 - - type: AtmosDevice - joinedGrid: 2 - uid: 73 components: - type: Transform @@ -11726,8 +11591,6 @@ entities: - 19963 - 20204 - 903 - - type: AtmosDevice - joinedGrid: 2 - uid: 74 components: - type: Transform @@ -11741,8 +11604,6 @@ entities: - 15354 - 15138 - 15074 - - type: AtmosDevice - joinedGrid: 2 - uid: 75 components: - type: Transform @@ -11756,8 +11617,6 @@ entities: - 19990 - 20233 - 926 - - type: AtmosDevice - joinedGrid: 2 - uid: 76 components: - type: Transform @@ -11770,8 +11629,6 @@ entities: - 19819 - 15231 - 15017 - - type: AtmosDevice - joinedGrid: 2 - uid: 77 components: - type: Transform @@ -11787,8 +11644,6 @@ entities: - 907 - 15026 - 15090 - - type: AtmosDevice - joinedGrid: 2 - uid: 78 components: - type: Transform @@ -11802,8 +11657,6 @@ entities: - 15406 - 906 - 20207 - - type: AtmosDevice - joinedGrid: 2 - uid: 79 components: - type: Transform @@ -11818,8 +11671,6 @@ entities: - 15023 - 15407 - 15408 - - type: AtmosDevice - joinedGrid: 2 - uid: 80 components: - type: Transform @@ -11837,8 +11688,6 @@ entities: - 20015 - 19779 - 827 - - type: AtmosDevice - joinedGrid: 2 - uid: 81 components: - type: Transform @@ -11855,8 +11704,6 @@ entities: - 15306 - 15307 - 15061 - - type: AtmosDevice - joinedGrid: 2 - uid: 82 components: - type: Transform @@ -11879,8 +11726,6 @@ entities: - 15409 - 15410 - 15095 - - type: AtmosDevice - joinedGrid: 2 - uid: 83 components: - type: Transform @@ -11897,8 +11742,6 @@ entities: - 15421 - 15420 - 15419 - - type: AtmosDevice - joinedGrid: 2 - uid: 84 components: - type: Transform @@ -11910,8 +11753,6 @@ entities: - 19982 - 20221 - 915 - - type: AtmosDevice - joinedGrid: 2 - uid: 85 components: - type: Transform @@ -11927,8 +11768,6 @@ entities: - 15419 - 15420 - 15421 - - type: AtmosDevice - joinedGrid: 2 - uid: 86 components: - type: Transform @@ -11943,8 +11782,6 @@ entities: - 15428 - 15429 - 15430 - - type: AtmosDevice - joinedGrid: 2 - uid: 87 components: - type: Transform @@ -11959,8 +11796,6 @@ entities: - 15345 - 19985 - 20226 - - type: AtmosDevice - joinedGrid: 2 - uid: 88 components: - type: Transform @@ -11986,8 +11821,6 @@ entities: - 15014 - 15004 - 14987 - - type: AtmosDevice - joinedGrid: 2 - uid: 89 components: - type: Transform @@ -12001,8 +11834,6 @@ entities: - 918 - 15435 - 15436 - - type: AtmosDevice - joinedGrid: 2 - uid: 90 components: - type: Transform @@ -12017,8 +11848,6 @@ entities: - 15029 - 15054 - 15107 - - type: AtmosDevice - joinedGrid: 2 - uid: 91 components: - type: Transform @@ -12033,8 +11862,6 @@ entities: - 15438 - 15109 - 15113 - - type: AtmosDevice - joinedGrid: 2 - uid: 92 components: - type: Transform @@ -12044,8 +11871,6 @@ entities: - type: DeviceList devices: - 921 - - type: AtmosDevice - joinedGrid: 2 - uid: 93 components: - type: Transform @@ -12056,8 +11881,6 @@ entities: devices: - 922 - 20146 - - type: AtmosDevice - joinedGrid: 2 - uid: 94 components: - type: Transform @@ -12071,8 +11894,6 @@ entities: - 15439 - 15441 - 15442 - - type: AtmosDevice - joinedGrid: 2 - uid: 95 components: - type: Transform @@ -12086,8 +11907,6 @@ entities: - 19769 - 15441 - 15440 - - type: AtmosDevice - joinedGrid: 2 - uid: 96 components: - type: Transform @@ -12100,8 +11919,6 @@ entities: - 20232 - 15443 - 15444 - - type: AtmosDevice - joinedGrid: 2 - uid: 97 components: - type: Transform @@ -12133,8 +11950,6 @@ entities: - 15269 - 15270 - 14998 - - type: AtmosDevice - joinedGrid: 2 - uid: 98 components: - type: Transform @@ -12154,8 +11969,6 @@ entities: - 15131 - 15451 - 15452 - - type: AtmosDevice - joinedGrid: 2 - uid: 99 components: - type: Transform @@ -12172,8 +11985,6 @@ entities: - 15133 - 15134 - 15132 - - type: AtmosDevice - joinedGrid: 2 - uid: 100 components: - type: Transform @@ -12186,8 +11997,6 @@ entities: - 19775 - 15072 - 15118 - - type: AtmosDevice - joinedGrid: 2 - uid: 101 components: - type: Transform @@ -12201,8 +12010,6 @@ entities: - 15450 - 15135 - 931 - - type: AtmosDevice - joinedGrid: 2 - uid: 102 components: - type: Transform @@ -12228,8 +12035,6 @@ entities: - 14990 - 14989 - 14988 - - type: AtmosDevice - joinedGrid: 2 - uid: 103 components: - type: Transform @@ -12244,16 +12049,12 @@ entities: - 15325 - 15450 - 15130 - - type: AtmosDevice - joinedGrid: 2 - uid: 104 components: - type: Transform rot: 1.5707963267948966 rad pos: -16.5,-53.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - proto: AirCanister entities: - uid: 105 @@ -12261,71 +12062,51 @@ entities: - type: Transform pos: -34.5,-57.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 106 components: - type: Transform pos: -29.5,-48.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 107 components: - type: Transform pos: 60.5,29.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 108 components: - type: Transform pos: 45.5,-53.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 109 components: - type: Transform pos: -15.5,-10.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 110 components: - type: Transform pos: 71.5,38.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 111 components: - type: Transform pos: -42.5,37.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 112 components: - type: Transform pos: 51.5,-34.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 113 components: - type: Transform pos: 46.5,-53.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 114 components: - type: Transform pos: 11.5,-59.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - proto: Airlock entities: - uid: 115 @@ -12608,7 +12389,7 @@ entities: pos: 19.5,16.5 parent: 2 - type: Door - secondsUntilStateChange: -25577.016 + secondsUntilStateChange: -25630.516 state: Opening - uid: 156 components: @@ -14425,7 +14206,7 @@ entities: pos: 51.5,-3.5 parent: 2 - type: Door - secondsUntilStateChange: -24390.834 + secondsUntilStateChange: -24444.334 state: Opening - uid: 458 components: @@ -14434,7 +14215,7 @@ entities: pos: 52.5,-3.5 parent: 2 - type: Door - secondsUntilStateChange: -24389.617 + secondsUntilStateChange: -24443.117 state: Opening - uid: 459 components: @@ -22730,22 +22511,16 @@ entities: - type: Transform pos: -49.5,-34.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 1974 components: - type: Transform pos: -49.5,-35.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 1975 components: - type: Transform pos: 10.5,-45.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - proto: Basketball entities: - uid: 1976 @@ -24013,46 +23788,6 @@ entities: - type: Transform pos: -8.120271,14.578207 parent: 2 -- proto: BookDetective - entities: - - uid: 2152 - components: - - type: Transform - pos: 8.262031,-12.4473095 - parent: 2 - - uid: 2153 - components: - - type: Transform - pos: 40.304634,21.43983 - parent: 2 -- proto: BookEscalation - entities: - - uid: 2154 - components: - - type: Transform - pos: 9.419705,-6.507422 - parent: 2 -- proto: BookEscalationSecurity - entities: - - uid: 2155 - components: - - type: Transform - pos: 15.607252,21.663286 - parent: 2 -- proto: BookFishing - entities: - - uid: 2156 - components: - - type: Transform - pos: 40.53901,21.517956 - parent: 2 -- proto: BookGnominomicon - entities: - - uid: 2157 - components: - - type: Transform - pos: 8.605781,-12.4316845 - parent: 2 - proto: BookRandom entities: - uid: 2158 @@ -24075,6 +23810,38 @@ entities: - type: Transform pos: -33.495968,-67.45002 parent: 2 +- proto: BookRandomStory + entities: + - uid: 2152 + components: + - type: Transform + pos: 8.262031,-12.4473095 + parent: 2 + - uid: 2153 + components: + - type: Transform + pos: 40.304634,21.43983 + parent: 2 + - uid: 2154 + components: + - type: Transform + pos: 9.419705,-6.507422 + parent: 2 + - uid: 2155 + components: + - type: Transform + pos: 15.607252,21.663286 + parent: 2 + - uid: 2156 + components: + - type: Transform + pos: 40.53901,21.517956 + parent: 2 + - uid: 2157 + components: + - type: Transform + pos: 8.605781,-12.4316845 + parent: 2 - proto: Bookshelf entities: - uid: 2162 @@ -64288,36 +64055,26 @@ entities: - type: Transform pos: -40.5,-38.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 10166 components: - type: Transform pos: -50.5,-50.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 10167 components: - type: Transform pos: -52.5,-62.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 10168 components: - type: Transform pos: -76.5,-45.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 10169 components: - type: Transform pos: 46.5,-54.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - proto: Carpet entities: - uid: 10170 @@ -76274,23 +76031,6 @@ entities: - type: Transform pos: -9.476166,-48.27978 parent: 2 -- proto: chem_master - entities: - - uid: 12354 - components: - - type: Transform - pos: 2.5,-45.5 - parent: 2 - - uid: 12355 - components: - - type: Transform - pos: 2.5,-47.5 - parent: 2 - - uid: 12356 - components: - - type: Transform - pos: 2.5,-53.5 - parent: 2 - proto: ChemDispenser entities: - uid: 12357 @@ -76315,6 +76055,23 @@ entities: - type: Transform pos: 5.5,-50.5 parent: 2 +- proto: ChemMaster + entities: + - uid: 12354 + components: + - type: Transform + pos: 2.5,-45.5 + parent: 2 + - uid: 12355 + components: + - type: Transform + pos: 2.5,-47.5 + parent: 2 + - uid: 12356 + components: + - type: Transform + pos: 2.5,-53.5 + parent: 2 - proto: ChessBoard entities: - uid: 12361 @@ -79114,14 +78871,6 @@ entities: - type: Transform pos: 31.51696,-61.276703 parent: 2 -- proto: ClothingHeadHatHairflower - entities: - - uid: 12569 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 12.635506,-36.53619 - parent: 2 - proto: ClothingHeadHatHardhatOrange entities: - uid: 12570 @@ -79278,6 +79027,13 @@ entities: - type: Transform pos: -27.578125,55.49253 parent: 2 +- proto: ClothingHeadHelmetBasic + entities: + - uid: 12597 + components: + - type: Transform + pos: -31.458502,-43.474 + parent: 2 - proto: ClothingHeadHelmetCosmonaut entities: - uid: 12594 @@ -79297,13 +79053,6 @@ entities: - type: Transform pos: -71.04211,-26.39878 parent: 2 -- proto: ClothingHeadHelmetScaf - entities: - - uid: 12597 - components: - - type: Transform - pos: -31.458502,-43.474 - parent: 2 - proto: ClothingHeadHelmetTemplar entities: - uid: 12598 @@ -80564,6 +80313,7 @@ entities: - uid: 12798 components: - type: Transform + rot: 1.5707963267948966 rad pos: 60.5,-53.5 parent: 2 - uid: 12799 @@ -80700,6 +80450,14 @@ entities: - type: Transform pos: 74.5,-31.5 parent: 2 +- proto: ComputerRoboticsControl + entities: + - uid: 31807 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 60.5,-54.5 + parent: 2 - proto: ComputerSalvageExpedition entities: - uid: 12821 @@ -82802,15 +82560,11 @@ entities: - type: Transform pos: 3.5,-57.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 13045 components: - type: Transform pos: 3.5,-60.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - proto: CryoxadoneBeakerSmall entities: - uid: 13046 @@ -93759,8 +93513,6 @@ entities: - 15249 - 15247 - 15096 - - type: AtmosDevice - joinedGrid: 2 - uid: 14896 components: - type: Transform @@ -93780,8 +93532,6 @@ entities: - 850 - 15377 - 15376 - - type: AtmosDevice - joinedGrid: 2 - uid: 14897 components: - type: Transform @@ -93798,8 +93548,6 @@ entities: - 15388 - 15366 - 851 - - type: AtmosDevice - joinedGrid: 2 - uid: 14898 components: - type: Transform @@ -93816,8 +93564,6 @@ entities: - 15062 - 15308 - 15309 - - type: AtmosDevice - joinedGrid: 2 - uid: 14899 components: - type: Transform @@ -93839,8 +93585,6 @@ entities: - 15260 - 15329 - 15255 - - type: AtmosDevice - joinedGrid: 2 - uid: 14900 components: - type: Transform @@ -93857,8 +93601,6 @@ entities: - 15235 - 15350 - 15352 - - type: AtmosDevice - joinedGrid: 2 - uid: 14901 components: - type: Transform @@ -93877,8 +93619,6 @@ entities: - 15371 - 15372 - 15320 - - type: AtmosDevice - joinedGrid: 2 - uid: 14902 components: - type: Transform @@ -93894,8 +93634,6 @@ entities: - 15267 - 15364 - 15365 - - type: AtmosDevice - joinedGrid: 2 - uid: 14903 components: - type: Transform @@ -93908,8 +93646,6 @@ entities: - 15061 - 15062 - 909 - - type: AtmosDevice - joinedGrid: 2 - uid: 14904 components: - type: Transform @@ -93926,8 +93662,6 @@ entities: - 15355 - 15312 - 15063 - - type: AtmosDevice - joinedGrid: 2 - uid: 14905 components: - type: Transform @@ -93944,8 +93678,6 @@ entities: - 15013 - 15203 - 833 - - type: AtmosDevice - joinedGrid: 2 - uid: 14906 components: - type: Transform @@ -93960,8 +93692,6 @@ entities: - 15383 - 15382 - 852 - - type: AtmosDevice - joinedGrid: 2 - uid: 14907 components: - type: Transform @@ -93975,8 +93705,6 @@ entities: - 15262 - 15025 - 15024 - - type: AtmosDevice - joinedGrid: 2 - uid: 14908 components: - type: Transform @@ -94001,8 +93729,6 @@ entities: - 15151 - 15016 - 831 - - type: AtmosDevice - joinedGrid: 2 - uid: 14909 components: - type: Transform @@ -94026,8 +93752,6 @@ entities: - 15195 - 15161 - 830 - - type: AtmosDevice - joinedGrid: 2 - uid: 14910 components: - type: Transform @@ -94048,8 +93772,6 @@ entities: - 15340 - 15341 - 15007 - - type: AtmosDevice - joinedGrid: 2 - uid: 14911 components: - type: Transform @@ -94063,8 +93785,6 @@ entities: - 15346 - 15250 - 840 - - type: AtmosDevice - joinedGrid: 2 - uid: 14912 components: - type: Transform @@ -94083,8 +93803,6 @@ entities: - 834 - 15220 - 15216 - - type: AtmosDevice - joinedGrid: 2 - uid: 14913 components: - type: Transform @@ -94100,8 +93818,6 @@ entities: - 15306 - 15307 - 15061 - - type: AtmosDevice - joinedGrid: 2 - uid: 14914 components: - type: Transform @@ -94126,8 +93842,6 @@ entities: - 15242 - 15243 - 15244 - - type: AtmosDevice - joinedGrid: 2 - uid: 14915 components: - type: Transform @@ -94149,8 +93863,6 @@ entities: - 15336 - 15337 - 15338 - - type: AtmosDevice - joinedGrid: 2 - uid: 14916 components: - type: Transform @@ -94167,8 +93879,6 @@ entities: - 15144 - 15289 - 15290 - - type: AtmosDevice - joinedGrid: 2 - uid: 14917 components: - type: Transform @@ -94190,8 +93900,6 @@ entities: - 15242 - 15243 - 15244 - - type: AtmosDevice - joinedGrid: 2 - uid: 14918 components: - type: Transform @@ -94210,8 +93918,6 @@ entities: - 15166 - 15167 - 871 - - type: AtmosDevice - joinedGrid: 2 - uid: 14919 components: - type: Transform @@ -94229,8 +93935,6 @@ entities: - 15140 - 15229 - 15160 - - type: AtmosDevice - joinedGrid: 2 - uid: 14920 components: - type: Transform @@ -94251,8 +93955,6 @@ entities: - 15236 - 15222 - 15164 - - type: AtmosDevice - joinedGrid: 2 - uid: 14921 components: - type: Transform @@ -94272,8 +93974,6 @@ entities: - 15261 - 15230 - 14977 - - type: AtmosDevice - joinedGrid: 2 - uid: 14922 components: - type: Transform @@ -94292,8 +93992,6 @@ entities: - 15227 - 15155 - 15176 - - type: AtmosDevice - joinedGrid: 2 - uid: 14923 components: - type: Transform @@ -94313,8 +94011,6 @@ entities: - 15214 - 15334 - 15187 - - type: AtmosDevice - joinedGrid: 2 - uid: 14924 components: - type: Transform @@ -94330,8 +94026,6 @@ entities: - 15256 - 15353 - 15275 - - type: AtmosDevice - joinedGrid: 2 - uid: 14925 components: - type: Transform @@ -94352,8 +94046,6 @@ entities: - 15258 - 15400 - 15399 - - type: AtmosDevice - joinedGrid: 2 - uid: 14926 components: - type: Transform @@ -94370,8 +94062,6 @@ entities: - 15219 - 15177 - 15449 - - type: AtmosDevice - joinedGrid: 2 - uid: 14927 components: - type: Transform @@ -94389,8 +94079,6 @@ entities: - 15323 - 15324 - 15328 - - type: AtmosDevice - joinedGrid: 2 - uid: 14928 components: - type: Transform @@ -94404,8 +94092,6 @@ entities: - 15323 - 15324 - 15328 - - type: AtmosDevice - joinedGrid: 2 - uid: 14929 components: - type: Transform @@ -94419,8 +94105,6 @@ entities: - 15301 - 15039 - 15040 - - type: AtmosDevice - joinedGrid: 2 - uid: 14930 components: - type: Transform @@ -94434,8 +94118,6 @@ entities: - 15036 - 15301 - 15302 - - type: AtmosDevice - joinedGrid: 2 - uid: 14931 components: - type: Transform @@ -94453,8 +94135,6 @@ entities: - 15030 - 15035 - 15034 - - type: AtmosDevice - joinedGrid: 2 - uid: 14932 components: - type: Transform @@ -94473,8 +94153,6 @@ entities: - 15273 - 15362 - 15363 - - type: AtmosDevice - joinedGrid: 2 - uid: 14933 components: - type: Transform @@ -94492,8 +94170,6 @@ entities: - 15186 - 15171 - 15200 - - type: AtmosDevice - joinedGrid: 2 - uid: 14934 components: - type: Transform @@ -94505,8 +94181,6 @@ entities: - 15354 - 15234 - 15191 - - type: AtmosDevice - joinedGrid: 2 - uid: 14935 components: - type: Transform @@ -94526,8 +94200,6 @@ entities: - 842 - 15400 - 15399 - - type: AtmosDevice - joinedGrid: 2 - uid: 14936 components: - type: Transform @@ -94540,8 +94212,6 @@ entities: - 15354 - 15138 - 15074 - - type: AtmosDevice - joinedGrid: 2 - uid: 14937 components: - type: Transform @@ -94559,8 +94229,6 @@ entities: - 15024 - 15025 - 896 - - type: AtmosDevice - joinedGrid: 2 - uid: 14938 components: - type: Transform @@ -94571,8 +94239,6 @@ entities: - 898 - 15432 - 15431 - - type: AtmosDevice - joinedGrid: 2 - uid: 14939 components: - type: Transform @@ -94598,8 +94264,6 @@ entities: - 15386 - 15387 - 15060 - - type: AtmosDevice - joinedGrid: 2 - uid: 14940 components: - type: Transform @@ -94617,8 +94281,6 @@ entities: - 15383 - 15384 - 15395 - - type: AtmosDevice - joinedGrid: 2 - uid: 14941 components: - type: Transform @@ -94632,8 +94294,6 @@ entities: - 15090 - 15092 - 15091 - - type: AtmosDevice - joinedGrid: 2 - uid: 14942 components: - type: Transform @@ -94647,8 +94307,6 @@ entities: - 15128 - 15023 - 892 - - type: AtmosDevice - joinedGrid: 2 - uid: 14943 components: - type: Transform @@ -94670,8 +94328,6 @@ entities: - 15279 - 15409 - 15410 - - type: AtmosDevice - joinedGrid: 2 - uid: 14944 components: - type: Transform @@ -94688,8 +94344,6 @@ entities: - 15006 - 14999 - 15011 - - type: AtmosDevice - joinedGrid: 2 - uid: 14945 components: - type: Transform @@ -94703,8 +94357,6 @@ entities: - 15093 - 15406 - 15405 - - type: AtmosDevice - joinedGrid: 2 - uid: 14946 components: - type: Transform @@ -94719,8 +94371,6 @@ entities: - 15421 - 15420 - 15419 - - type: AtmosDevice - joinedGrid: 2 - uid: 14947 components: - type: Transform @@ -94731,8 +94381,6 @@ entities: devices: - 15418 - 915 - - type: AtmosDevice - joinedGrid: 2 - uid: 14948 components: - type: Transform @@ -94746,8 +94394,6 @@ entities: - 15419 - 15420 - 15421 - - type: AtmosDevice - joinedGrid: 2 - uid: 14949 components: - type: Transform @@ -94763,8 +94409,6 @@ entities: - 15423 - 15424 - 846 - - type: AtmosDevice - joinedGrid: 2 - uid: 14950 components: - type: Transform @@ -94780,8 +94424,6 @@ entities: - 15430 - 15429 - 15428 - - type: AtmosDevice - joinedGrid: 2 - uid: 14951 components: - type: Transform @@ -94794,8 +94436,6 @@ entities: - 15428 - 15429 - 15430 - - type: AtmosDevice - joinedGrid: 2 - uid: 14952 components: - type: Transform @@ -94808,8 +94448,6 @@ entities: - 15345 - 809 - 15251 - - type: AtmosDevice - joinedGrid: 2 - uid: 14953 components: - type: Transform @@ -94823,8 +94461,6 @@ entities: - 15029 - 15054 - 15107 - - type: AtmosDevice - joinedGrid: 2 - uid: 14954 components: - type: Transform @@ -94840,8 +94476,6 @@ entities: - 15220 - 15108 - 15029 - - type: AtmosDevice - joinedGrid: 2 - uid: 14955 components: - type: Transform @@ -94854,8 +94488,6 @@ entities: - 15438 - 15109 - 15113 - - type: AtmosDevice - joinedGrid: 2 - uid: 14956 components: - type: Transform @@ -94868,8 +94500,6 @@ entities: - 15439 - 15441 - 15442 - - type: AtmosDevice - joinedGrid: 2 - uid: 14957 components: - type: Transform @@ -94881,8 +94511,6 @@ entities: - 923 - 15441 - 15440 - - type: AtmosDevice - joinedGrid: 2 - uid: 14958 components: - type: Transform @@ -94894,8 +94522,6 @@ entities: - 925 - 15443 - 15444 - - type: AtmosDevice - joinedGrid: 2 - uid: 14959 components: - type: Transform @@ -94908,8 +94534,6 @@ entities: - 15446 - 15448 - 926 - - type: AtmosDevice - joinedGrid: 2 - uid: 14960 components: - type: Transform @@ -94924,8 +94548,6 @@ entities: - 15133 - 15134 - 15132 - - type: AtmosDevice - joinedGrid: 2 - uid: 14961 components: - type: Transform @@ -94943,8 +94565,6 @@ entities: - 15131 - 15451 - 15452 - - type: AtmosDevice - joinedGrid: 2 - uid: 14962 components: - type: Transform @@ -94969,8 +94589,6 @@ entities: - 14990 - 14989 - 14988 - - type: AtmosDevice - joinedGrid: 2 - uid: 14963 components: - type: Transform @@ -94983,8 +94601,6 @@ entities: - 15450 - 15135 - 931 - - type: AtmosDevice - joinedGrid: 2 - uid: 14964 components: - type: Transform @@ -94999,8 +94615,6 @@ entities: - 15325 - 15450 - 15130 - - type: AtmosDevice - joinedGrid: 2 - uid: 14965 components: - type: Transform @@ -95012,8 +94626,6 @@ entities: - 15118 - 810 - 15072 - - type: AtmosDevice - joinedGrid: 2 - proto: FireAxeCabinetFilled entities: - uid: 14966 @@ -98452,6 +98064,14 @@ entities: - type: Transform pos: 49.46722,33.501156 parent: 2 +- proto: FoodPoppy + entities: + - uid: 12569 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 12.635506,-36.53619 + parent: 2 - proto: FoodRiceBoiled entities: - uid: 15561 @@ -98636,22 +98256,16 @@ entities: - type: Transform pos: -44.5,-46.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 15588 components: - type: Transform pos: -44.5,-44.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 15589 components: - type: Transform pos: -44.5,-42.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 15590 @@ -98659,29 +98273,21 @@ entities: - type: Transform pos: -44.5,-48.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 15591 components: - type: Transform pos: -44.5,-50.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 15592 components: - type: Transform pos: -44.5,-52.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 15593 components: - type: Transform pos: -44.5,-54.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - proto: GasMinerCarbonDioxide entities: - uid: 15594 @@ -98689,8 +98295,6 @@ entities: - type: Transform pos: -49.5,-50.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - proto: GasMinerNitrogenStationLarge entities: - uid: 15595 @@ -98698,8 +98302,6 @@ entities: - type: Transform pos: -49.5,-54.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - proto: GasMinerOxygenStationLarge entities: - uid: 15596 @@ -98707,8 +98309,6 @@ entities: - type: Transform pos: -49.5,-52.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - proto: GasMinerWaterVapor entities: - uid: 15597 @@ -98716,8 +98316,6 @@ entities: - type: Transform pos: -49.5,-48.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - proto: GasMixerFlipped entities: - uid: 15598 @@ -98728,8 +98326,6 @@ entities: - type: GasMixer inletTwoConcentration: 0 inletOneConcentration: 1 - - type: AtmosDevice - joinedGrid: 2 - uid: 15599 components: - type: Transform @@ -98738,8 +98334,6 @@ entities: - type: GasMixer inletTwoConcentration: 1 inletOneConcentration: 0 - - type: AtmosDevice - joinedGrid: 2 - uid: 15600 components: - type: Transform @@ -98749,8 +98343,6 @@ entities: - type: GasMixer inletTwoConcentration: 0.22000003 inletOneConcentration: 0.78 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#03FCD3FF' - uid: 15601 @@ -98761,8 +98353,6 @@ entities: - type: GasMixer inletTwoConcentration: 0 inletOneConcentration: 1 - - type: AtmosDevice - joinedGrid: 2 - uid: 15602 components: - type: Transform @@ -98771,8 +98361,6 @@ entities: - type: GasMixer inletTwoConcentration: 0 inletOneConcentration: 1 - - type: AtmosDevice - joinedGrid: 2 - uid: 15603 components: - type: Transform @@ -98781,8 +98369,6 @@ entities: - type: GasMixer inletTwoConcentration: 0 inletOneConcentration: 1 - - type: AtmosDevice - joinedGrid: 2 - uid: 15604 components: - type: Transform @@ -98791,8 +98377,6 @@ entities: - type: GasMixer inletTwoConcentration: 0 inletOneConcentration: 1 - - type: AtmosDevice - joinedGrid: 2 - proto: GasOutletInjector entities: - uid: 15605 @@ -98801,63 +98385,47 @@ entities: rot: 1.5707963267948966 rad pos: -48.5,-54.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 15606 components: - type: Transform rot: 1.5707963267948966 rad pos: -48.5,-52.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 15607 components: - type: Transform rot: 1.5707963267948966 rad pos: -48.5,-50.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 15608 components: - type: Transform rot: 1.5707963267948966 rad pos: -48.5,-48.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 15609 components: - type: Transform rot: 1.5707963267948966 rad pos: -48.5,-46.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 15610 components: - type: Transform rot: 1.5707963267948966 rad pos: -48.5,-44.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 15611 components: - type: Transform rot: 1.5707963267948966 rad pos: -48.5,-42.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 15612 components: - type: Transform pos: -42.5,-35.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - proto: GasPassiveVent entities: - uid: 15613 @@ -98865,30 +98433,22 @@ entities: - type: Transform pos: -44.5,-36.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 15614 components: - type: Transform rot: -1.5707963267948966 rad pos: -63.5,-43.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 15615 components: - type: Transform pos: -50.5,-52.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 15616 components: - type: Transform pos: 73.5,-26.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 15617 @@ -98897,8 +98457,6 @@ entities: rot: 3.141592653589793 rad pos: 49.5,-63.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 15618 @@ -98906,67 +98464,49 @@ entities: - type: Transform pos: -50.5,-54.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 15619 components: - type: Transform pos: -50.5,-50.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 15620 components: - type: Transform pos: -50.5,-48.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 15621 components: - type: Transform pos: -50.5,-46.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 15622 components: - type: Transform pos: -50.5,-44.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 15623 components: - type: Transform pos: -50.5,-42.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 15624 components: - type: Transform rot: 3.141592653589793 rad pos: -38.5,-60.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 15625 components: - type: Transform rot: 3.141592653589793 rad pos: 70.5,32.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 15626 components: - type: Transform rot: 3.141592653589793 rad pos: 3.5,64.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 15627 @@ -98975,8 +98515,6 @@ entities: rot: 3.141592653589793 rad pos: 2.5,63.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 15628 @@ -98985,8 +98523,6 @@ entities: rot: 3.141592653589793 rad pos: -5.5,63.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 15629 @@ -98995,8 +98531,6 @@ entities: rot: 3.141592653589793 rad pos: -6.5,64.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 15630 @@ -99005,8 +98539,6 @@ entities: rot: 1.5707963267948966 rad pos: -0.5,69.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 15631 @@ -99015,8 +98547,6 @@ entities: rot: -1.5707963267948966 rad pos: -2.5,69.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 15632 @@ -99025,8 +98555,6 @@ entities: rot: 3.141592653589793 rad pos: 66.5,-40.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 15633 @@ -99034,8 +98562,6 @@ entities: - type: Transform pos: 72.5,-29.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#999000FF' - uid: 15634 @@ -99044,15 +98570,11 @@ entities: rot: 3.141592653589793 rad pos: -55.5,-63.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 15635 components: - type: Transform pos: 71.5,-29.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#9755CCFF' - uid: 15636 @@ -99061,8 +98583,6 @@ entities: rot: 1.5707963267948966 rad pos: 68.5,-38.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#999000FF' - uid: 15637 @@ -99071,16 +98591,12 @@ entities: rot: 3.141592653589793 rad pos: 55.5,-51.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 15638 components: - type: Transform rot: 1.5707963267948966 rad pos: 68.5,-37.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#9755CCFF' - uid: 15639 @@ -99089,16 +98605,12 @@ entities: rot: -1.5707963267948966 rad pos: -44.5,-35.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 15640 components: - type: Transform rot: 1.5707963267948966 rad pos: -76.5,-40.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 15641 @@ -99107,8 +98619,6 @@ entities: rot: 1.5707963267948966 rad pos: -76.5,-42.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 15642 @@ -99117,8 +98627,6 @@ entities: rot: 3.141592653589793 rad pos: 40.5,58.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 15643 @@ -99127,8 +98635,6 @@ entities: rot: 1.5707963267948966 rad pos: 1.5,13.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - proto: GasPipeBend entities: - uid: 15644 @@ -124995,9 +124501,13 @@ entities: - uid: 19035 components: - type: Transform + anchored: False rot: 1.5707963267948966 rad pos: -74.5,-41.5 parent: 2 + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 19036 components: - type: Transform @@ -129953,24 +129463,18 @@ entities: rot: 3.141592653589793 rad pos: 2.5,11.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 19679 components: - type: Transform rot: -1.5707963267948966 rad pos: -66.5,-41.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 19680 components: - type: Transform rot: -1.5707963267948966 rad pos: -66.5,-46.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 19681 @@ -129979,8 +129483,6 @@ entities: rot: -1.5707963267948966 rad pos: -39.5,-49.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#947507FF' - uid: 19682 @@ -129989,8 +129491,6 @@ entities: rot: -1.5707963267948966 rad pos: -39.5,-50.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#947507FF' - uid: 19683 @@ -129999,8 +129499,6 @@ entities: rot: -1.5707963267948966 rad pos: -39.5,-51.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#947507FF' - uid: 19684 @@ -130009,8 +129507,6 @@ entities: rot: 1.5707963267948966 rad pos: -38.5,-49.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#947507FF' - uid: 19685 @@ -130019,8 +129515,6 @@ entities: rot: 1.5707963267948966 rad pos: -38.5,-50.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#947507FF' - uid: 19686 @@ -130029,8 +129523,6 @@ entities: rot: 1.5707963267948966 rad pos: -38.5,-51.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#947507FF' - uid: 19687 @@ -130039,8 +129531,6 @@ entities: rot: -1.5707963267948966 rad pos: -33.5,-43.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 19688 @@ -130049,8 +129539,6 @@ entities: rot: -1.5707963267948966 rad pos: -33.5,-44.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 19689 @@ -130059,8 +129547,6 @@ entities: rot: -1.5707963267948966 rad pos: -33.5,-45.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 19690 @@ -130068,16 +129554,12 @@ entities: - type: Transform pos: 70.5,38.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 19691 components: - type: Transform rot: -1.5707963267948966 rad pos: 72.5,-37.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#9755CCFF' - uid: 19692 @@ -130086,8 +129568,6 @@ entities: rot: -1.5707963267948966 rad pos: 72.5,-38.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#999000FF' - uid: 19693 @@ -130096,8 +129576,6 @@ entities: rot: 3.141592653589793 rad pos: 71.5,-33.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#9755CCFF' - uid: 19694 @@ -130106,8 +129584,6 @@ entities: rot: 3.141592653589793 rad pos: 72.5,-33.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#999000FF' - uid: 19695 @@ -130116,39 +129592,29 @@ entities: rot: 1.5707963267948966 rad pos: -57.5,-58.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 19696 components: - type: Transform pos: -54.5,-59.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 19697 components: - type: Transform rot: 3.141592653589793 rad pos: -48.5,-38.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 19698 components: - type: Transform rot: -1.5707963267948966 rad pos: -66.5,-40.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 19699 components: - type: Transform rot: 1.5707963267948966 rad pos: -72.5,-46.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19700 @@ -130157,24 +129623,18 @@ entities: rot: -1.5707963267948966 rad pos: 11.5,-47.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 19701 components: - type: Transform rot: -1.5707963267948966 rad pos: 6.5,-58.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 19702 components: - type: Transform rot: -1.5707963267948966 rad pos: 6.5,-61.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - proto: GasPressurePump entities: - uid: 19703 @@ -130183,16 +129643,12 @@ entities: rot: 3.141592653589793 rad pos: 10.5,-46.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 19704 components: - type: Transform rot: -1.5707963267948966 rad pos: -67.5,-41.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19705 @@ -130201,15 +129657,11 @@ entities: rot: 1.5707963267948966 rad pos: -73.5,-41.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 19706 components: - type: Transform pos: -70.5,-38.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19707 @@ -130217,8 +129669,6 @@ entities: - type: Transform pos: -68.5,-45.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 19708 @@ -130227,64 +129677,48 @@ entities: rot: 1.5707963267948966 rad pos: -44.5,-53.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 19709 components: - type: Transform rot: 1.5707963267948966 rad pos: -44.5,-55.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 19710 components: - type: Transform rot: 1.5707963267948966 rad pos: -44.5,-51.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 19711 components: - type: Transform rot: 1.5707963267948966 rad pos: -44.5,-49.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 19712 components: - type: Transform rot: 1.5707963267948966 rad pos: -44.5,-47.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 19713 components: - type: Transform rot: 1.5707963267948966 rad pos: -44.5,-45.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 19714 components: - type: Transform rot: 1.5707963267948966 rad pos: -44.5,-43.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 19715 components: - type: Transform rot: 1.5707963267948966 rad pos: -39.5,-55.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19716 @@ -130292,8 +129726,6 @@ entities: - type: Transform pos: -40.5,-54.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#03FCD3FF' - uid: 19717 @@ -130302,15 +129734,11 @@ entities: rot: 3.141592653589793 rad pos: -42.5,-40.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 19718 components: - type: Transform pos: -37.5,-54.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 19719 @@ -130318,8 +129746,6 @@ entities: - type: Transform pos: -38.5,-45.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#947507FF' - uid: 19720 @@ -130328,8 +129754,6 @@ entities: rot: 3.141592653589793 rad pos: 72.5,-31.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#999000FF' - uid: 19721 @@ -130337,8 +129761,6 @@ entities: - type: Transform pos: 71.5,-31.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#9755CCFF' - uid: 19722 @@ -130346,16 +129768,12 @@ entities: - type: Transform pos: -56.5,-59.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 19723 components: - type: Transform rot: -1.5707963267948966 rad pos: 70.5,-38.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#999000FF' - uid: 19724 @@ -130364,16 +129782,12 @@ entities: rot: 3.141592653589793 rad pos: -54.5,-60.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 19725 components: - type: Transform rot: 1.5707963267948966 rad pos: 70.5,-37.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#9755CCFF' - uid: 19726 @@ -130381,16 +129795,12 @@ entities: - type: Transform pos: -48.5,-37.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 19727 components: - type: Transform rot: 3.141592653589793 rad pos: -70.5,-43.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19728 @@ -130399,8 +129809,6 @@ entities: rot: -1.5707963267948966 rad pos: -67.5,-40.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 19729 @@ -130408,8 +129816,6 @@ entities: - type: Transform pos: 2.5,-57.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19730 @@ -130418,8 +129824,6 @@ entities: rot: 3.141592653589793 rad pos: 2.5,-62.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19731 @@ -130427,8 +129831,6 @@ entities: - type: Transform pos: 4.5,-62.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 19732 @@ -130437,8 +129839,6 @@ entities: rot: 3.141592653589793 rad pos: 4.5,-57.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 19733 @@ -130447,16 +129847,12 @@ entities: rot: -1.5707963267948966 rad pos: 5.5,-61.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 19734 components: - type: Transform rot: -1.5707963267948966 rad pos: 5.5,-58.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - proto: GasRecyclerMachineCircuitboard entities: - uid: 19735 @@ -130472,8 +129868,6 @@ entities: rot: 1.5707963267948966 rad pos: 0.5,-61.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 19737 components: - type: Transform @@ -130481,22 +129875,16 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0055CCFF' - - type: AtmosDevice - joinedGrid: 2 - uid: 19738 components: - type: Transform pos: 2.5,14.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 19739 components: - type: Transform pos: -33.5,-52.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 19740 components: - type: Transform @@ -130504,8 +129892,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#990000FF' - - type: AtmosDevice - joinedGrid: 2 - uid: 19741 components: - type: Transform @@ -130513,8 +129899,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#990000FF' - - type: AtmosDevice - joinedGrid: 2 - uid: 19742 components: - type: Transform @@ -130522,8 +129906,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#990000FF' - - type: AtmosDevice - joinedGrid: 2 - uid: 19743 components: - type: Transform @@ -130531,15 +129913,11 @@ entities: parent: 2 - type: AtmosPipeColor color: '#990000FF' - - type: AtmosDevice - joinedGrid: 2 - uid: 19744 components: - type: Transform pos: 53.5,-47.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 19745 components: - type: Transform @@ -130547,8 +129925,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0055CCFF' - - type: AtmosDevice - joinedGrid: 2 - uid: 19746 components: - type: Transform @@ -130556,8 +129932,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0055CCFF' - - type: AtmosDevice - joinedGrid: 2 - uid: 19747 components: - type: Transform @@ -130565,16 +129939,12 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0055CCFF' - - type: AtmosDevice - joinedGrid: 2 - uid: 19748 components: - type: Transform rot: 1.5707963267948966 rad pos: 0.5,-58.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - proto: GasThermoMachineHeater entities: - uid: 19749 @@ -130582,15 +129952,11 @@ entities: - type: Transform pos: -33.5,-54.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 19750 components: - type: Transform pos: -57.5,-59.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - proto: GasValve entities: - uid: 19751 @@ -130600,8 +129966,6 @@ entities: parent: 2 - type: GasValve open: False - - type: AtmosDevice - joinedGrid: 2 - uid: 19752 components: - type: Transform @@ -130610,8 +129974,6 @@ entities: parent: 2 - type: GasValve open: False - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 19753 @@ -130622,8 +129984,6 @@ entities: parent: 2 - type: GasValve open: False - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 19754 @@ -130634,8 +129994,6 @@ entities: parent: 2 - type: GasValve open: False - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19755 @@ -130644,8 +130002,6 @@ entities: rot: -1.5707963267948966 rad pos: -43.5,-41.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 19756 @@ -130655,8 +130011,6 @@ entities: parent: 2 - type: GasValve open: False - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#947507FF' - uid: 19757 @@ -130667,8 +130021,6 @@ entities: parent: 2 - type: GasValve open: False - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 19758 @@ -130678,8 +130030,6 @@ entities: parent: 2 - type: GasValve open: False - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#947507FF' - uid: 19759 @@ -130689,8 +130039,6 @@ entities: parent: 2 - type: GasValve open: False - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 19760 @@ -130701,8 +130049,6 @@ entities: parent: 2 - type: GasValve open: False - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19761 @@ -130713,8 +130059,6 @@ entities: parent: 2 - type: GasValve open: False - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19762 @@ -130724,8 +130068,6 @@ entities: parent: 2 - type: GasValve open: False - - type: AtmosDevice - joinedGrid: 2 - uid: 19763 components: - type: Transform @@ -130734,8 +130076,6 @@ entities: parent: 2 - type: GasValve open: False - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 19764 @@ -130746,8 +130086,6 @@ entities: parent: 2 - type: GasValve open: False - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - proto: GasVentPump @@ -130757,8 +130095,6 @@ entities: - type: Transform pos: -18.5,-57.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19766 @@ -130766,8 +130102,6 @@ entities: - type: Transform pos: -23.5,-58.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19767 @@ -130776,8 +130110,6 @@ entities: rot: -1.5707963267948966 rad pos: 9.5,-47.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19768 @@ -130786,8 +130118,6 @@ entities: rot: 3.141592653589793 rad pos: 18.5,16.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19769 @@ -130796,8 +130126,6 @@ entities: rot: 3.141592653589793 rad pos: -0.5,-4.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19770 @@ -130806,8 +130134,6 @@ entities: rot: 3.141592653589793 rad pos: 1.5,-5.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19771 @@ -130816,8 +130142,6 @@ entities: rot: -1.5707963267948966 rad pos: -70.5,-31.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19772 @@ -130826,8 +130150,6 @@ entities: rot: 3.141592653589793 rad pos: -72.5,-38.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19773 @@ -130836,8 +130158,6 @@ entities: rot: 1.5707963267948966 rad pos: -72.5,-25.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19774 @@ -130846,8 +130166,6 @@ entities: rot: 1.5707963267948966 rad pos: -9.5,2.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19775 @@ -130859,8 +130177,6 @@ entities: - type: DeviceNetwork deviceLists: - 100 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19776 @@ -130868,8 +130184,6 @@ entities: - type: Transform pos: 25.5,-5.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19777 @@ -130878,8 +130192,6 @@ entities: rot: 1.5707963267948966 rad pos: -12.5,-39.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19778 @@ -130888,8 +130200,6 @@ entities: rot: 3.141592653589793 rad pos: -23.5,-86.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19779 @@ -130897,8 +130207,6 @@ entities: - type: Transform pos: 2.5,-26.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19780 @@ -130909,8 +130217,6 @@ entities: - type: DeviceNetwork deviceLists: - 97 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19781 @@ -130919,8 +130225,6 @@ entities: rot: -1.5707963267948966 rad pos: 6.5,16.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19782 @@ -130928,8 +130232,6 @@ entities: - type: Transform pos: 26.5,11.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19783 @@ -130938,8 +130240,6 @@ entities: rot: 1.5707963267948966 rad pos: 5.5,8.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19784 @@ -130948,8 +130248,6 @@ entities: rot: -1.5707963267948966 rad pos: -4.5,-14.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19785 @@ -130958,8 +130256,6 @@ entities: rot: -1.5707963267948966 rad pos: 32.5,10.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19786 @@ -130968,8 +130264,6 @@ entities: rot: 1.5707963267948966 rad pos: 16.5,13.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19787 @@ -130978,8 +130272,6 @@ entities: rot: -1.5707963267948966 rad pos: 45.5,-27.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19788 @@ -130987,8 +130279,6 @@ entities: - type: Transform pos: 10.5,19.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19789 @@ -130997,8 +130287,6 @@ entities: rot: -1.5707963267948966 rad pos: 29.5,10.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19790 @@ -131007,8 +130295,6 @@ entities: rot: 3.141592653589793 rad pos: 18.5,3.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19791 @@ -131017,8 +130303,6 @@ entities: rot: 1.5707963267948966 rad pos: 8.5,1.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19792 @@ -131027,8 +130311,6 @@ entities: rot: 1.5707963267948966 rad pos: 8.5,-9.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19793 @@ -131036,8 +130318,6 @@ entities: - type: Transform pos: 22.5,22.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19794 @@ -131046,8 +130326,6 @@ entities: rot: 1.5707963267948966 rad pos: -0.5,17.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19795 @@ -131056,8 +130334,6 @@ entities: rot: -1.5707963267948966 rad pos: -10.5,-22.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19796 @@ -131066,8 +130342,6 @@ entities: rot: -1.5707963267948966 rad pos: -9.5,-6.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19797 @@ -131079,8 +130353,6 @@ entities: - type: DeviceNetwork deviceLists: - 102 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19798 @@ -131089,8 +130361,6 @@ entities: rot: -1.5707963267948966 rad pos: 35.5,10.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19799 @@ -131099,8 +130369,6 @@ entities: rot: 1.5707963267948966 rad pos: -30.5,-80.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19800 @@ -131109,8 +130377,6 @@ entities: rot: 3.141592653589793 rad pos: 36.5,7.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19801 @@ -131119,8 +130385,6 @@ entities: rot: 3.141592653589793 rad pos: 11.5,9.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19802 @@ -131129,8 +130393,6 @@ entities: rot: 1.5707963267948966 rad pos: 9.5,3.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19803 @@ -131138,8 +130400,6 @@ entities: - type: Transform pos: 20.5,14.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19804 @@ -131147,8 +130407,6 @@ entities: - type: Transform pos: 5.5,19.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19805 @@ -131157,8 +130415,6 @@ entities: rot: 3.141592653589793 rad pos: 0.5,12.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19806 @@ -131166,8 +130422,6 @@ entities: - type: Transform pos: -24.5,-79.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19807 @@ -131176,8 +130430,6 @@ entities: rot: 3.141592653589793 rad pos: -18.5,-78.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19808 @@ -131186,8 +130438,6 @@ entities: rot: -1.5707963267948966 rad pos: 20.5,18.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19809 @@ -131195,8 +130445,6 @@ entities: - type: Transform pos: 17.5,20.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19810 @@ -131205,8 +130453,6 @@ entities: rot: 1.5707963267948966 rad pos: 33.5,5.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19811 @@ -131214,8 +130460,6 @@ entities: - type: Transform pos: -4.5,-40.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19812 @@ -131224,8 +130468,6 @@ entities: rot: 3.141592653589793 rad pos: -4.5,12.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19813 @@ -131233,8 +130475,6 @@ entities: - type: Transform pos: -29.5,-70.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19814 @@ -131243,8 +130483,6 @@ entities: rot: 1.5707963267948966 rad pos: -23.5,29.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19815 @@ -131252,8 +130490,6 @@ entities: - type: Transform pos: 47.5,-23.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19816 @@ -131262,8 +130498,6 @@ entities: rot: 1.5707963267948966 rad pos: 27.5,0.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19817 @@ -131271,8 +130505,6 @@ entities: - type: Transform pos: -7.5,9.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19818 @@ -131281,8 +130513,6 @@ entities: rot: -1.5707963267948966 rad pos: 15.5,-32.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19819 @@ -131291,8 +130521,6 @@ entities: rot: 1.5707963267948966 rad pos: 17.5,-12.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19820 @@ -131300,8 +130528,6 @@ entities: - type: Transform pos: 30.5,-17.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19821 @@ -131309,8 +130535,6 @@ entities: - type: Transform pos: -18.5,33.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19822 @@ -131319,8 +130543,6 @@ entities: rot: 3.141592653589793 rad pos: 36.5,4.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19823 @@ -131329,8 +130551,6 @@ entities: rot: -1.5707963267948966 rad pos: 27.5,-24.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19824 @@ -131339,8 +130559,6 @@ entities: rot: 3.141592653589793 rad pos: -24.5,-89.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19825 @@ -131348,8 +130566,6 @@ entities: - type: Transform pos: 31.5,-14.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19826 @@ -131358,8 +130574,6 @@ entities: rot: -1.5707963267948966 rad pos: 42.5,-26.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19827 @@ -131368,8 +130582,6 @@ entities: rot: -1.5707963267948966 rad pos: -17.5,-72.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19828 @@ -131378,8 +130590,6 @@ entities: rot: 1.5707963267948966 rad pos: -19.5,-67.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19829 @@ -131388,8 +130598,6 @@ entities: rot: -1.5707963267948966 rad pos: -19.5,-88.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19830 @@ -131398,8 +130606,6 @@ entities: rot: -1.5707963267948966 rad pos: 35.5,-23.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19831 @@ -131407,8 +130613,6 @@ entities: - type: Transform pos: -16.5,-37.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19832 @@ -131416,8 +130620,6 @@ entities: - type: Transform pos: -11.5,-32.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19833 @@ -131426,8 +130628,6 @@ entities: rot: -1.5707963267948966 rad pos: -0.5,-10.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19834 @@ -131436,8 +130636,6 @@ entities: rot: 3.141592653589793 rad pos: 21.5,-46.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19835 @@ -131445,8 +130643,6 @@ entities: - type: Transform pos: 30.5,28.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19836 @@ -131454,8 +130650,6 @@ entities: - type: Transform pos: 45.5,15.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19837 @@ -131464,8 +130658,6 @@ entities: rot: -1.5707963267948966 rad pos: 61.5,15.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19838 @@ -131474,8 +130666,6 @@ entities: rot: -1.5707963267948966 rad pos: 52.5,13.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19839 @@ -131484,8 +130674,6 @@ entities: rot: -1.5707963267948966 rad pos: 61.5,18.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19840 @@ -131493,8 +130681,6 @@ entities: - type: Transform pos: 59.5,23.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19841 @@ -131502,8 +130688,6 @@ entities: - type: Transform pos: 56.5,23.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19842 @@ -131511,8 +130695,6 @@ entities: - type: Transform pos: 53.5,23.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19843 @@ -131520,8 +130702,6 @@ entities: - type: Transform pos: 50.5,23.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19844 @@ -131529,8 +130709,6 @@ entities: - type: Transform pos: 47.5,23.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19845 @@ -131539,8 +130717,6 @@ entities: rot: 3.141592653589793 rad pos: 47.5,13.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19846 @@ -131549,8 +130725,6 @@ entities: rot: -1.5707963267948966 rad pos: 60.5,11.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19847 @@ -131558,8 +130732,6 @@ entities: - type: Transform pos: 39.5,20.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19848 @@ -131568,8 +130740,6 @@ entities: rot: 1.5707963267948966 rad pos: 34.5,19.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19849 @@ -131577,8 +130747,6 @@ entities: - type: Transform pos: 45.5,1.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19850 @@ -131587,8 +130755,6 @@ entities: rot: -1.5707963267948966 rad pos: 57.5,0.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19851 @@ -131597,8 +130763,6 @@ entities: rot: 1.5707963267948966 rad pos: 43.5,-1.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19852 @@ -131607,8 +130771,6 @@ entities: rot: 1.5707963267948966 rad pos: 36.5,-3.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19853 @@ -131617,8 +130779,6 @@ entities: rot: 3.141592653589793 rad pos: 41.5,8.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19854 @@ -131627,8 +130787,6 @@ entities: rot: 1.5707963267948966 rad pos: 29.5,19.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19855 @@ -131637,8 +130795,6 @@ entities: rot: 1.5707963267948966 rad pos: 38.5,10.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19856 @@ -131647,8 +130803,6 @@ entities: rot: -1.5707963267948966 rad pos: 46.5,-1.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19857 @@ -131657,8 +130811,6 @@ entities: rot: -1.5707963267948966 rad pos: 57.5,-5.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19858 @@ -131667,8 +130819,6 @@ entities: rot: 3.141592653589793 rad pos: 49.5,-42.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19859 @@ -131677,8 +130827,6 @@ entities: rot: 3.141592653589793 rad pos: 56.5,-42.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19860 @@ -131687,8 +130835,6 @@ entities: rot: 3.141592653589793 rad pos: 44.5,-42.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19861 @@ -131697,8 +130843,6 @@ entities: rot: 3.141592653589793 rad pos: 57.5,-45.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19862 @@ -131707,8 +130851,6 @@ entities: rot: 3.141592653589793 rad pos: 61.5,-47.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19863 @@ -131717,8 +130859,6 @@ entities: rot: 1.5707963267948966 rad pos: 59.5,-32.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19864 @@ -131727,8 +130867,6 @@ entities: rot: -1.5707963267948966 rad pos: 62.5,-24.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19865 @@ -131736,8 +130874,6 @@ entities: - type: Transform pos: 61.5,-2.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19866 @@ -131746,8 +130882,6 @@ entities: rot: 3.141592653589793 rad pos: 60.5,-52.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19867 @@ -131756,8 +130890,6 @@ entities: rot: 1.5707963267948966 rad pos: 44.5,-46.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19868 @@ -131766,8 +130898,6 @@ entities: rot: -1.5707963267948966 rad pos: 51.5,-52.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19869 @@ -131776,8 +130906,6 @@ entities: rot: 1.5707963267948966 rad pos: 25.5,-56.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19870 @@ -131786,8 +130914,6 @@ entities: rot: -1.5707963267948966 rad pos: 30.5,-56.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19871 @@ -131796,8 +130922,6 @@ entities: rot: -1.5707963267948966 rad pos: 30.5,-52.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19872 @@ -131806,8 +130930,6 @@ entities: rot: 1.5707963267948966 rad pos: 28.5,-47.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19873 @@ -131816,8 +130938,6 @@ entities: rot: -1.5707963267948966 rad pos: 33.5,-47.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19874 @@ -131825,8 +130945,6 @@ entities: - type: Transform pos: 29.5,-45.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19875 @@ -131835,8 +130953,6 @@ entities: rot: -1.5707963267948966 rad pos: 53.5,-57.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19876 @@ -131844,8 +130960,6 @@ entities: - type: Transform pos: -13.5,2.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19877 @@ -131854,8 +130968,6 @@ entities: rot: 1.5707963267948966 rad pos: -17.5,1.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19878 @@ -131864,8 +130976,6 @@ entities: rot: 3.141592653589793 rad pos: -24.5,-14.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19879 @@ -131873,8 +130983,6 @@ entities: - type: Transform pos: -28.5,-12.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19880 @@ -131883,8 +130991,6 @@ entities: rot: -1.5707963267948966 rad pos: -19.5,-14.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19881 @@ -131893,8 +130999,6 @@ entities: rot: 3.141592653589793 rad pos: -24.5,-23.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19882 @@ -131902,8 +131006,6 @@ entities: - type: Transform pos: 38.5,-55.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19883 @@ -131912,8 +131014,6 @@ entities: rot: -1.5707963267948966 rad pos: 39.5,-63.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19884 @@ -131922,8 +131022,6 @@ entities: rot: -1.5707963267948966 rad pos: -19.5,-41.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19885 @@ -131932,8 +131030,6 @@ entities: rot: -1.5707963267948966 rad pos: -19.5,-47.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19886 @@ -131942,8 +131038,6 @@ entities: rot: -1.5707963267948966 rad pos: -19.5,-33.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19887 @@ -131952,8 +131046,6 @@ entities: rot: 1.5707963267948966 rad pos: 37.5,-71.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19888 @@ -131961,8 +131053,6 @@ entities: - type: Transform pos: -28.5,-16.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19889 @@ -131971,8 +131061,6 @@ entities: rot: 1.5707963267948966 rad pos: -32.5,-27.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19890 @@ -131981,8 +131069,6 @@ entities: rot: 1.5707963267948966 rad pos: -34.5,-15.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19891 @@ -131991,8 +131077,6 @@ entities: rot: 3.141592653589793 rad pos: -36.5,-12.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19892 @@ -132001,8 +131085,6 @@ entities: rot: 3.141592653589793 rad pos: -41.5,-16.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19893 @@ -132011,8 +131093,6 @@ entities: rot: -1.5707963267948966 rad pos: -25.5,-4.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19894 @@ -132021,8 +131101,6 @@ entities: rot: 3.141592653589793 rad pos: -44.5,-12.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19895 @@ -132031,8 +131109,6 @@ entities: rot: 3.141592653589793 rad pos: -46.5,-6.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19896 @@ -132041,8 +131117,6 @@ entities: rot: 1.5707963267948966 rad pos: -54.5,-13.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19897 @@ -132051,8 +131125,6 @@ entities: rot: -1.5707963267948966 rad pos: -50.5,-24.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19898 @@ -132060,8 +131132,6 @@ entities: - type: Transform pos: -45.5,-22.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19899 @@ -132069,8 +131139,6 @@ entities: - type: Transform pos: -59.5,-24.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19900 @@ -132079,8 +131147,6 @@ entities: rot: 1.5707963267948966 rad pos: -65.5,-27.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19901 @@ -132089,8 +131155,6 @@ entities: rot: 3.141592653589793 rad pos: -64.5,-31.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19902 @@ -132099,8 +131163,6 @@ entities: rot: 1.5707963267948966 rad pos: -32.5,-39.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19903 @@ -132108,8 +131170,6 @@ entities: - type: Transform pos: -30.5,-33.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19904 @@ -132118,8 +131178,6 @@ entities: rot: 1.5707963267948966 rad pos: -38.5,-34.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19905 @@ -132128,8 +131186,6 @@ entities: rot: -1.5707963267948966 rad pos: -23.5,-34.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19906 @@ -132138,8 +131194,6 @@ entities: rot: 1.5707963267948966 rad pos: -41.5,-71.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19907 @@ -132147,8 +131201,6 @@ entities: - type: Transform pos: 21.5,-27.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19908 @@ -132157,8 +131209,6 @@ entities: rot: -1.5707963267948966 rad pos: 29.5,-30.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19909 @@ -132167,8 +131217,6 @@ entities: rot: 1.5707963267948966 rad pos: -19.5,19.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19910 @@ -132177,8 +131225,6 @@ entities: rot: 3.141592653589793 rad pos: -28.5,22.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19911 @@ -132187,8 +131233,6 @@ entities: rot: 3.141592653589793 rad pos: -32.5,22.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19912 @@ -132196,8 +131240,6 @@ entities: - type: Transform pos: -32.5,28.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19913 @@ -132206,8 +131248,6 @@ entities: rot: 1.5707963267948966 rad pos: -41.5,23.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19914 @@ -132216,8 +131256,6 @@ entities: rot: 3.141592653589793 rad pos: -24.5,22.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19915 @@ -132226,8 +131264,6 @@ entities: rot: 1.5707963267948966 rad pos: -50.5,33.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19916 @@ -132236,8 +131272,6 @@ entities: rot: 1.5707963267948966 rad pos: -50.5,31.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19917 @@ -132245,8 +131279,6 @@ entities: - type: Transform pos: -44.5,34.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19918 @@ -132255,8 +131287,6 @@ entities: rot: -1.5707963267948966 rad pos: -37.5,30.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19919 @@ -132265,8 +131295,6 @@ entities: rot: 1.5707963267948966 rad pos: -26.5,12.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19920 @@ -132275,8 +131303,6 @@ entities: rot: 3.141592653589793 rad pos: -28.5,-3.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19921 @@ -132285,8 +131311,6 @@ entities: rot: 3.141592653589793 rad pos: -29.5,9.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19922 @@ -132294,8 +131318,6 @@ entities: - type: Transform pos: -29.5,15.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19923 @@ -132304,8 +131326,6 @@ entities: rot: -1.5707963267948966 rad pos: -36.5,8.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19924 @@ -132314,8 +131334,6 @@ entities: rot: 1.5707963267948966 rad pos: -38.5,5.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19925 @@ -132324,8 +131342,6 @@ entities: rot: 3.141592653589793 rad pos: -41.5,0.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19926 @@ -132334,8 +131350,6 @@ entities: rot: 3.141592653589793 rad pos: -45.5,0.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19927 @@ -132344,8 +131358,6 @@ entities: rot: -1.5707963267948966 rad pos: -44.5,6.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19928 @@ -132354,8 +131366,6 @@ entities: rot: 1.5707963267948966 rad pos: -51.5,7.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19929 @@ -132364,8 +131374,6 @@ entities: rot: -1.5707963267948966 rad pos: -43.5,11.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19930 @@ -132373,8 +131381,6 @@ entities: - type: Transform pos: -45.5,14.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19931 @@ -132382,8 +131388,6 @@ entities: - type: Transform pos: -51.5,14.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19932 @@ -132392,8 +131396,6 @@ entities: rot: 1.5707963267948966 rad pos: -52.5,11.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19933 @@ -132402,27 +131404,25 @@ entities: rot: 3.141592653589793 rad pos: 19.5,-54.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19934 components: - type: Transform + anchored: False rot: 3.141592653589793 rad pos: 19.5,-54.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 19935 components: - type: Transform pos: -54.5,-74.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19936 @@ -132430,8 +131430,6 @@ entities: - type: Transform pos: -8.5,-26.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19937 @@ -132443,8 +131441,6 @@ entities: - type: DeviceNetwork deviceLists: - 97 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19938 @@ -132453,8 +131449,6 @@ entities: rot: 1.5707963267948966 rad pos: -36.5,-44.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19939 @@ -132463,8 +131457,6 @@ entities: rot: 1.5707963267948966 rad pos: -30.5,-78.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19940 @@ -132473,8 +131465,6 @@ entities: rot: 1.5707963267948966 rad pos: 39.5,46.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19941 @@ -132482,8 +131472,6 @@ entities: - type: Transform pos: 54.5,56.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19942 @@ -132492,8 +131480,6 @@ entities: rot: -1.5707963267948966 rad pos: 55.5,43.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19943 @@ -132502,8 +131488,6 @@ entities: rot: -1.5707963267948966 rad pos: -12.5,33.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19944 @@ -132512,8 +131496,6 @@ entities: rot: 1.5707963267948966 rad pos: -20.5,44.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19945 @@ -132521,8 +131503,6 @@ entities: - type: Transform pos: -14.5,45.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19946 @@ -132531,16 +131511,12 @@ entities: rot: 3.141592653589793 rad pos: 70.5,37.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 19947 components: - type: Transform rot: -1.5707963267948966 rad pos: -11.5,38.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19948 @@ -132548,8 +131524,6 @@ entities: - type: Transform pos: -1.5,66.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19949 @@ -132558,8 +131532,6 @@ entities: rot: -1.5707963267948966 rad pos: -0.5,61.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19950 @@ -132568,8 +131540,6 @@ entities: rot: 1.5707963267948966 rad pos: 0.5,46.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19951 @@ -132578,8 +131548,6 @@ entities: rot: 1.5707963267948966 rad pos: -13.5,60.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19952 @@ -132588,8 +131556,6 @@ entities: rot: 3.141592653589793 rad pos: -17.5,60.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19953 @@ -132597,8 +131563,6 @@ entities: - type: Transform pos: -12.5,73.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19954 @@ -132606,8 +131570,6 @@ entities: - type: Transform pos: -22.5,73.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19955 @@ -132616,8 +131578,6 @@ entities: rot: -1.5707963267948966 rad pos: -21.5,60.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19956 @@ -132626,8 +131586,6 @@ entities: rot: 1.5707963267948966 rad pos: 0.5,57.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19957 @@ -132636,8 +131594,6 @@ entities: rot: -1.5707963267948966 rad pos: 30.5,46.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19958 @@ -132646,8 +131602,6 @@ entities: rot: 3.141592653589793 rad pos: 23.5,45.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19959 @@ -132656,8 +131610,6 @@ entities: rot: -1.5707963267948966 rad pos: -7.5,-91.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19960 @@ -132666,8 +131618,6 @@ entities: rot: 1.5707963267948966 rad pos: -21.5,-96.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19961 @@ -132676,8 +131626,6 @@ entities: rot: -1.5707963267948966 rad pos: -7.5,-97.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19962 @@ -132685,8 +131633,6 @@ entities: - type: Transform pos: -8.5,-84.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19963 @@ -132695,8 +131641,6 @@ entities: rot: 1.5707963267948966 rad pos: -34.5,-97.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19964 @@ -132704,8 +131648,6 @@ entities: - type: Transform pos: 65.5,-32.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19965 @@ -132714,8 +131656,6 @@ entities: rot: 3.141592653589793 rad pos: 68.5,-34.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19966 @@ -132724,8 +131664,6 @@ entities: rot: 1.5707963267948966 rad pos: 74.5,-40.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19967 @@ -132734,8 +131672,6 @@ entities: rot: -1.5707963267948966 rad pos: 74.5,-47.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19968 @@ -132744,8 +131680,6 @@ entities: rot: 1.5707963267948966 rad pos: 66.5,-37.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19969 @@ -132753,8 +131687,6 @@ entities: - type: Transform pos: 74.5,-32.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19970 @@ -132762,8 +131694,6 @@ entities: - type: Transform pos: 73.5,-29.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19971 @@ -132772,8 +131702,6 @@ entities: rot: 3.141592653589793 rad pos: 3.5,-30.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19972 @@ -132782,8 +131710,6 @@ entities: rot: -1.5707963267948966 rad pos: -18.5,66.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19973 @@ -132792,8 +131718,6 @@ entities: rot: 3.141592653589793 rad pos: 72.5,-49.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19974 @@ -132802,8 +131726,6 @@ entities: rot: -1.5707963267948966 rad pos: -15.5,24.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19975 @@ -132812,8 +131734,6 @@ entities: rot: 1.5707963267948966 rad pos: -8.5,-14.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19976 @@ -132821,8 +131741,6 @@ entities: - type: Transform pos: -11.5,-18.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19977 @@ -132831,8 +131749,6 @@ entities: rot: 3.141592653589793 rad pos: -30.5,-74.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19978 @@ -132841,8 +131757,6 @@ entities: rot: -1.5707963267948966 rad pos: 62.5,-38.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19979 @@ -132851,8 +131765,6 @@ entities: rot: 3.141592653589793 rad pos: 30.5,-84.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19980 @@ -132861,8 +131773,6 @@ entities: rot: -1.5707963267948966 rad pos: 48.5,-72.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19981 @@ -132870,8 +131780,6 @@ entities: - type: Transform pos: 25.5,-71.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19982 @@ -132880,8 +131788,6 @@ entities: rot: 3.141592653589793 rad pos: 18.5,-83.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19983 @@ -132890,8 +131796,6 @@ entities: rot: -1.5707963267948966 rad pos: 48.5,-86.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19984 @@ -132899,8 +131803,6 @@ entities: - type: Transform pos: 12.5,-22.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19985 @@ -132909,8 +131811,6 @@ entities: rot: -1.5707963267948966 rad pos: 45.5,5.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19986 @@ -132918,8 +131818,6 @@ entities: - type: Transform pos: -45.5,43.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19987 @@ -132927,8 +131825,6 @@ entities: - type: Transform pos: 68.5,-31.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19988 @@ -132937,8 +131833,6 @@ entities: rot: -1.5707963267948966 rad pos: -5.5,16.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19989 @@ -132947,8 +131841,6 @@ entities: rot: -1.5707963267948966 rad pos: -1.5,-21.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19990 @@ -132957,8 +131849,6 @@ entities: rot: 3.141592653589793 rad pos: 22.5,-37.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19991 @@ -132966,8 +131856,6 @@ entities: - type: Transform pos: 42.5,-37.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19992 @@ -132976,8 +131864,6 @@ entities: rot: 1.5707963267948966 rad pos: 38.5,61.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19993 @@ -132989,8 +131875,6 @@ entities: - type: DeviceNetwork deviceLists: - 103 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19994 @@ -132999,8 +131883,6 @@ entities: rot: -1.5707963267948966 rad pos: 11.5,-39.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 19995 @@ -133012,8 +131894,6 @@ entities: - type: DeviceNetwork deviceLists: - 98 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19996 @@ -133022,8 +131902,6 @@ entities: rot: 1.5707963267948966 rad pos: -12.5,-54.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19997 @@ -133032,8 +131910,6 @@ entities: rot: 1.5707963267948966 rad pos: -6.5,-58.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19998 @@ -133042,8 +131918,6 @@ entities: rot: -1.5707963267948966 rad pos: -2.5,-58.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 19999 @@ -133052,8 +131926,6 @@ entities: rot: -1.5707963267948966 rad pos: -2.5,-60.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 20000 @@ -133062,8 +131934,6 @@ entities: rot: 1.5707963267948966 rad pos: -6.5,-62.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 20001 @@ -133072,8 +131942,6 @@ entities: rot: -1.5707963267948966 rad pos: -2.5,-62.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 20002 @@ -133082,8 +131950,6 @@ entities: rot: 1.5707963267948966 rad pos: -4.5,-64.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 20003 @@ -133095,8 +131961,6 @@ entities: - type: DeviceNetwork deviceLists: - 101 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 20004 @@ -133108,8 +131972,6 @@ entities: - type: DeviceNetwork deviceLists: - 99 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - proto: GasVentScrubber @@ -133119,8 +131981,6 @@ entities: - type: Transform pos: -0.5,12.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20006 @@ -133129,8 +131989,6 @@ entities: rot: -1.5707963267948966 rad pos: 9.5,-46.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20007 @@ -133139,8 +131997,6 @@ entities: rot: 1.5707963267948966 rad pos: 1.5,-6.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20008 @@ -133149,8 +132005,6 @@ entities: rot: 1.5707963267948966 rad pos: -74.5,-24.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20009 @@ -133159,8 +132013,6 @@ entities: rot: 3.141592653589793 rad pos: -73.5,-38.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20010 @@ -133169,8 +132021,6 @@ entities: rot: 1.5707963267948966 rad pos: -4.5,11.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20011 @@ -133178,8 +132028,6 @@ entities: - type: Transform pos: 25.5,-51.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20012 @@ -133187,8 +132035,6 @@ entities: - type: Transform pos: 22.5,-4.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20013 @@ -133196,8 +132042,6 @@ entities: - type: Transform pos: 11.5,19.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20014 @@ -133206,8 +132050,6 @@ entities: rot: 1.5707963267948966 rad pos: 27.5,1.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20015 @@ -133216,8 +132058,6 @@ entities: rot: 3.141592653589793 rad pos: 7.5,-26.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20016 @@ -133225,8 +132065,6 @@ entities: - type: Transform pos: -8.5,-0.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20017 @@ -133237,8 +132075,6 @@ entities: - type: DeviceNetwork deviceLists: - 97 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20018 @@ -133246,8 +132082,6 @@ entities: - type: Transform pos: 31.5,16.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20019 @@ -133256,8 +132090,6 @@ entities: rot: 3.141592653589793 rad pos: -5.5,6.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20020 @@ -133266,8 +132098,6 @@ entities: rot: -1.5707963267948966 rad pos: -8.5,-39.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20021 @@ -133276,8 +132106,6 @@ entities: rot: 3.141592653589793 rad pos: 31.5,11.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20022 @@ -133286,8 +132114,6 @@ entities: rot: 1.5707963267948966 rad pos: 37.5,8.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20023 @@ -133296,8 +132122,6 @@ entities: rot: 1.5707963267948966 rad pos: 37.5,5.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20024 @@ -133306,8 +132130,6 @@ entities: rot: 3.141592653589793 rad pos: 28.5,11.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20025 @@ -133315,8 +132137,6 @@ entities: - type: Transform pos: 38.5,12.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20026 @@ -133325,8 +132145,6 @@ entities: rot: 3.141592653589793 rad pos: -4.5,-43.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20027 @@ -133335,8 +132153,6 @@ entities: rot: 1.5707963267948966 rad pos: 16.5,12.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20028 @@ -133345,8 +132161,6 @@ entities: rot: 3.141592653589793 rad pos: 34.5,11.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20029 @@ -133355,8 +132169,6 @@ entities: rot: -1.5707963267948966 rad pos: 26.5,7.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20030 @@ -133365,8 +132177,6 @@ entities: rot: -1.5707963267948966 rad pos: 8.5,19.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20031 @@ -133375,8 +132185,6 @@ entities: rot: -1.5707963267948966 rad pos: 22.5,-18.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20032 @@ -133385,8 +132193,6 @@ entities: rot: -1.5707963267948966 rad pos: 29.5,-29.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20033 @@ -133394,8 +132200,6 @@ entities: - type: Transform pos: 23.5,-27.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20034 @@ -133404,8 +132208,6 @@ entities: rot: -1.5707963267948966 rad pos: -8.5,-5.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20035 @@ -133417,8 +132219,6 @@ entities: - type: DeviceNetwork deviceLists: - 102 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20036 @@ -133430,8 +132230,6 @@ entities: - type: DeviceNetwork deviceLists: - 100 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20037 @@ -133440,8 +132238,6 @@ entities: rot: 3.141592653589793 rad pos: -20.5,-85.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20038 @@ -133450,8 +132246,6 @@ entities: rot: -1.5707963267948966 rad pos: -24.5,-77.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20039 @@ -133460,8 +132254,6 @@ entities: rot: 1.5707963267948966 rad pos: -28.5,-77.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20040 @@ -133469,8 +132261,6 @@ entities: - type: Transform pos: 17.5,0.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20041 @@ -133478,8 +132268,6 @@ entities: - type: Transform pos: 33.5,2.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20042 @@ -133488,8 +132276,6 @@ entities: rot: -1.5707963267948966 rad pos: 9.5,0.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20043 @@ -133498,8 +132284,6 @@ entities: rot: 1.5707963267948966 rad pos: -23.5,-89.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20044 @@ -133508,8 +132292,6 @@ entities: rot: 3.141592653589793 rad pos: -21.5,-90.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20045 @@ -133517,8 +132299,6 @@ entities: - type: Transform pos: 33.5,-14.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20046 @@ -133527,8 +132307,6 @@ entities: rot: 3.141592653589793 rad pos: 10.5,-4.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20047 @@ -133536,8 +132314,6 @@ entities: - type: Transform pos: 25.5,22.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20048 @@ -133545,8 +132321,6 @@ entities: - type: Transform pos: 16.5,22.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20049 @@ -133555,8 +132329,6 @@ entities: rot: -1.5707963267948966 rad pos: 16.5,-23.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20050 @@ -133565,8 +132337,6 @@ entities: rot: 1.5707963267948966 rad pos: -4.5,-11.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20051 @@ -133575,8 +132345,6 @@ entities: rot: -1.5707963267948966 rad pos: 22.5,12.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20052 @@ -133585,8 +132353,6 @@ entities: rot: 3.141592653589793 rad pos: 46.5,-30.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20053 @@ -133595,8 +132361,6 @@ entities: rot: -1.5707963267948966 rad pos: 45.5,-24.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20054 @@ -133604,8 +132368,6 @@ entities: - type: Transform pos: -20.5,33.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20055 @@ -133614,8 +132376,6 @@ entities: rot: -1.5707963267948966 rad pos: 3.5,1.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20056 @@ -133623,8 +132383,6 @@ entities: - type: Transform pos: 21.5,17.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20057 @@ -133633,8 +132391,6 @@ entities: rot: 1.5707963267948966 rad pos: 0.5,6.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20058 @@ -133643,8 +132399,6 @@ entities: rot: 1.5707963267948966 rad pos: -28.5,-79.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20059 @@ -133653,8 +132407,6 @@ entities: rot: 1.5707963267948966 rad pos: 20.5,-14.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20060 @@ -133662,8 +132414,6 @@ entities: - type: Transform pos: 12.5,17.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20061 @@ -133672,8 +132422,6 @@ entities: rot: 1.5707963267948966 rad pos: 23.5,-24.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20062 @@ -133682,8 +132430,6 @@ entities: rot: 1.5707963267948966 rad pos: 6.5,14.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20063 @@ -133692,8 +132438,6 @@ entities: rot: -1.5707963267948966 rad pos: 42.5,-25.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20064 @@ -133702,8 +132446,6 @@ entities: rot: -1.5707963267948966 rad pos: -19.5,-75.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20065 @@ -133712,8 +132454,6 @@ entities: rot: -1.5707963267948966 rad pos: -19.5,-70.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20066 @@ -133722,8 +132462,6 @@ entities: rot: -1.5707963267948966 rad pos: -19.5,-66.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20067 @@ -133732,8 +132470,6 @@ entities: rot: 1.5707963267948966 rad pos: 35.5,-31.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20068 @@ -133742,8 +132478,6 @@ entities: rot: -1.5707963267948966 rad pos: 9.5,10.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20069 @@ -133752,8 +132486,6 @@ entities: rot: 1.5707963267948966 rad pos: -14.5,-37.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20070 @@ -133761,8 +132493,6 @@ entities: - type: Transform pos: -9.5,-32.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20071 @@ -133771,8 +132501,6 @@ entities: rot: 1.5707963267948966 rad pos: 0.5,19.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20072 @@ -133781,8 +132509,6 @@ entities: rot: 3.141592653589793 rad pos: 20.5,-47.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20073 @@ -133790,8 +132516,6 @@ entities: - type: Transform pos: 28.5,28.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20074 @@ -133800,8 +132524,6 @@ entities: rot: 3.141592653589793 rad pos: 44.5,14.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20075 @@ -133809,8 +132531,6 @@ entities: - type: Transform pos: 47.5,16.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20076 @@ -133819,8 +132539,6 @@ entities: rot: -1.5707963267948966 rad pos: 52.5,12.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20077 @@ -133828,8 +132546,6 @@ entities: - type: Transform pos: 46.5,23.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20078 @@ -133837,8 +132553,6 @@ entities: - type: Transform pos: 49.5,23.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20079 @@ -133846,8 +132560,6 @@ entities: - type: Transform pos: 52.5,23.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20080 @@ -133855,8 +132567,6 @@ entities: - type: Transform pos: 55.5,23.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20081 @@ -133864,8 +132574,6 @@ entities: - type: Transform pos: 58.5,23.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20082 @@ -133874,8 +132582,6 @@ entities: rot: -1.5707963267948966 rad pos: 61.5,19.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20083 @@ -133884,8 +132590,6 @@ entities: rot: -1.5707963267948966 rad pos: 61.5,16.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20084 @@ -133894,8 +132598,6 @@ entities: rot: 1.5707963267948966 rad pos: 57.5,12.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20085 @@ -133904,8 +132606,6 @@ entities: rot: 3.141592653589793 rad pos: 40.5,19.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20086 @@ -133914,8 +132614,6 @@ entities: rot: 1.5707963267948966 rad pos: 34.5,20.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20087 @@ -133924,8 +132622,6 @@ entities: rot: -1.5707963267948966 rad pos: 56.5,1.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20088 @@ -133934,8 +132630,6 @@ entities: rot: 1.5707963267948966 rad pos: 41.5,-1.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20089 @@ -133944,8 +132638,6 @@ entities: rot: 1.5707963267948966 rad pos: 36.5,-2.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20090 @@ -133954,8 +132646,6 @@ entities: rot: -1.5707963267948966 rad pos: 29.5,22.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20091 @@ -133964,8 +132654,6 @@ entities: rot: 3.141592653589793 rad pos: 38.5,0.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20092 @@ -133974,8 +132662,6 @@ entities: rot: -1.5707963267948966 rad pos: 46.5,-2.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20093 @@ -133984,8 +132670,6 @@ entities: rot: 1.5707963267948966 rad pos: 41.5,9.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20094 @@ -133994,8 +132678,6 @@ entities: rot: -1.5707963267948966 rad pos: 57.5,-12.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20095 @@ -134004,8 +132686,6 @@ entities: rot: 3.141592653589793 rad pos: 73.5,-28.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20096 @@ -134013,8 +132693,6 @@ entities: - type: Transform pos: 43.5,-37.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20097 @@ -134023,8 +132701,6 @@ entities: rot: -1.5707963267948966 rad pos: 50.5,-43.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20098 @@ -134032,8 +132708,6 @@ entities: - type: Transform pos: 55.5,-42.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20099 @@ -134041,8 +132715,6 @@ entities: - type: Transform pos: 45.5,-42.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20100 @@ -134050,8 +132722,6 @@ entities: - type: Transform pos: 56.5,-44.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20101 @@ -134060,8 +132730,6 @@ entities: rot: 3.141592653589793 rad pos: 63.5,-47.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20102 @@ -134070,8 +132738,6 @@ entities: rot: 1.5707963267948966 rad pos: 62.5,-26.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20103 @@ -134079,8 +132745,6 @@ entities: - type: Transform pos: 63.5,-2.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20104 @@ -134089,8 +132753,6 @@ entities: rot: 3.141592653589793 rad pos: 64.5,-52.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20105 @@ -134099,8 +132761,6 @@ entities: rot: 3.141592653589793 rad pos: 42.5,-46.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20106 @@ -134109,8 +132769,6 @@ entities: rot: -1.5707963267948966 rad pos: 50.5,-54.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20107 @@ -134119,8 +132777,6 @@ entities: rot: 1.5707963267948966 rad pos: 48.5,-52.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20108 @@ -134129,8 +132785,6 @@ entities: rot: 3.141592653589793 rad pos: 70.5,-49.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20109 @@ -134139,8 +132793,6 @@ entities: rot: 1.5707963267948966 rad pos: 31.5,-52.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20110 @@ -134149,8 +132801,6 @@ entities: rot: -1.5707963267948966 rad pos: 33.5,-56.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20111 @@ -134159,8 +132809,6 @@ entities: rot: 1.5707963267948966 rad pos: 33.5,-48.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20112 @@ -134168,8 +132816,6 @@ entities: - type: Transform pos: 34.5,-45.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20113 @@ -134177,8 +132823,6 @@ entities: - type: Transform pos: 28.5,-48.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20114 @@ -134187,8 +132831,6 @@ entities: rot: 3.141592653589793 rad pos: -13.5,6.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20115 @@ -134197,8 +132839,6 @@ entities: rot: 3.141592653589793 rad pos: -19.5,4.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20116 @@ -134206,8 +132846,6 @@ entities: - type: Transform pos: -24.5,-9.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20117 @@ -134216,8 +132854,6 @@ entities: rot: 3.141592653589793 rad pos: -28.5,-11.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20118 @@ -134226,8 +132862,6 @@ entities: rot: 1.5707963267948966 rad pos: -19.5,-19.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20119 @@ -134236,8 +132870,6 @@ entities: rot: 3.141592653589793 rad pos: -23.5,-22.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20120 @@ -134246,8 +132878,6 @@ entities: rot: -1.5707963267948966 rad pos: 54.5,-61.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20121 @@ -134255,8 +132885,6 @@ entities: - type: Transform pos: 40.5,-55.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20122 @@ -134265,8 +132893,6 @@ entities: rot: 1.5707963267948966 rad pos: 39.5,-65.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20123 @@ -134275,8 +132901,6 @@ entities: rot: -1.5707963267948966 rad pos: -17.5,-43.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20124 @@ -134285,8 +132909,6 @@ entities: rot: 1.5707963267948966 rad pos: -19.5,-31.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20125 @@ -134295,8 +132917,6 @@ entities: rot: 1.5707963267948966 rad pos: -19.5,-46.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20126 @@ -134305,8 +132925,6 @@ entities: rot: -1.5707963267948966 rad pos: 30.5,-85.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20127 @@ -134315,8 +132933,6 @@ entities: rot: -1.5707963267948966 rad pos: 49.5,-73.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20128 @@ -134325,8 +132941,6 @@ entities: rot: -1.5707963267948966 rad pos: 41.5,-71.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20129 @@ -134335,8 +132949,6 @@ entities: rot: 3.141592653589793 rad pos: -29.5,-17.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20130 @@ -134345,8 +132957,6 @@ entities: rot: -1.5707963267948966 rad pos: -31.5,-25.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20131 @@ -134355,8 +132965,6 @@ entities: rot: 1.5707963267948966 rad pos: -34.5,-17.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20132 @@ -134364,8 +132972,6 @@ entities: - type: Transform pos: -35.5,-9.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20133 @@ -134374,8 +132980,6 @@ entities: rot: -1.5707963267948966 rad pos: -41.5,-15.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20134 @@ -134383,8 +132987,6 @@ entities: - type: Transform pos: -44.5,-9.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20135 @@ -134393,8 +132995,6 @@ entities: rot: 3.141592653589793 rad pos: -47.5,-22.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20136 @@ -134403,8 +133003,6 @@ entities: rot: 3.141592653589793 rad pos: -50.5,-22.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20137 @@ -134413,8 +133011,6 @@ entities: rot: 1.5707963267948966 rad pos: -53.5,-16.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20138 @@ -134422,8 +133018,6 @@ entities: - type: Transform pos: -47.5,-5.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20139 @@ -134432,8 +133026,6 @@ entities: rot: 3.141592653589793 rad pos: -56.5,-24.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20140 @@ -134442,8 +133034,6 @@ entities: rot: -1.5707963267948966 rad pos: -67.5,-27.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20141 @@ -134452,8 +133042,6 @@ entities: rot: 3.141592653589793 rad pos: -68.5,-31.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20142 @@ -134462,8 +133050,6 @@ entities: rot: -1.5707963267948966 rad pos: -31.5,-37.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20143 @@ -134472,8 +133058,6 @@ entities: rot: 3.141592653589793 rad pos: -33.5,-34.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20144 @@ -134482,8 +133066,6 @@ entities: rot: 1.5707963267948966 rad pos: -38.5,-33.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20145 @@ -134492,8 +133074,6 @@ entities: rot: -1.5707963267948966 rad pos: -24.5,-33.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20146 @@ -134502,8 +133082,6 @@ entities: rot: 1.5707963267948966 rad pos: -43.5,-34.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20147 @@ -134511,8 +133089,6 @@ entities: - type: Transform pos: -24.5,-58.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20148 @@ -134521,8 +133097,6 @@ entities: rot: 3.141592653589793 rad pos: -27.5,-70.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20149 @@ -134530,8 +133104,6 @@ entities: - type: Transform pos: -19.5,-57.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20150 @@ -134540,8 +133112,6 @@ entities: rot: 3.141592653589793 rad pos: -42.5,-72.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20151 @@ -134550,8 +133120,6 @@ entities: rot: -1.5707963267948966 rad pos: -19.5,16.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20152 @@ -134560,8 +133128,6 @@ entities: rot: 3.141592653589793 rad pos: -23.5,19.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20153 @@ -134569,8 +133135,6 @@ entities: - type: Transform pos: -28.5,21.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20154 @@ -134579,8 +133143,6 @@ entities: rot: 3.141592653589793 rad pos: -33.5,19.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20155 @@ -134589,8 +133151,6 @@ entities: rot: 1.5707963267948966 rad pos: -42.5,20.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20156 @@ -134598,8 +133158,6 @@ entities: - type: Transform pos: -33.5,28.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20157 @@ -134608,8 +133166,6 @@ entities: rot: -1.5707963267948966 rad pos: -37.5,29.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20158 @@ -134618,8 +133174,6 @@ entities: rot: 1.5707963267948966 rad pos: -25.5,13.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20159 @@ -134628,8 +133182,6 @@ entities: rot: 3.141592653589793 rad pos: -29.5,-3.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20160 @@ -134638,8 +133190,6 @@ entities: rot: 3.141592653589793 rad pos: -39.5,-0.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20161 @@ -134648,8 +133198,6 @@ entities: rot: -1.5707963267948966 rad pos: -37.5,3.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20162 @@ -134658,8 +133206,6 @@ entities: rot: 1.5707963267948966 rad pos: -39.5,8.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20163 @@ -134667,8 +133213,6 @@ entities: - type: Transform pos: -30.5,15.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20164 @@ -134677,8 +133221,6 @@ entities: rot: 3.141592653589793 rad pos: -30.5,9.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20165 @@ -134687,8 +133229,6 @@ entities: rot: 3.141592653589793 rad pos: -52.5,7.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20166 @@ -134696,8 +133236,6 @@ entities: - type: Transform pos: -51.5,11.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20167 @@ -134705,8 +133243,6 @@ entities: - type: Transform pos: -52.5,14.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20168 @@ -134715,8 +133251,6 @@ entities: rot: -1.5707963267948966 rad pos: -42.5,10.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20169 @@ -134725,8 +133259,6 @@ entities: rot: 1.5707963267948966 rad pos: -48.5,3.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20170 @@ -134735,8 +133267,6 @@ entities: rot: 3.141592653589793 rad pos: -47.5,-0.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20171 @@ -134744,8 +133274,6 @@ entities: - type: Transform pos: -46.5,15.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20172 @@ -134754,8 +133282,6 @@ entities: rot: 1.5707963267948966 rad pos: 21.5,-54.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20173 @@ -134764,8 +133290,6 @@ entities: rot: 3.141592653589793 rad pos: -54.5,-77.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20174 @@ -134774,8 +133298,6 @@ entities: rot: 3.141592653589793 rad pos: -7.5,-26.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20175 @@ -134786,8 +133308,6 @@ entities: - type: DeviceNetwork deviceLists: - 97 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20176 @@ -134796,8 +133316,6 @@ entities: rot: 1.5707963267948966 rad pos: -25.5,-2.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20177 @@ -134806,8 +133324,6 @@ entities: rot: 1.5707963267948966 rad pos: -35.5,-42.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20178 @@ -134816,8 +133332,6 @@ entities: rot: 1.5707963267948966 rad pos: 39.5,45.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20179 @@ -134826,8 +133340,6 @@ entities: rot: 1.5707963267948966 rad pos: 51.5,43.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20180 @@ -134835,8 +133347,6 @@ entities: - type: Transform pos: 52.5,56.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20181 @@ -134845,8 +133355,6 @@ entities: rot: -1.5707963267948966 rad pos: -12.5,34.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20182 @@ -134855,8 +133363,6 @@ entities: rot: 1.5707963267948966 rad pos: -24.5,30.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20183 @@ -134865,8 +133371,6 @@ entities: rot: -1.5707963267948966 rad pos: -14.5,43.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20184 @@ -134875,8 +133379,6 @@ entities: rot: 1.5707963267948966 rad pos: -20.5,43.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20185 @@ -134884,16 +133386,12 @@ entities: - type: Transform pos: 70.5,36.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 20186 components: - type: Transform rot: -1.5707963267948966 rad pos: -11.5,39.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20187 @@ -134902,8 +133400,6 @@ entities: rot: -1.5707963267948966 rad pos: 1.5,69.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20188 @@ -134912,8 +133408,6 @@ entities: rot: 1.5707963267948966 rad pos: -4.5,69.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20189 @@ -134922,8 +133416,6 @@ entities: rot: -1.5707963267948966 rad pos: -1.5,62.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20190 @@ -134931,8 +133423,6 @@ entities: - type: Transform pos: -1.5,68.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20191 @@ -134941,8 +133431,6 @@ entities: rot: -1.5707963267948966 rad pos: 0.5,48.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20192 @@ -134951,8 +133439,6 @@ entities: rot: 1.5707963267948966 rad pos: -22.5,58.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20193 @@ -134960,8 +133446,6 @@ entities: - type: Transform pos: -17.5,63.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20194 @@ -134969,8 +133453,6 @@ entities: - type: Transform pos: -21.5,73.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20195 @@ -134978,8 +133460,6 @@ entities: - type: Transform pos: -13.5,73.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20196 @@ -134988,8 +133468,6 @@ entities: rot: -1.5707963267948966 rad pos: -12.5,57.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20197 @@ -134998,8 +133476,6 @@ entities: rot: -1.5707963267948966 rad pos: 0.5,56.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20198 @@ -135008,8 +133484,6 @@ entities: rot: -1.5707963267948966 rad pos: 30.5,45.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20199 @@ -135018,8 +133492,6 @@ entities: rot: 1.5707963267948966 rad pos: 24.5,45.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20200 @@ -135027,8 +133499,6 @@ entities: - type: Transform pos: -7.5,-92.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20201 @@ -135036,8 +133506,6 @@ entities: - type: Transform pos: -21.5,-97.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20202 @@ -135046,8 +133514,6 @@ entities: rot: -1.5707963267948966 rad pos: -6.5,-98.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20203 @@ -135055,8 +133521,6 @@ entities: - type: Transform pos: -6.5,-84.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20204 @@ -135065,8 +133529,6 @@ entities: rot: 1.5707963267948966 rad pos: -34.5,-96.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20205 @@ -135075,8 +133537,6 @@ entities: rot: 3.141592653589793 rad pos: 65.5,-35.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20206 @@ -135084,8 +133544,6 @@ entities: - type: Transform pos: 67.5,-33.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20207 @@ -135094,8 +133552,6 @@ entities: rot: 3.141592653589793 rad pos: 73.5,-35.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20208 @@ -135104,8 +133560,6 @@ entities: rot: -1.5707963267948966 rad pos: 75.5,-41.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20209 @@ -135114,8 +133568,6 @@ entities: rot: -1.5707963267948966 rad pos: 72.5,-46.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20210 @@ -135123,8 +133575,6 @@ entities: - type: Transform pos: 66.5,-38.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20211 @@ -135133,8 +133583,6 @@ entities: rot: 3.141592653589793 rad pos: 5.5,-30.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20212 @@ -135143,8 +133591,6 @@ entities: rot: 1.5707963267948966 rad pos: 59.5,-34.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20213 @@ -135153,16 +133599,12 @@ entities: rot: 3.141592653589793 rad pos: -54.5,-63.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 20214 components: - type: Transform rot: -1.5707963267948966 rad pos: -15.5,25.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20215 @@ -135171,8 +133613,6 @@ entities: rot: 1.5707963267948966 rad pos: -8.5,-12.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20216 @@ -135181,8 +133621,6 @@ entities: rot: -1.5707963267948966 rad pos: -7.5,-22.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20217 @@ -135190,8 +133628,6 @@ entities: - type: Transform pos: -10.5,-18.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20218 @@ -135200,8 +133636,6 @@ entities: rot: 3.141592653589793 rad pos: -30.5,-70.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20219 @@ -135210,8 +133644,6 @@ entities: rot: 3.141592653589793 rad pos: -28.5,-74.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20220 @@ -135220,8 +133652,6 @@ entities: rot: 1.5707963267948966 rad pos: 61.5,-39.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20221 @@ -135230,8 +133660,6 @@ entities: rot: 1.5707963267948966 rad pos: 19.5,-83.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20222 @@ -135239,8 +133667,6 @@ entities: - type: Transform pos: 24.5,-72.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20223 @@ -135249,8 +133675,6 @@ entities: rot: 3.141592653589793 rad pos: 48.5,-85.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20224 @@ -135259,8 +133683,6 @@ entities: rot: 1.5707963267948966 rad pos: -16.5,66.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20225 @@ -135269,8 +133691,6 @@ entities: rot: 1.5707963267948966 rad pos: 7.5,-22.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20226 @@ -135278,8 +133698,6 @@ entities: - type: Transform pos: 45.5,7.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20227 @@ -135288,8 +133706,6 @@ entities: rot: 3.141592653589793 rad pos: -44.5,30.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20228 @@ -135297,8 +133713,6 @@ entities: - type: Transform pos: -46.5,43.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20229 @@ -135307,8 +133721,6 @@ entities: rot: -1.5707963267948966 rad pos: 67.5,-31.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20230 @@ -135317,8 +133729,6 @@ entities: rot: 1.5707963267948966 rad pos: -4.5,16.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20231 @@ -135327,8 +133737,6 @@ entities: rot: 3.141592653589793 rad pos: -1.5,-3.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20232 @@ -135336,8 +133744,6 @@ entities: - type: Transform pos: -1.5,-22.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20233 @@ -135346,8 +133752,6 @@ entities: rot: 3.141592653589793 rad pos: 28.5,-38.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20234 @@ -135355,8 +133759,6 @@ entities: - type: Transform pos: 40.5,61.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20235 @@ -135365,8 +133767,6 @@ entities: rot: 1.5707963267948966 rad pos: 11.5,-38.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 20236 @@ -135378,8 +133778,6 @@ entities: - type: DeviceNetwork deviceLists: - 98 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20237 @@ -135388,8 +133786,6 @@ entities: rot: 3.141592653589793 rad pos: -14.5,-54.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20238 @@ -135398,8 +133794,6 @@ entities: rot: 1.5707963267948966 rad pos: -6.5,-57.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20239 @@ -135408,8 +133802,6 @@ entities: rot: -1.5707963267948966 rad pos: -2.5,-57.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20240 @@ -135418,8 +133810,6 @@ entities: rot: 1.5707963267948966 rad pos: -6.5,-61.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20241 @@ -135428,8 +133818,6 @@ entities: rot: -1.5707963267948966 rad pos: -2.5,-61.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20242 @@ -135438,8 +133826,6 @@ entities: rot: -1.5707963267948966 rad pos: -2.5,-59.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20243 @@ -135448,8 +133834,6 @@ entities: rot: -1.5707963267948966 rad pos: -4.5,-66.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20244 @@ -135461,8 +133845,6 @@ entities: - type: DeviceNetwork deviceLists: - 101 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20245 @@ -135473,8 +133855,6 @@ entities: - type: DeviceNetwork deviceLists: - 99 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 20246 @@ -135483,8 +133863,6 @@ entities: rot: 3.141592653589793 rad pos: 6.5,-47.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - proto: GasVolumePump @@ -135495,16 +133873,12 @@ entities: rot: 3.141592653589793 rad pos: 2.5,12.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 20248 components: - type: Transform rot: -1.5707963267948966 rad pos: -39.5,-57.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - proto: Gauze1 @@ -141230,8 +139604,6 @@ entities: rot: -1.5707963267948966 rad pos: -63.5,-42.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 21309 @@ -141240,8 +139612,6 @@ entities: rot: -1.5707963267948966 rad pos: -63.5,-39.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 21310 @@ -141249,8 +139619,6 @@ entities: - type: Transform pos: -62.5,-41.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 21311 @@ -141258,8 +139626,6 @@ entities: - type: Transform pos: -62.5,-40.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - proto: Hemostat @@ -145156,78 +143522,56 @@ entities: - type: Transform pos: -8.5,-72.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 21818 components: - type: Transform pos: 45.5,-51.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 21819 components: - type: Transform pos: -50.5,-54.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 21820 components: - type: Transform pos: -39.5,-38.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 21821 components: - type: Transform pos: -51.5,-70.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 21822 components: - type: Transform pos: -26.5,37.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 21823 components: - type: Transform pos: -28.5,41.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 21824 components: - type: Transform pos: 72.5,-35.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 21825 components: - type: Transform pos: 46.5,-51.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 21826 components: - type: Transform pos: 3.5,-73.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 21827 components: - type: Transform pos: 9.5,-59.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - proto: NitrogenTankFilled entities: - uid: 21828 @@ -145257,22 +143601,16 @@ entities: - type: Transform pos: -38.5,-38.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 21833 components: - type: Transform pos: 54.5,-55.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 21834 components: - type: Transform pos: -76.5,-46.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - proto: NitrousOxideTankFilled entities: - uid: 21835 @@ -145396,113 +143734,81 @@ entities: - type: Transform pos: -76.5,-44.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 21854 components: - type: Transform pos: -9.5,-72.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 21855 components: - type: Transform pos: 59.5,29.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 21856 components: - type: Transform pos: 45.5,-52.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 21857 components: - type: Transform pos: -25.5,-31.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 21858 components: - type: Transform pos: -50.5,-52.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 21859 components: - type: Transform pos: -37.5,-38.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 21860 components: - type: Transform pos: -25.5,-55.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 21861 components: - type: Transform pos: -34.5,-30.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 21862 components: - type: Transform pos: -48.5,28.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 21863 components: - type: Transform pos: -31.5,17.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 21864 components: - type: Transform pos: -29.5,41.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 21865 components: - type: Transform pos: 73.5,-35.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 21866 components: - type: Transform pos: 46.5,-52.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 21867 components: - type: Transform pos: 4.5,-73.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 21868 components: - type: Transform pos: 9.5,-58.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - proto: OxygenTankFilled entities: - uid: 21869 @@ -146688,29 +144994,21 @@ entities: - type: Transform pos: 55.5,-55.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 22069 components: - type: Transform pos: -40.5,-39.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 22070 components: - type: Transform pos: -50.5,-46.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 22071 components: - type: Transform pos: -75.5,-44.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - proto: PlasmaOre1 entities: - uid: 22072 @@ -164615,7 +162913,7 @@ entities: - type: Transform pos: -31.5,-55.5 parent: 2 -- proto: soda_dispenser +- proto: SodaDispenser entities: - uid: 24744 components: @@ -166826,127 +165124,91 @@ entities: - type: Transform pos: -75.5,-45.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 25119 components: - type: Transform pos: 45.5,-54.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 25120 components: - type: Transform pos: -16.5,-10.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 25121 components: - type: Transform pos: -38.5,-51.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 25122 components: - type: Transform pos: -38.5,-50.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 25123 components: - type: Transform pos: -38.5,-49.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 25124 components: - type: Transform pos: -34.5,-39.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 25125 components: - type: Transform pos: -35.5,-39.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 25126 components: - type: Transform pos: -50.5,-44.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 25127 components: - type: Transform pos: -50.5,-42.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 25128 components: - type: Transform pos: 53.5,-37.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 25129 components: - type: Transform pos: -24.5,-55.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 25130 components: - type: Transform pos: -26.5,-55.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 25131 components: - type: Transform pos: 51.5,-35.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 25132 components: - type: Transform pos: -50.5,-35.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 25133 components: - type: Transform pos: -50.5,-34.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 25134 components: - type: Transform pos: -35.5,-38.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 25135 components: - type: Transform pos: -75.5,-46.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - proto: Stunbaton entities: - uid: 25136 @@ -172289,8 +170551,6 @@ entities: rot: -1.5707963267948966 rad pos: -69.5,-44.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - proto: TegCirculator entities: - uid: 26053 @@ -200756,15 +199016,11 @@ entities: - type: Transform pos: -50.5,-48.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 31149 components: - type: Transform pos: -34.5,-28.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - proto: WeaponCapacitorRecharger entities: - uid: 31150 From 771c34c304873dae9f1185f9bc1a15710b1c5b4c Mon Sep 17 00:00:00 2001 From: lzk <124214523+lzk228@users.noreply.github.com> Date: Sun, 16 Jun 2024 21:36:38 +0200 Subject: [PATCH 117/142] Update omega (#28343) * Update omega robotics console * morgue door --- Resources/Maps/omega.yml | 39 +++++++++++++++++---------------------- 1 file changed, 17 insertions(+), 22 deletions(-) diff --git a/Resources/Maps/omega.yml b/Resources/Maps/omega.yml index 07ebb24b9d..661149f4fe 100644 --- a/Resources/Maps/omega.yml +++ b/Resources/Maps/omega.yml @@ -6354,7 +6354,9 @@ entities: - type: Transform pos: -19.5,-19.5 parent: 4812 - - uid: 7416 +- proto: AirlockMedicalMorgueLocked + entities: + - uid: 6282 components: - type: Transform pos: -19.5,-13.5 @@ -31656,6 +31658,13 @@ entities: - type: Transform pos: 26.5,-17.5 parent: 4812 +- proto: ComputerRoboticsControl + entities: + - uid: 1482 + components: + - type: Transform + pos: 25.5,-17.5 + parent: 4812 - proto: ComputerSalvageExpedition entities: - uid: 7830 @@ -56224,6 +56233,12 @@ entities: parent: 4812 - proto: Lamp entities: + - uid: 1481 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 26.696417,-19.020947 + parent: 4812 - uid: 1520 components: - type: Transform @@ -56320,21 +56335,6 @@ entities: showEnts: False occludes: True ent: null - - uid: 6291 - components: - - type: Transform - pos: 25.537617,-17.441427 - parent: 4812 - - type: ContainerContainer - containers: - cellslot_cell_container: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - cell_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - uid: 6409 components: - type: Transform @@ -58827,7 +58827,7 @@ entities: - uid: 6307 components: - type: Transform - pos: 26.432638,-19.383717 + pos: 26.003157,-19.425182 parent: 4812 - uid: 7142 components: @@ -70310,11 +70310,6 @@ entities: - type: Transform pos: 19.5,-18.5 parent: 4812 - - uid: 6282 - components: - - type: Transform - pos: 25.5,-17.5 - parent: 4812 - uid: 6283 components: - type: Transform From 99358e8d4db7db70fc63284f2f19fee5780c74de Mon Sep 17 00:00:00 2001 From: lzk <124214523+lzk228@users.noreply.github.com> Date: Sun, 16 Jun 2024 21:36:54 +0200 Subject: [PATCH 118/142] Update marathon (#28344) * Update marathon robotics console * morgue door --- Resources/Maps/marathon.yml | 1445 ++--------------------------------- 1 file changed, 59 insertions(+), 1386 deletions(-) diff --git a/Resources/Maps/marathon.yml b/Resources/Maps/marathon.yml index b5eccd570f..caa60e9149 100644 --- a/Resources/Maps/marathon.yml +++ b/Resources/Maps/marathon.yml @@ -7754,12 +7754,13 @@ entities: - type: MetaData - type: Transform - type: Map + mapPaused: True - type: PhysicsMap + - type: GridTree + - type: MovedGrids - type: Broadphase - type: OccluderTree - type: LoadedMap - - type: GridTree - - type: MovedGrids - proto: AcousticGuitarInstrument entities: - uid: 525 @@ -7812,24 +7813,18 @@ entities: - 22086 - 3421 - 3422 - - type: AtmosDevice - joinedGrid: 30 - uid: 7927 components: - type: Transform rot: 3.141592653589793 rad pos: -11.5,-13.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 8252 components: - type: Transform rot: -1.5707963267948966 rad pos: -32.5,-3.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 8254 components: - type: Transform @@ -7843,8 +7838,6 @@ entities: - 7156 - 7571 - 7569 - - type: AtmosDevice - joinedGrid: 30 - uid: 8267 components: - type: Transform @@ -7862,16 +7855,12 @@ entities: - 7137 - 7131 - 7130 - - type: AtmosDevice - joinedGrid: 30 - uid: 9029 components: - type: Transform rot: -1.5707963267948966 rad pos: -11.5,-19.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 9477 components: - type: Transform @@ -7883,8 +7872,6 @@ entities: - 9952 - 11153 - 11094 - - type: AtmosDevice - joinedGrid: 30 - uid: 9671 components: - type: Transform @@ -7897,8 +7884,6 @@ entities: - 7116 - 9686 - 9864 - - type: AtmosDevice - joinedGrid: 30 - uid: 17960 components: - type: Transform @@ -7911,8 +7896,6 @@ entities: - 18435 - 18436 - 18437 - - type: AtmosDevice - joinedGrid: 30 - uid: 20325 components: - type: Transform @@ -7928,8 +7911,6 @@ entities: - 18442 - 18439 - 17228 - - type: AtmosDevice - joinedGrid: 30 - uid: 20353 components: - type: Transform @@ -7943,8 +7924,6 @@ entities: - 11264 - 11114 - 11163 - - type: AtmosDevice - joinedGrid: 30 - uid: 20356 components: - type: Transform @@ -7963,8 +7942,6 @@ entities: - 11098 - 11099 - 11154 - - type: AtmosDevice - joinedGrid: 30 - uid: 21740 components: - type: Transform @@ -7975,8 +7952,6 @@ entities: - 11097 - 11227 - 21741 - - type: AtmosDevice - joinedGrid: 30 - uid: 21743 components: - type: Transform @@ -7988,8 +7963,6 @@ entities: - 11176 - 11107 - 21744 - - type: AtmosDevice - joinedGrid: 30 - uid: 21747 components: - type: Transform @@ -8006,8 +7979,6 @@ entities: - 21749 - 11178 - 11179 - - type: AtmosDevice - joinedGrid: 30 - uid: 21754 components: - type: Transform @@ -8023,8 +7994,6 @@ entities: - 9300 - 11188 - 11189 - - type: AtmosDevice - joinedGrid: 30 - uid: 21755 components: - type: Transform @@ -8033,8 +8002,6 @@ entities: - type: DeviceList devices: - 21756 - - type: AtmosDevice - joinedGrid: 30 - uid: 21757 components: - type: Transform @@ -8052,8 +8019,6 @@ entities: - 9309 - 11192 - 11180 - - type: AtmosDevice - joinedGrid: 30 - uid: 21760 components: - type: Transform @@ -8064,8 +8029,6 @@ entities: devices: - 11214 - 21761 - - type: AtmosDevice - joinedGrid: 30 - uid: 21762 components: - type: Transform @@ -8082,8 +8045,6 @@ entities: - 12039 - 16096 - 11714 - - type: AtmosDevice - joinedGrid: 30 - uid: 21771 components: - type: Transform @@ -8103,8 +8064,6 @@ entities: - 21772 - 11201 - 11200 - - type: AtmosDevice - joinedGrid: 30 - uid: 21774 components: - type: Transform @@ -8122,8 +8081,6 @@ entities: - 21773 - 11211 - 11210 - - type: AtmosDevice - joinedGrid: 30 - uid: 21777 components: - type: Transform @@ -8144,8 +8101,6 @@ entities: - 11220 - 11219 - 20335 - - type: AtmosDevice - joinedGrid: 30 - uid: 21781 components: - type: Transform @@ -8163,8 +8118,6 @@ entities: - 8468 - 11221 - 11222 - - type: AtmosDevice - joinedGrid: 30 - uid: 21783 components: - type: Transform @@ -8183,8 +8136,6 @@ entities: - 11939 - 14540 - 11991 - - type: AtmosDevice - joinedGrid: 30 - uid: 21785 components: - type: Transform @@ -8202,8 +8153,6 @@ entities: - 12081 - 11764 - 11872 - - type: AtmosDevice - joinedGrid: 30 - uid: 21789 components: - type: Transform @@ -8216,8 +8165,6 @@ entities: - 12043 - 12044 - 12010 - - type: AtmosDevice - joinedGrid: 30 - uid: 21791 components: - type: Transform @@ -8230,8 +8177,6 @@ entities: - 21792 - 11985 - 11981 - - type: AtmosDevice - joinedGrid: 30 - uid: 21796 components: - type: Transform @@ -8248,8 +8193,6 @@ entities: - 21794 - 11218 - 11217 - - type: AtmosDevice - joinedGrid: 30 - uid: 21797 components: - type: Transform @@ -8282,8 +8225,6 @@ entities: - 3407 - 3409 - 3410 - - type: AtmosDevice - joinedGrid: 30 - uid: 21801 components: - type: Transform @@ -8303,8 +8244,6 @@ entities: - 6788 - 7339 - 7340 - - type: AtmosDevice - joinedGrid: 30 - uid: 21814 components: - type: Transform @@ -8315,8 +8254,6 @@ entities: - 21813 - 8223 - 8224 - - type: AtmosDevice - joinedGrid: 30 - uid: 21835 components: - type: Transform @@ -8327,8 +8264,6 @@ entities: - 6911 - 21836 - 6900 - - type: AtmosDevice - joinedGrid: 30 - uid: 21840 components: - type: Transform @@ -8340,8 +8275,6 @@ entities: - 21839 - 18730 - 18732 - - type: AtmosDevice - joinedGrid: 30 - uid: 21841 components: - type: Transform @@ -8355,8 +8288,6 @@ entities: - 18758 - 18759 - 21843 - - type: AtmosDevice - joinedGrid: 30 - uid: 21844 components: - type: Transform @@ -8368,8 +8299,6 @@ entities: - 18770 - 18769 - 21845 - - type: AtmosDevice - joinedGrid: 30 - uid: 21846 components: - type: Transform @@ -8381,8 +8310,6 @@ entities: - 18519 - 18662 - 21847 - - type: AtmosDevice - joinedGrid: 30 - uid: 21849 components: - type: Transform @@ -8393,8 +8320,6 @@ entities: - 18655 - 18520 - 21848 - - type: AtmosDevice - joinedGrid: 30 - uid: 21850 components: - type: Transform @@ -8408,8 +8333,6 @@ entities: - 21851 - 18524 - 18629 - - type: AtmosDevice - joinedGrid: 30 - uid: 21855 components: - type: Transform @@ -8423,8 +8346,6 @@ entities: - 21854 - 20351 - 20352 - - type: AtmosDevice - joinedGrid: 30 - uid: 21856 components: - type: Transform @@ -8438,8 +8359,6 @@ entities: - 20348 - 18451 - 18450 - - type: AtmosDevice - joinedGrid: 30 - uid: 21863 components: - type: Transform @@ -8455,8 +8374,6 @@ entities: - 3147 - 3136 - 3135 - - type: AtmosDevice - joinedGrid: 30 - uid: 21868 components: - type: Transform @@ -8476,8 +8393,6 @@ entities: - 3100 - 3111 - 3112 - - type: AtmosDevice - joinedGrid: 30 - uid: 21872 components: - type: Transform @@ -8496,8 +8411,6 @@ entities: - 3267 - 3253 - 3254 - - type: AtmosDevice - joinedGrid: 30 - uid: 21874 components: - type: Transform @@ -8518,8 +8431,6 @@ entities: - 1102 - 3069 - 3068 - - type: AtmosDevice - joinedGrid: 30 - uid: 21878 components: - type: Transform @@ -8535,8 +8446,6 @@ entities: - 3323 - 3318 - 3324 - - type: AtmosDevice - joinedGrid: 30 - uid: 21879 components: - type: Transform @@ -8557,8 +8466,6 @@ entities: - 3327 - 3326 - 3325 - - type: AtmosDevice - joinedGrid: 30 - uid: 21883 components: - type: Transform @@ -8579,8 +8486,6 @@ entities: - 21882 - 3067 - 3066 - - type: AtmosDevice - joinedGrid: 30 - uid: 21886 components: - type: Transform @@ -8601,8 +8506,6 @@ entities: - 21885 - 3065 - 3064 - - type: AtmosDevice - joinedGrid: 30 - uid: 21888 components: - type: Transform @@ -8625,8 +8528,6 @@ entities: - 2452 - 2454 - 2453 - - type: AtmosDevice - joinedGrid: 30 - uid: 21897 components: - type: Transform @@ -8640,8 +8541,6 @@ entities: - 21896 - 2493 - 2492 - - type: AtmosDevice - joinedGrid: 30 - uid: 21899 components: - type: Transform @@ -8653,8 +8552,6 @@ entities: - 21900 - 2490 - 2491 - - type: AtmosDevice - joinedGrid: 30 - uid: 21901 components: - type: Transform @@ -8665,8 +8562,6 @@ entities: - 21902 - 2483 - 2482 - - type: AtmosDevice - joinedGrid: 30 - uid: 21903 components: - type: Transform @@ -8688,8 +8583,6 @@ entities: - 21895 - 2523 - 2525 - - type: AtmosDevice - joinedGrid: 30 - uid: 21906 components: - type: Transform @@ -8703,8 +8596,6 @@ entities: - 1443 - 2545 - 2544 - - type: AtmosDevice - joinedGrid: 30 - uid: 21913 components: - type: Transform @@ -8724,8 +8615,6 @@ entities: - 2670 - 2675 - 2676 - - type: AtmosDevice - joinedGrid: 30 - uid: 21917 components: - type: Transform @@ -8742,8 +8631,6 @@ entities: - 2595 - 2526 - 2524 - - type: AtmosDevice - joinedGrid: 30 - uid: 21921 components: - type: Transform @@ -8754,8 +8641,6 @@ entities: - 2592 - 21920 - 2593 - - type: AtmosDevice - joinedGrid: 30 - uid: 21922 components: - type: Transform @@ -8767,8 +8652,6 @@ entities: - 21923 - 2573 - 2574 - - type: AtmosDevice - joinedGrid: 30 - uid: 21924 components: - type: Transform @@ -8780,8 +8663,6 @@ entities: - 3041 - 3042 - 21925 - - type: AtmosDevice - joinedGrid: 30 - uid: 21928 components: - type: Transform @@ -8798,8 +8679,6 @@ entities: - 6104 - 6109 - 6108 - - type: AtmosDevice - joinedGrid: 30 - uid: 21930 components: - type: Transform @@ -8818,8 +8697,6 @@ entities: - 6092 - 6113 - 6112 - - type: AtmosDevice - joinedGrid: 30 - uid: 21932 components: - type: Transform @@ -8831,8 +8708,6 @@ entities: - 6122 - 21933 - 6123 - - type: AtmosDevice - joinedGrid: 30 - uid: 21939 components: - type: Transform @@ -8844,8 +8719,6 @@ entities: - 6222 - 21940 - 21674 - - type: AtmosDevice - joinedGrid: 30 - uid: 21941 components: - type: Transform @@ -8861,8 +8734,6 @@ entities: - 5650 - 6204 - 6205 - - type: AtmosDevice - joinedGrid: 30 - uid: 21944 components: - type: Transform @@ -8874,8 +8745,6 @@ entities: - 21945 - 6213 - 6214 - - type: AtmosDevice - joinedGrid: 30 - uid: 21946 components: - type: Transform @@ -8890,8 +8759,6 @@ entities: - 6265 - 6268 - 6245 - - type: AtmosDevice - joinedGrid: 30 - uid: 22028 components: - type: Transform @@ -8905,8 +8772,6 @@ entities: - 6538 - 12605 - 12606 - - type: AtmosDevice - joinedGrid: 30 - uid: 22030 components: - type: Transform @@ -8924,8 +8789,6 @@ entities: - 12539 - 12538 - 11275 - - type: AtmosDevice - joinedGrid: 30 - uid: 22035 components: - type: Transform @@ -8940,8 +8803,6 @@ entities: - 22036 - 12490 - 12491 - - type: AtmosDevice - joinedGrid: 30 - uid: 22038 components: - type: Transform @@ -8964,8 +8825,6 @@ entities: - 22039 - 12537 - 12536 - - type: AtmosDevice - joinedGrid: 30 - uid: 22043 components: - type: Transform @@ -8976,8 +8835,6 @@ entities: - 22042 - 13799 - 13788 - - type: AtmosDevice - joinedGrid: 30 - uid: 22045 components: - type: Transform @@ -8988,8 +8845,6 @@ entities: - 21553 - 13593 - 22044 - - type: AtmosDevice - joinedGrid: 30 - uid: 22047 components: - type: Transform @@ -9001,8 +8856,6 @@ entities: - 22046 - 21549 - 21545 - - type: AtmosDevice - joinedGrid: 30 - uid: 22048 components: - type: Transform @@ -9021,8 +8874,6 @@ entities: - 20954 - 13084 - 13004 - - type: AtmosDevice - joinedGrid: 30 - uid: 22052 components: - type: Transform @@ -9036,8 +8887,6 @@ entities: - 22053 - 12959 - 12813 - - type: AtmosDevice - joinedGrid: 30 - uid: 22054 components: - type: Transform @@ -9058,8 +8907,6 @@ entities: - 13002 - 13086 - 13003 - - type: AtmosDevice - joinedGrid: 30 - uid: 22057 components: - type: Transform @@ -9070,8 +8917,6 @@ entities: - 22058 - 13360 - 12824 - - type: AtmosDevice - joinedGrid: 30 - uid: 22062 components: - type: Transform @@ -9081,8 +8926,6 @@ entities: - type: DeviceList devices: - 22063 - - type: AtmosDevice - joinedGrid: 30 - uid: 22065 components: - type: Transform @@ -9102,8 +8945,6 @@ entities: - 22066 - 11223 - 11224 - - type: AtmosDevice - joinedGrid: 30 - uid: 22067 components: - type: Transform @@ -9121,8 +8962,6 @@ entities: - 12620 - 13335 - 13336 - - type: AtmosDevice - joinedGrid: 30 - uid: 22070 components: - type: Transform @@ -9134,8 +8973,6 @@ entities: - 22071 - 13006 - 9161 - - type: AtmosDevice - joinedGrid: 30 - uid: 22073 components: - type: Transform @@ -9148,8 +8985,6 @@ entities: - 22072 - 3357 - 3358 - - type: AtmosDevice - joinedGrid: 30 - uid: 22075 components: - type: Transform @@ -9167,8 +9002,6 @@ entities: - 22077 - 3400 - 3401 - - type: AtmosDevice - joinedGrid: 30 - uid: 22078 components: - type: Transform @@ -9179,8 +9012,6 @@ entities: - 3482 - 22079 - 3479 - - type: AtmosDevice - joinedGrid: 30 - uid: 22081 components: - type: Transform @@ -9199,8 +9030,6 @@ entities: - 651 - 3485 - 3486 - - type: AtmosDevice - joinedGrid: 30 - uid: 22083 components: - type: Transform @@ -9212,8 +9041,6 @@ entities: - 22084 - 3484 - 3481 - - type: AtmosDevice - joinedGrid: 30 - proto: AirCanister entities: - uid: 2087 @@ -9221,71 +9048,51 @@ entities: - type: Transform pos: -7.5,64.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 11422 components: - type: Transform pos: 1.5,-16.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 12135 components: - type: Transform pos: 22.5,-13.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 15156 components: - type: Transform pos: 16.5,8.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 15645 components: - type: Transform pos: 22.5,-14.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 16895 components: - type: Transform pos: -44.5,25.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 18782 components: - type: Transform pos: -66.5,-65.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 18783 components: - type: Transform pos: -65.5,-65.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 18784 components: - type: Transform pos: -64.5,-65.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 22767 components: - type: Transform pos: -27.5,-63.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - proto: Airlock entities: - uid: 752 @@ -11351,13 +11158,6 @@ entities: - type: Transform pos: -16.5,-5.5 parent: 30 - - uid: 6878 - components: - - type: MetaData - name: Morgue - - type: Transform - pos: -22.5,0.5 - parent: 30 - uid: 6879 components: - type: MetaData @@ -11416,6 +11216,13 @@ entities: - type: Transform pos: -23.5,-22.5 parent: 30 +- proto: AirlockMedicalMorgueLocked + entities: + - uid: 6878 + components: + - type: Transform + pos: -22.5,0.5 + parent: 30 - proto: AirlockQuartermasterLocked entities: - uid: 11196 @@ -13842,15 +13649,11 @@ entities: rot: -1.5707963267948966 rad pos: -4.5,-8.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 9809 components: - type: Transform pos: 15.5,-21.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - proto: Beaker entities: - uid: 8000 @@ -14599,11 +14402,15 @@ entities: - type: Transform pos: -49.5,25.5 parent: 30 + - type: SpamEmitSound + enabled: False - uid: 2384 components: - type: Transform pos: -44.5,67.5 parent: 30 + - type: SpamEmitSound + enabled: False - proto: BookAtmosAirAlarms entities: - uid: 22308 @@ -14639,22 +14446,18 @@ entities: - type: Transform pos: -15.506373,7.7216425 parent: 30 -- proto: BookDetective +- proto: BookRandomStory entities: - uid: 21487 components: - type: Transform pos: 8.515235,-13.437349 parent: 30 -- proto: BookEscalation - entities: - uid: 22306 components: - type: Transform pos: -54.57496,-63.325558 parent: 30 -- proto: BookEscalationSecurity - entities: - uid: 22307 components: - type: Transform @@ -43355,29 +43158,21 @@ entities: - type: Transform pos: 27.5,-26.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 9115 components: - type: Transform pos: 18.5,-17.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 9116 components: - type: Transform pos: 19.5,-17.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 10430 components: - type: Transform pos: -14.5,-47.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - proto: Carpet entities: - uid: 626 @@ -49727,18 +49522,6 @@ entities: - type: Transform pos: -12.663173,-12.436495 parent: 30 -- proto: chem_master - entities: - - uid: 6690 - components: - - type: Transform - pos: -9.5,-6.5 - parent: 30 - - uid: 6691 - components: - - type: Transform - pos: -5.5,-6.5 - parent: 30 - proto: ChemDispenser entities: - uid: 6692 @@ -49758,6 +49541,18 @@ entities: - type: Transform pos: -7.5,-7.5 parent: 30 +- proto: ChemMaster + entities: + - uid: 6690 + components: + - type: Transform + pos: -9.5,-6.5 + parent: 30 + - uid: 6691 + components: + - type: Transform + pos: -5.5,-6.5 + parent: 30 - proto: ChessBoard entities: - uid: 16771 @@ -52024,13 +51819,6 @@ entities: - type: Transform pos: -0.618871,-7.128199 parent: 30 -- proto: ClothingHeadHatHairflower - entities: - - uid: 5626 - components: - - type: Transform - pos: 7.8005,42.792442 - parent: 30 - proto: ClothingHeadHatHetmanHat entities: - uid: 13666 @@ -53275,12 +53063,6 @@ entities: rot: -1.5707963267948966 rad pos: 7.5,-28.5 parent: 30 - - uid: 13073 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 25.5,14.5 - parent: 30 - uid: 17345 components: - type: Transform @@ -53591,6 +53373,14 @@ entities: rot: 1.5707963267948966 rad pos: 26.5,9.5 parent: 30 +- proto: ComputerRoboticsControl + entities: + - uid: 10251 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 25.5,14.5 + parent: 30 - proto: ComputerSalvageExpedition entities: - uid: 7266 @@ -54765,15 +54555,11 @@ entities: - type: Transform pos: -33.5,-9.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 6784 components: - type: Transform pos: -31.5,-9.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - proto: CryoxadoneBeakerSmall entities: - uid: 8274 @@ -61879,8 +61665,6 @@ entities: - 2648 - 1443 - 21911 - - type: AtmosDevice - joinedGrid: 30 - uid: 4354 components: - type: Transform @@ -61897,16 +61681,12 @@ entities: - 13644 - 17059 - 17625 - - type: AtmosDevice - joinedGrid: 30 - uid: 8248 components: - type: Transform rot: 3.141592653589793 rad pos: -15.5,-13.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 8249 components: - type: Transform @@ -61920,16 +61700,12 @@ entities: - 7960 - 7007 - 7200 - - type: AtmosDevice - joinedGrid: 30 - uid: 8259 components: - type: Transform rot: -1.5707963267948966 rad pos: -32.5,-4.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 8262 components: - type: Transform @@ -61942,8 +61718,6 @@ entities: - 8288 - 7155 - 7156 - - type: AtmosDevice - joinedGrid: 30 - uid: 9712 components: - type: Transform @@ -61954,8 +61728,6 @@ entities: devices: - 7960 - 7116 - - type: AtmosDevice - joinedGrid: 30 - uid: 17226 components: - type: Transform @@ -61968,8 +61740,6 @@ entities: - 15117 - 15116 - 13644 - - type: AtmosDevice - joinedGrid: 30 - uid: 20334 components: - type: Transform @@ -61982,8 +61752,6 @@ entities: - 11262 - 11263 - 11264 - - type: AtmosDevice - joinedGrid: 30 - uid: 20357 components: - type: Transform @@ -61998,8 +61766,6 @@ entities: - 11341 - 11342 - 20355 - - type: AtmosDevice - joinedGrid: 30 - uid: 21739 components: - type: Transform @@ -62011,8 +61777,6 @@ entities: - 11341 - 11342 - 20358 - - type: AtmosDevice - joinedGrid: 30 - uid: 21746 components: - type: Transform @@ -62028,8 +61792,6 @@ entities: - 9305 - 9304 - 9306 - - type: AtmosDevice - joinedGrid: 30 - uid: 21748 components: - type: Transform @@ -62044,8 +61806,6 @@ entities: - 8626 - 7731 - 21749 - - type: AtmosDevice - joinedGrid: 30 - uid: 21752 components: - type: Transform @@ -62059,8 +61819,6 @@ entities: - 9303 - 9301 - 9300 - - type: AtmosDevice - joinedGrid: 30 - uid: 21758 components: - type: Transform @@ -62076,8 +61834,6 @@ entities: - 9307 - 9308 - 9309 - - type: AtmosDevice - joinedGrid: 30 - uid: 21769 components: - type: Transform @@ -62092,8 +61848,6 @@ entities: - 11762 - 11803 - 12039 - - type: AtmosDevice - joinedGrid: 30 - uid: 21770 components: - type: Transform @@ -62111,8 +61865,6 @@ entities: - 8365 - 8364 - 21772 - - type: AtmosDevice - joinedGrid: 30 - uid: 21775 components: - type: Transform @@ -62128,8 +61880,6 @@ entities: - 8369 - 8367 - 21773 - - type: AtmosDevice - joinedGrid: 30 - uid: 21776 components: - type: Transform @@ -62148,8 +61898,6 @@ entities: - 8467 - 8468 - 21778 - - type: AtmosDevice - joinedGrid: 30 - uid: 21779 components: - type: Transform @@ -62165,8 +61913,6 @@ entities: - 6619 - 8467 - 8468 - - type: AtmosDevice - joinedGrid: 30 - uid: 21784 components: - type: Transform @@ -62181,8 +61927,6 @@ entities: - 11774 - 11705 - 21782 - - type: AtmosDevice - joinedGrid: 30 - uid: 21786 components: - type: Transform @@ -62196,8 +61940,6 @@ entities: - 11774 - 954 - 21787 - - type: AtmosDevice - joinedGrid: 30 - uid: 21793 components: - type: Transform @@ -62208,8 +61950,6 @@ entities: - 8473 - 8474 - 21792 - - type: AtmosDevice - joinedGrid: 30 - uid: 21795 components: - type: Transform @@ -62223,8 +61963,6 @@ entities: - 24 - 23 - 21794 - - type: AtmosDevice - joinedGrid: 30 - uid: 21798 components: - type: Transform @@ -62253,8 +61991,6 @@ entities: - 601 - 600 - 21799 - - type: AtmosDevice - joinedGrid: 30 - uid: 21800 components: - type: Transform @@ -62283,15 +62019,11 @@ entities: - 601 - 600 - 21799 - - type: AtmosDevice - joinedGrid: 30 - uid: 21802 components: - type: Transform pos: -7.5,-0.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 21852 components: - type: Transform @@ -62302,8 +62034,6 @@ entities: - 20349 - 20350 - 21851 - - type: AtmosDevice - joinedGrid: 30 - uid: 21853 components: - type: Transform @@ -62314,8 +62044,6 @@ entities: - 21854 - 20351 - 20352 - - type: AtmosDevice - joinedGrid: 30 - uid: 21857 components: - type: Transform @@ -62327,8 +62055,6 @@ entities: - 21859 - 20347 - 20348 - - type: AtmosDevice - joinedGrid: 30 - uid: 21858 components: - type: Transform @@ -62339,8 +62065,6 @@ entities: - 21859 - 20347 - 20348 - - type: AtmosDevice - joinedGrid: 30 - uid: 21866 components: - type: Transform @@ -62356,8 +62080,6 @@ entities: - 1410 - 21867 - 10401 - - type: AtmosDevice - joinedGrid: 30 - uid: 21871 components: - type: Transform @@ -62372,8 +62094,6 @@ entities: - 1412 - 1413 - 21870 - - type: AtmosDevice - joinedGrid: 30 - uid: 21873 components: - type: Transform @@ -62391,8 +62111,6 @@ entities: - 1104 - 1103 - 1102 - - type: AtmosDevice - joinedGrid: 30 - uid: 21876 components: - type: Transform @@ -62405,8 +62123,6 @@ entities: - 1405 - 1406 - 1407 - - type: AtmosDevice - joinedGrid: 30 - uid: 21880 components: - type: Transform @@ -62423,8 +62139,6 @@ entities: - 31 - 29 - 28 - - type: AtmosDevice - joinedGrid: 30 - uid: 21884 components: - type: Transform @@ -62443,8 +62157,6 @@ entities: - 1412 - 1413 - 21882 - - type: AtmosDevice - joinedGrid: 30 - uid: 21887 components: - type: Transform @@ -62463,8 +62175,6 @@ entities: - 20384 - 20383 - 21885 - - type: AtmosDevice - joinedGrid: 30 - uid: 21889 components: - type: Transform @@ -62483,8 +62193,6 @@ entities: - 20385 - 20383 - 21890 - - type: AtmosDevice - joinedGrid: 30 - uid: 21898 components: - type: Transform @@ -62497,8 +62205,6 @@ entities: - 2745 - 2744 - 21896 - - type: AtmosDevice - joinedGrid: 30 - uid: 21904 components: - type: Transform @@ -62519,8 +62225,6 @@ entities: - 21893 - 21894 - 21895 - - type: AtmosDevice - joinedGrid: 30 - uid: 21907 components: - type: Transform @@ -62532,8 +62236,6 @@ entities: - 2005 - 2006 - 1443 - - type: AtmosDevice - joinedGrid: 30 - uid: 21912 components: - type: Transform @@ -62549,8 +62251,6 @@ entities: - 2222 - 2221 - 21914 - - type: AtmosDevice - joinedGrid: 30 - uid: 21915 components: - type: Transform @@ -62562,8 +62262,6 @@ entities: - 4891 - 4892 - 21916 - - type: AtmosDevice - joinedGrid: 30 - uid: 21918 components: - type: Transform @@ -62576,8 +62274,6 @@ entities: - 20387 - 20388 - 21919 - - type: AtmosDevice - joinedGrid: 30 - uid: 21927 components: - type: Transform @@ -62592,8 +62288,6 @@ entities: - 6102 - 6103 - 6104 - - type: AtmosDevice - joinedGrid: 30 - uid: 21929 components: - type: Transform @@ -62611,8 +62305,6 @@ entities: - 6094 - 6093 - 6092 - - type: AtmosDevice - joinedGrid: 30 - uid: 21935 components: - type: Transform @@ -62624,8 +62316,6 @@ entities: - 21938 - 5649 - 5650 - - type: AtmosDevice - joinedGrid: 30 - uid: 21936 components: - type: Transform @@ -62637,8 +62327,6 @@ entities: - 5651 - 5652 - 21937 - - type: AtmosDevice - joinedGrid: 30 - uid: 21942 components: - type: Transform @@ -62652,8 +62340,6 @@ entities: - 5652 - 5649 - 5650 - - type: AtmosDevice - joinedGrid: 30 - uid: 22031 components: - type: Transform @@ -62669,8 +62355,6 @@ entities: - 6537 - 6538 - 11275 - - type: AtmosDevice - joinedGrid: 30 - uid: 22033 components: - type: Transform @@ -62682,8 +62366,6 @@ entities: - 22032 - 5441 - 923 - - type: AtmosDevice - joinedGrid: 30 - uid: 22034 components: - type: Transform @@ -62699,8 +62381,6 @@ entities: - 1538 - 5441 - 923 - - type: AtmosDevice - joinedGrid: 30 - uid: 22037 components: - type: Transform @@ -62722,8 +62402,6 @@ entities: - 6540 - 6541 - 22039 - - type: AtmosDevice - joinedGrid: 30 - uid: 22040 components: - type: Transform @@ -62735,8 +62413,6 @@ entities: - 6536 - 6537 - 6538 - - type: AtmosDevice - joinedGrid: 30 - uid: 22049 components: - type: Transform @@ -62753,8 +62429,6 @@ entities: - 20952 - 20953 - 20954 - - type: AtmosDevice - joinedGrid: 30 - uid: 22051 components: - type: Transform @@ -62767,8 +62441,6 @@ entities: - 20953 - 20954 - 22053 - - type: AtmosDevice - joinedGrid: 30 - uid: 22055 components: - type: Transform @@ -62784,8 +62456,6 @@ entities: - 12858 - 13391 - 22056 - - type: AtmosDevice - joinedGrid: 30 - uid: 22060 components: - type: Transform @@ -62796,8 +62466,6 @@ entities: - 12858 - 13391 - 22061 - - type: AtmosDevice - joinedGrid: 30 - uid: 22064 components: - type: Transform @@ -62815,8 +62483,6 @@ entities: - 12626 - 12624 - 22066 - - type: AtmosDevice - joinedGrid: 30 - uid: 22068 components: - type: Transform @@ -62832,8 +62498,6 @@ entities: - 12622 - 12621 - 12620 - - type: AtmosDevice - joinedGrid: 30 - uid: 22074 components: - type: Transform @@ -62844,8 +62508,6 @@ entities: - 320 - 21456 - 22072 - - type: AtmosDevice - joinedGrid: 30 - uid: 22076 components: - type: Transform @@ -62861,8 +62523,6 @@ entities: - 20378 - 20377 - 22077 - - type: AtmosDevice - joinedGrid: 30 - uid: 22080 components: - type: Transform @@ -62879,8 +62539,6 @@ entities: - 649 - 650 - 651 - - type: AtmosDevice - joinedGrid: 30 - uid: 22085 components: - type: Transform @@ -62910,8 +62568,6 @@ entities: - 601 - 600 - 22086 - - type: AtmosDevice - joinedGrid: 30 - proto: FireAxeCabinetFilled entities: - uid: 5846 @@ -65014,6 +64670,13 @@ entities: - type: Transform pos: 43.4532,20.776619 parent: 30 +- proto: FoodPoppy + entities: + - uid: 5626 + components: + - type: Transform + pos: 7.8005,42.792442 + parent: 30 - proto: FoodTinBeansTrash entities: - uid: 16164 @@ -65067,8 +64730,6 @@ entities: rot: 1.5707963267948966 rad pos: -32.5,-11.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - proto: GasMinerCarbonDioxide @@ -65078,8 +64739,6 @@ entities: - type: Transform pos: 26.5,-26.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - proto: GasMinerNitrogen entities: - uid: 8689 @@ -65087,8 +64746,6 @@ entities: - type: Transform pos: 26.5,-22.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - proto: GasMinerOxygen entities: - uid: 8690 @@ -65096,8 +64753,6 @@ entities: - type: Transform pos: 26.5,-24.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - proto: GasMinerWaterVapor entities: - uid: 8692 @@ -65105,8 +64760,6 @@ entities: - type: Transform pos: 26.5,-28.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - proto: GasMixer entities: - uid: 12927 @@ -65115,8 +64768,6 @@ entities: rot: -1.5707963267948966 rad pos: 36.5,9.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - proto: GasOutletInjector entities: - uid: 8693 @@ -65125,56 +64776,42 @@ entities: rot: -1.5707963267948966 rad pos: 25.5,-22.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 8695 components: - type: Transform rot: -1.5707963267948966 rad pos: 25.5,-24.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 8702 components: - type: Transform rot: -1.5707963267948966 rad pos: 25.5,-34.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 8703 components: - type: Transform rot: -1.5707963267948966 rad pos: 25.5,-32.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 8704 components: - type: Transform rot: -1.5707963267948966 rad pos: 25.5,-30.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 8705 components: - type: Transform rot: -1.5707963267948966 rad pos: 25.5,-28.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 8706 components: - type: Transform rot: -1.5707963267948966 rad pos: 25.5,-26.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - proto: GasPassiveVent entities: - uid: 368 @@ -65183,129 +64820,95 @@ entities: rot: 1.5707963267948966 rad pos: -17.5,16.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 481 components: - type: Transform rot: -1.5707963267948966 rad pos: -15.5,16.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 3125 components: - type: Transform rot: -1.5707963267948966 rad pos: -4.5,-57.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 3126 components: - type: Transform rot: -1.5707963267948966 rad pos: -4.5,-58.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 3221 components: - type: Transform rot: -1.5707963267948966 rad pos: -4.5,-59.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 7099 components: - type: Transform rot: 1.5707963267948966 rad pos: -10.5,-57.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 7100 components: - type: Transform rot: 1.5707963267948966 rad pos: -10.5,-58.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 8566 components: - type: Transform rot: -1.5707963267948966 rad pos: 23.5,-38.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 8694 components: - type: Transform pos: 27.5,-22.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 8696 components: - type: Transform pos: 27.5,-24.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 8697 components: - type: Transform pos: 27.5,-26.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 8698 components: - type: Transform pos: 27.5,-28.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 8699 components: - type: Transform pos: 27.5,-30.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 8700 components: - type: Transform pos: 27.5,-32.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 8701 components: - type: Transform pos: 27.5,-34.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 9018 components: - type: Transform rot: 1.5707963267948966 rad pos: 13.5,-36.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 9019 components: - type: Transform rot: -1.5707963267948966 rad pos: 11.5,-36.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#947507FF' - uid: 9622 @@ -65314,30 +64917,22 @@ entities: rot: 1.5707963267948966 rad pos: -10.5,-59.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 12869 components: - type: Transform pos: 35.5,12.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 12870 components: - type: Transform pos: 38.5,12.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 21275 components: - type: Transform rot: 1.5707963267948966 rad pos: 23.5,-20.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - proto: GasPipeBend entities: - uid: 866 @@ -75997,10 +75592,14 @@ entities: - uid: 8933 components: - type: Transform + anchored: False pos: 7.5,-22.5 parent: 30 - type: AtmosPipeColor color: '#0335FCFF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 8934 components: - type: Transform @@ -77107,10 +76706,14 @@ entities: - uid: 9980 components: - type: Transform + anchored: False pos: 5.5,-22.5 parent: 30 - type: AtmosPipeColor color: '#FF1212FF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 9982 components: - type: Transform @@ -83814,9 +83417,13 @@ entities: - uid: 925 components: - type: Transform + anchored: False rot: -1.5707963267948966 rad pos: -11.5,-56.5 parent: 30 + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 962 components: - type: Transform @@ -86686,56 +86293,42 @@ entities: rot: 3.141592653589793 rad pos: -10.5,-48.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 6711 components: - type: Transform rot: 3.141592653589793 rad pos: -11.5,-48.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 6757 components: - type: Transform rot: 1.5707963267948966 rad pos: -38.5,-9.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 6799 components: - type: Transform rot: 1.5707963267948966 rad pos: -38.5,-10.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 8800 components: - type: Transform rot: 1.5707963267948966 rad pos: -10.5,-51.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 8801 components: - type: Transform rot: -1.5707963267948966 rad pos: -4.5,-51.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 9064 components: - type: Transform rot: -1.5707963267948966 rad pos: -11.5,-51.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9676 @@ -86744,8 +86337,6 @@ entities: rot: 1.5707963267948966 rad pos: -3.5,-51.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#03FCD3FF' - uid: 10390 @@ -86754,8 +86345,6 @@ entities: rot: 1.5707963267948966 rad pos: 20.5,-17.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 10392 @@ -86764,8 +86353,6 @@ entities: rot: 1.5707963267948966 rad pos: 20.5,-16.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 11744 @@ -86774,8 +86361,6 @@ entities: rot: 1.5707963267948966 rad pos: 5.5,-25.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 11869 @@ -86784,8 +86369,6 @@ entities: rot: 1.5707963267948966 rad pos: 5.5,-24.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 12867 @@ -86794,63 +86377,47 @@ entities: rot: 3.141592653589793 rad pos: 39.5,9.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 12918 components: - type: Transform rot: -1.5707963267948966 rad pos: 37.5,9.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 12921 components: - type: Transform rot: 3.141592653589793 rad pos: 38.5,9.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 16775 components: - type: Transform pos: 36.5,10.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 18776 components: - type: Transform rot: 3.141592653589793 rad pos: -64.5,-65.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 18777 components: - type: Transform rot: 3.141592653589793 rad pos: -65.5,-65.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 18778 components: - type: Transform rot: 3.141592653589793 rad pos: -66.5,-65.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 19440 components: - type: Transform rot: 1.5707963267948966 rad pos: -5.5,-8.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - proto: GasPressurePump entities: - uid: 7140 @@ -86861,24 +86428,18 @@ entities: rot: 1.5707963267948966 rad pos: -36.5,-11.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 7911 components: - type: Transform rot: -1.5707963267948966 rad pos: 21.5,-35.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 7913 components: - type: Transform rot: -1.5707963267948966 rad pos: 21.5,-31.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 7962 components: - type: MetaData @@ -86886,8 +86447,6 @@ entities: - type: Transform pos: -30.5,-10.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8781 @@ -86896,8 +86455,6 @@ entities: rot: -1.5707963267948966 rad pos: 16.5,-24.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8792 @@ -86906,40 +86463,30 @@ entities: rot: -1.5707963267948966 rad pos: 21.5,-29.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 8793 components: - type: Transform rot: -1.5707963267948966 rad pos: 21.5,-27.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 8796 components: - type: Transform rot: -1.5707963267948966 rad pos: 21.5,-23.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 8797 components: - type: Transform rot: -1.5707963267948966 rad pos: 21.5,-25.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 8802 components: - type: Transform rot: -1.5707963267948966 rad pos: 21.5,-33.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 9013 components: - type: MetaData @@ -86948,8 +86495,6 @@ entities: rot: -1.5707963267948966 rad pos: 17.5,-36.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 9028 components: - type: MetaData @@ -86957,8 +86502,6 @@ entities: - type: Transform pos: 6.5,-36.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#EB9834FF' - uid: 9066 @@ -86967,8 +86510,6 @@ entities: rot: 1.5707963267948966 rad pos: -9.5,-51.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9102 @@ -86977,8 +86518,6 @@ entities: rot: -1.5707963267948966 rad pos: -5.5,-51.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#03FCD3FF' - uid: 9862 @@ -86989,8 +86528,6 @@ entities: rot: -1.5707963267948966 rad pos: -1.5,-54.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#34E5EBFF' - uid: 12922 @@ -86999,23 +86536,17 @@ entities: rot: 3.141592653589793 rad pos: 35.5,10.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 13354 components: - type: Transform pos: 38.5,10.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 18772 components: - type: Transform rot: 3.141592653589793 rad pos: -64.5,-62.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - proto: GasThermoMachineFreezer @@ -87025,22 +86556,16 @@ entities: - type: Transform pos: -16.5,17.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 901 components: - type: Transform pos: -36.5,-9.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 6659 components: - type: Transform pos: -10.5,-47.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 7109 components: - type: Transform @@ -87049,8 +86574,6 @@ entities: parent: 30 - type: AtmosPipeColor color: '#03FCD3FF' - - type: AtmosDevice - joinedGrid: 30 - uid: 7112 components: - type: Transform @@ -87059,46 +86582,34 @@ entities: parent: 30 - type: AtmosPipeColor color: '#03FCD3FF' - - type: AtmosDevice - joinedGrid: 30 - uid: 7598 components: - type: Transform rot: 3.141592653589793 rad pos: -34.5,-13.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 12038 components: - type: Transform rot: -1.5707963267948966 rad pos: 17.5,-33.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 12084 components: - type: Transform rot: -1.5707963267948966 rad pos: 17.5,-34.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 12749 components: - type: Transform pos: 31.5,12.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 12868 components: - type: Transform pos: 39.5,10.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - proto: GasThermoMachineHeater entities: - uid: 6642 @@ -87106,16 +86617,12 @@ entities: - type: Transform pos: -11.5,-47.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 12085 components: - type: Transform rot: -1.5707963267948966 rad pos: 17.5,-35.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - proto: GasValve entities: - uid: 6714 @@ -87125,8 +86632,6 @@ entities: parent: 30 - type: GasValve open: False - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 7222 @@ -87139,8 +86644,6 @@ entities: parent: 30 - type: GasValve open: False - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#03FCD3FF' - uid: 8278 @@ -87153,8 +86656,6 @@ entities: parent: 30 - type: GasValve open: False - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#03FCD3FF' - uid: 9657 @@ -87164,8 +86665,6 @@ entities: parent: 30 - type: GasValve open: False - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9807 @@ -87176,8 +86675,6 @@ entities: parent: 30 - type: GasValve open: False - - type: AtmosDevice - joinedGrid: 30 - uid: 9808 components: - type: Transform @@ -87186,8 +86683,6 @@ entities: parent: 30 - type: GasValve open: False - - type: AtmosDevice - joinedGrid: 30 - uid: 21274 components: - type: MetaData @@ -87198,8 +86693,6 @@ entities: parent: 30 - type: GasValve open: False - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - proto: GasVentPump @@ -87210,8 +86703,6 @@ entities: rot: 1.5707963267948966 rad pos: -35.5,31.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 2454 @@ -87220,8 +86711,6 @@ entities: rot: 1.5707963267948966 rad pos: -35.5,36.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 2482 @@ -87230,8 +86719,6 @@ entities: rot: 3.141592653589793 rad pos: -49.5,32.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 2491 @@ -87240,8 +86727,6 @@ entities: rot: 3.141592653589793 rad pos: -41.5,32.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 2493 @@ -87249,8 +86734,6 @@ entities: - type: Transform pos: -45.5,36.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 2503 @@ -87259,8 +86742,6 @@ entities: rot: 1.5707963267948966 rad pos: -35.5,39.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 2523 @@ -87268,8 +86749,6 @@ entities: - type: Transform pos: -33.5,43.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 2524 @@ -87278,8 +86757,6 @@ entities: rot: -1.5707963267948966 rad pos: -30.5,46.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 2544 @@ -87288,8 +86765,6 @@ entities: rot: 1.5707963267948966 rad pos: -41.5,48.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 2551 @@ -87297,8 +86772,6 @@ entities: - type: Transform pos: -40.5,51.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 2573 @@ -87307,8 +86780,6 @@ entities: rot: -1.5707963267948966 rad pos: -25.5,49.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 2592 @@ -87317,8 +86788,6 @@ entities: rot: 1.5707963267948966 rad pos: -31.5,57.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 2594 @@ -87327,8 +86796,6 @@ entities: rot: 3.141592653589793 rad pos: -30.5,52.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 2638 @@ -87337,8 +86804,6 @@ entities: rot: 3.141592653589793 rad pos: -38.5,40.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 2639 @@ -87347,8 +86812,6 @@ entities: rot: 3.141592653589793 rad pos: -42.5,40.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 2640 @@ -87357,8 +86820,6 @@ entities: rot: 3.141592653589793 rad pos: -46.5,40.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 2644 @@ -87366,8 +86827,6 @@ entities: - type: Transform pos: -41.5,43.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 2669 @@ -87376,8 +86835,6 @@ entities: rot: 1.5707963267948966 rad pos: -47.5,49.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 2676 @@ -87386,8 +86843,6 @@ entities: rot: 1.5707963267948966 rad pos: -50.5,52.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 2705 @@ -87395,8 +86850,6 @@ entities: - type: Transform pos: -48.5,68.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 2706 @@ -87405,8 +86858,6 @@ entities: rot: 3.141592653589793 rad pos: -48.5,66.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 2707 @@ -87415,8 +86866,6 @@ entities: rot: -1.5707963267948966 rad pos: -49.5,61.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 2708 @@ -87425,8 +86874,6 @@ entities: rot: -1.5707963267948966 rad pos: -45.5,61.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 2734 @@ -87435,8 +86882,6 @@ entities: rot: 1.5707963267948966 rad pos: -47.5,56.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 2743 @@ -87445,8 +86890,6 @@ entities: rot: -1.5707963267948966 rad pos: -28.5,42.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 2862 @@ -87454,8 +86897,6 @@ entities: - type: Transform pos: -8.5,26.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 3042 @@ -87464,8 +86905,6 @@ entities: rot: 1.5707963267948966 rad pos: -26.5,31.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 3050 @@ -87474,8 +86913,6 @@ entities: rot: 3.141592653589793 rad pos: -30.5,22.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 3056 @@ -87484,8 +86921,6 @@ entities: rot: 3.141592653589793 rad pos: -26.5,23.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 3062 @@ -87494,8 +86929,6 @@ entities: rot: 3.141592653589793 rad pos: -22.5,23.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 3064 @@ -87504,8 +86937,6 @@ entities: rot: 1.5707963267948966 rad pos: -35.5,26.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 3066 @@ -87514,8 +86945,6 @@ entities: rot: 1.5707963267948966 rad pos: -35.5,19.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 3069 @@ -87524,8 +86953,6 @@ entities: rot: 1.5707963267948966 rad pos: -35.5,8.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 3077 @@ -87533,8 +86960,6 @@ entities: - type: Transform pos: -40.5,10.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 3099 @@ -87542,8 +86967,6 @@ entities: - type: Transform pos: -42.5,6.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 3111 @@ -87552,8 +86975,6 @@ entities: rot: 3.141592653589793 rad pos: -39.5,0.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 3135 @@ -87562,8 +86983,6 @@ entities: rot: 3.141592653589793 rad pos: -53.5,9.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 3148 @@ -87572,8 +86991,6 @@ entities: rot: 1.5707963267948966 rad pos: -45.5,4.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 3171 @@ -87582,8 +86999,6 @@ entities: rot: 1.5707963267948966 rad pos: -45.5,-2.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 3228 @@ -87592,8 +87007,6 @@ entities: rot: -1.5707963267948966 rad pos: -31.5,8.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 3230 @@ -87601,8 +87014,6 @@ entities: - type: Transform pos: -32.5,2.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 3253 @@ -87610,8 +87021,6 @@ entities: - type: Transform pos: -43.5,18.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 3266 @@ -87619,8 +87028,6 @@ entities: - type: Transform pos: -44.5,14.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 3302 @@ -87629,8 +87036,6 @@ entities: rot: 1.5707963267948966 rad pos: -60.5,13.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 3303 @@ -87639,8 +87044,6 @@ entities: rot: 1.5707963267948966 rad pos: -60.5,15.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 3304 @@ -87649,8 +87052,6 @@ entities: rot: 1.5707963267948966 rad pos: -60.5,21.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 3305 @@ -87659,8 +87060,6 @@ entities: rot: 1.5707963267948966 rad pos: -60.5,23.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 3323 @@ -87669,8 +87068,6 @@ entities: rot: -1.5707963267948966 rad pos: -56.5,18.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 3324 @@ -87678,8 +87075,6 @@ entities: - type: Transform pos: -50.5,18.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 3325 @@ -87687,8 +87082,6 @@ entities: - type: Transform pos: -27.5,2.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 3327 @@ -87696,8 +87089,6 @@ entities: - type: Transform pos: -17.5,2.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 3357 @@ -87706,8 +87097,6 @@ entities: rot: -1.5707963267948966 rad pos: -26.5,10.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 3376 @@ -87715,8 +87104,6 @@ entities: - type: Transform pos: -26.5,16.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 3401 @@ -87725,8 +87112,6 @@ entities: rot: -1.5707963267948966 rad pos: -13.5,10.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 3407 @@ -87734,8 +87119,6 @@ entities: - type: Transform pos: -10.5,2.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 3410 @@ -87743,8 +87126,6 @@ entities: - type: Transform pos: 5.5,2.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 3422 @@ -87753,8 +87134,6 @@ entities: rot: -1.5707963267948966 rad pos: -0.5,7.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 3469 @@ -87762,8 +87141,6 @@ entities: - type: Transform pos: -16.5,15.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 3479 @@ -87772,8 +87149,6 @@ entities: rot: 3.141592653589793 rad pos: -8.5,13.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 3480 @@ -87781,8 +87156,6 @@ entities: - type: Transform pos: -9.5,18.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 3481 @@ -87791,8 +87164,6 @@ entities: rot: -1.5707963267948966 rad pos: 3.5,14.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 3485 @@ -87801,8 +87172,6 @@ entities: rot: 3.141592653589793 rad pos: -0.5,13.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 6109 @@ -87810,8 +87179,6 @@ entities: - type: Transform pos: -23.5,26.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 6113 @@ -87819,8 +87186,6 @@ entities: - type: Transform pos: 3.5,26.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 6123 @@ -87829,8 +87194,6 @@ entities: rot: 3.141592653589793 rad pos: -0.5,21.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 6205 @@ -87838,8 +87201,6 @@ entities: - type: Transform pos: -9.5,43.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 6214 @@ -87848,8 +87209,6 @@ entities: rot: 3.141592653589793 rad pos: -7.5,36.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 6223 @@ -87858,8 +87217,6 @@ entities: rot: -1.5707963267948966 rad pos: 0.5,31.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 6229 @@ -87868,8 +87225,6 @@ entities: rot: 1.5707963267948966 rad pos: -19.5,39.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 6239 @@ -87878,8 +87233,6 @@ entities: rot: 1.5707963267948966 rad pos: -25.5,37.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 6245 @@ -87888,8 +87241,6 @@ entities: rot: 3.141592653589793 rad pos: -20.5,31.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 6246 @@ -87898,8 +87249,6 @@ entities: rot: -1.5707963267948966 rad pos: -19.5,36.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 6834 @@ -87908,8 +87257,6 @@ entities: rot: 3.141592653589793 rad pos: -25.5,-22.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 6900 @@ -87918,8 +87265,6 @@ entities: rot: -1.5707963267948966 rad pos: -28.5,-1.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 6920 @@ -87928,8 +87273,6 @@ entities: rot: 1.5707963267948966 rad pos: -33.5,-16.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 6939 @@ -87938,8 +87281,6 @@ entities: rot: 1.5707963267948966 rad pos: -18.5,-2.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 7115 @@ -87947,8 +87288,6 @@ entities: - type: Transform pos: -28.5,-20.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 7136 @@ -87959,8 +87298,6 @@ entities: - type: DeviceNetwork deviceLists: - 8267 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 7137 @@ -87971,8 +87308,6 @@ entities: - type: DeviceNetwork deviceLists: - 8267 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 7340 @@ -87980,8 +87315,6 @@ entities: - type: Transform pos: -12.5,-1.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 7373 @@ -87990,8 +87323,6 @@ entities: rot: -1.5707963267948966 rad pos: -7.5,-9.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 7424 @@ -88000,8 +87331,6 @@ entities: rot: 1.5707963267948966 rad pos: -35.5,-1.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 7569 @@ -88013,8 +87342,6 @@ entities: - type: DeviceNetwork deviceLists: - 8254 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8033 @@ -88022,8 +87349,6 @@ entities: - type: Transform pos: -13.5,-8.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8100 @@ -88032,8 +87357,6 @@ entities: rot: 3.141592653589793 rad pos: -13.5,-20.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8224 @@ -88041,8 +87364,6 @@ entities: - type: Transform pos: -22.5,-3.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8316 @@ -88051,8 +87372,6 @@ entities: rot: -1.5707963267948966 rad pos: -29.5,-7.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 9046 @@ -88060,8 +87379,6 @@ entities: - type: Transform pos: -25.5,-15.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 9686 @@ -88073,8 +87390,6 @@ entities: - type: DeviceNetwork deviceLists: - 9671 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 9811 @@ -88083,8 +87398,6 @@ entities: rot: 1.5707963267948966 rad pos: -54.5,-8.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 11153 @@ -88093,8 +87406,6 @@ entities: rot: 1.5707963267948966 rad pos: -22.5,-42.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 11154 @@ -88102,8 +87413,6 @@ entities: - type: Transform pos: -12.5,-40.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 11155 @@ -88111,8 +87420,6 @@ entities: - type: Transform pos: -2.5,-40.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 11162 @@ -88120,8 +87427,6 @@ entities: - type: Transform pos: -6.5,-35.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 11163 @@ -88130,8 +87435,6 @@ entities: rot: 3.141592653589793 rad pos: -6.5,-43.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 11165 @@ -88140,8 +87443,6 @@ entities: rot: 1.5707963267948966 rad pos: 1.5,-32.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 11176 @@ -88150,8 +87451,6 @@ entities: rot: 1.5707963267948966 rad pos: -10.5,-28.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 11178 @@ -88160,8 +87459,6 @@ entities: rot: 1.5707963267948966 rad pos: -2.5,-26.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 11180 @@ -88169,8 +87466,6 @@ entities: - type: Transform pos: 10.5,-23.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 11188 @@ -88179,8 +87474,6 @@ entities: rot: 3.141592653589793 rad pos: 10.5,-28.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 11200 @@ -88188,8 +87481,6 @@ entities: - type: Transform pos: 2.5,-19.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 11208 @@ -88197,8 +87488,6 @@ entities: - type: Transform pos: 9.5,-15.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 11211 @@ -88207,8 +87496,6 @@ entities: rot: 1.5707963267948966 rad pos: 12.5,-17.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 11216 @@ -88216,8 +87503,6 @@ entities: - type: Transform pos: -2.5,-1.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 11217 @@ -88226,8 +87511,6 @@ entities: rot: 3.141592653589793 rad pos: 5.5,-3.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 11220 @@ -88236,8 +87519,6 @@ entities: rot: 1.5707963267948966 rad pos: 8.5,-9.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 11222 @@ -88246,8 +87527,6 @@ entities: rot: -1.5707963267948966 rad pos: 14.5,-4.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 11224 @@ -88255,8 +87534,6 @@ entities: - type: Transform pos: 12.5,2.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 11227 @@ -88264,8 +87541,6 @@ entities: - type: Transform pos: -19.5,-36.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 11664 @@ -88274,8 +87549,6 @@ entities: rot: 3.141592653589793 rad pos: 33.5,-10.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 11868 @@ -88284,8 +87557,6 @@ entities: rot: 3.141592653589793 rad pos: 24.5,-10.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 11872 @@ -88294,8 +87565,6 @@ entities: rot: 3.141592653589793 rad pos: 24.5,-3.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 11922 @@ -88304,8 +87573,6 @@ entities: rot: -1.5707963267948966 rad pos: 37.5,-5.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 11938 @@ -88314,8 +87581,6 @@ entities: rot: 3.141592653589793 rad pos: 17.5,-10.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 11939 @@ -88324,8 +87589,6 @@ entities: rot: 3.141592653589793 rad pos: 20.5,-10.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 11981 @@ -88333,8 +87596,6 @@ entities: - type: Transform pos: 20.5,0.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 11991 @@ -88343,8 +87604,6 @@ entities: rot: 1.5707963267948966 rad pos: 19.5,-1.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 12007 @@ -88352,8 +87611,6 @@ entities: - type: Transform pos: 30.5,1.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 12010 @@ -88361,8 +87618,6 @@ entities: - type: Transform pos: 25.5,0.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 12060 @@ -88371,8 +87626,6 @@ entities: rot: -1.5707963267948966 rad pos: 37.5,-3.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 12081 @@ -88381,8 +87634,6 @@ entities: rot: 3.141592653589793 rad pos: 30.5,-3.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 12230 @@ -88391,8 +87642,6 @@ entities: rot: 3.141592653589793 rad pos: 34.5,-14.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 12491 @@ -88401,8 +87650,6 @@ entities: rot: 1.5707963267948966 rad pos: 9.5,33.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 12492 @@ -88411,8 +87658,6 @@ entities: rot: -1.5707963267948966 rad pos: 11.5,39.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 12495 @@ -88420,8 +87665,6 @@ entities: - type: Transform pos: 9.5,41.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 12537 @@ -88430,8 +87673,6 @@ entities: rot: 1.5707963267948966 rad pos: 9.5,24.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 12538 @@ -88439,8 +87680,6 @@ entities: - type: Transform pos: 18.5,26.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 12579 @@ -88449,8 +87688,6 @@ entities: rot: 1.5707963267948966 rad pos: 18.5,40.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 12580 @@ -88459,8 +87696,6 @@ entities: rot: 1.5707963267948966 rad pos: 18.5,37.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 12581 @@ -88469,8 +87704,6 @@ entities: rot: 1.5707963267948966 rad pos: 18.5,34.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 12587 @@ -88478,8 +87711,6 @@ entities: - type: Transform pos: 25.5,42.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 12605 @@ -88488,8 +87719,6 @@ entities: rot: -1.5707963267948966 rad pos: 24.5,38.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 12611 @@ -88497,8 +87726,6 @@ entities: - type: Transform pos: 27.5,27.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 12756 @@ -88507,15 +87734,11 @@ entities: rot: -1.5707963267948966 rad pos: 33.5,14.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 12796 components: - type: Transform pos: 32.5,11.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 12959 @@ -88524,8 +87747,6 @@ entities: rot: -1.5707963267948966 rad pos: 27.5,18.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 12976 @@ -88534,8 +87755,6 @@ entities: rot: -1.5707963267948966 rad pos: 37.5,8.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 12983 @@ -88544,8 +87763,6 @@ entities: rot: 1.5707963267948966 rad pos: 16.5,10.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 13002 @@ -88554,8 +87771,6 @@ entities: rot: 1.5707963267948966 rad pos: 22.5,13.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 13003 @@ -88564,8 +87779,6 @@ entities: rot: 3.141592653589793 rad pos: 28.5,7.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 13004 @@ -88574,8 +87787,6 @@ entities: rot: -1.5707963267948966 rad pos: 24.5,19.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 13005 @@ -88583,8 +87794,6 @@ entities: - type: Transform pos: 14.5,21.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 13006 @@ -88593,8 +87802,6 @@ entities: rot: 1.5707963267948966 rad pos: 13.5,18.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 13081 @@ -88602,8 +87809,6 @@ entities: - type: Transform pos: 18.5,16.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 13335 @@ -88612,8 +87817,6 @@ entities: rot: 1.5707963267948966 rad pos: 9.5,14.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 13360 @@ -88622,8 +87825,6 @@ entities: rot: -1.5707963267948966 rad pos: 26.5,15.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 13469 @@ -88631,8 +87832,6 @@ entities: - type: Transform pos: 16.5,57.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 13470 @@ -88640,8 +87839,6 @@ entities: - type: Transform pos: 20.5,44.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 13593 @@ -88649,8 +87846,6 @@ entities: - type: Transform pos: 35.5,39.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 13783 @@ -88659,8 +87854,6 @@ entities: rot: -1.5707963267948966 rad pos: 45.5,38.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 13788 @@ -88669,8 +87862,6 @@ entities: rot: 3.141592653589793 rad pos: 30.5,37.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 13789 @@ -88678,8 +87869,6 @@ entities: - type: Transform pos: 30.5,42.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 15441 @@ -88688,8 +87877,6 @@ entities: rot: 1.5707963267948966 rad pos: 51.5,20.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 15619 @@ -88697,8 +87884,6 @@ entities: - type: Transform pos: 52.5,23.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 16096 @@ -88707,8 +87892,6 @@ entities: rot: 3.141592653589793 rad pos: 6.5,-28.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 18436 @@ -88717,8 +87900,6 @@ entities: rot: 1.5707963267948966 rad pos: -45.5,-13.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 18437 @@ -88727,8 +87908,6 @@ entities: rot: 1.5707963267948966 rad pos: -45.5,-21.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 18438 @@ -88736,8 +87915,6 @@ entities: - type: Transform pos: -58.5,-23.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 18439 @@ -88745,8 +87922,6 @@ entities: - type: Transform pos: -49.5,-23.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 18440 @@ -88754,8 +87929,6 @@ entities: - type: Transform pos: -53.5,-23.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 18449 @@ -88763,8 +87936,6 @@ entities: - type: Transform pos: -63.5,-19.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 18450 @@ -88773,8 +87944,6 @@ entities: rot: -1.5707963267948966 rad pos: -62.5,-21.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 18629 @@ -88783,8 +87952,6 @@ entities: rot: 1.5707963267948966 rad pos: -59.5,-44.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 18655 @@ -88792,8 +87959,6 @@ entities: - type: Transform pos: -79.5,-39.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 18662 @@ -88801,8 +87966,6 @@ entities: - type: Transform pos: -77.5,-42.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 18663 @@ -88810,8 +87973,6 @@ entities: - type: Transform pos: -75.5,-41.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 18667 @@ -88819,8 +87980,6 @@ entities: - type: Transform pos: -68.5,-45.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 18668 @@ -88828,8 +87987,6 @@ entities: - type: Transform pos: -67.5,-42.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 18674 @@ -88837,8 +87994,6 @@ entities: - type: Transform pos: -55.5,-45.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 18678 @@ -88847,8 +88002,6 @@ entities: rot: -1.5707963267948966 rad pos: -52.5,-56.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 18679 @@ -88857,8 +88010,6 @@ entities: rot: -1.5707963267948966 rad pos: -52.5,-52.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 18720 @@ -88867,8 +88018,6 @@ entities: rot: 1.5707963267948966 rad pos: -83.5,-60.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 18731 @@ -88877,8 +88026,6 @@ entities: rot: 3.141592653589793 rad pos: -80.5,-61.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 18732 @@ -88887,8 +88034,6 @@ entities: rot: 3.141592653589793 rad pos: -74.5,-61.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 18753 @@ -88897,8 +88042,6 @@ entities: rot: 1.5707963267948966 rad pos: -76.5,-55.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 18754 @@ -88906,8 +88049,6 @@ entities: - type: Transform pos: -71.5,-53.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 18757 @@ -88915,8 +88056,6 @@ entities: - type: Transform pos: -60.5,-59.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 18758 @@ -88925,8 +88064,6 @@ entities: rot: 3.141592653589793 rad pos: -60.5,-49.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 18769 @@ -88935,8 +88072,6 @@ entities: rot: 3.141592653589793 rad pos: -59.5,-64.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 20335 @@ -88945,8 +88080,6 @@ entities: rot: 3.141592653589793 rad pos: 4.5,-8.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 21549 @@ -88955,8 +88088,6 @@ entities: rot: 3.141592653589793 rad pos: 39.5,34.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 22023 @@ -88964,8 +88095,6 @@ entities: - type: Transform pos: -0.5,74.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 22024 @@ -88974,8 +88103,6 @@ entities: rot: -1.5707963267948966 rad pos: 0.5,65.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 22025 @@ -88983,8 +88110,6 @@ entities: - type: Transform pos: -1.5,38.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 22768 @@ -88993,8 +88118,6 @@ entities: rot: -1.5707963267948966 rad pos: -16.5,-47.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 22799 @@ -89003,8 +88126,6 @@ entities: rot: 3.141592653589793 rad pos: -26.5,-59.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 22800 @@ -89013,8 +88134,6 @@ entities: rot: 1.5707963267948966 rad pos: -31.5,-58.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - uid: 22801 @@ -89023,8 +88142,6 @@ entities: rot: 1.5707963267948966 rad pos: -36.5,-60.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#0335FCFF' - proto: GasVentScrubber @@ -89034,16 +88151,12 @@ entities: - type: Transform pos: -43.5,64.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 2452 components: - type: Transform rot: -1.5707963267948966 rad pos: -35.5,32.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 2453 @@ -89052,8 +88165,6 @@ entities: rot: -1.5707963267948966 rad pos: -35.5,37.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 2483 @@ -89062,8 +88173,6 @@ entities: rot: 3.141592653589793 rad pos: -50.5,32.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 2490 @@ -89072,8 +88181,6 @@ entities: rot: 3.141592653589793 rad pos: -42.5,32.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 2492 @@ -89082,8 +88189,6 @@ entities: rot: 3.141592653589793 rad pos: -41.5,36.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 2504 @@ -89092,8 +88197,6 @@ entities: rot: -1.5707963267948966 rad pos: -35.5,40.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 2525 @@ -89102,8 +88205,6 @@ entities: rot: 3.141592653589793 rad pos: -35.5,43.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 2526 @@ -89112,8 +88213,6 @@ entities: rot: 1.5707963267948966 rad pos: -34.5,46.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 2545 @@ -89122,8 +88221,6 @@ entities: rot: 1.5707963267948966 rad pos: -41.5,47.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 2552 @@ -89131,8 +88228,6 @@ entities: - type: Transform pos: -38.5,51.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 2574 @@ -89141,8 +88236,6 @@ entities: rot: -1.5707963267948966 rad pos: -25.5,51.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 2593 @@ -89151,8 +88244,6 @@ entities: rot: -1.5707963267948966 rad pos: -33.5,57.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 2595 @@ -89161,8 +88252,6 @@ entities: rot: 3.141592653589793 rad pos: -34.5,52.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 2641 @@ -89171,8 +88260,6 @@ entities: rot: 3.141592653589793 rad pos: -48.5,40.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 2642 @@ -89181,8 +88268,6 @@ entities: rot: 3.141592653589793 rad pos: -44.5,40.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 2643 @@ -89191,8 +88276,6 @@ entities: rot: 3.141592653589793 rad pos: -40.5,40.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 2645 @@ -89201,8 +88284,6 @@ entities: rot: 3.141592653589793 rad pos: -43.5,43.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 2670 @@ -89211,8 +88292,6 @@ entities: rot: -1.5707963267948966 rad pos: -47.5,50.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 2675 @@ -89221,8 +88300,6 @@ entities: rot: 1.5707963267948966 rad pos: -50.5,51.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 2730 @@ -89231,8 +88308,6 @@ entities: rot: 3.141592653589793 rad pos: -48.5,63.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 2731 @@ -89241,8 +88316,6 @@ entities: rot: -1.5707963267948966 rad pos: -50.5,60.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 2732 @@ -89251,8 +88324,6 @@ entities: rot: -1.5707963267948966 rad pos: -46.5,60.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 2733 @@ -89261,8 +88332,6 @@ entities: rot: 1.5707963267948966 rad pos: -49.5,56.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 2742 @@ -89271,8 +88340,6 @@ entities: rot: 3.141592653589793 rad pos: -28.5,43.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 3006 @@ -89281,8 +88348,6 @@ entities: rot: 3.141592653589793 rad pos: -10.5,26.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 3041 @@ -89291,8 +88356,6 @@ entities: rot: -1.5707963267948966 rad pos: -30.5,31.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 3049 @@ -89301,8 +88364,6 @@ entities: rot: 3.141592653589793 rad pos: -31.5,22.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 3055 @@ -89311,8 +88372,6 @@ entities: rot: 3.141592653589793 rad pos: -27.5,23.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 3063 @@ -89321,8 +88380,6 @@ entities: rot: 3.141592653589793 rad pos: -21.5,22.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 3065 @@ -89331,8 +88388,6 @@ entities: rot: -1.5707963267948966 rad pos: -35.5,24.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 3067 @@ -89341,8 +88396,6 @@ entities: rot: -1.5707963267948966 rad pos: -35.5,17.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 3068 @@ -89351,8 +88404,6 @@ entities: rot: -1.5707963267948966 rad pos: -35.5,10.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 3076 @@ -89361,8 +88412,6 @@ entities: rot: 1.5707963267948966 rad pos: -39.5,10.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 3100 @@ -89371,8 +88420,6 @@ entities: rot: 3.141592653589793 rad pos: -39.5,6.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 3112 @@ -89381,8 +88428,6 @@ entities: rot: 3.141592653589793 rad pos: -41.5,0.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 3136 @@ -89391,8 +88436,6 @@ entities: rot: 1.5707963267948966 rad pos: -52.5,9.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 3147 @@ -89401,8 +88444,6 @@ entities: rot: -1.5707963267948966 rad pos: -44.5,6.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 3170 @@ -89411,8 +88452,6 @@ entities: rot: -1.5707963267948966 rad pos: -44.5,-5.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 3229 @@ -89421,8 +88460,6 @@ entities: rot: -1.5707963267948966 rad pos: -31.5,7.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 3231 @@ -89431,8 +88468,6 @@ entities: rot: 3.141592653589793 rad pos: -31.5,2.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 3254 @@ -89440,8 +88475,6 @@ entities: - type: Transform pos: -42.5,18.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 3267 @@ -89450,8 +88483,6 @@ entities: rot: 3.141592653589793 rad pos: -41.5,14.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 3317 @@ -89460,8 +88491,6 @@ entities: rot: 1.5707963267948966 rad pos: -53.5,16.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 3318 @@ -89470,8 +88499,6 @@ entities: rot: 1.5707963267948966 rad pos: -53.5,20.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 3326 @@ -89480,8 +88507,6 @@ entities: rot: 3.141592653589793 rad pos: -24.5,2.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 3328 @@ -89490,8 +88515,6 @@ entities: rot: 3.141592653589793 rad pos: -14.5,2.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 3358 @@ -89500,8 +88523,6 @@ entities: rot: 1.5707963267948966 rad pos: -24.5,9.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 3377 @@ -89510,8 +88531,6 @@ entities: rot: 1.5707963267948966 rad pos: -24.5,16.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 3398 @@ -89519,8 +88538,6 @@ entities: - type: Transform pos: -17.5,14.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 3400 @@ -89529,8 +88546,6 @@ entities: rot: -1.5707963267948966 rad pos: -13.5,7.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 3408 @@ -89539,8 +88554,6 @@ entities: rot: 3.141592653589793 rad pos: -6.5,2.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 3409 @@ -89549,8 +88562,6 @@ entities: rot: 3.141592653589793 rad pos: 1.5,2.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 3421 @@ -89559,8 +88570,6 @@ entities: rot: 1.5707963267948966 rad pos: -4.5,7.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 3482 @@ -89568,8 +88577,6 @@ entities: - type: Transform pos: -12.5,14.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 3483 @@ -89577,8 +88584,6 @@ entities: - type: Transform pos: -10.5,17.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 3484 @@ -89587,8 +88592,6 @@ entities: rot: -1.5707963267948966 rad pos: 3.5,13.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 3486 @@ -89596,8 +88599,6 @@ entities: - type: Transform pos: -4.5,14.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 5029 @@ -89606,8 +88607,6 @@ entities: rot: 1.5707963267948966 rad pos: -28.5,39.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 6108 @@ -89616,8 +88615,6 @@ entities: rot: 3.141592653589793 rad pos: -19.5,26.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 6112 @@ -89626,8 +88623,6 @@ entities: rot: 3.141592653589793 rad pos: 0.5,26.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 6122 @@ -89636,8 +88631,6 @@ entities: rot: 3.141592653589793 rad pos: -2.5,21.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 6204 @@ -89646,8 +88639,6 @@ entities: rot: 3.141592653589793 rad pos: -9.5,39.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 6213 @@ -89656,8 +88647,6 @@ entities: rot: 3.141592653589793 rad pos: -11.5,36.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 6222 @@ -89666,8 +88655,6 @@ entities: rot: -1.5707963267948966 rad pos: 0.5,32.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 6265 @@ -89676,8 +88663,6 @@ entities: rot: 1.5707963267948966 rad pos: -27.5,37.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 6266 @@ -89686,8 +88671,6 @@ entities: rot: 3.141592653589793 rad pos: -21.5,34.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 6268 @@ -89696,8 +88679,6 @@ entities: rot: 3.141592653589793 rad pos: -19.5,31.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 6911 @@ -89705,8 +88686,6 @@ entities: - type: Transform pos: -28.5,-3.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 6935 @@ -89715,8 +88694,6 @@ entities: rot: 1.5707963267948966 rad pos: -33.5,-18.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 7119 @@ -89725,8 +88702,6 @@ entities: rot: 3.141592653589793 rad pos: -28.5,-18.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 7130 @@ -89738,8 +88713,6 @@ entities: - type: DeviceNetwork deviceLists: - 8267 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 7131 @@ -89751,8 +88724,6 @@ entities: - type: DeviceNetwork deviceLists: - 8267 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 7339 @@ -89760,8 +88731,6 @@ entities: - type: Transform pos: -11.5,-2.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 7377 @@ -89770,8 +88739,6 @@ entities: rot: 3.141592653589793 rad pos: -7.5,-11.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 7378 @@ -89780,8 +88747,6 @@ entities: rot: 3.141592653589793 rad pos: -5.5,-11.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 7407 @@ -89790,8 +88755,6 @@ entities: rot: -1.5707963267948966 rad pos: -18.5,-1.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 7567 @@ -89800,8 +88763,6 @@ entities: rot: -1.5707963267948966 rad pos: -17.5,-20.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 7571 @@ -89812,8 +88773,6 @@ entities: - type: DeviceNetwork deviceLists: - 8254 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 7572 @@ -89822,8 +88781,6 @@ entities: rot: 3.141592653589793 rad pos: -13.5,-12.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 8223 @@ -89831,8 +88788,6 @@ entities: - type: Transform pos: -24.5,-3.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9049 @@ -89840,8 +88795,6 @@ entities: - type: Transform pos: -25.5,-16.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9713 @@ -89850,8 +88803,6 @@ entities: rot: 3.141592653589793 rad pos: -25.5,-23.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9846 @@ -89860,8 +88811,6 @@ entities: rot: 1.5707963267948966 rad pos: -29.5,-5.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9864 @@ -89873,8 +88822,6 @@ entities: - type: DeviceNetwork deviceLists: - 9671 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 10039 @@ -89883,8 +88830,6 @@ entities: rot: 1.5707963267948966 rad pos: -55.5,-9.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 11094 @@ -89893,8 +88838,6 @@ entities: rot: 1.5707963267948966 rad pos: -22.5,-41.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 11097 @@ -89902,8 +88845,6 @@ entities: - type: Transform pos: -17.5,-36.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 11098 @@ -89912,8 +88853,6 @@ entities: rot: 3.141592653589793 rad pos: -3.5,-40.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 11099 @@ -89922,8 +88861,6 @@ entities: rot: 3.141592653589793 rad pos: -11.5,-40.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 11107 @@ -89932,8 +88869,6 @@ entities: rot: 1.5707963267948966 rad pos: -10.5,-30.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 11114 @@ -89942,8 +88877,6 @@ entities: rot: 3.141592653589793 rad pos: -8.5,-43.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 11115 @@ -89951,8 +88884,6 @@ entities: - type: Transform pos: -8.5,-35.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 11166 @@ -89961,8 +88892,6 @@ entities: rot: -1.5707963267948966 rad pos: 1.5,-34.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 11179 @@ -89971,8 +88900,6 @@ entities: rot: -1.5707963267948966 rad pos: -2.5,-27.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 11189 @@ -89981,8 +88908,6 @@ entities: rot: 3.141592653589793 rad pos: 11.5,-28.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 11192 @@ -89991,8 +88916,6 @@ entities: rot: 3.141592653589793 rad pos: 12.5,-23.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 11201 @@ -90001,8 +88924,6 @@ entities: rot: 3.141592653589793 rad pos: 4.5,-19.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 11209 @@ -90010,8 +88931,6 @@ entities: - type: Transform pos: 7.5,-15.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 11210 @@ -90020,8 +88939,6 @@ entities: rot: -1.5707963267948966 rad pos: 12.5,-15.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 11214 @@ -90029,8 +88946,6 @@ entities: - type: Transform pos: 20.5,-18.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 11215 @@ -90039,8 +88954,6 @@ entities: rot: 3.141592653589793 rad pos: -2.5,-4.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 11218 @@ -90048,8 +88961,6 @@ entities: - type: Transform pos: 6.5,-2.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 11219 @@ -90058,8 +88969,6 @@ entities: rot: -1.5707963267948966 rad pos: 8.5,-8.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 11221 @@ -90068,8 +88977,6 @@ entities: rot: -1.5707963267948966 rad pos: 12.5,-4.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 11223 @@ -90078,8 +88985,6 @@ entities: rot: 3.141592653589793 rad pos: 9.5,2.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 11681 @@ -90087,8 +88992,6 @@ entities: - type: Transform pos: 25.5,-10.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 11714 @@ -90097,8 +89000,6 @@ entities: rot: 3.141592653589793 rad pos: 6.5,-26.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 11764 @@ -90106,8 +89007,6 @@ entities: - type: Transform pos: 24.5,-5.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 11797 @@ -90115,8 +89014,6 @@ entities: - type: Transform pos: 32.5,-10.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 11944 @@ -90124,8 +89021,6 @@ entities: - type: Transform pos: 19.5,-10.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 11945 @@ -90133,8 +89028,6 @@ entities: - type: Transform pos: 16.5,-10.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 11985 @@ -90143,8 +89036,6 @@ entities: rot: 1.5707963267948966 rad pos: 18.5,1.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 12043 @@ -90152,8 +89043,6 @@ entities: - type: Transform pos: 29.5,1.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 12044 @@ -90161,8 +89050,6 @@ entities: - type: Transform pos: 26.5,0.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 12489 @@ -90170,8 +89057,6 @@ entities: - type: Transform pos: 8.5,39.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 12490 @@ -90180,8 +89065,6 @@ entities: rot: -1.5707963267948966 rad pos: 9.5,31.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 12536 @@ -90190,8 +89073,6 @@ entities: rot: -1.5707963267948966 rad pos: 9.5,26.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 12539 @@ -90200,8 +89081,6 @@ entities: rot: 3.141592653589793 rad pos: 16.5,26.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 12576 @@ -90210,8 +89089,6 @@ entities: rot: 1.5707963267948966 rad pos: 18.5,33.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 12577 @@ -90220,8 +89097,6 @@ entities: rot: 1.5707963267948966 rad pos: 18.5,36.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 12578 @@ -90230,8 +89105,6 @@ entities: rot: 1.5707963267948966 rad pos: 18.5,39.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 12583 @@ -90239,8 +89112,6 @@ entities: - type: Transform pos: 21.5,43.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 12606 @@ -90248,8 +89119,6 @@ entities: - type: Transform pos: 24.5,37.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 12619 @@ -90258,8 +89127,6 @@ entities: rot: -1.5707963267948966 rad pos: 27.5,29.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 12755 @@ -90268,16 +89135,12 @@ entities: rot: 1.5707963267948966 rad pos: 31.5,14.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 12813 components: - type: Transform rot: -1.5707963267948966 rad pos: 29.5,20.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 12824 @@ -90286,8 +89149,6 @@ entities: rot: 3.141592653589793 rad pos: 28.5,15.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 13078 @@ -90296,8 +89157,6 @@ entities: rot: 1.5707963267948966 rad pos: 16.5,11.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 13079 @@ -90306,8 +89165,6 @@ entities: rot: 3.141592653589793 rad pos: 13.5,21.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 13080 @@ -90316,8 +89173,6 @@ entities: rot: -1.5707963267948966 rad pos: 13.5,16.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 13082 @@ -90325,8 +89180,6 @@ entities: - type: Transform pos: 18.5,15.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 13084 @@ -90335,8 +89188,6 @@ entities: rot: -1.5707963267948966 rad pos: 22.5,18.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 13085 @@ -90345,8 +89196,6 @@ entities: rot: -1.5707963267948966 rad pos: 22.5,11.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 13086 @@ -90354,8 +89203,6 @@ entities: - type: Transform pos: 25.5,8.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 13336 @@ -90364,8 +89211,6 @@ entities: rot: -1.5707963267948966 rad pos: 9.5,15.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 13353 @@ -90373,8 +89218,6 @@ entities: - type: Transform pos: 40.5,13.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 13355 @@ -90382,8 +89225,6 @@ entities: - type: Transform pos: 38.5,8.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 13782 @@ -90392,8 +89233,6 @@ entities: rot: -1.5707963267948966 rad pos: 45.5,35.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 13798 @@ -90401,8 +89240,6 @@ entities: - type: Transform pos: 29.5,42.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 13799 @@ -90410,8 +89247,6 @@ entities: - type: Transform pos: 30.5,36.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 14540 @@ -90420,8 +89255,6 @@ entities: rot: 1.5707963267948966 rad pos: 20.5,-5.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 18060 @@ -90429,8 +89262,6 @@ entities: - type: Transform pos: 30.5,-5.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 18435 @@ -90439,8 +89270,6 @@ entities: rot: -1.5707963267948966 rad pos: -44.5,-17.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 18441 @@ -90449,8 +89278,6 @@ entities: rot: 3.141592653589793 rad pos: -57.5,-23.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 18442 @@ -90459,8 +89286,6 @@ entities: rot: 3.141592653589793 rad pos: -51.5,-23.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 18451 @@ -90468,8 +89293,6 @@ entities: - type: Transform pos: -61.5,-21.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 18519 @@ -90478,8 +89301,6 @@ entities: rot: 3.141592653589793 rad pos: -77.5,-48.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 18520 @@ -90487,8 +89308,6 @@ entities: - type: Transform pos: -78.5,-39.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 18523 @@ -90496,8 +89315,6 @@ entities: - type: Transform pos: -68.5,-42.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 18524 @@ -90505,8 +89322,6 @@ entities: - type: Transform pos: -64.5,-44.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 18630 @@ -90515,8 +89330,6 @@ entities: rot: -1.5707963267948966 rad pos: -67.5,-44.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 18675 @@ -90524,8 +89337,6 @@ entities: - type: Transform pos: -56.5,-45.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 18676 @@ -90534,8 +89345,6 @@ entities: rot: -1.5707963267948966 rad pos: -52.5,-53.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 18677 @@ -90544,8 +89353,6 @@ entities: rot: -1.5707963267948966 rad pos: -52.5,-57.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 18729 @@ -90554,8 +89361,6 @@ entities: rot: 1.5707963267948966 rad pos: -80.5,-59.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 18730 @@ -90564,8 +89369,6 @@ entities: rot: 3.141592653589793 rad pos: -75.5,-61.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 18744 @@ -90573,8 +89376,6 @@ entities: - type: Transform pos: -76.5,-53.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 18745 @@ -90582,8 +89383,6 @@ entities: - type: Transform pos: -72.5,-53.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 18756 @@ -90592,8 +89391,6 @@ entities: rot: 3.141592653589793 rad pos: -63.5,-60.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 18759 @@ -90601,8 +89398,6 @@ entities: - type: Transform pos: -63.5,-48.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 18770 @@ -90611,8 +89406,6 @@ entities: rot: 1.5707963267948966 rad pos: -59.5,-65.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 21545 @@ -90621,8 +89414,6 @@ entities: rot: 3.141592653589793 rad pos: 35.5,34.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 21553 @@ -90630,8 +89421,6 @@ entities: - type: Transform pos: 43.5,39.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - proto: GasVolumePump @@ -90641,8 +89430,6 @@ entities: - type: Transform pos: -9.5,-50.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#FF1212FF' - uid: 8258 @@ -90651,8 +89438,6 @@ entities: rot: 3.141592653589793 rad pos: -5.5,-50.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#03FCD3FF' - proto: GeneratorRTG @@ -97380,29 +96165,21 @@ entities: - type: Transform pos: -3.5,-58.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 3155 components: - type: Transform pos: -3.5,-57.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 7104 components: - type: Transform pos: -11.5,-58.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 8295 components: - type: Transform pos: 3.5,-51.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - type: AtmosPipeColor color: '#03FCD3FF' - uid: 9621 @@ -97410,8 +96187,6 @@ entities: - type: Transform pos: -11.5,-57.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - proto: HighSecCommandLocked entities: - uid: 2128 @@ -102023,71 +100798,51 @@ entities: - type: Transform pos: -19.5,23.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 7770 components: - type: Transform pos: -11.5,-37.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 8771 components: - type: Transform pos: 27.5,-22.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 9118 components: - type: Transform pos: 21.5,-19.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 10397 components: - type: Transform pos: -14.5,-46.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 15154 components: - type: Transform pos: 15.5,8.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 15755 components: - type: Transform pos: 44.5,13.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 16893 components: - type: Transform pos: -44.5,27.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 16894 components: - type: Transform pos: -44.5,26.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 19624 components: - type: Transform pos: -32.5,-38.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - proto: NitrogenTankFilled entities: - uid: 8247 @@ -102107,15 +100862,11 @@ entities: - type: Transform pos: 19.5,-16.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 7769 components: - type: Transform pos: 18.5,-16.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - proto: NuclearBomb entities: - uid: 5607 @@ -102188,148 +100939,106 @@ entities: - type: Transform pos: 0.5,23.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 1983 components: - type: Transform pos: 33.5,-14.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 5661 components: - type: Transform pos: -24.5,45.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 5670 components: - type: Transform pos: -39.5,19.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 6032 components: - type: Transform pos: -1.5,38.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 7970 components: - type: Transform pos: -38.5,-9.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 8770 components: - type: Transform pos: 27.5,-24.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 9095 components: - type: Transform pos: 20.5,-14.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 9096 components: - type: Transform pos: 20.5,-13.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 9114 components: - type: Transform pos: 21.5,-14.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 9117 components: - type: Transform pos: 21.5,-13.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 9427 components: - type: Transform pos: -13.5,-37.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 9845 components: - type: Transform pos: -38.5,-10.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 10444 components: - type: Transform pos: -14.5,-48.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 11266 components: - type: Transform pos: -18.5,-50.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 15155 components: - type: Transform pos: 14.5,8.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 15438 components: - type: Transform pos: 46.5,17.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 15754 components: - type: Transform pos: 44.5,12.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 15968 components: - type: Transform pos: 51.5,29.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 16983 components: - type: Transform pos: -63.5,44.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 19623 components: - type: Transform pos: -33.5,-38.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - proto: OxygenTankFilled entities: - uid: 8226 @@ -103031,36 +101740,26 @@ entities: - type: Transform pos: 18.5,-14.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 9696 components: - type: Transform pos: 18.5,-13.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 10510 components: - type: Transform pos: -14.5,-51.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 17005 components: - type: Transform pos: 27.5,-30.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 20465 components: - type: Transform pos: -25.5,-48.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - proto: PlasticFlapsAirtightClear entities: - uid: 1952 @@ -116583,7 +115282,7 @@ entities: - type: Transform pos: 48.50878,41.513634 parent: 30 -- proto: soda_dispenser +- proto: SodaDispenser entities: - uid: 512 components: @@ -117945,11 +116644,15 @@ entities: - type: Transform pos: 18.5,44.5 parent: 30 + - type: SpamEmitSound + enabled: False - uid: 15237 components: - type: Transform pos: 37.5,45.5 parent: 30 + - type: SpamEmitSound + enabled: False - proto: SpawnMobAlexander entities: - uid: 9033 @@ -119050,92 +117753,66 @@ entities: - type: Transform pos: 19.5,-13.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 7939 components: - type: Transform pos: 14.5,-29.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 7973 components: - type: Transform pos: 19.5,-14.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 8775 components: - type: Transform pos: 27.5,-32.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 8776 components: - type: Transform pos: 27.5,-34.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 8791 components: - type: Transform pos: 14.5,-27.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 8803 components: - type: Transform pos: 14.5,-28.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 9794 components: - type: Transform pos: -12.5,-43.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 9998 components: - type: Transform pos: -13.5,-43.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 10000 components: - type: Transform pos: -11.5,-43.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 10001 components: - type: Transform pos: -10.5,-43.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 13342 components: - type: Transform pos: 35.5,7.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - uid: 13343 components: - type: Transform pos: 36.5,7.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - proto: Stunbaton entities: - uid: 2030 @@ -123274,8 +121951,6 @@ entities: rot: 1.5707963267948966 rad pos: -7.5,-50.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - proto: TegCirculator entities: - uid: 15013 @@ -139731,8 +138406,6 @@ entities: - type: Transform pos: 27.5,-28.5 parent: 30 - - type: AtmosDevice - joinedGrid: 30 - proto: WeaponCapacitorRecharger entities: - uid: 1084 From 93ea4c07ff4585eeedef3e90dca35c6dc270d975 Mon Sep 17 00:00:00 2001 From: lzk <124214523+lzk228@users.noreply.github.com> Date: Sun, 16 Jun 2024 21:37:08 +0200 Subject: [PATCH 119/142] Update packed (#28346) robotics console --- Resources/Maps/packed.yml | 960 ++++---------------------------------- 1 file changed, 93 insertions(+), 867 deletions(-) diff --git a/Resources/Maps/packed.yml b/Resources/Maps/packed.yml index 56d169e1ab..5e533af961 100644 --- a/Resources/Maps/packed.yml +++ b/Resources/Maps/packed.yml @@ -5975,12 +5975,13 @@ entities: - type: MetaData - type: Transform - type: Map + mapPaused: True - type: PhysicsMap + - type: GridTree + - type: MovedGrids - type: Broadphase - type: OccluderTree - type: LoadedMap - - type: GridTree - - type: MovedGrids - proto: AccordionInstrument entities: - uid: 5749 @@ -6000,8 +6001,6 @@ entities: devices: - 4027 - 4092 - - type: AtmosDevice - joinedGrid: 2 - uid: 151 components: - type: Transform @@ -6015,8 +6014,6 @@ entities: - 12554 - 10358 - 10403 - - type: AtmosDevice - joinedGrid: 2 - uid: 170 components: - type: Transform @@ -6027,8 +6024,6 @@ entities: devices: - 4460 - 4447 - - type: AtmosDevice - joinedGrid: 2 - uid: 182 components: - type: Transform @@ -6039,8 +6034,6 @@ entities: - 12564 - 10347 - 10400 - - type: AtmosDevice - joinedGrid: 2 - uid: 195 components: - type: Transform @@ -6051,8 +6044,6 @@ entities: devices: - 6949 - 4035 - - type: AtmosDevice - joinedGrid: 2 - uid: 360 components: - type: Transform @@ -6079,8 +6070,6 @@ entities: - 6638 - 6622 - 6609 - - type: AtmosDevice - joinedGrid: 2 - uid: 1017 components: - type: Transform @@ -6097,8 +6086,6 @@ entities: - 5684 - 1305 - 1625 - - type: AtmosDevice - joinedGrid: 2 - uid: 1520 components: - type: Transform @@ -6108,8 +6095,6 @@ entities: - type: DeviceList devices: - 1560 - - type: AtmosDevice - joinedGrid: 2 - uid: 1647 components: - type: Transform @@ -6123,8 +6108,6 @@ entities: - 10412 - 12559 - 10352 - - type: AtmosDevice - joinedGrid: 2 - uid: 2124 components: - type: Transform @@ -6149,8 +6132,6 @@ entities: - 7950 - 7837 - 7838 - - type: AtmosDevice - joinedGrid: 2 - uid: 2296 components: - type: Transform @@ -6168,8 +6149,6 @@ entities: - 10415 - 10356 - 10375 - - type: AtmosDevice - joinedGrid: 2 - uid: 5020 components: - type: Transform @@ -6199,8 +6178,6 @@ entities: - 7011 - 6621 - 6620 - - type: AtmosDevice - joinedGrid: 2 - uid: 5101 components: - type: Transform @@ -6211,8 +6188,6 @@ entities: devices: - 10402 - 10331 - - type: AtmosDevice - joinedGrid: 2 - uid: 5680 components: - type: Transform @@ -6222,8 +6197,6 @@ entities: devices: - 5679 - 5678 - - type: AtmosDevice - joinedGrid: 2 - uid: 6158 components: - type: Transform @@ -6233,8 +6206,6 @@ entities: devices: - 5968 - 5964 - - type: AtmosDevice - joinedGrid: 2 - uid: 6632 components: - type: Transform @@ -6252,8 +6223,6 @@ entities: - 6610 - 6593 - 6595 - - type: AtmosDevice - joinedGrid: 2 - uid: 6682 components: - type: Transform @@ -6270,8 +6239,6 @@ entities: - 6684 - 6570 - 6571 - - type: AtmosDevice - joinedGrid: 2 - uid: 7839 components: - type: Transform @@ -6289,8 +6256,6 @@ entities: - 7843 - 7472 - 7469 - - type: AtmosDevice - joinedGrid: 2 - uid: 8011 components: - type: Transform @@ -6319,8 +6284,6 @@ entities: - 8009 - 6778 - 7708 - - type: AtmosDevice - joinedGrid: 2 - uid: 8239 components: - type: Transform @@ -6333,8 +6296,6 @@ entities: - 8238 - 8222 - 8229 - - type: AtmosDevice - joinedGrid: 2 - uid: 8922 components: - type: Transform @@ -6354,8 +6315,6 @@ entities: - 6804 - 10206 - 10205 - - type: AtmosDevice - joinedGrid: 2 - uid: 9587 components: - type: Transform @@ -6370,8 +6329,6 @@ entities: - 9589 - 9570 - 9569 - - type: AtmosDevice - joinedGrid: 2 - uid: 9637 components: - type: Transform @@ -6381,8 +6338,6 @@ entities: devices: - 9636 - 9635 - - type: AtmosDevice - joinedGrid: 2 - uid: 10201 components: - type: Transform @@ -6394,8 +6349,6 @@ entities: - 12459 - 10172 - 10180 - - type: AtmosDevice - joinedGrid: 2 - uid: 10202 components: - type: Transform @@ -6405,8 +6358,6 @@ entities: devices: - 10181 - 10178 - - type: AtmosDevice - joinedGrid: 2 - uid: 10203 components: - type: Transform @@ -6417,8 +6368,6 @@ entities: devices: - 10182 - 10171 - - type: AtmosDevice - joinedGrid: 2 - uid: 10204 components: - type: Transform @@ -6429,8 +6378,6 @@ entities: devices: - 8017 - 8016 - - type: AtmosDevice - joinedGrid: 2 - uid: 10207 components: - type: Transform @@ -6443,8 +6390,6 @@ entities: - 10206 - 10215 - 10214 - - type: AtmosDevice - joinedGrid: 2 - uid: 10250 components: - type: Transform @@ -6455,8 +6400,6 @@ entities: devices: - 10249 - 10248 - - type: AtmosDevice - joinedGrid: 2 - uid: 10419 components: - type: Transform @@ -6467,8 +6410,6 @@ entities: devices: - 10411 - 10355 - - type: AtmosDevice - joinedGrid: 2 - uid: 10653 components: - type: Transform @@ -6478,8 +6419,6 @@ entities: devices: - 10652 - 10643 - - type: AtmosDevice - joinedGrid: 2 - uid: 10930 components: - type: Transform @@ -6488,8 +6427,6 @@ entities: - type: DeviceList devices: - 8659 - - type: AtmosDevice - joinedGrid: 2 - uid: 11165 components: - type: Transform @@ -6516,8 +6453,6 @@ entities: - 9586 - 9585 - 9584 - - type: AtmosDevice - joinedGrid: 2 - uid: 11508 components: - type: Transform @@ -6551,8 +6486,6 @@ entities: - 6568 - 6640 - 6628 - - type: AtmosDevice - joinedGrid: 2 - uid: 11730 components: - type: Transform @@ -6563,8 +6496,6 @@ entities: devices: - 11515 - 11719 - - type: AtmosDevice - joinedGrid: 2 - uid: 11731 components: - type: Transform @@ -6574,8 +6505,6 @@ entities: devices: - 5189 - 10128 - - type: AtmosDevice - joinedGrid: 2 - uid: 11990 components: - type: Transform @@ -6597,8 +6526,6 @@ entities: - 5622 - 4552 - 4551 - - type: AtmosDevice - joinedGrid: 2 - uid: 12152 components: - type: Transform @@ -6625,8 +6552,6 @@ entities: - 12162 - 11938 - 11945 - - type: AtmosDevice - joinedGrid: 2 - uid: 12163 components: - type: Transform @@ -6639,16 +6564,12 @@ entities: - 12158 - 12159 - 12161 - - type: AtmosDevice - joinedGrid: 2 - uid: 12416 components: - type: Transform rot: 1.5707963267948966 rad pos: 24.5,-14.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 12447 components: - type: Transform @@ -6667,8 +6588,6 @@ entities: - 11246 - 6951 - 6950 - - type: AtmosDevice - joinedGrid: 2 - uid: 12473 components: - type: Transform @@ -6687,8 +6606,6 @@ entities: - 6931 - 6927 - 4183 - - type: AtmosDevice - joinedGrid: 2 - uid: 12476 components: - type: Transform @@ -6712,8 +6629,6 @@ entities: - 9351 - 9353 - 9352 - - type: AtmosDevice - joinedGrid: 2 - uid: 12480 components: - type: Transform @@ -6722,8 +6637,6 @@ entities: - type: DeviceList devices: - 12481 - - type: AtmosDevice - joinedGrid: 2 - uid: 12484 components: - type: Transform @@ -6747,8 +6660,6 @@ entities: - 9362 - 3693 - 3692 - - type: AtmosDevice - joinedGrid: 2 - uid: 12486 components: - type: Transform @@ -6770,8 +6681,6 @@ entities: - 9352 - 5103 - 10365 - - type: AtmosDevice - joinedGrid: 2 - uid: 12488 components: - type: Transform @@ -6786,8 +6695,6 @@ entities: - 12076 - 11744 - 11743 - - type: AtmosDevice - joinedGrid: 2 - uid: 12503 components: - type: Transform @@ -6798,8 +6705,6 @@ entities: - 12502 - 11709 - 11729 - - type: AtmosDevice - joinedGrid: 2 - uid: 12504 components: - type: Transform @@ -6808,8 +6713,6 @@ entities: - type: DeviceList devices: - 11365 - - type: AtmosDevice - joinedGrid: 2 - uid: 12506 components: - type: Transform @@ -6819,8 +6722,6 @@ entities: devices: - 11957 - 11956 - - type: AtmosDevice - joinedGrid: 2 - uid: 12520 components: - type: Transform @@ -6834,8 +6735,6 @@ entities: - 8238 - 8236 - 8235 - - type: AtmosDevice - joinedGrid: 2 - uid: 12528 components: - type: Transform @@ -6848,8 +6747,6 @@ entities: - 8575 - 8629 - 8630 - - type: AtmosDevice - joinedGrid: 2 - uid: 12530 components: - type: Transform @@ -6861,8 +6758,6 @@ entities: - 12531 - 8597 - 8598 - - type: AtmosDevice - joinedGrid: 2 - uid: 12532 components: - type: Transform @@ -6872,8 +6767,6 @@ entities: devices: - 8684 - 8685 - - type: AtmosDevice - joinedGrid: 2 - uid: 12537 components: - type: Transform @@ -6884,8 +6777,6 @@ entities: - 12538 - 8296 - 9546 - - type: AtmosDevice - joinedGrid: 2 - uid: 12539 components: - type: Transform @@ -6897,8 +6788,6 @@ entities: - 12540 - 9558 - 9557 - - type: AtmosDevice - joinedGrid: 2 - uid: 12548 components: - type: Transform @@ -6910,8 +6799,6 @@ entities: - 12087 - 10366 - 10351 - - type: AtmosDevice - joinedGrid: 2 - uid: 12562 components: - type: Transform @@ -6923,8 +6810,6 @@ entities: - 12563 - 10346 - 10401 - - type: AtmosDevice - joinedGrid: 2 - proto: AirCanister entities: - uid: 2078 @@ -6932,78 +6817,56 @@ entities: - type: Transform pos: 28.5,-23.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 4555 components: - type: Transform pos: 28.5,-24.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 4572 components: - type: Transform pos: 32.5,-26.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 5518 components: - type: Transform pos: 66.5,44.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 5706 components: - type: Transform pos: 85.5,-1.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 5747 components: - type: Transform pos: 48.5,-13.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 7858 components: - type: Transform pos: 70.5,-19.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 10794 components: - type: Transform pos: 78.5,-16.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 10842 components: - type: Transform pos: 46.5,36.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 10843 components: - type: Transform pos: 46.5,35.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 12802 components: - type: Transform pos: 14.5,-9.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - proto: Airlock entities: - uid: 467 @@ -8633,8 +8496,6 @@ entities: - type: Transform pos: 26.5,19.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 12518 components: - type: Transform @@ -9706,8 +9567,6 @@ entities: rot: 1.5707963267948966 rad pos: 38.5,-21.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - proto: Basketball entities: - uid: 10804 @@ -10226,12 +10085,16 @@ entities: rot: -1.5707963267948966 rad pos: 41.5,30.5 parent: 2 + - type: SpamEmitSound + enabled: False - uid: 6617 components: - type: Transform rot: 1.5707963267948966 rad pos: 29.5,-6.5 parent: 2 + - type: SpamEmitSound + enabled: False - proto: Bonfire entities: - uid: 12709 @@ -28219,15 +28082,11 @@ entities: - type: Transform pos: 45.5,-37.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 12998 components: - type: Transform pos: 34.5,-45.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - proto: Carpet entities: - uid: 3 @@ -31770,70 +31629,6 @@ entities: - type: Transform pos: 70.44693,7.937353 parent: 2 -- proto: chem_master - entities: - - uid: 5052 - components: - - type: Transform - pos: 49.5,-4.5 - parent: 2 - - type: ContainerContainer - containers: - ChemMaster-reagentContainerContainer: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - machine_board: !type:Container - showEnts: False - occludes: True - ents: [] - machine_parts: !type:Container - showEnts: False - occludes: True - ents: [] - ChemMaster-beaker: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - beakerSlot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - outputSlot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - - uid: 5053 - components: - - type: Transform - pos: 52.5,-3.5 - parent: 2 - - type: ContainerContainer - containers: - ChemMaster-reagentContainerContainer: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - machine_board: !type:Container - showEnts: False - occludes: True - ents: [] - machine_parts: !type:Container - showEnts: False - occludes: True - ents: [] - ChemMaster-beaker: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - beakerSlot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - outputSlot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - proto: ChemDispenser entities: - uid: 5050 @@ -31897,6 +31692,70 @@ entities: - type: Transform pos: 51.5,-7.5 parent: 2 +- proto: ChemMaster + entities: + - uid: 5052 + components: + - type: Transform + pos: 49.5,-4.5 + parent: 2 + - type: ContainerContainer + containers: + ChemMaster-reagentContainerContainer: !type:ContainerSlot + showEnts: False + occludes: True + ent: null + machine_board: !type:Container + showEnts: False + occludes: True + ents: [] + machine_parts: !type:Container + showEnts: False + occludes: True + ents: [] + ChemMaster-beaker: !type:ContainerSlot + showEnts: False + occludes: True + ent: null + beakerSlot: !type:ContainerSlot + showEnts: False + occludes: True + ent: null + outputSlot: !type:ContainerSlot + showEnts: False + occludes: True + ent: null + - uid: 5053 + components: + - type: Transform + pos: 52.5,-3.5 + parent: 2 + - type: ContainerContainer + containers: + ChemMaster-reagentContainerContainer: !type:ContainerSlot + showEnts: False + occludes: True + ent: null + machine_board: !type:Container + showEnts: False + occludes: True + ents: [] + machine_parts: !type:Container + showEnts: False + occludes: True + ents: [] + ChemMaster-beaker: !type:ContainerSlot + showEnts: False + occludes: True + ent: null + beakerSlot: !type:ContainerSlot + showEnts: False + occludes: True + ent: null + outputSlot: !type:ContainerSlot + showEnts: False + occludes: True + ent: null - proto: ChurchOrganInstrument entities: - uid: 8921 @@ -32456,7 +32315,7 @@ entities: - type: Transform pos: 90.45974,-18.462885 parent: 2 -- proto: ClothingHeadHatFlowerCrown +- proto: ClothingHeadHatFlowerWreath entities: - uid: 8829 components: @@ -32470,13 +32329,6 @@ entities: - type: Transform pos: 45.45547,27.660194 parent: 2 -- proto: ClothingHeadHatHairflower - entities: - - uid: 12099 - components: - - type: Transform - pos: 19.740185,41.04155 - parent: 2 - proto: ClothingHeadHatHardhatOrange entities: - uid: 10798 @@ -33365,12 +33217,6 @@ entities: linkedPorts: 8666: - ArtifactAnalyzerSender: ArtifactAnalyzerReceiver - - uid: 10667 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 61.5,8.5 - parent: 2 - proto: computerBodyScanner entities: - uid: 31 @@ -33608,6 +33454,14 @@ entities: rot: 3.141592653589793 rad pos: 62.5,8.5 parent: 2 +- proto: ComputerRoboticsControl + entities: + - uid: 5652 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 61.5,8.5 + parent: 2 - proto: ComputerSalvageExpedition entities: - uid: 12820 @@ -34602,6 +34456,9 @@ entities: - type: Transform pos: 51.5,25.5 parent: 2 + - type: SingletonDeviceNetServer + active: False + available: False - proto: Crowbar entities: - uid: 686 @@ -34663,15 +34520,11 @@ entities: - type: Transform pos: 58.5,-0.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 11774 components: - type: Transform pos: 60.5,-0.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - proto: CryoxadoneBeakerSmall entities: - uid: 11801 @@ -38679,8 +38532,6 @@ entities: - 12522 - 8237 - 8238 - - type: AtmosDevice - joinedGrid: 2 - uid: 194 components: - type: Transform @@ -38697,8 +38548,6 @@ entities: - 6930 - 11247 - 11246 - - type: AtmosDevice - joinedGrid: 2 - uid: 1016 components: - type: Transform @@ -38718,8 +38567,6 @@ entities: - 802 - 5621 - 5622 - - type: AtmosDevice - joinedGrid: 2 - uid: 1657 components: - type: Transform @@ -38741,8 +38588,6 @@ entities: - 1511 - 1515 - 1513 - - type: AtmosDevice - joinedGrid: 2 - uid: 2123 components: - type: Transform @@ -38765,8 +38610,6 @@ entities: - 7889 - 131 - 7950 - - type: AtmosDevice - joinedGrid: 2 - uid: 2474 components: - type: Transform @@ -38779,8 +38622,6 @@ entities: - 10413 - 10414 - 10415 - - type: AtmosDevice - joinedGrid: 2 - uid: 4049 components: - type: Transform @@ -38795,8 +38636,6 @@ entities: - 169 - 1024 - 5684 - - type: AtmosDevice - joinedGrid: 2 - uid: 5077 components: - type: Transform @@ -38826,8 +38665,6 @@ entities: - 7011 - 6620 - 5144 - - type: AtmosDevice - joinedGrid: 2 - uid: 6633 components: - type: Transform @@ -38841,8 +38678,6 @@ entities: - 1513 - 6645 - 6637 - - type: AtmosDevice - joinedGrid: 2 - uid: 6634 components: - type: Transform @@ -38859,8 +38694,6 @@ entities: - 6638 - 6523 - 1510 - - type: AtmosDevice - joinedGrid: 2 - uid: 6683 components: - type: Transform @@ -38875,8 +38708,6 @@ entities: - 6568 - 12077 - 6684 - - type: AtmosDevice - joinedGrid: 2 - uid: 7662 components: - type: Transform @@ -38899,8 +38730,6 @@ entities: - 7889 - 131 - 7950 - - type: AtmosDevice - joinedGrid: 2 - uid: 7842 components: - type: Transform @@ -38916,8 +38745,6 @@ entities: - 7749 - 7750 - 7843 - - type: AtmosDevice - joinedGrid: 2 - uid: 8005 components: - type: Transform @@ -38942,8 +38769,6 @@ entities: - 6952 - 11244 - 11245 - - type: AtmosDevice - joinedGrid: 2 - uid: 8006 components: - type: Transform @@ -38969,8 +38794,6 @@ entities: - 6952 - 11244 - 11245 - - type: AtmosDevice - joinedGrid: 2 - uid: 8007 components: - type: Transform @@ -38996,8 +38819,6 @@ entities: - 6952 - 11244 - 11245 - - type: AtmosDevice - joinedGrid: 2 - uid: 8316 components: - type: Transform @@ -39027,8 +38848,6 @@ entities: - 7011 - 6620 - 5144 - - type: AtmosDevice - joinedGrid: 2 - uid: 8920 components: - type: Transform @@ -39046,8 +38865,6 @@ entities: - 6800 - 10206 - 10205 - - type: AtmosDevice - joinedGrid: 2 - uid: 9588 components: - type: Transform @@ -39060,8 +38877,6 @@ entities: - 9585 - 9584 - 9589 - - type: AtmosDevice - joinedGrid: 2 - uid: 10208 components: - type: Transform @@ -39072,8 +38887,6 @@ entities: - 10216 - 10205 - 10206 - - type: AtmosDevice - joinedGrid: 2 - uid: 10956 components: - type: Transform @@ -39082,8 +38895,6 @@ entities: - type: DeviceList devices: - 8659 - - type: AtmosDevice - joinedGrid: 2 - uid: 10964 components: - type: Transform @@ -39106,8 +38917,6 @@ entities: - 9586 - 9585 - 9584 - - type: AtmosDevice - joinedGrid: 2 - uid: 11507 components: - type: Transform @@ -39139,8 +38948,6 @@ entities: - 7011 - 6509 - 6568 - - type: AtmosDevice - joinedGrid: 2 - uid: 12153 components: - type: Transform @@ -39165,8 +38972,6 @@ entities: - 12159 - 12161 - 12162 - - type: AtmosDevice - joinedGrid: 2 - uid: 12154 components: - type: Transform @@ -39191,8 +38996,6 @@ entities: - 12159 - 12161 - 12162 - - type: AtmosDevice - joinedGrid: 2 - uid: 12474 components: - type: Transform @@ -39209,8 +39012,6 @@ entities: - 6929 - 6930 - 6931 - - type: AtmosDevice - joinedGrid: 2 - uid: 12477 components: - type: Transform @@ -39232,8 +39033,6 @@ entities: - 9352 - 9353 - 9351 - - type: AtmosDevice - joinedGrid: 2 - uid: 12483 components: - type: Transform @@ -39255,8 +39054,6 @@ entities: - 9364 - 9363 - 9362 - - type: AtmosDevice - joinedGrid: 2 - uid: 12487 components: - type: Transform @@ -39276,8 +39073,6 @@ entities: - 9353 - 9352 - 12087 - - type: AtmosDevice - joinedGrid: 2 - uid: 12489 components: - type: Transform @@ -39291,8 +39086,6 @@ entities: - 12075 - 12490 - 12076 - - type: AtmosDevice - joinedGrid: 2 - uid: 12517 components: - type: Transform @@ -39307,8 +39100,6 @@ entities: - 11323 - 11324 - 12518 - - type: AtmosDevice - joinedGrid: 2 - uid: 12521 components: - type: Transform @@ -39320,8 +39111,6 @@ entities: - 12086 - 8237 - 8238 - - type: AtmosDevice - joinedGrid: 2 - uid: 12549 components: - type: Transform @@ -39331,8 +39120,6 @@ entities: devices: - 12550 - 12087 - - type: AtmosDevice - joinedGrid: 2 - uid: 12556 components: - type: Transform @@ -39347,8 +39134,6 @@ entities: - 1252 - 1162 - 6473 - - type: AtmosDevice - joinedGrid: 2 - uid: 12557 components: - type: Transform @@ -39364,8 +39149,6 @@ entities: - 10413 - 10414 - 10415 - - type: AtmosDevice - joinedGrid: 2 - proto: FireAxeCabinetFilled entities: - uid: 1571 @@ -40809,6 +40592,13 @@ entities: - type: Transform pos: -0.9697714,-25.884264 parent: 2 +- proto: FoodPoppy + entities: + - uid: 12099 + components: + - type: Transform + pos: 19.740185,41.04155 + parent: 2 - proto: FoodShakerPepper entities: - uid: 6758 @@ -40878,8 +40668,6 @@ entities: rot: 3.141592653589793 rad pos: 40.5,-33.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#FF1212FF' - uid: 2785 @@ -40888,24 +40676,18 @@ entities: rot: 3.141592653589793 rad pos: 40.5,-25.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 4102 components: - type: Transform rot: 3.141592653589793 rad pos: 40.5,-29.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 4154 components: - type: Transform rot: 3.141592653589793 rad pos: 40.5,-23.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#FF1212FF' - uid: 4156 @@ -40914,32 +40696,24 @@ entities: rot: 3.141592653589793 rad pos: 40.5,-27.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 4176 components: - type: Transform rot: 3.141592653589793 rad pos: 40.5,-31.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 4903 components: - type: Transform rot: 1.5707963267948966 rad pos: 45.5,-39.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 11767 components: - type: Transform rot: -1.5707963267948966 rad pos: 59.5,0.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#FF1212FF' - proto: GasMinerCarbonDioxide @@ -40949,8 +40723,6 @@ entities: - type: Transform pos: 46.5,-27.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - proto: GasMinerNitrogenStation entities: - uid: 1182 @@ -40958,8 +40730,6 @@ entities: - type: Transform pos: 46.5,-23.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - proto: GasMinerOxygenStation entities: - uid: 4098 @@ -40967,8 +40737,6 @@ entities: - type: Transform pos: 46.5,-25.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - proto: GasMinerWaterVapor entities: - uid: 2138 @@ -40976,8 +40744,6 @@ entities: - type: Transform pos: 46.5,-29.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - proto: GasMixer entities: - uid: 1938 @@ -40986,8 +40752,6 @@ entities: rot: -1.5707963267948966 rad pos: 39.5,-34.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - proto: GasMixerFlipped entities: - uid: 669 @@ -40996,24 +40760,18 @@ entities: rot: 3.141592653589793 rad pos: 39.5,-28.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 671 components: - type: Transform rot: 3.141592653589793 rad pos: 39.5,-30.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 757 components: - type: Transform rot: 3.141592653589793 rad pos: 39.5,-32.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 1034 components: - type: Transform @@ -41023,8 +40781,6 @@ entities: - type: GasMixer inletTwoConcentration: 0.78 inletOneConcentration: 0.22 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#03FCD3FF' - uid: 2751 @@ -41033,16 +40789,12 @@ entities: rot: 3.141592653589793 rad pos: 38.5,-26.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 4924 components: - type: Transform rot: -1.5707963267948966 rad pos: 43.5,-40.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - proto: GasOutletInjector entities: - uid: 474 @@ -41051,63 +40803,47 @@ entities: rot: -1.5707963267948966 rad pos: 45.5,-25.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 2072 components: - type: Transform rot: -1.5707963267948966 rad pos: 45.5,-23.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 2075 components: - type: Transform rot: -1.5707963267948966 rad pos: 45.5,-33.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 2140 components: - type: Transform rot: -1.5707963267948966 rad pos: 45.5,-29.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 2141 components: - type: Transform rot: -1.5707963267948966 rad pos: 45.5,-31.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 4047 components: - type: Transform rot: -1.5707963267948966 rad pos: 45.5,-27.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 4355 components: - type: Transform pos: 35.5,-32.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 12882 components: - type: Transform rot: -1.5707963267948966 rad pos: 46.5,-45.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - proto: GasPassiveVent entities: - uid: 351 @@ -41115,51 +40851,37 @@ entities: - type: Transform pos: 47.5,-33.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 361 components: - type: Transform pos: 47.5,-31.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 367 components: - type: Transform pos: 47.5,-29.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 628 components: - type: Transform pos: 47.5,-25.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 675 components: - type: Transform pos: 47.5,-27.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 745 components: - type: Transform pos: 47.5,-23.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 3951 components: - type: Transform rot: 3.141592653589793 rad pos: 48.5,-48.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#FF1212FF' - uid: 3953 @@ -41168,8 +40890,6 @@ entities: rot: 3.141592653589793 rad pos: 49.5,-48.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#FF1212FF' - uid: 4179 @@ -41178,54 +40898,40 @@ entities: rot: -1.5707963267948966 rad pos: 47.5,-35.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 4354 components: - type: Transform rot: 3.141592653589793 rad pos: 35.5,-30.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 5265 components: - type: Transform rot: 3.141592653589793 rad pos: 79.5,-9.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 8677 components: - type: Transform rot: -1.5707963267948966 rad pos: 43.5,33.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 10426 components: - type: Transform pos: 63.5,28.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 10427 components: - type: Transform pos: 64.5,28.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 11587 components: - type: Transform rot: 3.141592653589793 rad pos: 47.5,-48.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#FF1212FF' - uid: 11588 @@ -41234,8 +40940,6 @@ entities: rot: 3.141592653589793 rad pos: 46.5,-48.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#FF1212FF' - proto: GasPipeBend @@ -51600,8 +51304,6 @@ entities: rot: 1.5707963267948966 rad pos: 24.5,-23.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#FF1212FF' - uid: 4034 @@ -51610,24 +51312,18 @@ entities: rot: -1.5707963267948966 rad pos: 28.5,-24.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 4038 components: - type: Transform rot: -1.5707963267948966 rad pos: 28.5,-23.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 4040 components: - type: Transform rot: 1.5707963267948966 rad pos: 24.5,-24.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#FF1212FF' - uid: 4362 @@ -51636,145 +51332,107 @@ entities: rot: 3.141592653589793 rad pos: 36.5,-25.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 4363 components: - type: Transform rot: 3.141592653589793 rad pos: 37.5,-25.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 4913 components: - type: Transform rot: -1.5707963267948966 rad pos: 41.5,-40.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 4920 components: - type: Transform rot: -1.5707963267948966 rad pos: 39.5,-40.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 4921 components: - type: Transform rot: 1.5707963267948966 rad pos: 42.5,-40.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 4922 components: - type: Transform pos: 43.5,-39.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 4923 components: - type: Transform rot: -1.5707963267948966 rad pos: 44.5,-40.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 4925 components: - type: Transform rot: 3.141592653589793 rad pos: 45.5,-40.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 4926 components: - type: Transform rot: 1.5707963267948966 rad pos: 44.5,-39.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 4927 components: - type: Transform rot: -1.5707963267948966 rad pos: 46.5,-39.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 5072 components: - type: Transform rot: -1.5707963267948966 rad pos: 39.5,-21.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 6480 components: - type: Transform pos: 37.5,-42.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 7882 components: - type: Transform pos: 38.5,-42.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 10420 components: - type: Transform rot: 3.141592653589793 rad pos: 63.5,22.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 10425 components: - type: Transform rot: 3.141592653589793 rad pos: 64.5,22.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 12871 components: - type: Transform pos: 41.5,-42.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 12872 components: - type: Transform pos: 42.5,-42.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 12873 components: - type: Transform pos: 43.5,-42.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 12874 components: - type: Transform pos: 44.5,-42.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - proto: GasPressurePump entities: - uid: 670 @@ -51782,8 +51440,6 @@ entities: - type: Transform pos: 31.5,-27.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0335FCFF' - uid: 1942 @@ -51792,24 +51448,18 @@ entities: rot: -1.5707963267948966 rad pos: 40.5,-30.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 2781 components: - type: Transform rot: -1.5707963267948966 rad pos: 40.5,-28.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 4030 components: - type: Transform rot: 1.5707963267948966 rad pos: 27.5,-24.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0335FCFF' - uid: 4033 @@ -51818,8 +51468,6 @@ entities: rot: 1.5707963267948966 rad pos: 27.5,-23.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0335FCFF' - uid: 4128 @@ -51828,48 +51476,36 @@ entities: rot: -1.5707963267948966 rad pos: 40.5,-34.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 4130 components: - type: Transform rot: -1.5707963267948966 rad pos: 40.5,-32.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 4145 components: - type: Transform rot: -1.5707963267948966 rad pos: 40.5,-26.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 4178 components: - type: Transform rot: -1.5707963267948966 rad pos: 40.5,-24.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 4361 components: - type: Transform rot: 3.141592653589793 rad pos: 35.5,-25.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 5037 components: - type: Transform rot: 3.141592653589793 rad pos: 57.5,-0.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0335FCFF' - uid: 6583 @@ -51878,8 +51514,6 @@ entities: rot: -1.5707963267948966 rad pos: 31.5,-10.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0335FCFF' - uid: 7803 @@ -51888,8 +51522,6 @@ entities: rot: -1.5707963267948966 rad pos: 51.5,24.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0335FCFF' - uid: 7883 @@ -51897,8 +51529,6 @@ entities: - type: Transform pos: 37.5,-43.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#FF1212FF' - uid: 10423 @@ -51907,22 +51537,16 @@ entities: rot: 3.141592653589793 rad pos: 63.5,23.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 10424 components: - type: Transform pos: 64.5,23.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 11577 components: - type: Transform pos: 38.5,-43.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#03FCD3FF' - proto: GasThermoMachineFreezer @@ -51933,31 +51557,23 @@ entities: rot: 3.141592653589793 rad pos: 34.5,-25.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 4912 components: - type: Transform rot: 1.5707963267948966 rad pos: 40.5,-40.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 7984 components: - type: Transform rot: 3.141592653589793 rad pos: 50.5,23.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 11775 components: - type: Transform pos: 59.5,-0.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 12989 components: - type: Transform @@ -51966,8 +51582,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#03FCD3FF' - - type: AtmosDevice - joinedGrid: 2 - proto: GasThermoMachineFreezerEnabled entities: - uid: 1156 @@ -51977,8 +51591,6 @@ entities: parent: 2 - type: GasThermoMachine targetTemperature: 0 - - type: AtmosDevice - joinedGrid: 2 - proto: GasThermoMachineHeater entities: - uid: 1216 @@ -51989,16 +51601,12 @@ entities: parent: 2 - type: AtmosPipeColor color: '#FF1212FF' - - type: AtmosDevice - joinedGrid: 2 - uid: 4906 components: - type: Transform rot: 1.5707963267948966 rad pos: 38.5,-40.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - proto: GasValve entities: - uid: 1233 @@ -52008,8 +51616,6 @@ entities: parent: 2 - type: GasValve open: False - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#03FCD3FF' - uid: 4150 @@ -52020,8 +51626,6 @@ entities: parent: 2 - type: GasValve open: False - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#FF1212FF' - uid: 4250 @@ -52032,8 +51636,6 @@ entities: parent: 2 - type: GasValve open: False - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#FF1212FF' - uid: 11586 @@ -52044,8 +51646,6 @@ entities: parent: 2 - type: GasValve open: False - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#FF1212FF' - proto: GasVentPump @@ -52056,8 +51656,6 @@ entities: rot: 3.141592653589793 rad pos: 26.5,-29.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0335FCFF' - uid: 1560 @@ -52066,8 +51664,6 @@ entities: rot: 1.5707963267948966 rad pos: 21.5,-17.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0335FCFF' - uid: 1625 @@ -52076,8 +51672,6 @@ entities: rot: -1.5707963267948966 rad pos: 22.5,-32.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0335FCFF' - uid: 2393 @@ -52085,8 +51679,6 @@ entities: - type: Transform pos: 30.5,-27.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0335FCFF' - uid: 3692 @@ -52095,8 +51687,6 @@ entities: rot: 1.5707963267948966 rad pos: 41.5,8.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0335FCFF' - uid: 4027 @@ -52105,8 +51695,6 @@ entities: rot: 1.5707963267948966 rad pos: 15.5,13.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0335FCFF' - uid: 4035 @@ -52115,8 +51703,6 @@ entities: rot: 3.141592653589793 rad pos: 19.5,6.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0335FCFF' - uid: 4460 @@ -52125,8 +51711,6 @@ entities: rot: 3.141592653589793 rad pos: 32.5,-40.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0335FCFF' - uid: 4465 @@ -52135,8 +51719,6 @@ entities: rot: 3.141592653589793 rad pos: 20.5,-38.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0335FCFF' - uid: 4551 @@ -52145,8 +51727,6 @@ entities: rot: 3.141592653589793 rad pos: 24.5,-36.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0335FCFF' - uid: 5103 @@ -52154,8 +51734,6 @@ entities: - type: Transform pos: 41.5,14.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0335FCFF' - uid: 5189 @@ -52164,8 +51742,6 @@ entities: rot: 3.141592653589793 rad pos: 57.5,-9.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0335FCFF' - uid: 5422 @@ -52174,8 +51750,6 @@ entities: rot: 3.141592653589793 rad pos: 11.5,-40.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0335FCFF' - uid: 5533 @@ -52184,8 +51758,6 @@ entities: rot: -1.5707963267948966 rad pos: 36.5,42.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0335FCFF' - uid: 5678 @@ -52194,8 +51766,6 @@ entities: rot: 3.141592653589793 rad pos: 13.5,-36.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0335FCFF' - uid: 5964 @@ -52204,8 +51774,6 @@ entities: rot: 3.141592653589793 rad pos: 11.5,5.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0335FCFF' - uid: 6570 @@ -52214,8 +51782,6 @@ entities: rot: 1.5707963267948966 rad pos: 45.5,-6.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0335FCFF' - uid: 6590 @@ -52224,16 +51790,12 @@ entities: rot: 3.141592653589793 rad pos: 30.5,-12.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 6593 components: - type: Transform rot: 3.141592653589793 rad pos: 35.5,-11.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0335FCFF' - uid: 6608 @@ -52242,8 +51804,6 @@ entities: rot: 3.141592653589793 rad pos: 39.5,-11.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0335FCFF' - uid: 6609 @@ -52252,8 +51812,6 @@ entities: rot: 1.5707963267948966 rad pos: 38.5,-4.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0335FCFF' - uid: 6620 @@ -52262,8 +51820,6 @@ entities: rot: -1.5707963267948966 rad pos: 36.5,0.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0335FCFF' - uid: 6627 @@ -52272,8 +51828,6 @@ entities: rot: 1.5707963267948966 rad pos: 34.5,-3.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0335FCFF' - uid: 6640 @@ -52281,8 +51835,6 @@ entities: - type: Transform pos: 46.5,-0.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0335FCFF' - uid: 6778 @@ -52291,8 +51843,6 @@ entities: rot: 1.5707963267948966 rad pos: 4.5,4.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0335FCFF' - uid: 6804 @@ -52300,8 +51850,6 @@ entities: - type: Transform pos: 26.5,-16.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0335FCFF' - uid: 6927 @@ -52310,8 +51858,6 @@ entities: rot: 3.141592653589793 rad pos: 22.5,12.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0335FCFF' - uid: 6951 @@ -52320,8 +51866,6 @@ entities: rot: -1.5707963267948966 rad pos: 20.5,9.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0335FCFF' - uid: 7469 @@ -52330,8 +51874,6 @@ entities: rot: 1.5707963267948966 rad pos: -16.5,-14.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0335FCFF' - uid: 7801 @@ -52340,16 +51882,12 @@ entities: rot: 1.5707963267948966 rad pos: 49.5,24.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 7838 components: - type: Transform rot: 1.5707963267948966 rad pos: -6.5,-6.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8009 @@ -52357,8 +51895,6 @@ entities: - type: Transform pos: 12.5,0.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8016 @@ -52367,8 +51903,6 @@ entities: rot: -1.5707963267948966 rad pos: 15.5,-3.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8220 @@ -52377,8 +51911,6 @@ entities: rot: 3.141592653589793 rad pos: 9.5,19.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8222 @@ -52386,8 +51918,6 @@ entities: - type: Transform pos: 9.5,22.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8236 @@ -52395,8 +51925,6 @@ entities: - type: Transform pos: 19.5,21.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8240 @@ -52404,8 +51932,6 @@ entities: - type: Transform pos: 26.5,21.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8242 @@ -52413,8 +51939,6 @@ entities: - type: Transform pos: 22.5,21.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8296 @@ -52423,8 +51947,6 @@ entities: rot: 1.5707963267948966 rad pos: 26.5,46.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8301 @@ -52433,8 +51955,6 @@ entities: rot: 1.5707963267948966 rad pos: 23.5,41.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8344 @@ -52443,8 +51963,6 @@ entities: rot: 1.5707963267948966 rad pos: 31.5,42.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8575 @@ -52452,8 +51970,6 @@ entities: - type: Transform pos: 34.5,25.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8596 @@ -52462,8 +51978,6 @@ entities: rot: -1.5707963267948966 rad pos: 43.5,24.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8597 @@ -52472,8 +51986,6 @@ entities: rot: 3.141592653589793 rad pos: 39.5,23.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8607 @@ -52481,8 +51993,6 @@ entities: - type: Transform pos: 39.5,27.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8629 @@ -52490,8 +52000,6 @@ entities: - type: Transform pos: 38.5,18.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8673 @@ -52499,8 +52007,6 @@ entities: - type: Transform pos: 40.5,32.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8684 @@ -52508,8 +52014,6 @@ entities: - type: Transform pos: 42.5,17.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8700 @@ -52518,8 +52022,6 @@ entities: rot: -1.5707963267948966 rad pos: 57.5,30.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8701 @@ -52527,8 +52029,6 @@ entities: - type: Transform pos: 56.5,34.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0335FCFF' - uid: 9358 @@ -52536,8 +52036,6 @@ entities: - type: Transform pos: 32.5,14.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0335FCFF' - uid: 9558 @@ -52546,8 +52044,6 @@ entities: rot: 1.5707963267948966 rad pos: 27.5,39.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0335FCFF' - uid: 9570 @@ -52555,8 +52051,6 @@ entities: - type: Transform pos: 26.5,36.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0335FCFF' - uid: 9581 @@ -52564,8 +52058,6 @@ entities: - type: Transform pos: 18.5,40.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0335FCFF' - uid: 9582 @@ -52574,8 +52066,6 @@ entities: rot: 1.5707963267948966 rad pos: 14.5,36.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0335FCFF' - uid: 9635 @@ -52583,8 +52073,6 @@ entities: - type: Transform pos: 47.5,3.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0335FCFF' - uid: 10163 @@ -52593,8 +52081,6 @@ entities: rot: 3.141592653589793 rad pos: 7.5,-12.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0335FCFF' - uid: 10170 @@ -52603,8 +52089,6 @@ entities: rot: 3.141592653589793 rad pos: 1.5,-12.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0335FCFF' - uid: 10171 @@ -52613,8 +52097,6 @@ entities: rot: -1.5707963267948966 rad pos: 10.5,-6.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0335FCFF' - uid: 10172 @@ -52623,8 +52105,6 @@ entities: rot: -1.5707963267948966 rad pos: 4.5,-5.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0335FCFF' - uid: 10173 @@ -52633,8 +52113,6 @@ entities: rot: 1.5707963267948966 rad pos: -1.5,-4.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0335FCFF' - uid: 10178 @@ -52643,8 +52121,6 @@ entities: rot: 1.5707963267948966 rad pos: -2.5,-10.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0335FCFF' - uid: 10214 @@ -52653,8 +52129,6 @@ entities: rot: 1.5707963267948966 rad pos: 23.5,-11.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0335FCFF' - uid: 10248 @@ -52663,8 +52137,6 @@ entities: rot: 3.141592653589793 rad pos: 26.5,8.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0335FCFF' - uid: 10331 @@ -52672,8 +52144,6 @@ entities: - type: Transform pos: 48.5,11.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0335FCFF' - uid: 10346 @@ -52682,8 +52152,6 @@ entities: rot: 3.141592653589793 rad pos: 62.5,10.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0335FCFF' - uid: 10347 @@ -52692,8 +52160,6 @@ entities: rot: -1.5707963267948966 rad pos: 67.5,14.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0335FCFF' - uid: 10351 @@ -52702,8 +52168,6 @@ entities: rot: 1.5707963267948966 rad pos: 55.5,18.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0335FCFF' - uid: 10352 @@ -52712,8 +52176,6 @@ entities: rot: -1.5707963267948966 rad pos: 57.5,25.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0335FCFF' - uid: 10355 @@ -52722,8 +52184,6 @@ entities: rot: -1.5707963267948966 rad pos: 62.5,24.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0335FCFF' - uid: 10356 @@ -52732,8 +52192,6 @@ entities: rot: -1.5707963267948966 rad pos: 60.5,18.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0335FCFF' - uid: 10358 @@ -52742,8 +52200,6 @@ entities: rot: -1.5707963267948966 rad pos: 60.5,15.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0335FCFF' - uid: 10643 @@ -52752,8 +52208,6 @@ entities: rot: 3.141592653589793 rad pos: 29.5,8.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0335FCFF' - uid: 11365 @@ -52762,8 +52216,6 @@ entities: rot: 3.141592653589793 rad pos: 77.5,-4.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0335FCFF' - uid: 11366 @@ -52772,8 +52224,6 @@ entities: rot: -1.5707963267948966 rad pos: 78.5,1.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0335FCFF' - uid: 11514 @@ -52782,8 +52232,6 @@ entities: rot: 1.5707963267948966 rad pos: 64.5,-1.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0335FCFF' - uid: 11515 @@ -52791,8 +52239,6 @@ entities: - type: Transform pos: 66.5,-5.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0335FCFF' - uid: 11516 @@ -52801,8 +52247,6 @@ entities: rot: 3.141592653589793 rad pos: 66.5,-10.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0335FCFF' - uid: 11709 @@ -52810,8 +52254,6 @@ entities: - type: Transform pos: 71.5,-3.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0335FCFF' - uid: 11743 @@ -52820,8 +52262,6 @@ entities: rot: 1.5707963267948966 rad pos: 52.5,-4.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0335FCFF' - uid: 11924 @@ -52830,8 +52270,6 @@ entities: rot: 3.141592653589793 rad pos: 56.5,-5.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0335FCFF' - uid: 11937 @@ -52840,8 +52278,6 @@ entities: rot: 3.141592653589793 rad pos: 61.5,-10.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0335FCFF' - uid: 11945 @@ -52849,8 +52285,6 @@ entities: - type: Transform pos: 63.5,2.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0335FCFF' - uid: 11956 @@ -52858,8 +52292,6 @@ entities: - type: Transform pos: 71.5,5.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0335FCFF' - proto: GasVentScrubber @@ -52870,8 +52302,6 @@ entities: rot: 1.5707963267948966 rad pos: 30.5,-32.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#FF1212FF' - uid: 1324 @@ -52880,8 +52310,6 @@ entities: rot: 3.141592653589793 rad pos: 10.5,-41.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#FF1212FF' - uid: 3475 @@ -52889,16 +52317,12 @@ entities: - type: Transform pos: 79.5,-5.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 3693 components: - type: Transform rot: -1.5707963267948966 rad pos: 41.5,6.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#FF1212FF' - uid: 4092 @@ -52907,8 +52331,6 @@ entities: rot: 1.5707963267948966 rad pos: 15.5,15.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#FF1212FF' - uid: 4183 @@ -52917,8 +52339,6 @@ entities: rot: -1.5707963267948966 rad pos: 19.5,15.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#FF1212FF' - uid: 4447 @@ -52927,8 +52347,6 @@ entities: rot: 3.141592653589793 rad pos: 31.5,-39.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#FF1212FF' - uid: 4464 @@ -52937,8 +52355,6 @@ entities: rot: 3.141592653589793 rad pos: 22.5,-38.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#FF1212FF' - uid: 4552 @@ -52946,8 +52362,6 @@ entities: - type: Transform pos: 28.5,-35.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#FF1212FF' - uid: 4553 @@ -52956,8 +52370,6 @@ entities: rot: 3.141592653589793 rad pos: 26.5,-28.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#FF1212FF' - uid: 5679 @@ -52965,8 +52377,6 @@ entities: - type: Transform pos: 13.5,-33.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#FF1212FF' - uid: 5968 @@ -52975,8 +52385,6 @@ entities: rot: 3.141592653589793 rad pos: 9.5,5.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#FF1212FF' - uid: 6571 @@ -52985,8 +52393,6 @@ entities: rot: -1.5707963267948966 rad pos: 43.5,-6.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#FF1212FF' - uid: 6595 @@ -52995,8 +52401,6 @@ entities: rot: 3.141592653589793 rad pos: 33.5,-11.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#FF1212FF' - uid: 6610 @@ -53005,8 +52409,6 @@ entities: rot: -1.5707963267948966 rad pos: 39.5,-9.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#FF1212FF' - uid: 6614 @@ -53015,8 +52417,6 @@ entities: rot: -1.5707963267948966 rad pos: 29.5,-10.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#FF1212FF' - uid: 6621 @@ -53025,8 +52425,6 @@ entities: rot: 1.5707963267948966 rad pos: 32.5,0.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#FF1212FF' - uid: 6622 @@ -53035,8 +52433,6 @@ entities: rot: -1.5707963267948966 rad pos: 38.5,-6.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#FF1212FF' - uid: 6628 @@ -53045,8 +52441,6 @@ entities: rot: -1.5707963267948966 rad pos: 45.5,-0.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#FF1212FF' - uid: 6629 @@ -53055,8 +52449,6 @@ entities: rot: 3.141592653589793 rad pos: 34.5,-7.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#FF1212FF' - uid: 6805 @@ -53064,8 +52456,6 @@ entities: - type: Transform pos: 26.5,-9.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#FF1212FF' - uid: 6949 @@ -53074,8 +52464,6 @@ entities: rot: 3.141592653589793 rad pos: 18.5,6.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#FF1212FF' - uid: 6950 @@ -53084,8 +52472,6 @@ entities: rot: -1.5707963267948966 rad pos: 20.5,10.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#FF1212FF' - uid: 7472 @@ -53094,8 +52480,6 @@ entities: rot: 1.5707963267948966 rad pos: -15.5,-13.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#FF1212FF' - uid: 7708 @@ -53104,8 +52488,6 @@ entities: rot: -1.5707963267948966 rad pos: 4.5,7.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#FF1212FF' - uid: 7837 @@ -53114,8 +52496,6 @@ entities: rot: -1.5707963267948966 rad pos: -5.5,-4.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#FF1212FF' - uid: 8010 @@ -53124,8 +52504,6 @@ entities: rot: 3.141592653589793 rad pos: 14.5,0.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#FF1212FF' - uid: 8017 @@ -53134,8 +52512,6 @@ entities: rot: 1.5707963267948966 rad pos: 15.5,-4.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#FF1212FF' - uid: 8221 @@ -53144,8 +52520,6 @@ entities: rot: 3.141592653589793 rad pos: 8.5,17.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#FF1212FF' - uid: 8229 @@ -53153,8 +52527,6 @@ entities: - type: Transform pos: 8.5,26.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#FF1212FF' - uid: 8235 @@ -53162,8 +52534,6 @@ entities: - type: Transform pos: 18.5,22.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#FF1212FF' - uid: 8243 @@ -53171,8 +52541,6 @@ entities: - type: Transform pos: 23.5,22.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#FF1212FF' - uid: 8564 @@ -53181,8 +52549,6 @@ entities: rot: 3.141592653589793 rad pos: 34.5,22.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#FF1212FF' - uid: 8595 @@ -53191,8 +52557,6 @@ entities: rot: -1.5707963267948966 rad pos: 43.5,23.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#FF1212FF' - uid: 8598 @@ -53201,8 +52565,6 @@ entities: rot: 1.5707963267948966 rad pos: 39.5,22.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#FF1212FF' - uid: 8610 @@ -53210,8 +52572,6 @@ entities: - type: Transform pos: 40.5,26.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#FF1212FF' - uid: 8630 @@ -53220,8 +52580,6 @@ entities: rot: -1.5707963267948966 rad pos: 38.5,19.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#FF1212FF' - uid: 8674 @@ -53230,15 +52588,11 @@ entities: rot: 1.5707963267948966 rad pos: 40.5,33.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 8685 components: - type: Transform pos: 41.5,18.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#FF1212FF' - uid: 8810 @@ -53247,8 +52601,6 @@ entities: rot: 3.141592653589793 rad pos: 26.5,22.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9359 @@ -53257,8 +52609,6 @@ entities: rot: 3.141592653589793 rad pos: 30.5,14.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9546 @@ -53266,8 +52616,6 @@ entities: - type: Transform pos: 28.5,46.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9554 @@ -53276,8 +52624,6 @@ entities: rot: 3.141592653589793 rad pos: 22.5,41.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9557 @@ -53286,8 +52632,6 @@ entities: rot: -1.5707963267948966 rad pos: 27.5,42.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9569 @@ -53296,8 +52640,6 @@ entities: rot: 1.5707963267948966 rad pos: 23.5,37.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9636 @@ -53305,8 +52647,6 @@ entities: - type: Transform pos: 44.5,3.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#FF1212FF' - uid: 10128 @@ -53315,8 +52655,6 @@ entities: rot: 3.141592653589793 rad pos: 55.5,-9.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#FF1212FF' - uid: 10179 @@ -53325,8 +52663,6 @@ entities: rot: 3.141592653589793 rad pos: -0.5,-3.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#FF1212FF' - uid: 10180 @@ -53335,8 +52671,6 @@ entities: rot: 3.141592653589793 rad pos: 4.5,-3.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#FF1212FF' - uid: 10181 @@ -53345,8 +52679,6 @@ entities: rot: -1.5707963267948966 rad pos: -2.5,-7.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#FF1212FF' - uid: 10182 @@ -53355,8 +52687,6 @@ entities: rot: -1.5707963267948966 rad pos: 10.5,-7.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#FF1212FF' - uid: 10215 @@ -53365,8 +52695,6 @@ entities: rot: 1.5707963267948966 rad pos: 22.5,-10.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#FF1212FF' - uid: 10217 @@ -53375,8 +52703,6 @@ entities: rot: 3.141592653589793 rad pos: 29.5,-28.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#FF1212FF' - uid: 10249 @@ -53384,8 +52710,6 @@ entities: - type: Transform pos: 26.5,5.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#FF1212FF' - uid: 10365 @@ -53394,8 +52718,6 @@ entities: rot: 3.141592653589793 rad pos: 45.5,14.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#FF1212FF' - uid: 10366 @@ -53404,8 +52726,6 @@ entities: rot: 3.141592653589793 rad pos: 50.5,17.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#FF1212FF' - uid: 10375 @@ -53414,8 +52734,6 @@ entities: rot: -1.5707963267948966 rad pos: 59.5,19.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#FF1212FF' - uid: 10400 @@ -53424,8 +52742,6 @@ entities: rot: -1.5707963267948966 rad pos: 67.5,15.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#FF1212FF' - uid: 10401 @@ -53434,8 +52750,6 @@ entities: rot: 3.141592653589793 rad pos: 63.5,10.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#FF1212FF' - uid: 10402 @@ -53444,8 +52758,6 @@ entities: rot: 1.5707963267948966 rad pos: 54.5,9.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#FF1212FF' - uid: 10403 @@ -53453,8 +52765,6 @@ entities: - type: Transform pos: 57.5,14.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#FF1212FF' - uid: 10411 @@ -53463,8 +52773,6 @@ entities: rot: -1.5707963267948966 rad pos: 62.5,23.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#FF1212FF' - uid: 10412 @@ -53473,8 +52781,6 @@ entities: rot: 1.5707963267948966 rad pos: 57.5,23.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#FF1212FF' - uid: 10652 @@ -53483,8 +52789,6 @@ entities: rot: 1.5707963267948966 rad pos: 32.5,6.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#FF1212FF' - uid: 11367 @@ -53493,8 +52797,6 @@ entities: rot: -1.5707963267948966 rad pos: 77.5,2.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#FF1212FF' - uid: 11719 @@ -53503,8 +52805,6 @@ entities: rot: 3.141592653589793 rad pos: 64.5,-6.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#FF1212FF' - uid: 11726 @@ -53513,8 +52813,6 @@ entities: rot: -1.5707963267948966 rad pos: 67.5,-1.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#FF1212FF' - uid: 11729 @@ -53523,8 +52821,6 @@ entities: rot: 3.141592653589793 rad pos: 72.5,-0.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#FF1212FF' - uid: 11744 @@ -53533,8 +52829,6 @@ entities: rot: 1.5707963267948966 rad pos: 52.5,-5.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#FF1212FF' - uid: 11923 @@ -53542,8 +52836,6 @@ entities: - type: Transform pos: 60.5,-4.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#FF1212FF' - uid: 11936 @@ -53552,8 +52844,6 @@ entities: rot: 3.141592653589793 rad pos: 60.5,-10.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#FF1212FF' - uid: 11938 @@ -53561,8 +52851,6 @@ entities: - type: Transform pos: 56.5,2.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#FF1212FF' - uid: 11957 @@ -53570,8 +52858,6 @@ entities: - type: Transform pos: 73.5,5.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#FF1212FF' - proto: GasVolumePump @@ -53582,8 +52868,6 @@ entities: rot: -1.5707963267948966 rad pos: 38.5,-47.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#03FCD3FF' - uid: 1373 @@ -53592,8 +52876,6 @@ entities: rot: 1.5707963267948966 rad pos: 39.5,-22.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#FF1212FF' - uid: 4501 @@ -53602,8 +52884,6 @@ entities: rot: 1.5707963267948966 rad pos: 38.5,-45.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#FF1212FF' - proto: Gauze @@ -57967,8 +57247,6 @@ entities: rot: 1.5707963267948966 rad pos: 42.5,-51.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#03FCD3FF' - uid: 12861 @@ -57977,8 +57255,6 @@ entities: rot: 1.5707963267948966 rad pos: 42.5,-52.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#03FCD3FF' - uid: 12862 @@ -57987,8 +57263,6 @@ entities: rot: 1.5707963267948966 rad pos: 42.5,-53.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#03FCD3FF' - uid: 12904 @@ -57997,8 +57271,6 @@ entities: rot: 3.141592653589793 rad pos: 48.5,-45.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#FF1212FF' - proto: Hemostat @@ -59360,36 +58632,26 @@ entities: - type: Transform pos: 43.5,-37.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 4311 components: - type: Transform pos: 43.5,-38.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 4571 components: - type: Transform pos: 32.5,-27.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 5746 components: - type: Transform pos: 49.5,-13.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 10442 components: - type: Transform pos: 58.5,11.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - proto: NitrousOxideCanister entities: - uid: 4334 @@ -59397,8 +58659,6 @@ entities: - type: Transform pos: 44.5,-37.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - proto: NuclearBomb entities: - uid: 12093 @@ -59447,71 +58707,51 @@ entities: - type: Transform pos: 42.5,-38.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 2833 components: - type: Transform pos: 42.5,-37.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 4570 components: - type: Transform pos: 32.5,-28.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 5745 components: - type: Transform pos: 50.5,-13.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 6424 components: - type: Transform pos: 46.5,7.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 7969 components: - type: Transform pos: 5.5,19.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 9620 components: - type: Transform pos: 47.5,2.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 10314 components: - type: Transform pos: 8.5,-5.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 10441 components: - type: Transform pos: 58.5,10.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 12997 components: - type: Transform pos: 34.5,-44.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - proto: OxygenTankFilled entities: - uid: 5720 @@ -59759,15 +58999,11 @@ entities: - type: Transform pos: 44.5,-38.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 12996 components: - type: Transform pos: 34.5,-43.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - proto: PlasmaReinforcedWindowDirectional entities: - uid: 2092 @@ -67725,7 +66961,7 @@ entities: - type: Transform pos: 32.982197,41.628204 parent: 2 -- proto: soda_dispenser +- proto: SodaDispenser entities: - uid: 2922 components: @@ -68360,6 +67596,8 @@ entities: - type: Transform pos: 20.5,10.5 parent: 2 + - type: SpamEmitSound + enabled: False - proto: SpawnMechRipley entities: - uid: 8178 @@ -69124,36 +68362,26 @@ entities: - type: Transform pos: 46.5,-38.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 951 components: - type: Transform pos: 46.5,-37.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 4568 components: - type: Transform pos: 36.5,-25.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 4569 components: - type: Transform pos: 37.5,-25.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 10440 components: - type: Transform pos: 58.5,9.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - proto: Stunbaton entities: - uid: 10137 @@ -71741,8 +70969,6 @@ entities: - type: Transform pos: 40.5,-46.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - proto: TegCirculator entities: - uid: 13128 From 92e6e10c0afc871201b27a1c001583aa1b04928b Mon Sep 17 00:00:00 2001 From: lzk <124214523+lzk228@users.noreply.github.com> Date: Sun, 16 Jun 2024 21:37:17 +0200 Subject: [PATCH 120/142] Update train (#28345) robotics console --- Resources/Maps/train.yml | 488 ++++++++++++++++++++++++++++++++++++--- 1 file changed, 458 insertions(+), 30 deletions(-) diff --git a/Resources/Maps/train.yml b/Resources/Maps/train.yml index f83c5019f7..ae2783e643 100644 --- a/Resources/Maps/train.yml +++ b/Resources/Maps/train.yml @@ -34699,18 +34699,6 @@ entities: - type: Transform pos: 4.5698934,-180.42856 parent: 2 -- proto: chem_master - entities: - - uid: 3116 - components: - - type: Transform - pos: 5.5,-165.5 - parent: 2 - - uid: 3117 - components: - - type: Transform - pos: 7.5,-167.5 - parent: 2 - proto: ChemDispenser entities: - uid: 3112 @@ -34730,6 +34718,18 @@ entities: - type: Transform pos: 4.5,-167.5 parent: 2 +- proto: ChemMaster + entities: + - uid: 3116 + components: + - type: Transform + pos: 5.5,-165.5 + parent: 2 + - uid: 3117 + components: + - type: Transform + pos: 7.5,-167.5 + parent: 2 - proto: ChessBoard entities: - uid: 12938 @@ -36687,6 +36687,14 @@ entities: rot: -1.5707963267948966 rad pos: -2.5,-316.5 parent: 2 +- proto: ComputerRoboticsControl + entities: + - uid: 6661 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -9.5,-300.5 + parent: 2 - proto: ComputerSalvageExpedition entities: - uid: 8873 @@ -54872,11 +54880,15 @@ entities: - uid: 4565 components: - type: Transform + anchored: False rot: 1.5707963267948966 rad pos: 3.5,-149.5 parent: 2 - type: AtmosPipeColor color: '#0335FCFF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 4566 components: - type: Transform @@ -55133,11 +55145,15 @@ entities: - uid: 4664 components: - type: Transform + anchored: False rot: 3.141592653589793 rad pos: 1.5,-192.5 parent: 2 - type: AtmosPipeColor color: '#FF0000FF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 4665 components: - type: Transform @@ -61359,11 +61375,15 @@ entities: - uid: 14873 components: - type: Transform + anchored: False rot: 3.141592653589793 rad pos: 5.5,-109.5 parent: 2 - type: AtmosPipeColor color: '#0335FCFF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 14892 components: - type: Transform @@ -63407,15 +63427,23 @@ entities: - uid: 11927 components: - type: Transform + anchored: False rot: -1.5707963267948966 rad pos: -20.5,-263.5 parent: 2 + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 11930 components: - type: Transform + anchored: False rot: -1.5707963267948966 rad pos: -19.5,-263.5 parent: 2 + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 12412 components: - type: Transform @@ -63559,11 +63587,15 @@ entities: - uid: 838 components: - type: Transform + anchored: False rot: 3.141592653589793 rad pos: 0.5,-157.5 parent: 2 - type: AtmosPipeColor color: '#0335FCFF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 855 components: - type: Transform @@ -63601,6 +63633,7 @@ entities: - uid: 884 components: - type: Transform + anchored: False rot: 1.5707963267948966 rad pos: 0.5,0.5 parent: 2 @@ -63609,6 +63642,9 @@ entities: - 12935 - type: AtmosPipeColor color: '#0335FCFF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 905 components: - type: Transform @@ -63620,11 +63656,15 @@ entities: - uid: 921 components: - type: Transform + anchored: False rot: -1.5707963267948966 rad pos: 5.5,-57.5 parent: 2 - type: AtmosPipeColor color: '#0335FCFF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 954 components: - type: Transform @@ -63639,6 +63679,7 @@ entities: - uid: 977 components: - type: Transform + anchored: False rot: 3.141592653589793 rad pos: 0.5,-30.5 parent: 2 @@ -63647,13 +63688,20 @@ entities: - 13109 - type: AtmosPipeColor color: '#0335FCFF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 1004 components: - type: Transform + anchored: False pos: 0.5,-22.5 parent: 2 - type: AtmosPipeColor color: '#0335FCFF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 1057 components: - type: Transform @@ -63665,11 +63713,15 @@ entities: - uid: 1123 components: - type: Transform + anchored: False rot: 3.141592653589793 rad pos: 0.5,-49.5 parent: 2 - type: AtmosPipeColor color: '#0335FCFF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 1138 components: - type: Transform @@ -63734,14 +63786,19 @@ entities: - uid: 1373 components: - type: Transform + anchored: False rot: 3.141592653589793 rad pos: 0.5,-56.5 parent: 2 - type: AtmosPipeColor color: '#0335FCFF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 1375 components: - type: Transform + anchored: False rot: 1.5707963267948966 rad pos: -2.5,-189.5 parent: 2 @@ -63750,6 +63807,9 @@ entities: - 14727 - type: AtmosPipeColor color: '#0335FCFF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 1382 components: - type: Transform @@ -63772,10 +63832,14 @@ entities: - uid: 1769 components: - type: Transform + anchored: False pos: 0.5,-68.5 parent: 2 - type: AtmosPipeColor color: '#0335FCFF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 1806 components: - type: Transform @@ -63829,10 +63893,14 @@ entities: - uid: 3040 components: - type: Transform + anchored: False pos: 0.5,-184.5 parent: 2 - type: AtmosPipeColor color: '#0335FCFF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 3110 components: - type: Transform @@ -63844,14 +63912,19 @@ entities: - uid: 3333 components: - type: Transform + anchored: False rot: 3.141592653589793 rad pos: 0.5,-76.5 parent: 2 - type: AtmosPipeColor color: '#0335FCFF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 3351 components: - type: Transform + anchored: False rot: -1.5707963267948966 rad pos: 4.5,-81.5 parent: 2 @@ -63860,14 +63933,21 @@ entities: - 13147 - type: AtmosPipeColor color: '#0335FCFF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 3352 components: - type: Transform + anchored: False rot: 1.5707963267948966 rad pos: -4.5,-81.5 parent: 2 - type: AtmosPipeColor color: '#0335FCFF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 3371 components: - type: Transform @@ -63892,11 +63972,15 @@ entities: - uid: 3373 components: - type: Transform + anchored: False rot: 1.5707963267948966 rad pos: -3.5,-88.5 parent: 2 - type: AtmosPipeColor color: '#0335FCFF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 3374 components: - type: Transform @@ -63927,11 +64011,15 @@ entities: - uid: 3393 components: - type: Transform + anchored: False rot: 3.141592653589793 rad pos: 0.5,-103.5 parent: 2 - type: AtmosPipeColor color: '#0335FCFF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 3403 components: - type: Transform @@ -63965,10 +64053,14 @@ entities: - uid: 3438 components: - type: Transform + anchored: False pos: -3.5,-107.5 parent: 2 - type: AtmosPipeColor color: '#0335FCFF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 3451 components: - type: Transform @@ -63999,6 +64091,7 @@ entities: - uid: 3474 components: - type: Transform + anchored: False pos: -6.5,-113.5 parent: 2 - type: DeviceNetwork @@ -64006,9 +64099,13 @@ entities: - 13161 - type: AtmosPipeColor color: '#0335FCFF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 3475 components: - type: Transform + anchored: False pos: -6.5,-116.5 parent: 2 - type: DeviceNetwork @@ -64016,9 +64113,13 @@ entities: - 13161 - type: AtmosPipeColor color: '#0335FCFF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 3476 components: - type: Transform + anchored: False pos: -6.5,-119.5 parent: 2 - type: DeviceNetwork @@ -64026,9 +64127,13 @@ entities: - 13168 - type: AtmosPipeColor color: '#0335FCFF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 3477 components: - type: Transform + anchored: False pos: -6.5,-122.5 parent: 2 - type: DeviceNetwork @@ -64036,6 +64141,9 @@ entities: - 13168 - type: AtmosPipeColor color: '#0335FCFF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 3478 components: - type: Transform @@ -64060,10 +64168,14 @@ entities: - uid: 3481 components: - type: Transform + anchored: False pos: 0.5,-130.5 parent: 2 - type: AtmosPipeColor color: '#0335FCFF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 3482 components: - type: Transform @@ -64097,6 +64209,7 @@ entities: - uid: 3650 components: - type: Transform + anchored: False rot: 1.5707963267948966 rad pos: 5.5,-138.5 parent: 2 @@ -64105,9 +64218,13 @@ entities: - 13182 - type: AtmosPipeColor color: '#0335FCFF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 4016 components: - type: Transform + anchored: False rot: 3.141592653589793 rad pos: 0.5,-136.5 parent: 2 @@ -64116,25 +64233,37 @@ entities: - 13176 - type: AtmosPipeColor color: '#0335FCFF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 4018 components: - type: Transform + anchored: False rot: -1.5707963267948966 rad pos: 3.5,-138.5 parent: 2 - type: AtmosPipeColor color: '#0335FCFF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 4020 components: - type: Transform + anchored: False rot: -1.5707963267948966 rad pos: 8.5,-138.5 parent: 2 - type: AtmosPipeColor color: '#0335FCFF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 4031 components: - type: Transform + anchored: False pos: -4.5,-136.5 parent: 2 - type: DeviceNetwork @@ -64142,6 +64271,9 @@ entities: - 13187 - type: AtmosPipeColor color: '#0335FCFF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 4033 components: - type: Transform @@ -64195,6 +64327,7 @@ entities: - uid: 4202 components: - type: Transform + anchored: False rot: 3.141592653589793 rad pos: 15.5,-256.5 parent: 2 @@ -64203,6 +64336,9 @@ entities: - 15292 - type: AtmosPipeColor color: '#0335FCFF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 4234 components: - type: Transform @@ -64225,11 +64361,15 @@ entities: - uid: 4558 components: - type: Transform + anchored: False rot: -1.5707963267948966 rad pos: 3.5,-152.5 parent: 2 - type: AtmosPipeColor color: '#0335FCFF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 4559 components: - type: Transform @@ -64274,6 +64414,7 @@ entities: - uid: 4950 components: - type: Transform + anchored: False rot: 1.5707963267948966 rad pos: 17.5,-248.5 parent: 2 @@ -64282,6 +64423,9 @@ entities: - 15292 - type: AtmosPipeColor color: '#0335FCFF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 4967 components: - type: Transform @@ -64320,6 +64464,7 @@ entities: - uid: 5082 components: - type: Transform + anchored: False rot: -1.5707963267948966 rad pos: 4.5,-189.5 parent: 2 @@ -64328,9 +64473,13 @@ entities: - 13241 - type: AtmosPipeColor color: '#0335FCFF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 5083 components: - type: Transform + anchored: False rot: 3.141592653589793 rad pos: 0.5,-194.5 parent: 2 @@ -64339,6 +64488,9 @@ entities: - 13249 - type: AtmosPipeColor color: '#0335FCFF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 5108 components: - type: Transform @@ -64364,6 +64516,7 @@ entities: - uid: 5121 components: - type: Transform + anchored: False rot: -1.5707963267948966 rad pos: -2.5,-202.5 parent: 2 @@ -64372,6 +64525,9 @@ entities: - 13252 - type: AtmosPipeColor color: '#0335FCFF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 5126 components: - type: Transform @@ -64418,11 +64574,15 @@ entities: - uid: 5161 components: - type: Transform + anchored: False rot: 3.141592653589793 rad pos: 0.5,-221.5 parent: 2 - type: AtmosPipeColor color: '#0335FCFF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 5163 components: - type: Transform @@ -64442,13 +64602,18 @@ entities: - uid: 5199 components: - type: Transform + anchored: False pos: 0.5,-228.5 parent: 2 - type: AtmosPipeColor color: '#0335FCFF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 5251 components: - type: Transform + anchored: False rot: 3.141592653589793 rad pos: 0.5,-178.5 parent: 2 @@ -64457,9 +64622,13 @@ entities: - 13211 - type: AtmosPipeColor color: '#0335FCFF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 5260 components: - type: Transform + anchored: False rot: -1.5707963267948966 rad pos: 3.5,-175.5 parent: 2 @@ -64468,9 +64637,13 @@ entities: - 8201 - type: AtmosPipeColor color: '#0335FCFF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 5261 components: - type: Transform + anchored: False rot: 1.5707963267948966 rad pos: -1.5,-175.5 parent: 2 @@ -64479,6 +64652,9 @@ entities: - 13213 - type: AtmosPipeColor color: '#0335FCFF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 5288 components: - type: Transform @@ -64490,11 +64666,15 @@ entities: - uid: 5293 components: - type: Transform + anchored: False rot: 1.5707963267948966 rad pos: -2.5,-163.5 parent: 2 - type: AtmosPipeColor color: '#0335FCFF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 5302 components: - type: Transform @@ -64517,6 +64697,7 @@ entities: - uid: 6036 components: - type: Transform + anchored: False pos: 0.5,-34.5 parent: 2 - type: DeviceNetwork @@ -64525,6 +64706,9 @@ entities: - 13109 - type: AtmosPipeColor color: '#0335FCFF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 6727 components: - type: Transform @@ -64552,6 +64736,7 @@ entities: - uid: 6915 components: - type: Transform + anchored: False rot: 3.141592653589793 rad pos: 1.5,-15.5 parent: 2 @@ -64560,6 +64745,9 @@ entities: - 13105 - type: AtmosPipeColor color: '#0335FCFF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 7504 components: - type: Transform @@ -64571,11 +64759,15 @@ entities: - uid: 7506 components: - type: Transform + anchored: False rot: 3.141592653589793 rad pos: 0.5,-265.5 parent: 2 - type: AtmosPipeColor color: '#0335FCFF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 7769 components: - type: Transform @@ -64587,19 +64779,27 @@ entities: - uid: 8066 components: - type: Transform + anchored: False rot: 1.5707963267948966 rad pos: -2.5,-260.5 parent: 2 - type: AtmosPipeColor color: '#0335FCFF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 8070 components: - type: Transform + anchored: False rot: 1.5707963267948966 rad pos: -2.5,-243.5 parent: 2 - type: AtmosPipeColor color: '#0335FCFF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 8071 components: - type: Transform @@ -64614,17 +64814,25 @@ entities: - uid: 8113 components: - type: Transform + anchored: False pos: 0.5,-238.5 parent: 2 - type: AtmosPipeColor color: '#0335FCFF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 8123 components: - type: Transform + anchored: False pos: 0.5,-211.5 parent: 2 - type: AtmosPipeColor color: '#0335FCFF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 8157 components: - type: Transform @@ -64636,6 +64844,7 @@ entities: - uid: 8314 components: - type: Transform + anchored: False rot: 1.5707963267948966 rad pos: 8.5,-248.5 parent: 2 @@ -64644,6 +64853,9 @@ entities: - 15280 - type: AtmosPipeColor color: '#0335FCFF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 8431 components: - type: Transform @@ -64663,6 +64875,7 @@ entities: - uid: 10658 components: - type: Transform + anchored: False pos: -6.5,-338.5 parent: 2 - type: DeviceNetwork @@ -64670,6 +64883,9 @@ entities: - 5925 - type: AtmosPipeColor color: '#0335FCFF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 10811 components: - type: Transform @@ -64689,10 +64905,14 @@ entities: - uid: 10976 components: - type: Transform + anchored: False pos: 7.5,-337.5 parent: 2 - type: AtmosPipeColor color: '#0335FCFF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 12142 components: - type: Transform @@ -64731,6 +64951,7 @@ entities: - uid: 12333 components: - type: Transform + anchored: False rot: -1.5707963267948966 rad pos: 5.5,-273.5 parent: 2 @@ -64739,9 +64960,13 @@ entities: - 13322 - type: AtmosPipeColor color: '#0335FCFF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 12341 components: - type: Transform + anchored: False pos: 0.5,-274.5 parent: 2 - type: DeviceNetwork @@ -64749,14 +64974,21 @@ entities: - 13317 - type: AtmosPipeColor color: '#0335FCFF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 12345 components: - type: Transform + anchored: False rot: -1.5707963267948966 rad pos: 2.5,-284.5 parent: 2 - type: AtmosPipeColor color: '#0335FCFF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 12349 components: - type: Transform @@ -64768,6 +65000,7 @@ entities: - uid: 12356 components: - type: Transform + anchored: False pos: 0.5,-286.5 parent: 2 - type: DeviceNetwork @@ -64775,6 +65008,9 @@ entities: - 13333 - type: AtmosPipeColor color: '#0335FCFF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 12362 components: - type: Transform @@ -64808,6 +65044,7 @@ entities: - uid: 12428 components: - type: Transform + anchored: False rot: -1.5707963267948966 rad pos: -4.5,-315.5 parent: 2 @@ -64816,6 +65053,9 @@ entities: - 13374 - type: AtmosPipeColor color: '#0335FCFF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 12429 components: - type: Transform @@ -64827,6 +65067,7 @@ entities: - uid: 12430 components: - type: Transform + anchored: False pos: 0.5,-318.5 parent: 2 - type: DeviceNetwork @@ -64834,6 +65075,9 @@ entities: - 13370 - type: AtmosPipeColor color: '#0335FCFF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 12470 components: - type: Transform @@ -64918,28 +65162,41 @@ entities: - uid: 12637 components: - type: Transform + anchored: False pos: 0.5,-292.5 parent: 2 - type: AtmosPipeColor color: '#0335FCFF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 12641 components: - type: Transform + anchored: False pos: 0.5,-324.5 parent: 2 - type: AtmosPipeColor color: '#0335FCFF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 12652 components: - type: Transform + anchored: False rot: 1.5707963267948966 rad pos: -0.5,-327.5 parent: 2 - type: AtmosPipeColor color: '#0335FCFF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 12705 components: - type: Transform + anchored: False rot: -1.5707963267948966 rad pos: 0.5,-297.5 parent: 2 @@ -64948,6 +65205,9 @@ entities: - 13358 - type: AtmosPipeColor color: '#0335FCFF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 12718 components: - type: Transform @@ -64959,6 +65219,7 @@ entities: - uid: 12754 components: - type: Transform + anchored: False rot: -1.5707963267948966 rad pos: 0.5,-356.5 parent: 2 @@ -64967,16 +65228,24 @@ entities: - 13421 - type: AtmosPipeColor color: '#0335FCFF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 12895 components: - type: Transform + anchored: False pos: 0.5,-344.5 parent: 2 - type: AtmosPipeColor color: '#0335FCFF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 12897 components: - type: Transform + anchored: False pos: 0.5,-340.5 parent: 2 - type: DeviceNetwork @@ -64984,9 +65253,13 @@ entities: - 11906 - type: AtmosPipeColor color: '#0335FCFF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 12898 components: - type: Transform + anchored: False pos: 0.5,-329.5 parent: 2 - type: DeviceNetwork @@ -64995,13 +65268,20 @@ entities: - 11906 - type: AtmosPipeColor color: '#0335FCFF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 12918 components: - type: Transform + anchored: False pos: 0.5,-351.5 parent: 2 - type: AtmosPipeColor color: '#0335FCFF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 12920 components: - type: Transform @@ -65121,17 +65401,25 @@ entities: - uid: 13077 components: - type: Transform + anchored: False pos: -3.5,-368.5 parent: 2 - type: AtmosPipeColor color: '#0335FCFF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 13079 components: - type: Transform + anchored: False pos: 4.5,-368.5 parent: 2 - type: AtmosPipeColor color: '#0335FCFF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 13145 components: - type: Transform @@ -65145,6 +65433,7 @@ entities: - uid: 13207 components: - type: Transform + anchored: False pos: 0.5,-167.5 parent: 2 - type: DeviceNetwork @@ -65152,6 +65441,9 @@ entities: - 13209 - type: AtmosPipeColor color: '#0335FCFF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 13237 components: - type: Transform @@ -65275,6 +65567,7 @@ entities: - uid: 15284 components: - type: Transform + anchored: False rot: 3.141592653589793 rad pos: 0.5,-254.5 parent: 2 @@ -65283,6 +65576,9 @@ entities: - 15282 - type: AtmosPipeColor color: '#0335FCFF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 16679 components: - type: Transform @@ -65360,6 +65656,7 @@ entities: - uid: 747 components: - type: Transform + anchored: False pos: 2.5,-6.5 parent: 2 - type: DeviceNetwork @@ -65367,6 +65664,9 @@ entities: - 13080 - type: AtmosPipeColor color: '#FF0000FF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 751 components: - type: Transform @@ -65410,6 +65710,7 @@ entities: - uid: 1155 components: - type: Transform + anchored: False rot: 3.141592653589793 rad pos: -0.5,-30.5 parent: 2 @@ -65418,9 +65719,13 @@ entities: - 13109 - type: AtmosPipeColor color: '#FF0000FF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 1191 components: - type: Transform + anchored: False rot: 3.141592653589793 rad pos: -0.5,-34.5 parent: 2 @@ -65430,6 +65735,9 @@ entities: - 13109 - type: AtmosPipeColor color: '#FF0000FF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 1201 components: - type: Transform @@ -65554,6 +65862,7 @@ entities: - uid: 1825 components: - type: Transform + anchored: False rot: 1.5707963267948966 rad pos: 0.5,1.5 parent: 2 @@ -65562,6 +65871,9 @@ entities: - 12935 - type: AtmosPipeColor color: '#FF0000FF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 2797 components: - type: Transform @@ -65584,8 +65896,12 @@ entities: - uid: 3120 components: - type: Transform + anchored: False pos: 1.5,-167.5 parent: 2 + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 3261 components: - type: Transform @@ -65765,6 +66081,7 @@ entities: - uid: 3600 components: - type: Transform + anchored: False pos: -0.5,-120.5 parent: 2 - type: DeviceNetwork @@ -65772,9 +66089,13 @@ entities: - 13165 - type: AtmosPipeColor color: '#FF0000FF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 3603 components: - type: Transform + anchored: False rot: 3.141592653589793 rad pos: -0.5,-123.5 parent: 2 @@ -65783,6 +66104,9 @@ entities: - 13168 - type: AtmosPipeColor color: '#FF0000FF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 3608 components: - type: Transform @@ -65797,11 +66121,15 @@ entities: - uid: 3622 components: - type: Transform + anchored: False rot: 3.141592653589793 rad pos: 6.5,-110.5 parent: 2 - type: AtmosPipeColor color: '#FF0000FF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 3623 components: - type: Transform @@ -65838,11 +66166,15 @@ entities: - uid: 3637 components: - type: Transform + anchored: False rot: -1.5707963267948966 rad pos: 4.5,-108.5 parent: 2 - type: AtmosPipeColor color: '#FF0000FF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 3647 components: - type: Transform @@ -65900,11 +66232,15 @@ entities: - uid: 3982 components: - type: Transform + anchored: False rot: 1.5707963267948966 rad pos: 7.5,-135.5 parent: 2 - type: AtmosPipeColor color: '#FF0000FF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 3993 components: - type: Transform @@ -65993,6 +66329,7 @@ entities: - uid: 4508 components: - type: Transform + anchored: False rot: 3.141592653589793 rad pos: 4.5,-88.5 parent: 2 @@ -66001,6 +66338,9 @@ entities: - 13146 - type: AtmosPipeColor color: '#FF0000FF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 4509 components: - type: Transform @@ -66100,6 +66440,7 @@ entities: - uid: 5072 components: - type: Transform + anchored: False rot: 3.141592653589793 rad pos: 1.5,-194.5 parent: 2 @@ -66108,6 +66449,9 @@ entities: - 13249 - type: AtmosPipeColor color: '#FF0000FF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 5073 components: - type: Transform @@ -66141,19 +66485,27 @@ entities: - uid: 5179 components: - type: Transform + anchored: False rot: 1.5707963267948966 rad pos: 4.5,-229.5 parent: 2 - type: AtmosPipeColor color: '#FF0000FF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 5185 components: - type: Transform + anchored: False rot: 1.5707963267948966 rad pos: 0.5,-229.5 parent: 2 - type: AtmosPipeColor color: '#FF0000FF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 5188 components: - type: Transform @@ -66165,19 +66517,27 @@ entities: - uid: 5189 components: - type: Transform + anchored: False rot: -1.5707963267948966 rad pos: -3.5,-220.5 parent: 2 - type: AtmosPipeColor color: '#FF0000FF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 5190 components: - type: Transform + anchored: False rot: -1.5707963267948966 rad pos: 0.5,-220.5 parent: 2 - type: AtmosPipeColor color: '#FF0000FF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 5225 components: - type: Transform @@ -66188,6 +66548,7 @@ entities: - uid: 5252 components: - type: Transform + anchored: False rot: 3.141592653589793 rad pos: 1.5,-178.5 parent: 2 @@ -66196,9 +66557,13 @@ entities: - 13211 - type: AtmosPipeColor color: '#FF0000FF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 5275 components: - type: Transform + anchored: False rot: 1.5707963267948966 rad pos: -1.5,-174.5 parent: 2 @@ -66207,6 +66572,9 @@ entities: - 13213 - type: AtmosPipeColor color: '#FF0000FF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 5277 components: - type: Transform @@ -66267,6 +66635,7 @@ entities: - uid: 7476 components: - type: Transform + anchored: False rot: 3.141592653589793 rad pos: 16.5,-256.5 parent: 2 @@ -66275,6 +66644,9 @@ entities: - 15292 - type: AtmosPipeColor color: '#FF1212FF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 7563 components: - type: Transform @@ -66285,6 +66657,7 @@ entities: - uid: 7776 components: - type: Transform + anchored: False rot: 3.141592653589793 rad pos: 18.5,-249.5 parent: 2 @@ -66293,6 +66666,9 @@ entities: - 15292 - type: AtmosPipeColor color: '#FF1212FF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 7823 components: - type: Transform @@ -66326,6 +66702,7 @@ entities: - uid: 8089 components: - type: Transform + anchored: False rot: -1.5707963267948966 rad pos: 8.5,-256.5 parent: 2 @@ -66334,6 +66711,9 @@ entities: - 15280 - type: AtmosPipeColor color: '#FF1212FF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 8091 components: - type: Transform @@ -66385,12 +66765,16 @@ entities: - uid: 11912 components: - type: Transform + anchored: False rot: 1.5707963267948966 rad pos: -5.5,-361.5 parent: 2 - type: DeviceNetwork deviceLists: - 13421 + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 12134 components: - type: Transform @@ -66459,6 +66843,7 @@ entities: - uid: 12340 components: - type: Transform + anchored: False pos: 1.5,-274.5 parent: 2 - type: DeviceNetwork @@ -66466,9 +66851,13 @@ entities: - 13317 - type: AtmosPipeColor color: '#FF0000FF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 12355 components: - type: Transform + anchored: False pos: -0.5,-286.5 parent: 2 - type: DeviceNetwork @@ -66476,6 +66865,9 @@ entities: - 13333 - type: AtmosPipeColor color: '#FF0000FF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 12375 components: - type: Transform @@ -66531,6 +66923,7 @@ entities: - uid: 12530 components: - type: Transform + anchored: False rot: -1.5707963267948966 rad pos: 0.5,-319.5 parent: 2 @@ -66539,6 +66932,9 @@ entities: - 13370 - type: AtmosPipeColor color: '#FF0000FF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 12564 components: - type: Transform @@ -66578,6 +66974,7 @@ entities: - uid: 12704 components: - type: Transform + anchored: False rot: -1.5707963267948966 rad pos: 0.5,-298.5 parent: 2 @@ -66586,6 +66983,9 @@ entities: - 13358 - type: AtmosPipeColor color: '#FF0000FF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 12721 components: - type: Transform @@ -66624,14 +67024,19 @@ entities: - uid: 12812 components: - type: Transform + anchored: False rot: 1.5707963267948966 rad pos: 0.5,-346.5 parent: 2 - type: AtmosPipeColor color: '#FF0000FF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 12813 components: - type: Transform + anchored: False rot: 3.141592653589793 rad pos: -4.5,-344.5 parent: 2 @@ -66640,9 +67045,13 @@ entities: - 13402 - type: AtmosPipeColor color: '#FF0000FF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 12896 components: - type: Transform + anchored: False pos: 1.5,-329.5 parent: 2 - type: DeviceNetwork @@ -66651,6 +67060,9 @@ entities: - 11906 - type: AtmosPipeColor color: '#FF0000FF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 12914 components: - type: Transform @@ -66693,6 +67105,7 @@ entities: - uid: 13040 components: - type: Transform + anchored: False rot: 3.141592653589793 rad pos: -6.5,-363.5 parent: 2 @@ -66701,9 +67114,13 @@ entities: - 13421 - type: AtmosPipeColor color: '#FF0000FF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 13041 components: - type: Transform + anchored: False rot: 3.141592653589793 rad pos: 7.5,-363.5 parent: 2 @@ -66712,9 +67129,13 @@ entities: - 13421 - type: AtmosPipeColor color: '#FF0000FF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 13053 components: - type: Transform + anchored: False pos: 0.5,-365.5 parent: 2 - type: DeviceNetwork @@ -66722,14 +67143,21 @@ entities: - 13429 - type: AtmosPipeColor color: '#FF0000FF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 13055 components: - type: Transform + anchored: False rot: 3.141592653589793 rad pos: 0.5,-367.5 parent: 2 - type: AtmosPipeColor color: '#FF0000FF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 13067 components: - type: Transform @@ -66755,6 +67183,7 @@ entities: - uid: 13081 components: - type: Transform + anchored: False rot: -1.5707963267948966 rad pos: 3.5,-361.5 parent: 2 @@ -66763,9 +67192,13 @@ entities: - 13421 - type: AtmosPipeColor color: '#FF0000FF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 13082 components: - type: Transform + anchored: False rot: 1.5707963267948966 rad pos: -2.5,-361.5 parent: 2 @@ -66774,6 +67207,9 @@ entities: - 13421 - type: AtmosPipeColor color: '#FF0000FF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 13088 components: - type: Transform @@ -66830,6 +67266,7 @@ entities: - uid: 15283 components: - type: Transform + anchored: False rot: 3.141592653589793 rad pos: -0.5,-257.5 parent: 2 @@ -66838,14 +67275,21 @@ entities: - 15282 - type: AtmosPipeColor color: '#FF1212FF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 16999 components: - type: Transform + anchored: False rot: 1.5707963267948966 rad pos: -5.5,-248.5 parent: 2 - type: AtmosPipeColor color: '#FF1212FF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 17001 components: - type: Transform @@ -74248,7 +74692,7 @@ entities: pos: 8.5,-176.5 parent: 2 - type: Door - secondsUntilStateChange: -134384.86 + secondsUntilStateChange: -134439.94 state: Closing - uid: 11796 components: @@ -80145,12 +80589,6 @@ entities: rot: 3.141592653589793 rad pos: -2.5,-207.5 parent: 2 - - uid: 6882 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -9.5,-300.5 - parent: 2 - uid: 7791 components: - type: Transform @@ -86125,7 +86563,7 @@ entities: - type: Transform pos: 3.2005093,-101.69577 parent: 2 -- proto: soda_dispenser +- proto: SodaDispenser entities: - uid: 1025 components: @@ -90101,11 +90539,6 @@ entities: - type: Transform pos: 1.2603997,-187.48691 parent: 2 - - uid: 6661 - components: - - type: Transform - pos: -9.413958,-300.49924 - parent: 2 - uid: 15265 components: - type: Transform @@ -90167,11 +90600,6 @@ entities: - type: Transform pos: 7.516703,-56.70343 parent: 2 - - uid: 6883 - components: - - type: Transform - pos: -9.6328745,-300.19412 - parent: 2 - uid: 8681 components: - type: Transform From ce5641036ca283ec84421b18fd0c86afacda6734 Mon Sep 17 00:00:00 2001 From: lzk <124214523+lzk228@users.noreply.github.com> Date: Sun, 16 Jun 2024 21:37:26 +0200 Subject: [PATCH 121/142] Update fland (#28347) robotics console --- Resources/Maps/fland.yml | 60 +++++++++++++++++++++------------------- 1 file changed, 31 insertions(+), 29 deletions(-) diff --git a/Resources/Maps/fland.yml b/Resources/Maps/fland.yml index fa9d58f0d2..56eb8ec73a 100644 --- a/Resources/Maps/fland.yml +++ b/Resources/Maps/fland.yml @@ -19098,13 +19098,13 @@ entities: - type: Transform pos: -16.5,-30.5 parent: 13329 - - type: DeviceLinkSink - links: - - 3748 - type: DeviceLinkSource linkedPorts: 3748: - DoorStatus: Close + - type: DeviceLinkSink + links: + - 3748 - uid: 10108 components: - type: Transform @@ -28701,11 +28701,10 @@ entities: rot: -1.5707963267948966 rad pos: -19.5,57.5 parent: 13329 - - uid: 15487 + - uid: 15462 components: - type: Transform - rot: 3.141592653589793 rad - pos: 49.5,-43.5 + pos: 49.5,-37.5 parent: 13329 - uid: 31586 components: @@ -89645,23 +89644,6 @@ entities: - type: Transform pos: -36.57214,64.58148 parent: 13329 -- proto: chem_master - entities: - - uid: 18338 - components: - - type: Transform - pos: 17.5,36.5 - parent: 13329 - - uid: 18341 - components: - - type: Transform - pos: 20.5,41.5 - parent: 13329 - - uid: 18450 - components: - - type: Transform - pos: 30.5,36.5 - parent: 13329 - proto: ChemDispenser entities: - uid: 18340 @@ -89686,6 +89668,23 @@ entities: - type: Transform pos: 25.5,40.5 parent: 13329 +- proto: ChemMaster + entities: + - uid: 18338 + components: + - type: Transform + pos: 17.5,36.5 + parent: 13329 + - uid: 18341 + components: + - type: Transform + pos: 20.5,41.5 + parent: 13329 + - uid: 18450 + components: + - type: Transform + pos: 30.5,36.5 + parent: 13329 - proto: ChessBoard entities: - uid: 1101 @@ -96355,11 +96354,6 @@ entities: rot: -1.5707963267948966 rad pos: 39.5,-22.5 parent: 13329 - - uid: 15462 - components: - - type: Transform - pos: 49.5,-37.5 - parent: 13329 - uid: 15485 components: - type: Transform @@ -96393,6 +96387,14 @@ entities: - type: Transform pos: 77.5,57.5 parent: 13329 +- proto: ComputerRoboticsControl + entities: + - uid: 15487 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 49.5,-43.5 + parent: 13329 - proto: ComputerSalvageExpedition entities: - uid: 13473 @@ -184695,7 +184697,7 @@ entities: - type: Transform pos: 81.47995,53.57306 parent: 13329 -- proto: soda_dispenser +- proto: SodaDispenser entities: - uid: 1175 components: From 31d155dfe06bb437aea6f79106ae2c724a0a42a3 Mon Sep 17 00:00:00 2001 From: lzk <124214523+lzk228@users.noreply.github.com> Date: Sun, 16 Jun 2024 21:37:37 +0200 Subject: [PATCH 122/142] Update box (#28348) * Update box robotics console * Morgue airlock * update --- Resources/Maps/box.yml | 137 +++++++++++++++++++++-------------------- 1 file changed, 71 insertions(+), 66 deletions(-) diff --git a/Resources/Maps/box.yml b/Resources/Maps/box.yml index 968ef2caa5..07a5cd9d35 100644 --- a/Resources/Maps/box.yml +++ b/Resources/Maps/box.yml @@ -11429,63 +11429,63 @@ entities: rot: -1.5707963267948966 rad pos: -81.5,9.5 parent: 8364 - - type: DeviceLinkSink - links: - - 655 - type: DeviceLinkSource linkedPorts: 655: - DoorStatus: Close + - type: DeviceLinkSink + links: + - 655 - uid: 1110 components: - type: Transform rot: -1.5707963267948966 rad pos: -79.5,-13.5 parent: 8364 - - type: DeviceLinkSink - links: - - 12466 - type: DeviceLinkSource linkedPorts: 12466: - DoorStatus: Close + - type: DeviceLinkSink + links: + - 12466 - uid: 12469 components: - type: Transform pos: -75.5,-17.5 parent: 8364 - - type: DeviceLinkSink - links: - - 12468 - type: DeviceLinkSource linkedPorts: 12468: - DoorStatus: Close + - type: DeviceLinkSink + links: + - 12468 - uid: 12470 components: - type: Transform pos: -68.5,-17.5 parent: 8364 - - type: DeviceLinkSink - links: - - 12467 - type: DeviceLinkSource linkedPorts: 12467: - DoorStatus: Close + - type: DeviceLinkSink + links: + - 12467 - uid: 12486 components: - type: Transform rot: -1.5707963267948966 rad pos: -81.5,-4.5 parent: 8364 - - type: DeviceLinkSink - links: - - 610 - type: DeviceLinkSource linkedPorts: 610: - DoorStatus: Close + - type: DeviceLinkSink + links: + - 610 - proto: AirlockFreezer entities: - uid: 25720 @@ -11541,7 +11541,7 @@ entities: pos: 24.5,16.5 parent: 8364 - type: Door - secondsUntilStateChange: -354.4333 + secondsUntilStateChange: -706.3356 state: Opening - type: DeviceLinkSource lastSignals: @@ -11880,21 +11880,24 @@ entities: rot: 3.141592653589793 rad pos: -66.5,21.5 parent: 8364 - - type: Docking - dockJointId: docking46345 - dockedWith: 21828 - type: Door changeAirtight: False state: Open + - type: Docking + dockJointId: docking46345 + dockedWith: 21828 + - type: DeviceLinkSource + linkedPorts: + 1495: + - DoorStatus: Close + lastSignals: + DoorStatus: False + DockStatus: True - type: Physics canCollide: False - type: DeviceLinkSink links: - 1495 - - type: DeviceLinkSource - linkedPorts: - 1495: - - DoorStatus: Close - uid: 5209 components: - type: Transform @@ -11912,12 +11915,16 @@ entities: - type: Transform pos: -0.5,-0.5 parent: 11906 - - type: Docking - dockJointId: docking46345 - dockedWith: 562 - type: Door changeAirtight: False state: Open + - type: Docking + dockJointId: docking46345 + dockedWith: 562 + - type: DeviceLinkSource + lastSignals: + DoorStatus: False + DockStatus: True - type: Physics canCollide: False - proto: AirlockHeadOfPersonnelGlassLocked @@ -12764,10 +12771,10 @@ entities: - type: Transform pos: 41.5,-21.5 parent: 8364 +- proto: AirlockMedicalMorgueLocked + entities: - uid: 18321 components: - - type: MetaData - name: Morgue - type: Transform pos: 44.5,-15.5 parent: 8364 @@ -64138,23 +64145,6 @@ entities: - type: Transform pos: 14.5,10.5 parent: 8364 -- proto: chem_master - entities: - - uid: 18770 - components: - - type: Transform - pos: 22.5,-20.5 - parent: 8364 - - uid: 18771 - components: - - type: Transform - pos: 22.5,-16.5 - parent: 8364 - - uid: 18775 - components: - - type: Transform - pos: 18.5,-16.5 - parent: 8364 - proto: ChemDispenser entities: - uid: 18610 @@ -64179,6 +64169,23 @@ entities: - type: Transform pos: 18.5,-17.5 parent: 8364 +- proto: ChemMaster + entities: + - uid: 18770 + components: + - type: Transform + pos: 22.5,-20.5 + parent: 8364 + - uid: 18771 + components: + - type: Transform + pos: 22.5,-16.5 + parent: 8364 + - uid: 18775 + components: + - type: Transform + pos: 18.5,-16.5 + parent: 8364 - proto: ChessBoard entities: - uid: 11671 @@ -69520,12 +69527,6 @@ entities: - type: Transform pos: -6.5,-6.5 parent: 8364 - - uid: 6491 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 71.5,-34.5 - parent: 8364 - uid: 19091 components: - type: Transform @@ -69672,6 +69673,12 @@ entities: rot: -1.5707963267948966 rad pos: 37.5,-41.5 parent: 8364 + - uid: 20698 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 46.5,-25.5 + parent: 8364 - proto: ComputerCriminalRecords entities: - uid: 9075 @@ -69774,12 +69781,6 @@ entities: rot: 3.141592653589793 rad pos: 28.5,-21.5 parent: 8364 - - uid: 26738 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 46.5,-25.5 - parent: 8364 - proto: ComputerPowerMonitoring entities: - uid: 595 @@ -69873,6 +69874,14 @@ entities: rot: 1.5707963267948966 rad pos: 69.5,-20.5 parent: 8364 +- proto: ComputerRoboticsControl + entities: + - uid: 6491 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 71.5,-34.5 + parent: 8364 - proto: ComputerSalvageExpedition entities: - uid: 24680 @@ -96651,14 +96660,6 @@ entities: parent: 8364 - type: AtmosPipeColor color: '#FF1212FF' - - uid: 23915 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 76.5,-6.5 - parent: 8364 - - type: AtmosPipeColor - color: '#FF1212FF' - uid: 23916 components: - type: Transform @@ -105733,11 +105734,15 @@ entities: - uid: 25784 components: - type: Transform + anchored: False rot: -1.5707963267948966 rad pos: 14.5,31.5 parent: 8364 - type: AtmosPipeColor color: '#0335FCFF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 25785 components: - type: Transform @@ -141475,7 +141480,7 @@ entities: - type: Transform pos: 10.464365,-22.554323 parent: 8364 -- proto: soda_dispenser +- proto: SodaDispenser entities: - uid: 7256 components: From 5e50bd83d6e5ed98c57b6a0fa5d280b32b7e7219 Mon Sep 17 00:00:00 2001 From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> Date: Sun, 16 Jun 2024 15:37:43 -0400 Subject: [PATCH 123/142] Missing meteor presets (#29044) * add meteors into missing game presets * changes for real * implement code * this too --- .../Tests/GameRules/FailAndStartPresetTest.cs | 2 ++ .../GameTicking/Rules/GameRuleSystem.cs | 17 ++++++++++++----- .../GameTicking/Rules/SecretRuleSystem.cs | 2 +- .../GameTicking/Components/GameRuleComponent.cs | 7 +++++++ Resources/Prototypes/GameRules/meteorswarms.yml | 1 + Resources/Prototypes/game_presets.yml | 3 +++ 6 files changed, 26 insertions(+), 6 deletions(-) diff --git a/Content.IntegrationTests/Tests/GameRules/FailAndStartPresetTest.cs b/Content.IntegrationTests/Tests/GameRules/FailAndStartPresetTest.cs index 09a27c1bae..f660eccf30 100644 --- a/Content.IntegrationTests/Tests/GameRules/FailAndStartPresetTest.cs +++ b/Content.IntegrationTests/Tests/GameRules/FailAndStartPresetTest.cs @@ -140,6 +140,8 @@ public sealed class TestRuleSystem : EntitySystem while (query.MoveNext(out _, out _, out var gameRule)) { var minPlayers = gameRule.MinPlayers; + if (!gameRule.CancelPresetOnTooFewPlayers) + continue; if (args.Players.Length >= minPlayers) continue; diff --git a/Content.Server/GameTicking/Rules/GameRuleSystem.cs b/Content.Server/GameTicking/Rules/GameRuleSystem.cs index 730748ce6b..cb5b117549 100644 --- a/Content.Server/GameTicking/Rules/GameRuleSystem.cs +++ b/Content.Server/GameTicking/Rules/GameRuleSystem.cs @@ -41,11 +41,18 @@ public abstract partial class GameRuleSystem : EntitySystem where T : ICompon if (args.Players.Length >= minPlayers) continue; - ChatManager.SendAdminAnnouncement(Loc.GetString("preset-not-enough-ready-players", - ("readyPlayersCount", args.Players.Length), - ("minimumPlayers", minPlayers), - ("presetName", ToPrettyString(uid)))); - args.Cancel(); + if (gameRule.CancelPresetOnTooFewPlayers) + { + ChatManager.SendAdminAnnouncement(Loc.GetString("preset-not-enough-ready-players", + ("readyPlayersCount", args.Players.Length), + ("minimumPlayers", minPlayers), + ("presetName", ToPrettyString(uid)))); + args.Cancel(); + } + else + { + ForceEndSelf(uid, gameRule); + } } } diff --git a/Content.Server/GameTicking/Rules/SecretRuleSystem.cs b/Content.Server/GameTicking/Rules/SecretRuleSystem.cs index 320f9d197a..8608f250d4 100644 --- a/Content.Server/GameTicking/Rules/SecretRuleSystem.cs +++ b/Content.Server/GameTicking/Rules/SecretRuleSystem.cs @@ -164,7 +164,7 @@ public sealed class SecretRuleSystem : GameRuleSystem return false; } - if (ruleComp.MinPlayers > players) + if (ruleComp.MinPlayers > players && ruleComp.CancelPresetOnTooFewPlayers) return false; } diff --git a/Content.Shared/GameTicking/Components/GameRuleComponent.cs b/Content.Shared/GameTicking/Components/GameRuleComponent.cs index 4e93c2b003..87a5822d47 100644 --- a/Content.Shared/GameTicking/Components/GameRuleComponent.cs +++ b/Content.Shared/GameTicking/Components/GameRuleComponent.cs @@ -23,6 +23,13 @@ public sealed partial class GameRuleComponent : Component [DataField] public int MinPlayers; + /// + /// If true, this rule not having enough players will cancel the preset selection. + /// If false, it will simply not run silently. + /// + [DataField] + public bool CancelPresetOnTooFewPlayers = true; + /// /// A delay for when the rule the is started and when the starting logic actually runs. /// diff --git a/Resources/Prototypes/GameRules/meteorswarms.yml b/Resources/Prototypes/GameRules/meteorswarms.yml index 70dd5265b0..b85032f056 100644 --- a/Resources/Prototypes/GameRules/meteorswarms.yml +++ b/Resources/Prototypes/GameRules/meteorswarms.yml @@ -4,6 +4,7 @@ components: - type: GameRule minPlayers: 25 + cancelPresetOnTooFewPlayers: false - type: MeteorScheduler - type: weightedRandomEntity diff --git a/Resources/Prototypes/game_presets.yml b/Resources/Prototypes/game_presets.yml index 8876468bbd..39523a1a37 100644 --- a/Resources/Prototypes/game_presets.yml +++ b/Resources/Prototypes/game_presets.yml @@ -7,6 +7,7 @@ description: survival-description rules: - RampingStationEventScheduler + - GameRuleMeteorScheduler - BasicRoundstartVariation - type: gamePreset @@ -20,6 +21,7 @@ - Revolutionary - Zombie - RampingStationEventScheduler + - GameRuleMeteorScheduler - type: gamePreset id: Extended @@ -44,6 +46,7 @@ description: greenshift-description rules: - BasicRoundstartVariation + - GameRuleMeteorScheduler - type: gamePreset id: Secret From ee2769ed9f4d075bb280d4c86c6ccf7c2f2fe741 Mon Sep 17 00:00:00 2001 From: deltanedas <39013340+deltanedas@users.noreply.github.com> Date: Sun, 16 Jun 2024 19:38:00 +0000 Subject: [PATCH 124/142] atlas update (#28514) * atlas update * unkill previous changes * fix lawyer room --------- Co-authored-by: deltanedas <@deltanedas:kde.org> --- Resources/Maps/atlas.yml | 294 +++++++++++++++++++++++++++------------ 1 file changed, 202 insertions(+), 92 deletions(-) diff --git a/Resources/Maps/atlas.yml b/Resources/Maps/atlas.yml index 2db45c0308..18c63121f6 100644 --- a/Resources/Maps/atlas.yml +++ b/Resources/Maps/atlas.yml @@ -77,7 +77,7 @@ entities: version: 6 1,-1: ind: 1,-1 - tiles: eQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAaAAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAHQAAAAAAOgAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAaAAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAHQAAAAAAOgAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAaAAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAHQAAAAAAHQAAAAAAOgAAAAAAHQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAaAAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAHQAAAAAAHQAAAAAAOgAAAAAAHQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAaAAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAHQAAAAAAOgAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAaAAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAHQAAAAAAOgAAAAAAHQAAAAAAeQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAHQAAAAAAOgAAAAAAHQAAAAAAeQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAeQAAAAAAdgAAAAAAdgAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAdgAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAeQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAdgAAAAAAdgAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAeQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAeQAAAAAAdgAAAAAAdgAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAeQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAeQAAAAAAdgAAAAAAdgAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAA + tiles: eQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAaAAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAHQAAAAAAOgAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAaAAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAHQAAAAAAOgAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAATQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAHQAAAAAAHQAAAAAAOgAAAAAAHQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAHQAAAAAAHQAAAAAAOgAAAAAAHQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAATQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAHQAAAAAAOgAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAaAAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAHQAAAAAAOgAAAAAAHQAAAAAAeQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAHQAAAAAAOgAAAAAAHQAAAAAAeQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAeQAAAAAAdgAAAAAAdgAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAdgAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAeQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAdgAAAAAAdgAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAeQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAeQAAAAAAdgAAAAAAdgAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAeQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAeQAAAAAAdgAAAAAAdgAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAA version: 6 2,0: ind: 2,0 @@ -2261,10 +2261,10 @@ entities: 0: 57582 7,-4: 0: 4353 - 2: 16384 + 2: 50176 7,-3: - 0: 273 - 2: 16452 + 0: 497 + 2: 16384 7,-2: 0: 40209 2: 12 @@ -2574,7 +2574,8 @@ entities: -12,-1: 0: 65535 -13,-1: - 0: 47288 + 0: 34952 + 4: 12336 -12,0: 0: 65535 -12,-5: @@ -2610,7 +2611,7 @@ entities: -13,-6: 2: 61680 -13,-5: - 0: 61152 + 4: 61152 -11,-6: 2: 49 0: 56320 @@ -2639,8 +2640,8 @@ entities: 0: 305 -13,0: 0: 34952 - 4: 48 - 5: 12288 + 5: 48 + 6: 12288 -12,1: 0: 30576 -13,1: @@ -2703,12 +2704,13 @@ entities: 2: 3140 -14,0: 0: 13107 - 4: 128 - 5: 32768 + 5: 128 + 6: 32768 -14,1: 0: 243 -14,-1: - 0: 46003 + 0: 13107 + 4: 32896 -14,2: 0: 52352 2: 8 @@ -2798,6 +2800,21 @@ entities: - 0 - 0 - 0 + - volume: 2500 + temperature: 293.15 + moles: + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 - volume: 2500 temperature: 293.15 moles: @@ -3032,11 +3049,9 @@ entities: devices: - 1989 - 845 - - 7333 - 1231 - 3817 - 3815 - - 929 - 7599 - uid: 7372 components: @@ -3342,6 +3357,11 @@ entities: - type: Transform pos: 16.5,-9.5 parent: 30 + - uid: 8524 + components: + - type: Transform + pos: -43.5,-2.5 + parent: 30 - proto: Airlock entities: - uid: 33 @@ -3657,11 +3677,17 @@ entities: parent: 30 - proto: AirlockExternalGlass entities: - - uid: 5372 + - uid: 1296 components: - type: Transform pos: 7.5,28.5 parent: 30 + - uid: 7393 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 29.5,-10.5 + parent: 30 - uid: 7775 components: - type: Transform @@ -3757,11 +3783,6 @@ entities: parent: 30 - proto: AirlockExternalGlassShuttleArrivals entities: - - uid: 1296 - components: - - type: Transform - pos: 7.5,30.5 - parent: 30 - uid: 7628 components: - type: Transform @@ -3796,6 +3817,20 @@ entities: - type: Transform pos: 21.5,-24.5 parent: 30 +- proto: AirlockExternalGlassShuttleEscape + entities: + - uid: 2908 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 7.5,30.5 + parent: 30 + - uid: 6972 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 31.5,-10.5 + parent: 30 - proto: AirlockExternalGlassShuttleLocked entities: - uid: 1328 @@ -4743,12 +4778,14 @@ entities: - uid: 8507 components: - type: Transform - pos: 22.5,34.5 + rot: 1.5707963267948966 rad + pos: 31.5,-10.5 parent: 30 - uid: 8508 components: - type: Transform - pos: 15.5,34.5 + rot: 3.141592653589793 rad + pos: 7.5,30.5 parent: 30 - proto: AtmosFixBlockerMarker entities: @@ -16863,6 +16900,11 @@ entities: - type: Transform pos: -55.5,-7.5 parent: 30 + - uid: 8527 + components: + - type: Transform + pos: -44.5,-3.5 + parent: 30 - proto: Carpet entities: - uid: 160 @@ -20989,6 +21031,11 @@ entities: - type: Transform pos: 7.5,29.5 parent: 30 + - uid: 8522 + components: + - type: Transform + pos: 30.5,-10.5 + parent: 30 - proto: DefaultStationBeaconEVAStorage entities: - uid: 7600 @@ -23922,22 +23969,6 @@ entities: parent: 6004 - type: Physics canCollide: False -- proto: EncryptionKeyEngineering - entities: - - uid: 7113 - components: - - type: Transform - parent: 6972 - - type: Physics - canCollide: False -- proto: EncryptionKeyScience - entities: - - uid: 7393 - components: - - type: Transform - parent: 7379 - - type: Physics - canCollide: False - proto: EncryptionKeySecurity entities: - uid: 6530 @@ -24659,6 +24690,13 @@ entities: parent: 30 - type: Fixtures fixtures: {} + - uid: 8523 + components: + - type: Transform + pos: -15.5,6.5 + parent: 30 + - type: Fixtures + fixtures: {} - proto: FloorTileItemCarpetClown entities: - uid: 4155 @@ -25974,6 +26012,13 @@ entities: parent: 30 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 8670 + components: + - type: Transform + pos: 2.5,9.5 + parent: 30 + - type: AtmosPipeColor + color: '#990000FF' - proto: GasPipeFourway entities: - uid: 391 @@ -33465,6 +33510,13 @@ entities: parent: 30 - type: AtmosPipeColor color: '#990000FF' + - uid: 8671 + components: + - type: Transform + pos: 2.5,8.5 + parent: 30 + - type: AtmosPipeColor + color: '#990000FF' - proto: GasPipeTJunction entities: - uid: 388 @@ -34663,6 +34715,14 @@ entities: parent: 30 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 7333 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,9.5 + parent: 30 + - type: AtmosPipeColor + color: '#990000FF' - uid: 7336 components: - type: Transform @@ -35598,6 +35658,13 @@ entities: parent: 30 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 8669 + components: + - type: Transform + pos: 2.5,6.5 + parent: 30 + - type: AtmosPipeColor + color: '#0055CCFF' - proto: GasVentScrubber entities: - uid: 373 @@ -35703,10 +35770,10 @@ entities: - uid: 929 components: - type: Transform - pos: 2.5,6.5 + pos: 1.5,10.5 parent: 30 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#990000FF' - uid: 1099 components: - type: Transform @@ -36150,14 +36217,6 @@ entities: parent: 30 - type: AtmosPipeColor color: '#990000FF' - - uid: 7333 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 1.5,9.5 - parent: 30 - - type: AtmosPipeColor - color: '#990000FF' - uid: 7349 components: - type: Transform @@ -36270,6 +36329,14 @@ entities: parent: 30 - type: AtmosPipeColor color: '#990000FF' + - uid: 8668 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,7.5 + parent: 30 + - type: AtmosPipeColor + color: '#990000FF' - proto: GasVolumePump entities: - uid: 7730 @@ -38288,6 +38355,18 @@ entities: - type: Transform pos: -53.5,6.5 parent: 30 + - uid: 8515 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 30.5,-9.5 + parent: 30 + - uid: 8516 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 30.5,-11.5 + parent: 30 - uid: 8538 components: - type: Transform @@ -39670,6 +39749,18 @@ entities: - type: Transform pos: -51.5,-6.5 parent: 30 + - uid: 8525 + components: + - type: Transform + pos: -43.5,-3.5 + parent: 30 +- proto: NitrousOxideCanister + entities: + - uid: 8650 + components: + - type: Transform + pos: -43.5,-4.5 + parent: 30 - proto: NoticeBoard entities: - uid: 7632 @@ -39747,6 +39838,11 @@ entities: - type: Transform pos: -35.5,-21.5 parent: 30 + - uid: 8526 + components: + - type: Transform + pos: -44.5,-2.5 + parent: 30 - proto: PaintingCafeTerraceAtNight entities: - uid: 4137 @@ -40004,6 +40100,11 @@ entities: - type: Transform pos: -51.5,-9.5 parent: 30 + - uid: 8651 + components: + - type: Transform + pos: -44.5,-4.5 + parent: 30 - proto: PlasmaTankFilled entities: - uid: 6099 @@ -42070,6 +42171,12 @@ entities: parent: 30 - type: ApcPowerReceiver powerLoad: 0 + - uid: 5372 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -4.5,-16.5 + parent: 30 - uid: 5409 components: - type: Transform @@ -44320,6 +44427,18 @@ entities: - type: Transform pos: -53.5,6.5 parent: 30 + - uid: 8519 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 30.5,-11.5 + parent: 30 + - uid: 8521 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 30.5,-9.5 + parent: 30 - uid: 8542 components: - type: Transform @@ -47003,6 +47122,16 @@ entities: - type: Transform pos: -52.5,-11.5 parent: 30 + - uid: 8662 + components: + - type: Transform + pos: -43.5,-5.5 + parent: 30 + - uid: 8663 + components: + - type: Transform + pos: -44.5,-5.5 + parent: 30 - proto: SubstationBasic entities: - uid: 1695 @@ -48686,46 +48815,6 @@ entities: showEnts: False occludes: True ents: [] - - uid: 6972 - components: - - type: Transform - pos: -48.5,7.5 - parent: 30 - - type: ContainerContainer - containers: - key_slots: !type:Container - showEnts: False - occludes: True - ents: - - 7113 - machine_board: !type:Container - showEnts: False - occludes: True - ents: [] - machine_parts: !type:Container - showEnts: False - occludes: True - ents: [] - - uid: 7379 - components: - - type: Transform - pos: -48.5,8.5 - parent: 30 - - type: ContainerContainer - containers: - key_slots: !type:Container - showEnts: False - occludes: True - ents: - - 7393 - machine_board: !type:Container - showEnts: False - occludes: True - ents: [] - machine_parts: !type:Container - showEnts: False - occludes: True - ents: [] - proto: TelecomServerFilledCargo entities: - uid: 7438 @@ -48733,6 +48822,13 @@ entities: - type: Transform pos: -48.5,6.5 parent: 30 +- proto: TelecomServerFilledEngineering + entities: + - uid: 7113 + components: + - type: Transform + pos: -48.5,7.5 + parent: 30 - proto: TelecomServerFilledMedical entities: - uid: 7915 @@ -48740,6 +48836,13 @@ entities: - type: Transform pos: -47.5,6.5 parent: 30 +- proto: TelecomServerFilledScience + entities: + - uid: 7379 + components: + - type: Transform + pos: -48.5,8.5 + parent: 30 - proto: ToiletDirtyWater entities: - uid: 7674 @@ -50854,11 +50957,6 @@ entities: - type: Transform pos: 29.5,-12.5 parent: 30 - - uid: 2908 - components: - - type: Transform - pos: 29.5,-10.5 - parent: 30 - uid: 2910 components: - type: Transform @@ -52899,6 +52997,18 @@ entities: rot: -1.5707963267948966 rad pos: 6.5,19.5 parent: 30 + - uid: 8517 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 31.5,-11.5 + parent: 30 + - uid: 8518 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 31.5,-9.5 + parent: 30 - uid: 8603 components: - type: Transform From 89a9f07c3abe77e3d8964a7aa35e6844e55db2ae Mon Sep 17 00:00:00 2001 From: Tayrtahn Date: Sun, 16 Jun 2024 15:38:53 -0400 Subject: [PATCH 125/142] Add a system for modifying entity names without causing conflicts (#27863) --- .../TransformableContainerComponent.cs | 8 - .../TransformableContainerSystem.cs | 27 ++-- Content.Server/Cluwne/CluwneSystem.cs | 23 ++- Content.Server/Fax/FaxSystem.cs | 8 +- Content.Server/Glue/GlueSystem.cs | 24 +-- Content.Server/Labels/Label/LabelSystem.cs | 26 +--- Content.Server/Lube/LubedSystem.cs | 16 +- .../EntitySystems/AnimalHusbandrySystem.cs | 25 ++- .../Zombies/ZombieSystem.Transform.cs | 4 +- Content.Server/Zombies/ZombieSystem.cs | 5 +- Content.Shared/Glue/GluedComponent.cs | 5 - .../Inventory/InventorySystem.Relay.cs | 2 + .../Labels/Components/LabelComponent.cs | 7 - .../Labels/EntitySystems/SharedLabelSystem.cs | 8 + Content.Shared/Lube/LubedComponent.cs | 6 - .../Components/ModifyWearerNameComponent.cs | 25 +++ .../Components/NameModifierComponent.cs | 20 +++ .../EntitySystems/ModifyWearerNameSystem.cs | 34 +++++ .../EntitySystems/NameModifierSystem.cs | 143 ++++++++++++++++++ .../AnimalHusbandry/InfantComponent.cs | 6 - Content.Shared/Zombies/SharedZombieSystem.cs | 7 + Content.Shared/Zombies/ZombieComponent.cs | 6 - .../transformable-container-component.ftl | 2 +- Resources/Locale/en-US/cluwne/cluwne.ftl | 2 +- Resources/Locale/en-US/glue/glue.ftl | 2 +- .../Locale/en-US/label/label-component.ftl | 1 + Resources/Locale/en-US/lube/lube.ftl | 2 +- .../nutrition/components/animal-husbandry.ftl | 2 +- Resources/Locale/en-US/zombies/zombie.ftl | 2 +- .../Objects/Specific/chemical-containers.yml | 1 - 30 files changed, 326 insertions(+), 123 deletions(-) create mode 100644 Content.Shared/NameModifier/Components/ModifyWearerNameComponent.cs create mode 100644 Content.Shared/NameModifier/Components/NameModifierComponent.cs create mode 100644 Content.Shared/NameModifier/EntitySystems/ModifyWearerNameSystem.cs create mode 100644 Content.Shared/NameModifier/EntitySystems/NameModifierSystem.cs create mode 100644 Resources/Locale/en-US/label/label-component.ftl diff --git a/Content.Server/Chemistry/Components/TransformableContainerComponent.cs b/Content.Server/Chemistry/Components/TransformableContainerComponent.cs index 5ea9a24487..db6c9c5397 100644 --- a/Content.Server/Chemistry/Components/TransformableContainerComponent.cs +++ b/Content.Server/Chemistry/Components/TransformableContainerComponent.cs @@ -14,14 +14,6 @@ namespace Content.Server.Chemistry.Components; [RegisterComponent, Access(typeof(TransformableContainerSystem))] public sealed partial class TransformableContainerComponent : Component { - /// - /// This is the initial metadata name for the container. - /// It will revert to this when emptied. - /// It defaults to the name of the parent entity unless overwritten. - /// - [DataField("initialName")] - public string? InitialName; - /// /// This is the initial metadata description for the container. /// It will revert to this when emptied. diff --git a/Content.Server/Chemistry/EntitySystems/TransformableContainerSystem.cs b/Content.Server/Chemistry/EntitySystems/TransformableContainerSystem.cs index c375d97b8c..32bd912b22 100644 --- a/Content.Server/Chemistry/EntitySystems/TransformableContainerSystem.cs +++ b/Content.Server/Chemistry/EntitySystems/TransformableContainerSystem.cs @@ -2,6 +2,7 @@ using Content.Server.Chemistry.Components; using Content.Server.Chemistry.Containers.EntitySystems; using Content.Shared.Chemistry.EntitySystems; using Content.Shared.Chemistry.Reagent; +using Content.Shared.NameModifier.EntitySystems; using Robust.Shared.Prototypes; namespace Content.Server.Chemistry.EntitySystems; @@ -11,6 +12,7 @@ public sealed class TransformableContainerSystem : EntitySystem [Dependency] private readonly IPrototypeManager _prototypeManager = default!; [Dependency] private readonly SolutionContainerSystem _solutionsSystem = default!; [Dependency] private readonly MetaDataSystem _metadataSystem = default!; + [Dependency] private readonly NameModifierSystem _nameMod = default!; public override void Initialize() { @@ -18,15 +20,12 @@ public sealed class TransformableContainerSystem : EntitySystem SubscribeLocalEvent(OnMapInit); SubscribeLocalEvent(OnSolutionChange); + SubscribeLocalEvent(OnRefreshNameModifiers); } - private void OnMapInit(Entity entity, ref MapInitEvent args) + private void OnMapInit(Entity entity, ref MapInitEvent args) { var meta = MetaData(entity.Owner); - if (string.IsNullOrEmpty(entity.Comp.InitialName)) - { - entity.Comp.InitialName = meta.EntityName; - } if (string.IsNullOrEmpty(entity.Comp.InitialDescription)) { entity.Comp.InitialDescription = meta.EntityDescription; @@ -58,12 +57,20 @@ public sealed class TransformableContainerSystem : EntitySystem && _prototypeManager.TryIndex(reagentId.Value.Prototype, out ReagentPrototype? proto)) { var metadata = MetaData(entity.Owner); - var val = Loc.GetString("transformable-container-component-glass", ("name", proto.LocalizedName)); - _metadataSystem.SetEntityName(entity.Owner, val, metadata); _metadataSystem.SetEntityDescription(entity.Owner, proto.LocalizedDescription, metadata); entity.Comp.CurrentReagent = proto; entity.Comp.Transformed = true; } + + _nameMod.RefreshNameModifiers(entity.Owner); + } + + private void OnRefreshNameModifiers(Entity entity, ref RefreshNameModifiersEvent args) + { + if (entity.Comp.CurrentReagent is { } currentReagent) + { + args.AddModifier("transformable-container-component-glass", priority: -1, ("reagent", currentReagent.LocalizedName)); + } } private void CancelTransformation(Entity entity) @@ -73,10 +80,8 @@ public sealed class TransformableContainerSystem : EntitySystem var metadata = MetaData(entity); - if (!string.IsNullOrEmpty(entity.Comp.InitialName)) - { - _metadataSystem.SetEntityName(entity.Owner, entity.Comp.InitialName, metadata); - } + _nameMod.RefreshNameModifiers(entity.Owner); + if (!string.IsNullOrEmpty(entity.Comp.InitialDescription)) { _metadataSystem.SetEntityDescription(entity.Owner, entity.Comp.InitialDescription, metadata); diff --git a/Content.Server/Cluwne/CluwneSystem.cs b/Content.Server/Cluwne/CluwneSystem.cs index c170886a80..18d82659de 100644 --- a/Content.Server/Cluwne/CluwneSystem.cs +++ b/Content.Server/Cluwne/CluwneSystem.cs @@ -14,8 +14,8 @@ using Content.Server.Emoting.Systems; using Content.Server.Speech.EntitySystems; using Content.Shared.Cluwne; using Content.Shared.Interaction.Components; -using Robust.Shared.Audio; using Robust.Shared.Audio.Systems; +using Content.Shared.NameModifier.EntitySystems; namespace Content.Server.Cluwne; @@ -30,6 +30,7 @@ public sealed class CluwneSystem : EntitySystem [Dependency] private readonly ChatSystem _chat = default!; [Dependency] private readonly AutoEmoteSystem _autoEmote = default!; [Dependency] private readonly MetaDataSystem _metaData = default!; + [Dependency] private readonly NameModifierSystem _nameMod = default!; public override void Initialize() { @@ -39,6 +40,7 @@ public sealed class CluwneSystem : EntitySystem SubscribeLocalEvent(OnMobState); SubscribeLocalEvent(OnEmote, before: new[] { typeof(VocalSystem), typeof(BodyEmotesSystem) }); + SubscribeLocalEvent(OnRefreshNameModifiers); } /// @@ -47,19 +49,19 @@ public sealed class CluwneSystem : EntitySystem private void OnMobState(EntityUid uid, CluwneComponent component, MobStateChangedEvent args) { if (args.NewMobState == MobState.Dead) - { + { RemComp(uid); RemComp(uid); RemComp(uid); var damageSpec = new DamageSpecifier(_prototypeManager.Index("Genetic"), 300); _damageableSystem.TryChangeDamage(uid, damageSpec); - } + } } public EmoteSoundsPrototype? EmoteSounds; /// - /// OnStartup gives the cluwne outfit, ensures clumsy, gives name prefix and makes sure emote sounds are laugh. + /// OnStartup gives the cluwne outfit, ensures clumsy, and makes sure emote sounds are laugh. /// private void OnComponentStartup(EntityUid uid, CluwneComponent component, ComponentStartup args) { @@ -67,9 +69,6 @@ public sealed class CluwneSystem : EntitySystem return; _prototypeManager.TryIndex(component.EmoteSoundsId, out EmoteSounds); - var meta = MetaData(uid); - var name = meta.EntityName; - EnsureComp(uid); _autoEmote.AddEmote(uid, "CluwneGiggle"); EnsureComp(uid); @@ -77,7 +76,7 @@ public sealed class CluwneSystem : EntitySystem _popupSystem.PopupEntity(Loc.GetString("cluwne-transform", ("target", uid)), uid, PopupType.LargeCaution); _audio.PlayPvs(component.SpawnSound, uid); - _metaData.SetEntityName(uid, Loc.GetString("cluwne-name-prefix", ("target", name)), meta); + _nameMod.RefreshNameModifiers(uid); SetOutfitCommand.SetOutfit(uid, "CluwneGear", EntityManager); } @@ -104,4 +103,12 @@ public sealed class CluwneSystem : EntitySystem _chat.TrySendInGameICMessage(uid, "spasms", InGameICChatType.Emote, ChatTransmitRange.Normal); } } + + /// + /// Applies "Cluwnified" prefix + /// + private void OnRefreshNameModifiers(Entity entity, ref RefreshNameModifiersEvent args) + { + args.AddModifier("cluwne-name-prefix"); + } } diff --git a/Content.Server/Fax/FaxSystem.cs b/Content.Server/Fax/FaxSystem.cs index 16d2d391f6..82acb3c60c 100644 --- a/Content.Server/Fax/FaxSystem.cs +++ b/Content.Server/Fax/FaxSystem.cs @@ -29,6 +29,7 @@ using Robust.Shared.Audio.Systems; using Robust.Shared.Containers; using Robust.Shared.Player; using Robust.Shared.Prototypes; +using Content.Shared.NameModifier.Components; namespace Content.Server.Fax; @@ -464,10 +465,11 @@ public sealed class FaxSystem : EntitySystem return; TryComp(sendEntity, out var labelComponent); + TryComp(sendEntity, out var nameMod); // TODO: See comment in 'Send()' about not being able to copy whole entities var printout = new FaxPrintout(paper.Content, - labelComponent?.OriginalName ?? metadata.EntityName, + nameMod?.BaseName ?? metadata.EntityName, labelComponent?.CurrentLabel, metadata.EntityPrototype?.ID ?? DefaultPaperPrototypeId, paper.StampState, @@ -510,12 +512,14 @@ public sealed class FaxSystem : EntitySystem !TryComp(sendEntity, out var paper)) return; + TryComp(sendEntity, out var nameMod); + TryComp(sendEntity, out var labelComponent); var payload = new NetworkPayload() { { DeviceNetworkConstants.Command, FaxConstants.FaxPrintCommand }, - { FaxConstants.FaxPaperNameData, labelComponent?.OriginalName ?? metadata.EntityName }, + { FaxConstants.FaxPaperNameData, nameMod?.BaseName ?? metadata.EntityName }, { FaxConstants.FaxPaperLabelData, labelComponent?.CurrentLabel }, { FaxConstants.FaxPaperContentData, paper.Content }, }; diff --git a/Content.Server/Glue/GlueSystem.cs b/Content.Server/Glue/GlueSystem.cs index ff53ef91ca..79249f5bd9 100644 --- a/Content.Server/Glue/GlueSystem.cs +++ b/Content.Server/Glue/GlueSystem.cs @@ -6,6 +6,7 @@ using Content.Shared.Hands; using Content.Shared.Interaction; using Content.Shared.Interaction.Components; using Content.Shared.Item; +using Content.Shared.NameModifier.EntitySystems; using Content.Shared.Nutrition.EntitySystems; using Content.Shared.Popups; using Content.Shared.Verbs; @@ -20,9 +21,9 @@ public sealed class GlueSystem : SharedGlueSystem [Dependency] private readonly SharedPopupSystem _popup = default!; [Dependency] private readonly SolutionContainerSystem _solutionContainer = default!; [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly MetaDataSystem _metaData = default!; [Dependency] private readonly IAdminLogManager _adminLogger = default!; [Dependency] private readonly OpenableSystem _openable = default!; + [Dependency] private readonly NameModifierSystem _nameMod = default!; public override void Initialize() { @@ -32,6 +33,7 @@ public sealed class GlueSystem : SharedGlueSystem SubscribeLocalEvent(OnGluedInit); SubscribeLocalEvent>(OnUtilityVerb); SubscribeLocalEvent(OnHandPickUp); + SubscribeLocalEvent(OnRefreshNameModifiers); } // When glue bottle is used on item it will apply the glued and unremoveable components. @@ -95,27 +97,22 @@ public sealed class GlueSystem : SharedGlueSystem { base.Update(frameTime); - var query = EntityQueryEnumerator(); - while (query.MoveNext(out var uid, out var glue, out var _, out var meta)) + var query = EntityQueryEnumerator(); + while (query.MoveNext(out var uid, out var glue, out var _)) { if (_timing.CurTime < glue.Until) continue; - // Instead of string matching, just reconstruct the expected name and compare - if (meta.EntityName == Loc.GetString("glued-name-prefix", ("target", glue.BeforeGluedEntityName))) - _metaData.SetEntityName(uid, glue.BeforeGluedEntityName); - RemComp(uid); RemComp(uid); + + _nameMod.RefreshNameModifiers(uid); } } private void OnGluedInit(Entity entity, ref ComponentInit args) { - var meta = MetaData(entity); - var name = meta.EntityName; - entity.Comp.BeforeGluedEntityName = meta.EntityName; - _metaData.SetEntityName(entity.Owner, Loc.GetString("glued-name-prefix", ("target", name))); + _nameMod.RefreshNameModifiers(entity.Owner); } private void OnHandPickUp(Entity entity, ref GotEquippedHandEvent args) @@ -124,4 +121,9 @@ public sealed class GlueSystem : SharedGlueSystem comp.DeleteOnDrop = false; entity.Comp.Until = _timing.CurTime + entity.Comp.Duration; } + + private void OnRefreshNameModifiers(Entity entity, ref RefreshNameModifiersEvent args) + { + args.AddModifier("glued-name-prefix"); + } } diff --git a/Content.Server/Labels/Label/LabelSystem.cs b/Content.Server/Labels/Label/LabelSystem.cs index aee2abe7ab..17d18918fe 100644 --- a/Content.Server/Labels/Label/LabelSystem.cs +++ b/Content.Server/Labels/Label/LabelSystem.cs @@ -5,6 +5,7 @@ using Content.Shared.Examine; using Content.Shared.Labels; using Content.Shared.Labels.Components; using Content.Shared.Labels.EntitySystems; +using Content.Shared.NameModifier.EntitySystems; using JetBrains.Annotations; using Robust.Shared.Containers; @@ -18,7 +19,7 @@ namespace Content.Server.Labels { [Dependency] private readonly ItemSlotsSystem _itemSlotsSystem = default!; [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly MetaDataSystem _metaData = default!; + [Dependency] private readonly NameModifierSystem _nameMod = default!; public const string ContainerName = "paper_label"; @@ -41,6 +42,8 @@ namespace Content.Server.Labels component.CurrentLabel = Loc.GetString(component.CurrentLabel); Dirty(uid, component); } + + _nameMod.RefreshNameModifiers(uid); } /// @@ -52,30 +55,11 @@ namespace Content.Server.Labels /// metadata component for resolve public override void Label(EntityUid uid, string? text, MetaDataComponent? metadata = null, LabelComponent? label = null) { - if (!Resolve(uid, ref metadata)) - return; if (!Resolve(uid, ref label, false)) label = EnsureComp(uid); - if (string.IsNullOrEmpty(text)) - { - if (label.OriginalName is null) - return; - - // Remove label - _metaData.SetEntityName(uid, label.OriginalName, metadata); - label.CurrentLabel = null; - label.OriginalName = null; - - Dirty(uid, label); - - return; - } - - // Update label - label.OriginalName ??= metadata.EntityName; label.CurrentLabel = text; - _metaData.SetEntityName(uid, $"{label.OriginalName} ({text})", metadata); + _nameMod.RefreshNameModifiers(uid); Dirty(uid, label); } diff --git a/Content.Server/Lube/LubedSystem.cs b/Content.Server/Lube/LubedSystem.cs index f786c5f91a..c2d15c8a28 100644 --- a/Content.Server/Lube/LubedSystem.cs +++ b/Content.Server/Lube/LubedSystem.cs @@ -1,5 +1,6 @@ using Content.Shared.IdentityManagement; using Content.Shared.Lube; +using Content.Shared.NameModifier.EntitySystems; using Content.Shared.Popups; using Content.Shared.Throwing; using Robust.Shared.Containers; @@ -9,11 +10,11 @@ namespace Content.Server.Lube; public sealed class LubedSystem : EntitySystem { - [Dependency] private readonly MetaDataSystem _metaData = default!; [Dependency] private readonly ThrowingSystem _throwing = default!; [Dependency] private readonly IRobustRandom _random = default!; [Dependency] private readonly SharedTransformSystem _transform = default!; [Dependency] private readonly SharedPopupSystem _popup = default!; + [Dependency] private readonly NameModifierSystem _nameMod = default!; public override void Initialize() { @@ -21,14 +22,12 @@ public sealed class LubedSystem : EntitySystem SubscribeLocalEvent(OnInit); SubscribeLocalEvent(OnHandPickUp); + SubscribeLocalEvent(OnRefreshNameModifiers); } private void OnInit(EntityUid uid, LubedComponent component, ComponentInit args) { - var meta = MetaData(uid); - var name = meta.EntityName; - component.BeforeLubedEntityName = meta.EntityName; - _metaData.SetEntityName(uid, Loc.GetString("lubed-name-prefix", ("target", name))); + _nameMod.RefreshNameModifiers(uid); } private void OnHandPickUp(EntityUid uid, LubedComponent component, ContainerGettingInsertedAttemptEvent args) @@ -36,7 +35,7 @@ public sealed class LubedSystem : EntitySystem if (component.SlipsLeft <= 0) { RemComp(uid); - _metaData.SetEntityName(uid, component.BeforeLubedEntityName); + _nameMod.RefreshNameModifiers(uid); return; } component.SlipsLeft--; @@ -47,4 +46,9 @@ public sealed class LubedSystem : EntitySystem _throwing.TryThrow(uid, _random.NextVector2(), strength: component.SlipStrength); _popup.PopupEntity(Loc.GetString("lube-slip", ("target", Identity.Entity(uid, EntityManager))), user, user, PopupType.MediumCaution); } + + private void OnRefreshNameModifiers(Entity entity, ref RefreshNameModifiersEvent args) + { + args.AddModifier("lubed-name-prefix"); + } } diff --git a/Content.Server/Nutrition/EntitySystems/AnimalHusbandrySystem.cs b/Content.Server/Nutrition/EntitySystems/AnimalHusbandrySystem.cs index e224c7c479..e5f590a362 100644 --- a/Content.Server/Nutrition/EntitySystems/AnimalHusbandrySystem.cs +++ b/Content.Server/Nutrition/EntitySystems/AnimalHusbandrySystem.cs @@ -5,13 +5,12 @@ using Content.Shared.IdentityManagement; using Content.Shared.Interaction.Components; using Content.Shared.Mind.Components; using Content.Shared.Mobs.Systems; +using Content.Shared.NameModifier.EntitySystems; using Content.Shared.Nutrition.AnimalHusbandry; using Content.Shared.Nutrition.Components; using Content.Shared.Nutrition.EntitySystems; using Content.Shared.Storage; using Content.Shared.Whitelist; -using Robust.Server.GameObjects; -using Robust.Shared.Audio; using Robust.Shared.Audio.Systems; using Robust.Shared.Player; using Robust.Shared.Random; @@ -29,12 +28,12 @@ public sealed class AnimalHusbandrySystem : EntitySystem [Dependency] private readonly IAdminLogManager _adminLog = default!; [Dependency] private readonly IGameTiming _timing = default!; [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly MetaDataSystem _metaData = default!; [Dependency] private readonly MobStateSystem _mobState = default!; [Dependency] private readonly PopupSystem _popup = default!; [Dependency] private readonly SharedAudioSystem _audio = default!; [Dependency] private readonly SharedTransformSystem _transform = default!; [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!; + [Dependency] private readonly NameModifierSystem _nameMod = default!; private readonly HashSet _failedAttempts = new(); private readonly HashSet _birthQueue = new(); @@ -43,8 +42,7 @@ public sealed class AnimalHusbandrySystem : EntitySystem public override void Initialize() { SubscribeLocalEvent(OnMindAdded); - SubscribeLocalEvent(OnInfantStartup); - SubscribeLocalEvent(OnInfantShutdown); + SubscribeLocalEvent(OnRefreshNameModifiers); } // we express EZ-pass terminate the pregnancy if a player takes the role @@ -54,16 +52,11 @@ public sealed class AnimalHusbandrySystem : EntitySystem component.GestationEndTime = null; } - private void OnInfantStartup(EntityUid uid, InfantComponent component, ComponentStartup args) + private void OnRefreshNameModifiers(Entity entity, ref RefreshNameModifiersEvent args) { - var meta = MetaData(uid); - component.OriginalName = meta.EntityName; - _metaData.SetEntityName(uid, Loc.GetString("infant-name-prefix", ("name", meta.EntityName)), meta); - } - - private void OnInfantShutdown(EntityUid uid, InfantComponent component, ComponentShutdown args) - { - _metaData.SetEntityName(uid, component.OriginalName); + // This check may seem redundant, but it makes sure that the prefix is removed before the component is removed + if (_timing.CurTime < entity.Comp.InfantEndTime) + args.AddModifier("infant-name-prefix"); } /// @@ -202,6 +195,8 @@ public sealed class AnimalHusbandrySystem : EntitySystem { var infant = AddComp(offspring); infant.InfantEndTime = _timing.CurTime + infant.InfantDuration; + // Make sure the name prefix is applied + _nameMod.RefreshNameModifiers(offspring); } _adminLog.Add(LogType.Action, $"{ToPrettyString(uid)} gave birth to {ToPrettyString(offspring)}."); } @@ -249,6 +244,8 @@ public sealed class AnimalHusbandrySystem : EntitySystem if (_timing.CurTime < infant.InfantEndTime) continue; RemCompDeferred(uid, infant); + // Make sure the name prefix gets removed + _nameMod.RefreshNameModifiers(uid); } } } diff --git a/Content.Server/Zombies/ZombieSystem.Transform.cs b/Content.Server/Zombies/ZombieSystem.Transform.cs index 0a745d5fc7..a8952009e6 100644 --- a/Content.Server/Zombies/ZombieSystem.Transform.cs +++ b/Content.Server/Zombies/ZombieSystem.Transform.cs @@ -222,9 +222,7 @@ namespace Content.Server.Zombies _faction.AddFaction(target, "Zombie"); //gives it the funny "Zombie ___" name. - var meta = MetaData(target); - zombiecomp.BeforeZombifiedEntityName = meta.EntityName; - _metaData.SetEntityName(target, Loc.GetString("zombie-name-prefix", ("target", meta.EntityName)), meta); + _nameMod.RefreshNameModifiers(target); _identity.QueueIdentityUpdate(target); diff --git a/Content.Server/Zombies/ZombieSystem.cs b/Content.Server/Zombies/ZombieSystem.cs index 552fd2781c..371c6f1222 100644 --- a/Content.Server/Zombies/ZombieSystem.cs +++ b/Content.Server/Zombies/ZombieSystem.cs @@ -14,6 +14,7 @@ using Content.Shared.Mind; using Content.Shared.Mobs; using Content.Shared.Mobs.Components; using Content.Shared.Mobs.Systems; +using Content.Shared.NameModifier.EntitySystems; using Content.Shared.Popups; using Content.Shared.Weapons.Melee.Events; using Content.Shared.Zombies; @@ -34,9 +35,9 @@ namespace Content.Server.Zombies [Dependency] private readonly ActionsSystem _actions = default!; [Dependency] private readonly AutoEmoteSystem _autoEmote = default!; [Dependency] private readonly EmoteOnDamageSystem _emoteOnDamage = default!; - [Dependency] private readonly MetaDataSystem _metaData = default!; [Dependency] private readonly MobStateSystem _mobState = default!; [Dependency] private readonly SharedPopupSystem _popup = default!; + [Dependency] private readonly NameModifierSystem _nameMod = default!; public const SlotFlags ProtectiveSlots = SlotFlags.FEET | @@ -281,7 +282,7 @@ namespace Content.Server.Zombies _humanoidAppearance.SetSkinColor(target, zombiecomp.BeforeZombifiedSkinColor, false); _bloodstream.ChangeBloodReagent(target, zombiecomp.BeforeZombifiedBloodReagent); - _metaData.SetEntityName(target, zombiecomp.BeforeZombifiedEntityName); + _nameMod.RefreshNameModifiers(target); return true; } diff --git a/Content.Shared/Glue/GluedComponent.cs b/Content.Shared/Glue/GluedComponent.cs index fd7a52fdb1..4b46f0aa5b 100644 --- a/Content.Shared/Glue/GluedComponent.cs +++ b/Content.Shared/Glue/GluedComponent.cs @@ -6,11 +6,6 @@ namespace Content.Shared.Glue; [Access(typeof(SharedGlueSystem))] public sealed partial class GluedComponent : Component { - /// - /// Reverts name to before prefix event (essentially removes prefix). - /// - [DataField("beforeGluedEntityName"), ViewVariables(VVAccess.ReadOnly)] - public string BeforeGluedEntityName = string.Empty; [DataField("until", customTypeSerializer: typeof(TimeOffsetSerializer)), ViewVariables(VVAccess.ReadWrite)] public TimeSpan Until; diff --git a/Content.Shared/Inventory/InventorySystem.Relay.cs b/Content.Shared/Inventory/InventorySystem.Relay.cs index ea368884e0..bca9eb6cfa 100644 --- a/Content.Shared/Inventory/InventorySystem.Relay.cs +++ b/Content.Shared/Inventory/InventorySystem.Relay.cs @@ -7,6 +7,7 @@ using Content.Shared.Gravity; using Content.Shared.IdentityManagement.Components; using Content.Shared.Inventory.Events; using Content.Shared.Movement.Systems; +using Content.Shared.NameModifier.EntitySystems; using Content.Shared.Overlays; using Content.Shared.Radio; using Content.Shared.Slippery; @@ -28,6 +29,7 @@ public partial class InventorySystem SubscribeLocalEvent(RelayInventoryEvent); SubscribeLocalEvent(RelayInventoryEvent); SubscribeLocalEvent(RelayInventoryEvent); + SubscribeLocalEvent(RelayInventoryEvent); // by-ref events SubscribeLocalEvent(RefRelayInventoryEvent); diff --git a/Content.Shared/Labels/Components/LabelComponent.cs b/Content.Shared/Labels/Components/LabelComponent.cs index c0dccd3481..d57023c8ab 100644 --- a/Content.Shared/Labels/Components/LabelComponent.cs +++ b/Content.Shared/Labels/Components/LabelComponent.cs @@ -14,11 +14,4 @@ public sealed partial class LabelComponent : Component /// [DataField, AutoNetworkedField] public string? CurrentLabel { get; set; } - - /// - /// The original name of the entity - /// Used for reverting the modified entity name when the label is removed - /// - [DataField, AutoNetworkedField] - public string? OriginalName { get; set; } } diff --git a/Content.Shared/Labels/EntitySystems/SharedLabelSystem.cs b/Content.Shared/Labels/EntitySystems/SharedLabelSystem.cs index 1189bb46d0..f1998e524d 100644 --- a/Content.Shared/Labels/EntitySystems/SharedLabelSystem.cs +++ b/Content.Shared/Labels/EntitySystems/SharedLabelSystem.cs @@ -1,5 +1,6 @@ using Content.Shared.Examine; using Content.Shared.Labels.Components; +using Content.Shared.NameModifier.EntitySystems; using Robust.Shared.Utility; namespace Content.Shared.Labels.EntitySystems; @@ -11,6 +12,7 @@ public abstract partial class SharedLabelSystem : EntitySystem base.Initialize(); SubscribeLocalEvent(OnExamine); + SubscribeLocalEvent(OnRefreshNameModifiers); } public virtual void Label(EntityUid uid, string? text, MetaDataComponent? metadata = null, LabelComponent? label = null){} @@ -27,4 +29,10 @@ public abstract partial class SharedLabelSystem : EntitySystem message.AddText(Loc.GetString("hand-labeler-has-label", ("label", label.CurrentLabel))); args.PushMessage(message); } + + private void OnRefreshNameModifiers(Entity entity, ref RefreshNameModifiersEvent args) + { + if (!string.IsNullOrEmpty(entity.Comp.CurrentLabel)) + args.AddModifier("comp-label-format", extraArgs: ("label", entity.Comp.CurrentLabel)); + } } diff --git a/Content.Shared/Lube/LubedComponent.cs b/Content.Shared/Lube/LubedComponent.cs index fe1946ddb1..9d032a077e 100644 --- a/Content.Shared/Lube/LubedComponent.cs +++ b/Content.Shared/Lube/LubedComponent.cs @@ -3,12 +3,6 @@ namespace Content.Shared.Lube; [RegisterComponent] public sealed partial class LubedComponent : Component { - /// - /// Reverts name to before prefix event (essentially removes prefix). - /// - [DataField("beforeLubedEntityName")] - public string BeforeLubedEntityName = string.Empty; - [DataField("slipsLeft"), ViewVariables(VVAccess.ReadWrite)] public int SlipsLeft; diff --git a/Content.Shared/NameModifier/Components/ModifyWearerNameComponent.cs b/Content.Shared/NameModifier/Components/ModifyWearerNameComponent.cs new file mode 100644 index 0000000000..781ed3daae --- /dev/null +++ b/Content.Shared/NameModifier/Components/ModifyWearerNameComponent.cs @@ -0,0 +1,25 @@ +using Robust.Shared.GameStates; + +namespace Content.Shared.NameModifier.Components; + +/// +/// Adds a modifier to the wearer's name when this item is equipped, +/// and removes it when it is unequipped. +/// +[RegisterComponent, NetworkedComponent] +[AutoGenerateComponentState] +public sealed partial class ModifyWearerNameComponent : Component +{ + /// + /// The localization ID of the text to be used as the modifier. + /// The base name will be passed in as $baseName + /// + [DataField, AutoNetworkedField] + public LocId LocId = string.Empty; + + /// + /// Priority of the modifier. See for more information. + /// + [DataField, AutoNetworkedField] + public int Priority; +} diff --git a/Content.Shared/NameModifier/Components/NameModifierComponent.cs b/Content.Shared/NameModifier/Components/NameModifierComponent.cs new file mode 100644 index 0000000000..3a9dd9712b --- /dev/null +++ b/Content.Shared/NameModifier/Components/NameModifierComponent.cs @@ -0,0 +1,20 @@ +using Content.Shared.NameModifier.EntitySystems; +using Robust.Shared.GameStates; + +namespace Content.Shared.NameModifier.Components; + +/// +/// Used to manage modifiers on an entity's name and handle renaming in a way +/// that survives being renamed by multiple systems. +/// +[RegisterComponent] +[NetworkedComponent, AutoGenerateComponentState] +[Access(typeof(NameModifierSystem))] +public sealed partial class NameModifierComponent : Component +{ + /// + /// The entity's name without any modifiers applied. + /// + [DataField, AutoNetworkedField] + public string BaseName = string.Empty; +} diff --git a/Content.Shared/NameModifier/EntitySystems/ModifyWearerNameSystem.cs b/Content.Shared/NameModifier/EntitySystems/ModifyWearerNameSystem.cs new file mode 100644 index 0000000000..e728e6cdb5 --- /dev/null +++ b/Content.Shared/NameModifier/EntitySystems/ModifyWearerNameSystem.cs @@ -0,0 +1,34 @@ +using Content.Shared.Clothing; +using Content.Shared.Inventory; +using Content.Shared.NameModifier.Components; + +namespace Content.Shared.NameModifier.EntitySystems; + +public sealed partial class ModifyWearerNameSystem : EntitySystem +{ + [Dependency] private readonly NameModifierSystem _nameMod = default!; + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent>(OnRefreshNameModifiers); + SubscribeLocalEvent(OnGotEquipped); + SubscribeLocalEvent(OnGotUnequipped); + } + + private void OnGotEquipped(Entity entity, ref ClothingGotEquippedEvent args) + { + _nameMod.RefreshNameModifiers(args.Wearer); + } + + private void OnGotUnequipped(Entity entity, ref ClothingGotUnequippedEvent args) + { + _nameMod.RefreshNameModifiers(args.Wearer); + } + + private void OnRefreshNameModifiers(Entity entity, ref InventoryRelayedEvent args) + { + args.Args.AddModifier(entity.Comp.LocId, entity.Comp.Priority); + } +} diff --git a/Content.Shared/NameModifier/EntitySystems/NameModifierSystem.cs b/Content.Shared/NameModifier/EntitySystems/NameModifierSystem.cs new file mode 100644 index 0000000000..4dffb51805 --- /dev/null +++ b/Content.Shared/NameModifier/EntitySystems/NameModifierSystem.cs @@ -0,0 +1,143 @@ +using System.Linq; +using Content.Shared.Inventory; +using Content.Shared.NameModifier.Components; + +namespace Content.Shared.NameModifier.EntitySystems; + +/// +public sealed partial class NameModifierSystem : EntitySystem +{ + [Dependency] private readonly MetaDataSystem _metaData = default!; + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnEntityRenamed); + } + + private void OnEntityRenamed(Entity entity, ref EntityRenamedEvent args) + { + SetBaseName((entity, entity.Comp), args.NewName); + RefreshNameModifiers((entity, entity.Comp)); + } + + private void SetBaseName(Entity entity, string name) + { + if (name == entity.Comp.BaseName) + return; + + // Set the base name to the new name + entity.Comp.BaseName = name; + Dirty(entity); + } + + /// + /// Raises a to gather modifiers and + /// updates the entity's name to its base name with modifiers applied. + /// This will add a if any modifiers are added. + /// + /// + /// Call this to update the entity's name when adding or removing a modifier. + /// + public void RefreshNameModifiers(Entity entity) + { + var meta = MetaData(entity); + var baseName = meta.EntityName; + if (Resolve(entity, ref entity.Comp, logMissing: false)) + baseName = entity.Comp.BaseName; + + // Raise an event to get any modifiers + // If the entity already has the component, use its BaseName, otherwise use the entity's name from metadata + var modifierEvent = new RefreshNameModifiersEvent(baseName); + RaiseLocalEvent(entity, ref modifierEvent); + + // Nothing added a modifier, so we can just use the base name + if (modifierEvent.ModifierCount == 0) + { + // If the entity doesn't have the component, we're done + if (entity.Comp == null) + return; + + // Restore the base name + _metaData.SetEntityName(entity, entity.Comp.BaseName, meta, raiseEvents: false); + // The component isn't doing anything anymore, so remove it + RemComp(entity); + return; + } + // We have at least one modifier, so we need to apply it to the entity. + + // Get the final name with modifiers applied + var modifiedName = modifierEvent.GetModifiedName(); + + // Add the component if needed, and initialize it with the base name + if (!EnsureComp(entity, out var comp)) + SetBaseName((entity, comp), meta.EntityName); + + // Set the entity's name with modifiers applied + _metaData.SetEntityName(entity, modifiedName, meta, raiseEvents: false); + } +} + +/// +/// Raised on an entity when is called. +/// Subscribe to this event and use its methods to add modifiers to the entity's name. +/// +[ByRefEvent] +public sealed class RefreshNameModifiersEvent : IInventoryRelayEvent +{ + /// + /// The entity's name without any modifiers applied. + /// If you want to base a modifier on the entity's name, use + /// this so you don't include other modifiers. + /// + public readonly string BaseName; + + private readonly List<(LocId LocId, int Priority, (string, object)[] ExtraArgs)> _modifiers = []; + + /// + public SlotFlags TargetSlots => ~SlotFlags.POCKET; + + /// + /// How many modifiers have been added to this event. + /// + public int ModifierCount => _modifiers.Count; + + public RefreshNameModifiersEvent(string baseName) + { + BaseName = baseName; + } + + /// + /// Adds a modifier to the entity's name. + /// The original name will be passed to Fluent as $baseName along with any . + /// Modifiers with a higher will be applied later. + /// + public void AddModifier(LocId locId, int priority = 0, params (string, object)[] extraArgs) + { + _modifiers.Add((locId, priority, extraArgs)); + } + + /// + /// Returns the final name with all modifiers applied. + /// + public string GetModifiedName() + { + // Start out with the entity's name name + var name = BaseName; + + // Iterate through all the modifiers in priority order + foreach (var modifier in _modifiers.OrderBy(n => n.Priority)) + { + // Grab any extra args needed by the Loc string + var args = modifier.ExtraArgs; + // Add the current version of the entity name as an arg + Array.Resize(ref args, args.Length + 1); + args[^1] = ("baseName", name); + // Resolve the Loc string and use the result as the base in the next iteration. + name = Loc.GetString(modifier.LocId, args); + } + + return name; + } +} diff --git a/Content.Shared/Nutrition/AnimalHusbandry/InfantComponent.cs b/Content.Shared/Nutrition/AnimalHusbandry/InfantComponent.cs index 2708c823d2..06c533e646 100644 --- a/Content.Shared/Nutrition/AnimalHusbandry/InfantComponent.cs +++ b/Content.Shared/Nutrition/AnimalHusbandry/InfantComponent.cs @@ -35,10 +35,4 @@ public sealed partial class InfantComponent : Component [DataField("infantEndTime", customTypeSerializer: typeof(TimeOffsetSerializer))] [AutoPausedField] public TimeSpan InfantEndTime; - - /// - /// The entity's name before the "baby" prefix is added. - /// - [DataField("originalName")] - public string OriginalName = string.Empty; } diff --git a/Content.Shared/Zombies/SharedZombieSystem.cs b/Content.Shared/Zombies/SharedZombieSystem.cs index 6d9103639f..0388450a8c 100644 --- a/Content.Shared/Zombies/SharedZombieSystem.cs +++ b/Content.Shared/Zombies/SharedZombieSystem.cs @@ -1,4 +1,5 @@ using Content.Shared.Movement.Systems; +using Content.Shared.NameModifier.EntitySystems; namespace Content.Shared.Zombies; @@ -10,6 +11,7 @@ public abstract class SharedZombieSystem : EntitySystem base.Initialize(); SubscribeLocalEvent(OnRefreshSpeed); + SubscribeLocalEvent(OnRefreshNameModifiers); } private void OnRefreshSpeed(EntityUid uid, ZombieComponent component, RefreshMovementSpeedModifiersEvent args) @@ -17,4 +19,9 @@ public abstract class SharedZombieSystem : EntitySystem var mod = component.ZombieMovementSpeedDebuff; args.ModifySpeed(mod, mod); } + + private void OnRefreshNameModifiers(Entity entity, ref RefreshNameModifiersEvent args) + { + args.AddModifier("zombie-name-prefix"); + } } diff --git a/Content.Shared/Zombies/ZombieComponent.cs b/Content.Shared/Zombies/ZombieComponent.cs index 2cd0cdb96d..f510d65d6d 100644 --- a/Content.Shared/Zombies/ZombieComponent.cs +++ b/Content.Shared/Zombies/ZombieComponent.cs @@ -62,12 +62,6 @@ public sealed partial class ZombieComponent : Component [DataField("zombieRoleId", customTypeSerializer: typeof(PrototypeIdSerializer))] public string ZombieRoleId = "Zombie"; - /// - /// The EntityName of the humanoid to restore in case of cloning - /// - [DataField("beforeZombifiedEntityName"), ViewVariables(VVAccess.ReadOnly)] - public string BeforeZombifiedEntityName = string.Empty; - /// /// The CustomBaseLayers of the humanoid to restore in case of cloning /// diff --git a/Resources/Locale/en-US/chemistry/components/transformable-container-component.ftl b/Resources/Locale/en-US/chemistry/components/transformable-container-component.ftl index 21f096273d..ce43bd714a 100644 --- a/Resources/Locale/en-US/chemistry/components/transformable-container-component.ftl +++ b/Resources/Locale/en-US/chemistry/components/transformable-container-component.ftl @@ -1 +1 @@ -transformable-container-component-glass = {$name} glass +transformable-container-component-glass = {$reagent} glass diff --git a/Resources/Locale/en-US/cluwne/cluwne.ftl b/Resources/Locale/en-US/cluwne/cluwne.ftl index 206df8657d..0ffd3f32df 100644 --- a/Resources/Locale/en-US/cluwne/cluwne.ftl +++ b/Resources/Locale/en-US/cluwne/cluwne.ftl @@ -1,2 +1,2 @@ cluwne-transform = {CAPITALIZE(THE($target))} turned into a cluwne! -cluwne-name-prefix = Cluwnified {$target} +cluwne-name-prefix = cluwnified {$baseName} diff --git a/Resources/Locale/en-US/glue/glue.ftl b/Resources/Locale/en-US/glue/glue.ftl index 1a711d51c2..158ebc9ed8 100644 --- a/Resources/Locale/en-US/glue/glue.ftl +++ b/Resources/Locale/en-US/glue/glue.ftl @@ -1,5 +1,5 @@ glue-success = {THE($target)} has been covered in glue! -glued-name-prefix = Glued {$target} +glued-name-prefix = glued {$baseName} glue-failure = Can't cover {THE($target)} in glue! glue-verb-text = Apply Glue glue-verb-message = Glue an object diff --git a/Resources/Locale/en-US/label/label-component.ftl b/Resources/Locale/en-US/label/label-component.ftl new file mode 100644 index 0000000000..ff3a250c7b --- /dev/null +++ b/Resources/Locale/en-US/label/label-component.ftl @@ -0,0 +1 @@ +comp-label-format = {$baseName} ({$label}) diff --git a/Resources/Locale/en-US/lube/lube.ftl b/Resources/Locale/en-US/lube/lube.ftl index 92dd2802ec..1b5b66e069 100644 --- a/Resources/Locale/en-US/lube/lube.ftl +++ b/Resources/Locale/en-US/lube/lube.ftl @@ -1,5 +1,5 @@ lube-success = {THE($target)} has been covered in lube! -lubed-name-prefix = Lubed {$target} +lubed-name-prefix = lubed {$baseName} lube-failure = Can't cover {THE($target)} in lube! lube-slip = {THE($target)} slips out of your hands! lube-verb-text = Apply Lube diff --git a/Resources/Locale/en-US/nutrition/components/animal-husbandry.ftl b/Resources/Locale/en-US/nutrition/components/animal-husbandry.ftl index 6ca108b653..cf7bf2d03a 100644 --- a/Resources/Locale/en-US/nutrition/components/animal-husbandry.ftl +++ b/Resources/Locale/en-US/nutrition/components/animal-husbandry.ftl @@ -1,3 +1,3 @@ -infant-name-prefix = baby {$name} +infant-name-prefix = baby {$baseName} reproductive-birth-popup = {CAPITALIZE(THE($parent))} gave birth! reproductive-laid-egg-popup = {CAPITALIZE(THE($parent))} lays an egg! diff --git a/Resources/Locale/en-US/zombies/zombie.ftl b/Resources/Locale/en-US/zombies/zombie.ftl index a391a95b0d..d45943e825 100644 --- a/Resources/Locale/en-US/zombies/zombie.ftl +++ b/Resources/Locale/en-US/zombies/zombie.ftl @@ -2,7 +2,7 @@ zombie-transform = {CAPITALIZE(THE($target))} turned into a zombie! zombie-infection-greeting = You have become a zombie. Your goal is to seek out the living and to try to infect them. Work together with the other zombies to overtake the station. zombie-generic = zombie -zombie-name-prefix = Zombified {$target} +zombie-name-prefix = zombified {$baseName} zombie-role-desc = A malevolent creature of the dead. zombie-role-rules = You are an antagonist. Search out the living and bite them in order to infect them and turn them into zombies. Work together with the other zombies to overtake the station. diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml b/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml index 4bd71f898d..68d96fcd3d 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml @@ -79,7 +79,6 @@ - !type:DoActsBehavior acts: [ "Destruction" ] - type: Label - originalName: jug - type: Tag tags: - ChemDispensable From 14823453309b66a3c8e1a911dd283cd37c19ad51 Mon Sep 17 00:00:00 2001 From: Futuristic-OK <141568243+Futuristic-OK@users.noreply.github.com> Date: Mon, 17 Jun 2024 05:24:29 +0600 Subject: [PATCH 126/142] Delete RandomSentience event (#28982) --- Resources/Prototypes/GameRules/events.yml | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/Resources/Prototypes/GameRules/events.yml b/Resources/Prototypes/GameRules/events.yml index 853853fb22..a443ff5027 100644 --- a/Resources/Prototypes/GameRules/events.yml +++ b/Resources/Prototypes/GameRules/events.yml @@ -277,19 +277,7 @@ duration: 60 maxDuration: 120 - type: PowerGridCheckRule - -- type: entity - id: RandomSentience - parent: BaseGameRule - components: - - type: StationEvent - weight: 6 - duration: 1 - maxOccurrences: 1 # this event has diminishing returns on interesting-ness, so we cap it - startAudio: - path: /Audio/Announcements/attention.ogg - - type: RandomSentienceRule - + - type: entity parent: BaseGameRule id: SolarFlare From 8a199a882b9b2c03ace4b55ced9776f1a3709fbc Mon Sep 17 00:00:00 2001 From: PJBot Date: Sun, 16 Jun 2024 23:25:39 +0000 Subject: [PATCH 127/142] 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 b3d8fff813..5b94f8f47c 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Flareguy - changes: - - message: Removed SCAF armor. - type: Remove - id: 6261 - time: '2024-03-31T02:01:28.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/26566 - author: lzk228 changes: - message: Syndicate duffelbag storage increased from 8x5 to 9x5. @@ -3859,3 +3852,10 @@ id: 6760 time: '2024-06-16T11:57:57.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/25155 +- author: Futuristic + changes: + - message: RandomSentience event was removed + type: Remove + id: 6761 + time: '2024-06-16T23:24:29.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/28982 From 388d372ee8eac2e2af39cfed142ea90fb69fa212 Mon Sep 17 00:00:00 2001 From: Partmedia Date: Sun, 16 Jun 2024 17:13:32 -0800 Subject: [PATCH 128/142] Fix incorrect use of atmos dt (#29112) --- Content.Server/Power/Generation/Teg/TegSystem.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Server/Power/Generation/Teg/TegSystem.cs b/Content.Server/Power/Generation/Teg/TegSystem.cs index bc1bff052c..02412ca5fb 100644 --- a/Content.Server/Power/Generation/Teg/TegSystem.cs +++ b/Content.Server/Power/Generation/Teg/TegSystem.cs @@ -179,7 +179,7 @@ public sealed class TegSystem : EntitySystem component.LastGeneration = electricalEnergy; // Turn energy (at atmos tick rate) into wattage. - var power = electricalEnergy * _atmosphere.AtmosTickRate; + var power = electricalEnergy / args.dt; // Add ramp factor. This magics slight power into existence, but allows us to ramp up. supplier.MaxSupply = power * component.RampFactor; From 72665eb6e002fdc4d944cd74fcad4d0ad999d065 Mon Sep 17 00:00:00 2001 From: PJBot Date: Mon, 17 Jun 2024 01:14:39 +0000 Subject: [PATCH 129/142] 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 5b94f8f47c..294d52eba1 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: lzk228 - changes: - - message: Syndicate duffelbag storage increased from 8x5 to 9x5. - type: Tweak - id: 6262 - time: '2024-03-31T02:21:31.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/26565 - author: Velcroboy changes: - message: Changed plastic flaps to be completely constructable/deconstructable @@ -3859,3 +3852,10 @@ id: 6761 time: '2024-06-16T23:24:29.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/28982 +- author: notafet + changes: + - message: Adjust TEG power generation levels. + type: Tweak + id: 6762 + time: '2024-06-17T01:13:33.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/29112 From f7aca6b15f029caf0b5d23b92a4ad9b41737db1e Mon Sep 17 00:00:00 2001 From: deltanedas <39013340+deltanedas@users.noreply.github.com> Date: Mon, 17 Jun 2024 03:03:01 +0000 Subject: [PATCH 130/142] nuke actions from map files (#28589) --- Resources/Maps/Shuttles/emergency_meta.yml | 200 --------------------- Resources/Maps/atlas.yml | 22 --- Resources/Maps/bagel.yml | 22 --- Resources/Maps/cluster.yml | 42 ----- Resources/Maps/marathon.yml | 22 --- Resources/Maps/oasis.yml | 162 ----------------- Resources/Maps/saltern.yml | 22 --- 7 files changed, 492 deletions(-) diff --git a/Resources/Maps/Shuttles/emergency_meta.yml b/Resources/Maps/Shuttles/emergency_meta.yml index a85c607195..84b6ff02e6 100644 --- a/Resources/Maps/Shuttles/emergency_meta.yml +++ b/Resources/Maps/Shuttles/emergency_meta.yml @@ -465,85 +465,6 @@ entities: - type: RadiationGridResistance - type: GravityShake shakeTimes: 10 -- proto: ActionToggleLight - entities: - - uid: 4 - components: - - type: Transform - parent: 3 - - type: InstantAction - container: 3 - - uid: 5 - components: - - type: Transform - parent: 3 - - type: InstantAction - container: 3 - - uid: 12 - components: - - type: Transform - parent: 11 - - type: InstantAction - container: 11 - - uid: 13 - components: - - type: Transform - parent: 11 - - type: InstantAction - container: 11 - - uid: 22 - components: - - type: Transform - parent: 21 - - type: InstantAction - container: 21 - - uid: 23 - components: - - type: Transform - parent: 21 - - type: InstantAction - container: 21 - - uid: 32 - components: - - type: Transform - parent: 31 - - type: InstantAction - container: 31 - - uid: 33 - components: - - type: Transform - parent: 31 - - type: InstantAction - container: 31 - - uid: 42 - components: - - type: Transform - parent: 41 - - type: InstantAction - container: 41 - - uid: 43 - components: - - type: Transform - parent: 41 - - type: InstantAction - container: 41 -- proto: ActionToggleSuitPiece - entities: - - uid: 51 - components: - - type: Transform - parent: 50 - - type: InstantAction - container: 50 - entIcon: 52 -- proto: ActionVendingThrow - entities: - - uid: 54 - components: - - type: Transform - parent: 53 - - type: InstantAction - container: 53 - proto: AirCanister entities: - uid: 55 @@ -2604,27 +2525,8 @@ entities: components: - type: Transform parent: 2 - - type: HandheldLight - selfToggleActionEntity: 5 - toggleActionEntity: 4 - - type: ContainerContainer - containers: - cell_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: 6 - actions: !type:Container - showEnts: False - occludes: True - ents: - - 4 - - 5 - type: Physics canCollide: False - - type: ActionsContainer - - type: Actions - actions: - - 5 - type: InsideEntityStorage - proto: ClothingMaskBreath entities: @@ -2755,23 +2657,8 @@ entities: - type: Transform pos: 11.467667,-10.363369 parent: 1 - - type: ToggleableClothing - clothingUid: 52 - actionEntity: 51 - - type: ContainerContainer - containers: - toggleable-clothing: !type:ContainerSlot - showEnts: False - occludes: True - ent: 52 - actions: !type:Container - showEnts: False - occludes: True - ents: - - 51 - type: Physics canCollide: False - - type: ActionsContainer - proto: ClothingOuterSuitFire entities: - uid: 8 @@ -3291,102 +3178,26 @@ entities: components: - type: Transform parent: 10 - - type: HandheldLight - selfToggleActionEntity: 13 - toggleActionEntity: 12 - - type: ContainerContainer - containers: - cell_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: 14 - actions: !type:Container - showEnts: False - occludes: True - ents: - - 12 - - 13 - type: Physics canCollide: False - - type: ActionsContainer - - type: Actions - actions: - - 13 - uid: 21 components: - type: Transform parent: 20 - - type: HandheldLight - selfToggleActionEntity: 23 - toggleActionEntity: 22 - - type: ContainerContainer - containers: - cell_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: 24 - actions: !type:Container - showEnts: False - occludes: True - ents: - - 22 - - 23 - type: Physics canCollide: False - - type: ActionsContainer - - type: Actions - actions: - - 23 - uid: 31 components: - type: Transform parent: 30 - - type: HandheldLight - selfToggleActionEntity: 33 - toggleActionEntity: 32 - - type: ContainerContainer - containers: - cell_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: 34 - actions: !type:Container - showEnts: False - occludes: True - ents: - - 32 - - 33 - type: Physics canCollide: False - - type: ActionsContainer - - type: Actions - actions: - - 33 - uid: 41 components: - type: Transform parent: 40 - - type: HandheldLight - selfToggleActionEntity: 43 - toggleActionEntity: 42 - - type: ContainerContainer - containers: - cell_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: 44 - actions: !type:Container - showEnts: False - occludes: True - ents: - - 42 - - 43 - type: Physics canCollide: False - - type: ActionsContainer - - type: Actions - actions: - - 43 - proto: FoodBoxDonut entities: - uid: 583 @@ -7517,17 +7328,6 @@ entities: - type: Transform pos: 16.5,-0.5 parent: 1 - - type: VendingMachine - actionEntity: 54 - - type: Actions - actions: - - 54 - - type: ActionsContainer - - type: ContainerContainer - containers: - actions: !type:Container - ents: - - 54 - proto: VendingMachineWallMedical entities: - uid: 926 diff --git a/Resources/Maps/atlas.yml b/Resources/Maps/atlas.yml index 18c63121f6..d220057d5e 100644 --- a/Resources/Maps/atlas.yml +++ b/Resources/Maps/atlas.yml @@ -2855,14 +2855,6 @@ entities: - type: GasTileOverlay - type: RadiationGridResistance - type: NavMap -- proto: ActionToggleLight - entities: - - uid: 7876 - components: - - type: Transform - parent: 7875 - - type: InstantAction - container: 7875 - proto: AirAlarm entities: - uid: 1942 @@ -39104,22 +39096,8 @@ entities: - type: Transform pos: -43.645462,-17.224262 parent: 30 - - type: HandheldLight - toggleActionEntity: 7876 - - type: ContainerContainer - containers: - cell_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - actions: !type:Container - showEnts: False - occludes: True - ents: - - 7876 - type: Physics canCollide: True - - type: ActionsContainer - proto: LemonSeeds entities: - uid: 8448 diff --git a/Resources/Maps/bagel.yml b/Resources/Maps/bagel.yml index 3dfb5c154a..51a2b8ba6c 100644 --- a/Resources/Maps/bagel.yml +++ b/Resources/Maps/bagel.yml @@ -9395,14 +9395,6 @@ entities: - type: Transform pos: 31.477634,-79.4623 parent: 60 -- proto: ActionToggleLight - entities: - - uid: 3189 - components: - - type: Transform - parent: 19193 - - type: InstantAction - container: 19193 - proto: AirAlarm entities: - uid: 249 @@ -70806,20 +70798,6 @@ entities: - type: Transform pos: 20.983997,21.51571 parent: 60 - - type: HandheldLight - toggleActionEntity: 3189 - - type: ContainerContainer - containers: - cell_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - actions: !type:Container - showEnts: False - occludes: True - ents: - - 3189 - - type: ActionsContainer - uid: 21240 components: - type: Transform diff --git a/Resources/Maps/cluster.yml b/Resources/Maps/cluster.yml index 78fdcc4fd1..655c0ff53d 100644 --- a/Resources/Maps/cluster.yml +++ b/Resources/Maps/cluster.yml @@ -4499,20 +4499,6 @@ entities: - type: Transform pos: 3.5402613,7.6028175 parent: 1 -- proto: ActionToggleLight - entities: - - uid: 9312 - components: - - type: Transform - parent: 12532 - - type: InstantAction - container: 12532 - - uid: 9313 - components: - - type: Transform - parent: 12533 - - type: InstantAction - container: 12533 - proto: AirAlarm entities: - uid: 8049 @@ -35985,39 +35971,11 @@ entities: - type: Transform pos: 16.59333,23.726284 parent: 1 - - type: HandheldLight - toggleActionEntity: 9312 - - type: ContainerContainer - containers: - cell_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - actions: !type:Container - showEnts: False - occludes: True - ents: - - 9312 - - type: ActionsContainer - uid: 12533 components: - type: Transform pos: 16.59333,23.476284 parent: 1 - - type: HandheldLight - toggleActionEntity: 9313 - - type: ContainerContainer - containers: - cell_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - actions: !type:Container - showEnts: False - occludes: True - ents: - - 9313 - - type: ActionsContainer - proto: Floodlight entities: - uid: 7307 diff --git a/Resources/Maps/marathon.yml b/Resources/Maps/marathon.yml index caa60e9149..f7a2a60564 100644 --- a/Resources/Maps/marathon.yml +++ b/Resources/Maps/marathon.yml @@ -7773,14 +7773,6 @@ entities: - type: Transform pos: -19.30925,-35.362278 parent: 30 -- proto: ActionToggleLight - entities: - - uid: 3117 - components: - - type: Transform - parent: 5704 - - type: InstantAction - container: 5704 - proto: AirAlarm entities: - uid: 6224 @@ -98436,22 +98428,8 @@ entities: - type: Transform pos: 2.4391665,31.963726 parent: 30 - - type: HandheldLight - toggleActionEntity: 3117 - - type: ContainerContainer - containers: - cell_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - actions: !type:Container - showEnts: False - occludes: True - ents: - - 3117 - type: Physics canCollide: True - - type: ActionsContainer - uid: 7472 components: - type: Transform diff --git a/Resources/Maps/oasis.yml b/Resources/Maps/oasis.yml index 9fd4c24c89..34c01f3a3f 100644 --- a/Resources/Maps/oasis.yml +++ b/Resources/Maps/oasis.yml @@ -9688,70 +9688,6 @@ entities: - type: Transform pos: 19.476593,-4.469906 parent: 21002 -- proto: ActionToggleInternals - entities: - - uid: 23831 - components: - - type: Transform - parent: 23830 - - type: InstantAction - container: 23830 - - uid: 23833 - components: - - type: Transform - parent: 23832 - - type: InstantAction - container: 23832 - - uid: 23835 - components: - - type: Transform - parent: 23834 - - type: InstantAction - container: 23834 - - uid: 23837 - components: - - type: Transform - parent: 23836 - - type: InstantAction - container: 23836 - - uid: 23839 - components: - - type: Transform - parent: 23838 - - type: InstantAction - container: 23838 - - uid: 28282 - components: - - type: Transform - parent: 28281 - - type: InstantAction - container: 28281 - - uid: 28284 - components: - - type: Transform - parent: 28283 - - type: InstantAction - container: 28283 -- proto: ActionToggleLight - entities: - - uid: 2263 - components: - - type: Transform - parent: 2262 - - type: InstantAction - container: 2262 - - uid: 6624 - components: - - type: Transform - parent: 6623 - - type: InstantAction - container: 6623 - - uid: 23803 - components: - - type: Transform - parent: 23802 - - type: InstantAction - container: 23802 - proto: AirAlarm entities: - uid: 5583 @@ -74652,20 +74588,6 @@ entities: - type: Transform pos: -1.6524403,40.692146 parent: 2 - - type: HandheldLight - toggleActionEntity: 23803 - - type: ContainerContainer - containers: - cell_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - actions: !type:Container - showEnts: False - occludes: True - ents: - - 23803 - - type: ActionsContainer - proto: ClothingHeadHelmetRiot entities: - uid: 4267 @@ -86086,14 +86008,6 @@ entities: - type: Transform pos: -26.335854,15.494169 parent: 2 - - type: GasTank - toggleActionEntity: 23839 - - type: ActionsContainer - - type: ContainerContainer - containers: - actions: !type:Container - ents: - - 23839 - proto: DoubleEmergencyOxygenTankFilled entities: - uid: 23832 @@ -86101,14 +86015,6 @@ entities: - type: Transform pos: -26.606686,15.712919 parent: 2 - - type: GasTank - toggleActionEntity: 23833 - - type: ActionsContainer - - type: ContainerContainer - containers: - actions: !type:Container - ents: - - 23833 - proto: Dresser entities: - uid: 22340 @@ -87717,14 +87623,6 @@ entities: - type: Transform pos: -26.28377,14.921253 parent: 2 - - type: GasTank - toggleActionEntity: 23837 - - type: ActionsContainer - - type: ContainerContainer - containers: - actions: !type:Container - ents: - - 23837 - uid: 28423 components: - type: Transform @@ -87747,40 +87645,16 @@ entities: - type: Transform pos: -26.481686,14.431669 parent: 2 - - type: GasTank - toggleActionEntity: 23835 - - type: ActionsContainer - - type: ContainerContainer - containers: - actions: !type:Container - ents: - - 23835 - uid: 28281 components: - type: Transform pos: 43.584152,5.432804 parent: 21002 - - type: GasTank - toggleActionEntity: 28282 - - type: ActionsContainer - - type: ContainerContainer - containers: - actions: !type:Container - ents: - - 28282 - uid: 28283 components: - type: Transform pos: 64.58009,6.520523 parent: 21002 - - type: GasTank - toggleActionEntity: 28284 - - type: ActionsContainer - - type: ContainerContainer - containers: - actions: !type:Container - ents: - - 28284 - uid: 28286 components: - type: Transform @@ -87989,14 +87863,6 @@ entities: - type: Transform pos: -26.606686,14.921253 parent: 2 - - type: GasTank - toggleActionEntity: 23831 - - type: ActionsContainer - - type: ContainerContainer - containers: - actions: !type:Container - ents: - - 23831 - proto: ExtinguisherCabinetFilled entities: - uid: 5804 @@ -134748,22 +134614,8 @@ entities: - type: Transform pos: -31.387814,-44.28387 parent: 2 - - type: HandheldLight - toggleActionEntity: 2263 - - type: ContainerContainer - containers: - cell_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - actions: !type:Container - showEnts: False - occludes: True - ents: - - 2263 - type: Physics canCollide: True - - type: ActionsContainer - proto: LampGold entities: - uid: 1597 @@ -134788,22 +134640,8 @@ entities: - type: Transform pos: 3.4081588,44.633736 parent: 2 - - type: HandheldLight - toggleActionEntity: 6624 - - type: ContainerContainer - containers: - cell_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - actions: !type:Container - showEnts: False - occludes: True - ents: - - 6624 - type: Physics canCollide: True - - type: ActionsContainer - uid: 7981 components: - type: Transform diff --git a/Resources/Maps/saltern.yml b/Resources/Maps/saltern.yml index c9d3218c45..048b0a2e5c 100644 --- a/Resources/Maps/saltern.yml +++ b/Resources/Maps/saltern.yml @@ -3401,14 +3401,6 @@ entities: - type: Transform pos: -11.470391,11.486723 parent: 31 -- proto: ActionToggleLight - entities: - - uid: 7544 - components: - - type: Transform - parent: 9761 - - type: InstantAction - container: 9761 - proto: AirAlarm entities: - uid: 5107 @@ -48902,20 +48894,6 @@ entities: - type: Transform pos: -16.721703,-38.96948 parent: 31 - - type: HandheldLight - toggleActionEntity: 7544 - - type: ContainerContainer - containers: - cell_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - actions: !type:Container - showEnts: False - occludes: True - ents: - - 7544 - - type: ActionsContainer - proto: LargeBeaker entities: - uid: 5074 From 390f8d19d1505364389e1f595a54df2cfa43a96e Mon Sep 17 00:00:00 2001 From: Cojoke <83733158+Cojoke-dot@users.noreply.github.com> Date: Sun, 16 Jun 2024 22:21:29 -0500 Subject: [PATCH 131/142] Makes Eyepatches Flippable (#26277) --- .../Clothing/ClientClothingSystem.cs | 8 ++-- .../FlippableClothingVisualizerSystem.cs | 48 +++++++++++++++++++ .../FlippableClothingVisualsComponent.cs | 16 +++++++ Content.Client/Sprite/RandomSpriteSystem.cs | 3 -- .../Clothing/Components/ClothingComponent.cs | 8 +++- .../Clothing/EntitySystems/ClothingSystem.cs | 6 --- .../EntitySystems/FoldableClothingSystem.cs | 40 ++++++++-------- .../Clothing/Eyes/base_clothingeyes.yml | 39 +++++++++++++++ .../Prototypes/Entities/Clothing/Eyes/hud.yml | 32 +++++++++---- .../Entities/Clothing/Eyes/misc.yml | 31 +++++++----- 10 files changed, 175 insertions(+), 56 deletions(-) create mode 100644 Content.Client/Clothing/FlippableClothingVisualizerSystem.cs create mode 100644 Content.Client/Clothing/FlippableClothingVisualsComponent.cs diff --git a/Content.Client/Clothing/ClientClothingSystem.cs b/Content.Client/Clothing/ClientClothingSystem.cs index dd69521f48..1c0d831226 100644 --- a/Content.Client/Clothing/ClientClothingSystem.cs +++ b/Content.Client/Clothing/ClientClothingSystem.cs @@ -1,5 +1,6 @@ using System.Diagnostics.CodeAnalysis; using System.Linq; +using System.Numerics; using Content.Client.Inventory; using Content.Shared.Clothing; using Content.Shared.Clothing.Components; @@ -113,6 +114,7 @@ public sealed class ClientClothingSystem : ClothingSystem i++; } + item.MappedLayer = key; args.Layers.Add((key, layer)); } } @@ -153,13 +155,9 @@ public sealed class ClientClothingSystem : ClothingSystem // species specific if (speciesId != null && rsi.TryGetState($"{state}-{speciesId}", out _)) - { state = $"{state}-{speciesId}"; - } else if (!rsi.TryGetState(state, out _)) - { return false; - } var layer = new PrototypeLayerData(); layer.RsiPath = rsi.Path.ToString(); @@ -287,6 +285,8 @@ public sealed class ClientClothingSystem : ClothingSystem if (layerData.Color != null) sprite.LayerSetColor(key, layerData.Color.Value); + if (layerData.Scale != null) + sprite.LayerSetScale(key, layerData.Scale.Value); } else index = sprite.LayerMapReserveBlank(key); diff --git a/Content.Client/Clothing/FlippableClothingVisualizerSystem.cs b/Content.Client/Clothing/FlippableClothingVisualizerSystem.cs new file mode 100644 index 0000000000..2c3afb0324 --- /dev/null +++ b/Content.Client/Clothing/FlippableClothingVisualizerSystem.cs @@ -0,0 +1,48 @@ +using Content.Shared.Clothing; +using Content.Shared.Clothing.Components; +using Content.Shared.Clothing.EntitySystems; +using Content.Shared.Foldable; +using Content.Shared.Item; +using Robust.Client.GameObjects; + +namespace Content.Client.Clothing; + +public sealed class FlippableClothingVisualizerSystem : VisualizerSystem +{ + [Dependency] private readonly SharedItemSystem _itemSys = default!; + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnGetVisuals, after: [typeof(ClothingSystem)]); + SubscribeLocalEvent(OnFolded); + } + + private void OnFolded(Entity ent, ref FoldedEvent args) + { + _itemSys.VisualsChanged(ent); + } + + private void OnGetVisuals(Entity ent, ref GetEquipmentVisualsEvent args) + { + if (!TryComp(ent, out SpriteComponent? sprite) || + !TryComp(ent, out ClothingComponent? clothing)) + return; + + if (clothing.MappedLayer == null || + !AppearanceSystem.TryGetData(ent, FoldableSystem.FoldedVisuals.State, out var folding) || + !sprite.LayerMapTryGet(folding ? ent.Comp.FoldingLayer : ent.Comp.UnfoldingLayer, out var idx)) + return; + + // add each layer to the visuals + var spriteLayer = sprite[idx]; + foreach (var layer in args.Layers) + { + if (layer.Item1 != clothing.MappedLayer) + continue; + + layer.Item2.Scale = spriteLayer.Scale; + } + } +} diff --git a/Content.Client/Clothing/FlippableClothingVisualsComponent.cs b/Content.Client/Clothing/FlippableClothingVisualsComponent.cs new file mode 100644 index 0000000000..33d622b8b5 --- /dev/null +++ b/Content.Client/Clothing/FlippableClothingVisualsComponent.cs @@ -0,0 +1,16 @@ +namespace Content.Client.Clothing; + +/// +/// Communicates folded layers data (currently only Scale to handle flipping) +/// to the wearer clothing sprite layer +/// +[RegisterComponent] +[Access(typeof(FlippableClothingVisualizerSystem))] +public sealed partial class FlippableClothingVisualsComponent : Component +{ + [DataField] + public string FoldingLayer = "foldedLayer"; + + [DataField] + public string UnfoldingLayer = "unfoldedLayer"; +} diff --git a/Content.Client/Sprite/RandomSpriteSystem.cs b/Content.Client/Sprite/RandomSpriteSystem.cs index b9be2a44b4..c4aa43a65b 100644 --- a/Content.Client/Sprite/RandomSpriteSystem.cs +++ b/Content.Client/Sprite/RandomSpriteSystem.cs @@ -43,9 +43,6 @@ public sealed class RandomSpriteSystem : SharedRandomSpriteSystem if (!Resolve(uid, ref clothing, false)) return; - if (clothing.ClothingVisuals == null) - return; - foreach (var slotPair in clothing.ClothingVisuals) { foreach (var keyColorPair in component.Selected) diff --git a/Content.Shared/Clothing/Components/ClothingComponent.cs b/Content.Shared/Clothing/Components/ClothingComponent.cs index 6d7226e767..846a78b868 100644 --- a/Content.Shared/Clothing/Components/ClothingComponent.cs +++ b/Content.Shared/Clothing/Components/ClothingComponent.cs @@ -16,9 +16,14 @@ namespace Content.Shared.Clothing.Components; public sealed partial class ClothingComponent : Component { [DataField("clothingVisuals")] - [Access(typeof(ClothingSystem), typeof(InventorySystem), Other = AccessPermissions.ReadExecute)] // TODO remove execute permissions. public Dictionary> ClothingVisuals = new(); + /// + /// The name of the layer in the user that this piece of clothing will map to + /// + [DataField] + public string? MappedLayer; + [ViewVariables(VVAccess.ReadWrite)] [DataField("quickEquip")] public bool QuickEquip = true; @@ -121,4 +126,3 @@ public sealed partial class ClothingUnequipDoAfterEvent : DoAfterEvent public override DoAfterEvent Clone() => this; } - diff --git a/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs b/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs index 1e2825a49a..bdcb2c8204 100644 --- a/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs +++ b/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs @@ -241,9 +241,6 @@ public abstract class ClothingSystem : EntitySystem public void SetLayerColor(ClothingComponent clothing, string slot, string mapKey, Color? color) { - if (clothing.ClothingVisuals == null) - return; - foreach (var layer in clothing.ClothingVisuals[slot]) { if (layer.MapKeys == null) @@ -257,9 +254,6 @@ public abstract class ClothingSystem : EntitySystem } public void SetLayerState(ClothingComponent clothing, string slot, string mapKey, string state) { - if (clothing.ClothingVisuals == null) - return; - foreach (var layer in clothing.ClothingVisuals[slot]) { if (layer.MapKeys == null) diff --git a/Content.Shared/Clothing/EntitySystems/FoldableClothingSystem.cs b/Content.Shared/Clothing/EntitySystems/FoldableClothingSystem.cs index 27ea168018..be55588ddd 100644 --- a/Content.Shared/Clothing/EntitySystems/FoldableClothingSystem.cs +++ b/Content.Shared/Clothing/EntitySystems/FoldableClothingSystem.cs @@ -33,32 +33,32 @@ public sealed class FoldableClothingSystem : EntitySystem private void OnFolded(Entity ent, ref FoldedEvent args) { - if (TryComp(ent.Owner, out var clothingComp) && - TryComp(ent.Owner, out var itemComp)) + if (!TryComp(ent.Owner, out var clothingComp) || + !TryComp(ent.Owner, out var itemComp)) + return; + + if (args.IsFolded) { - if (args.IsFolded) - { - if (ent.Comp.FoldedSlots.HasValue) - _clothingSystem.SetSlots(ent.Owner, ent.Comp.FoldedSlots.Value, clothingComp); + if (ent.Comp.FoldedSlots.HasValue) + _clothingSystem.SetSlots(ent.Owner, ent.Comp.FoldedSlots.Value, clothingComp); - if (ent.Comp.FoldedEquippedPrefix != null) - _clothingSystem.SetEquippedPrefix(ent.Owner, ent.Comp.FoldedEquippedPrefix, clothingComp); + if (ent.Comp.FoldedEquippedPrefix != null) + _clothingSystem.SetEquippedPrefix(ent.Owner, ent.Comp.FoldedEquippedPrefix, clothingComp); - if (ent.Comp.FoldedHeldPrefix != null) - _itemSystem.SetHeldPrefix(ent.Owner, ent.Comp.FoldedHeldPrefix, false, itemComp); - } - else - { - if (ent.Comp.UnfoldedSlots.HasValue) - _clothingSystem.SetSlots(ent.Owner, ent.Comp.UnfoldedSlots.Value, clothingComp); + if (ent.Comp.FoldedHeldPrefix != null) + _itemSystem.SetHeldPrefix(ent.Owner, ent.Comp.FoldedHeldPrefix, false, itemComp); + } + else + { + if (ent.Comp.UnfoldedSlots.HasValue) + _clothingSystem.SetSlots(ent.Owner, ent.Comp.UnfoldedSlots.Value, clothingComp); - if (ent.Comp.FoldedEquippedPrefix != null) - _clothingSystem.SetEquippedPrefix(ent.Owner, null, clothingComp); + if (ent.Comp.FoldedEquippedPrefix != null) + _clothingSystem.SetEquippedPrefix(ent.Owner, null, clothingComp); - if (ent.Comp.FoldedHeldPrefix != null) - _itemSystem.SetHeldPrefix(ent.Owner, null, false, itemComp); + if (ent.Comp.FoldedHeldPrefix != null) + _itemSystem.SetHeldPrefix(ent.Owner, null, false, itemComp); - } } } } diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/base_clothingeyes.yml b/Resources/Prototypes/Entities/Clothing/Eyes/base_clothingeyes.yml index 10f265a4a2..b31f821629 100644 --- a/Resources/Prototypes/Entities/Clothing/Eyes/base_clothingeyes.yml +++ b/Resources/Prototypes/Entities/Clothing/Eyes/base_clothingeyes.yml @@ -10,3 +10,42 @@ - type: Item size: Small storedRotation: -90 + +- type: entity + parent: [ClothingEyesBase, BaseFoldable] + id: ClothingHeadEyeBaseFlippable + abstract: true + components: + - type: Appearance + - type: FlippableClothingVisuals + - type: Foldable + canFoldInsideContainer: true + unfoldVerbText: fold-flip-verb + foldVerbText: fold-flip-verb + - type: FoldableClothing + - type: Sprite + layers: + - map: [ "unfoldedLayer" ] + state: icon + - map: ["foldedLayer"] + state: icon + visible: false + scale: -1,1 + +- type: entity + parent: ClothingHeadEyeBaseFlippable + id: ClothingHeadEyeBaseFlipped + suffix: flipped + abstract: true + components: + - type: Foldable + folded: true + - type: Sprite + layers: + - map: [ "unfoldedLayer" ] + state: icon + visible: false + - map: ["foldedLayer"] + state: icon + visible: true + scale: -1,1 diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml b/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml index c74a60e8fc..0c7fc5b2a1 100644 --- a/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml +++ b/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml @@ -220,7 +220,7 @@ suffix: Syndicate - type: entity - parent: ClothingEyesHudMedical + parent: [ClothingEyesHudMedical, ClothingHeadEyeBaseFlippable] id: ClothingEyesEyepatchHudMedical name: medical hud eyepatch description: A heads-up display that scans the humanoids in view and provides accurate data about their health status. For true patriots. @@ -231,7 +231,12 @@ sprite: Clothing/Eyes/Hud/medpatch.rsi - type: entity - parent: ClothingEyesHudSecurity + parent: [ClothingEyesEyepatchHudMedical, ClothingHeadEyeBaseFlipped] + id: ClothingEyesEyepatchHudMedicalFlipped + name: medical hud eyepatch + +- type: entity + parent: [ClothingEyesHudSecurity, ClothingHeadEyeBaseFlippable] id: ClothingEyesEyepatchHudSecurity name: security hud eyepatch description: A heads-up display that scans the humanoids in view and provides accurate data about their ID status and security records. For true patriots. @@ -242,7 +247,12 @@ sprite: Clothing/Eyes/Hud/secpatch.rsi - type: entity - parent: ClothingEyesHudBeer + parent: [ClothingEyesEyepatchHudSecurity, ClothingHeadEyeBaseFlipped] + id: ClothingEyesEyepatchHudSecurityFlipped + name: security hud eyepatch + +- type: entity + parent: [ClothingEyesHudBeer, ClothingHeadEyeBaseFlippable] id: ClothingEyesEyepatchHudBeer name: beer hud eyepatch description: A pair of sunHud outfitted with apparatus to scan reagents, as well as providing an innate understanding of liquid viscosity while in motion. For true patriots. @@ -253,7 +263,12 @@ sprite: Clothing/Eyes/Hud/beerpatch.rsi - type: entity - parent: ClothingEyesBase + parent: [ClothingEyesEyepatchHudBeer, ClothingHeadEyeBaseFlipped] + id: ClothingEyesEyepatchHudBeerFlipped + name: beer hud eyepatch + +- type: entity + parent: [ClothingEyesHudDiagnostic, ClothingHeadEyeBaseFlippable] id: ClothingEyesEyepatchHudDiag name: diagnostic hud eyepatch description: A heads-up display capable of analyzing the integrity and status of robotics and exosuits. Made out of see-borg-ium. @@ -262,7 +277,8 @@ sprite: Clothing/Eyes/Hud/diagpatch.rsi - type: Clothing sprite: Clothing/Eyes/Hud/diagpatch.rsi - - type: ShowHealthBars - damageContainers: - - Inorganic - - Silicon + +- type: entity + parent: [ClothingEyesEyepatchHudDiag, ClothingHeadEyeBaseFlipped] + id: ClothingEyesEyepatchHudDiagFlipped + name: diagnostic hud eyepatch diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/misc.yml b/Resources/Prototypes/Entities/Clothing/Eyes/misc.yml index 06ff347172..075ccae1c4 100644 --- a/Resources/Prototypes/Entities/Clothing/Eyes/misc.yml +++ b/Resources/Prototypes/Entities/Clothing/Eyes/misc.yml @@ -1,16 +1,3 @@ -- type: entity - parent: ClothingEyesBase - id: ClothingEyesEyepatch - name: eyepatch - description: Yarr. - components: - - type: Sprite - sprite: Clothing/Eyes/Misc/eyepatch.rsi - - type: Clothing - sprite: Clothing/Eyes/Misc/eyepatch.rsi - - type: EyeProtection - protectionTime: 5 - - type: entity parent: ClothingEyesBase id: ClothingEyesBlindfold @@ -26,3 +13,21 @@ graph: Blindfold node: blindfold - type: FlashImmunity + +- type: entity + parent: ClothingHeadEyeBaseFlippable + id: ClothingEyesEyepatch + name: eyepatch + description: Yarr. + components: + - type: Sprite + sprite: Clothing/Eyes/Misc/eyepatch.rsi + - type: Clothing + sprite: Clothing/Eyes/Misc/eyepatch.rsi + - type: EyeProtection + protectionTime: 5 + +- type: entity + parent: [ClothingEyesEyepatch, ClothingHeadEyeBaseFlipped] + id: ClothingEyesEyepatchFlipped + suffix: flipped From 7ff557d1ef2f42049d0a96166e1103d5916d42c3 Mon Sep 17 00:00:00 2001 From: PJBot Date: Mon, 17 Jun 2024 03:22:36 +0000 Subject: [PATCH 132/142] 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 294d52eba1..60f9065237 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Velcroboy - changes: - - message: Changed plastic flaps to be completely constructable/deconstructable - type: Tweak - id: 6263 - time: '2024-03-31T02:24:39.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/26341 - author: Flareguy changes: - message: Security glasses have been moved from research to roundstart gear. All @@ -3859,3 +3852,10 @@ id: 6762 time: '2024-06-17T01:13:33.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/29112 +- author: Cojoke-dot, AJCM-git + changes: + - message: You can now flip your eyepatches to the other eye! Yarrrrr! + type: Add + id: 6763 + time: '2024-06-17T03:21:29.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/26277 From c332677971f23afbebe9505c2621f8a5d714f1a0 Mon Sep 17 00:00:00 2001 From: deltanedas <39013340+deltanedas@users.noreply.github.com> Date: Mon, 17 Jun 2024 03:30:10 +0000 Subject: [PATCH 133/142] remove robotics console emag checking, make it a bit fairer (#27876) --- .../Robotics/UI/RoboticsConsoleWindow.xaml.cs | 2 +- .../Components/AutomatedTimerComponent.cs | 2 +- .../EntitySystems/TriggerSystem.OnUse.cs | 25 +-------- .../Explosion/EntitySystems/TriggerSystem.cs | 12 ++++ .../Silicons/Borgs/BorgSystem.Transponder.cs | 56 ++++++++++++++----- Content.Server/Silicons/Borgs/BorgSystem.cs | 2 +- .../Components/RoboticsConsoleComponent.cs | 2 +- Content.Shared/Robotics/RoboticsConsoleUi.cs | 10 +++- .../Components/BorgTransponderComponent.cs | 39 ++++++++++++- Resources/Locale/en-US/borg/borg.ftl | 2 + .../research/components/robotics-console.ftl | 2 +- .../Mobs/Cyborgs/base_borg_chassis.yml | 11 ++++ 12 files changed, 123 insertions(+), 42 deletions(-) diff --git a/Content.Client/Robotics/UI/RoboticsConsoleWindow.xaml.cs b/Content.Client/Robotics/UI/RoboticsConsoleWindow.xaml.cs index 367114f2aa..fc7b234bcc 100644 --- a/Content.Client/Robotics/UI/RoboticsConsoleWindow.xaml.cs +++ b/Content.Client/Robotics/UI/RoboticsConsoleWindow.xaml.cs @@ -134,7 +134,7 @@ public sealed partial class RoboticsConsoleWindow : FancyWindow BorgInfo.SetMessage(text); // how the turntables - DisableButton.Disabled = !data.HasBrain; + DisableButton.Disabled = !(data.HasBrain && data.CanDisable); DestroyButton.Disabled = _timing.CurTime < _console.Comp1.NextDestroy; } diff --git a/Content.Server/Explosion/Components/AutomatedTimerComponent.cs b/Content.Server/Explosion/Components/AutomatedTimerComponent.cs index 7019c08d43..c01aeb91e5 100644 --- a/Content.Server/Explosion/Components/AutomatedTimerComponent.cs +++ b/Content.Server/Explosion/Components/AutomatedTimerComponent.cs @@ -1,7 +1,7 @@ namespace Content.Server.Explosion.Components; /// -/// Disallows starting the timer by hand, must be stuck or triggered by a system. +/// Disallows starting the timer by hand, must be stuck or triggered by a system using StartTimer. /// [RegisterComponent] public sealed partial class AutomatedTimerComponent : Component diff --git a/Content.Server/Explosion/EntitySystems/TriggerSystem.OnUse.cs b/Content.Server/Explosion/EntitySystems/TriggerSystem.OnUse.cs index 8725dd1ae7..dcd11062bb 100644 --- a/Content.Server/Explosion/EntitySystems/TriggerSystem.OnUse.cs +++ b/Content.Server/Explosion/EntitySystems/TriggerSystem.OnUse.cs @@ -26,13 +26,7 @@ public sealed partial class TriggerSystem if (!component.StartOnStick) return; - HandleTimerTrigger( - uid, - args.User, - component.Delay, - component.BeepInterval, - component.InitialBeepDelay, - component.BeepSound); + StartTimer((uid, component), args.User); } private void OnExamined(EntityUid uid, OnUseTimerTriggerComponent component, ExaminedEvent args) @@ -54,14 +48,7 @@ public sealed partial class TriggerSystem args.Verbs.Add(new AlternativeVerb() { Text = Loc.GetString("verb-start-detonation"), - Act = () => HandleTimerTrigger( - uid, - args.User, - component.Delay, - component.BeepInterval, - component.InitialBeepDelay, - component.BeepSound - ), + Act = () => StartTimer((uid, component), args.User), Priority = 2 }); } @@ -174,13 +161,7 @@ public sealed partial class TriggerSystem if (component.DoPopup) _popupSystem.PopupEntity(Loc.GetString("trigger-activated", ("device", uid)), args.User, args.User); - HandleTimerTrigger( - uid, - args.User, - component.Delay, - component.BeepInterval, - component.InitialBeepDelay, - component.BeepSound); + StartTimer((uid, component), args.User); args.Handled = true; } diff --git a/Content.Server/Explosion/EntitySystems/TriggerSystem.cs b/Content.Server/Explosion/EntitySystems/TriggerSystem.cs index e03b8aff54..92e065bf4c 100644 --- a/Content.Server/Explosion/EntitySystems/TriggerSystem.cs +++ b/Content.Server/Explosion/EntitySystems/TriggerSystem.cs @@ -265,6 +265,18 @@ namespace Content.Server.Explosion.EntitySystems comp.TimeRemaining += amount; } + /// + /// Start the timer for triggering the device. + /// + public void StartTimer(Entity ent, EntityUid? user) + { + if (!Resolve(ent, ref ent.Comp, false)) + return; + + var comp = ent.Comp; + HandleTimerTrigger(ent, user, comp.Delay, comp.BeepInterval, comp.InitialBeepDelay, comp.BeepSound); + } + public void HandleTimerTrigger(EntityUid uid, EntityUid? user, float delay, float beepInterval, float? initialBeepDelay, SoundSpecifier? beepSound) { if (delay <= 0) diff --git a/Content.Server/Silicons/Borgs/BorgSystem.Transponder.cs b/Content.Server/Silicons/Borgs/BorgSystem.Transponder.cs index 1c10cbe667..781f847be3 100644 --- a/Content.Server/Silicons/Borgs/BorgSystem.Transponder.cs +++ b/Content.Server/Silicons/Borgs/BorgSystem.Transponder.cs @@ -1,5 +1,6 @@ using Content.Shared.DeviceNetwork; using Content.Shared.Emag.Components; +using Content.Shared.Movement.Components; using Content.Shared.Popups; using Content.Shared.Robotics; using Content.Shared.Silicons.Borgs.Components; @@ -26,6 +27,9 @@ public sealed partial class BorgSystem var query = EntityQueryEnumerator(); while (query.MoveNext(out var uid, out var comp, out var chassis, out var device, out var meta)) { + if (comp.NextDisable is {} nextDisable && now >= nextDisable) + DoDisable((uid, comp, chassis, meta)); + if (now < comp.NextBroadcast) continue; @@ -33,13 +37,16 @@ public sealed partial class BorgSystem if (_powerCell.TryGetBatteryFromSlot(uid, out var battery)) charge = battery.CurrentCharge / battery.MaxCharge; + var hasBrain = chassis.BrainEntity != null && !comp.FakeDisabled; + var canDisable = comp.NextDisable == null && !comp.FakeDisabling; var data = new CyborgControlData( comp.Sprite, comp.Name, meta.EntityName, charge, chassis.ModuleCount, - chassis.BrainEntity != null); + hasBrain, + canDisable); var payload = new NetworkPayload() { @@ -52,6 +59,24 @@ public sealed partial class BorgSystem } } + private void DoDisable(Entity ent) + { + ent.Comp1.NextDisable = null; + if (ent.Comp1.FakeDisabling) + { + ent.Comp1.FakeDisabled = true; + ent.Comp1.FakeDisabling = false; + return; + } + + if (ent.Comp2.BrainEntity is not {} brain) + return; + + var message = Loc.GetString(ent.Comp1.DisabledPopup, ("name", Name(ent, ent.Comp3))); + Popup.PopupEntity(message, ent); + _container.Remove(brain, ent.Comp2.BrainContainer); + } + private void OnPacketReceived(Entity ent, ref DeviceNetworkPacketEvent args) { var payload = args.Data; @@ -61,28 +86,28 @@ public sealed partial class BorgSystem if (command == RoboticsConsoleConstants.NET_DISABLE_COMMAND) Disable(ent); else if (command == RoboticsConsoleConstants.NET_DESTROY_COMMAND) - Destroy(ent.Owner); + Destroy(ent); } private void Disable(Entity ent) { - if (!Resolve(ent, ref ent.Comp2) || ent.Comp2.BrainEntity is not {} brain) + if (!Resolve(ent, ref ent.Comp2) || ent.Comp2.BrainEntity == null || ent.Comp1.NextDisable != null) return; - // this won't exactly be stealthy but if you are malf its better than actually disabling you + // update ui immediately + ent.Comp1.NextBroadcast = _timing.CurTime; + + // pretend the borg is being disabled forever now if (CheckEmagged(ent, "disabled")) - return; + ent.Comp1.FakeDisabling = true; + else + Popup.PopupEntity(Loc.GetString(ent.Comp1.DisablingPopup), ent); - var message = Loc.GetString(ent.Comp1.DisabledPopup, ("name", Name(ent))); - Popup.PopupEntity(message, ent); - _container.Remove(brain, ent.Comp2.BrainContainer); + ent.Comp1.NextDisable = _timing.CurTime + ent.Comp1.DisableDelay; } - private void Destroy(Entity ent) + private void Destroy(Entity ent) { - if (!Resolve(ent, ref ent.Comp)) - return; - // this is stealthy until someone realises you havent exploded if (CheckEmagged(ent, "destroyed")) { @@ -91,7 +116,12 @@ public sealed partial class BorgSystem return; } - _explosion.TriggerExplosive(ent, ent.Comp, delete: false); + var message = Loc.GetString(ent.Comp.DestroyingPopup, ("name", Name(ent))); + Popup.PopupEntity(message, ent); + _trigger.StartTimer(ent.Owner, user: null); + + // prevent a shitter borg running into people + RemComp(ent); } private bool CheckEmagged(EntityUid uid, string name) diff --git a/Content.Server/Silicons/Borgs/BorgSystem.cs b/Content.Server/Silicons/Borgs/BorgSystem.cs index 1ab7f5387f..c97ca9cbc0 100644 --- a/Content.Server/Silicons/Borgs/BorgSystem.cs +++ b/Content.Server/Silicons/Borgs/BorgSystem.cs @@ -43,8 +43,8 @@ public sealed partial class BorgSystem : SharedBorgSystem [Dependency] private readonly ActionsSystem _actions = default!; [Dependency] private readonly AlertsSystem _alerts = default!; [Dependency] private readonly DeviceNetworkSystem _deviceNetwork = default!; - [Dependency] private readonly ExplosionSystem _explosion = default!; [Dependency] private readonly SharedAppearanceSystem _appearance = default!; + [Dependency] private readonly TriggerSystem _trigger = default!; [Dependency] private readonly HandsSystem _hands = default!; [Dependency] private readonly MetaDataSystem _metaData = default!; [Dependency] private readonly SharedMindSystem _mind = default!; diff --git a/Content.Shared/Robotics/Components/RoboticsConsoleComponent.cs b/Content.Shared/Robotics/Components/RoboticsConsoleComponent.cs index 4329e437a2..9e4b51866f 100644 --- a/Content.Shared/Robotics/Components/RoboticsConsoleComponent.cs +++ b/Content.Shared/Robotics/Components/RoboticsConsoleComponent.cs @@ -36,7 +36,7 @@ public sealed partial class RoboticsConsoleComponent : Component /// Radio message sent when destroying a borg. /// [DataField] - public LocId DestroyMessage = "robotics-console-cyborg-destroyed"; + public LocId DestroyMessage = "robotics-console-cyborg-destroying"; /// /// Cooldown on destroying borgs to prevent complete abuse. diff --git a/Content.Shared/Robotics/RoboticsConsoleUi.cs b/Content.Shared/Robotics/RoboticsConsoleUi.cs index 1be89beff0..996c65cb0e 100644 --- a/Content.Shared/Robotics/RoboticsConsoleUi.cs +++ b/Content.Shared/Robotics/RoboticsConsoleUi.cs @@ -97,6 +97,13 @@ public record struct CyborgControlData [DataField] public bool HasBrain; + /// + /// Whether the borg can currently be disabled if the brain is installed, + /// if on cooldown then can't queue up multiple disables. + /// + [DataField] + public bool CanDisable; + /// /// When this cyborg's data will be deleted. /// Set by the console when receiving the packet. @@ -104,7 +111,7 @@ public record struct CyborgControlData [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))] public TimeSpan Timeout = TimeSpan.Zero; - public CyborgControlData(SpriteSpecifier? chassisSprite, string chassisName, string name, float charge, int moduleCount, bool hasBrain) + public CyborgControlData(SpriteSpecifier? chassisSprite, string chassisName, string name, float charge, int moduleCount, bool hasBrain, bool canDisable) { ChassisSprite = chassisSprite; ChassisName = chassisName; @@ -112,6 +119,7 @@ public record struct CyborgControlData Charge = charge; ModuleCount = moduleCount; HasBrain = hasBrain; + CanDisable = canDisable; } } diff --git a/Content.Shared/Silicons/Borgs/Components/BorgTransponderComponent.cs b/Content.Shared/Silicons/Borgs/Components/BorgTransponderComponent.cs index 8c15e20d5d..577056bb46 100644 --- a/Content.Shared/Silicons/Borgs/Components/BorgTransponderComponent.cs +++ b/Content.Shared/Silicons/Borgs/Components/BorgTransponderComponent.cs @@ -23,12 +23,25 @@ public sealed partial class BorgTransponderComponent : Component public string Name = string.Empty; /// - /// Popup shown to everyone when a borg is disabled. + /// Popup shown to everyone after a borg is disabled. /// Gets passed a string "name". /// [DataField] public LocId DisabledPopup = "borg-transponder-disabled-popup"; + /// + /// Popup shown to the borg when it is being disabled. + /// + [DataField] + public LocId DisablingPopup = "borg-transponder-disabling-popup"; + + /// + /// Popup shown to everyone when a borg is being destroyed. + /// Gets passed a string "name". + /// + [DataField] + public LocId DestroyingPopup = "borg-transponder-destroying-popup"; + /// /// How long to wait between each broadcast. /// @@ -40,4 +53,28 @@ public sealed partial class BorgTransponderComponent : Component /// [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))] public TimeSpan NextBroadcast = TimeSpan.Zero; + + /// + /// When to next disable the borg. + /// + [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))] + public TimeSpan? NextDisable; + + /// + /// How long to wait to disable the borg after RD has ordered it. + /// + [DataField] + public TimeSpan DisableDelay = TimeSpan.FromSeconds(5); + + /// + /// Pretend that the borg cannot be disabled due to being on delay. + /// + [DataField] + public bool FakeDisabling; + + /// + /// Pretend that the borg has no brain inserted. + /// + [DataField] + public bool FakeDisabled; } diff --git a/Resources/Locale/en-US/borg/borg.ftl b/Resources/Locale/en-US/borg/borg.ftl index 72667f318e..6c495510b0 100644 --- a/Resources/Locale/en-US/borg/borg.ftl +++ b/Resources/Locale/en-US/borg/borg.ftl @@ -21,5 +21,7 @@ borg-ui-module-counter = {$actual}/{$max} # Transponder borg-transponder-disabled-popup = A brain shoots out the top of {$name}! +borg-transponder-disabling-popup = Your transponder begins to lock you out of the chassis! +borg-transponder-destroying-popup = The self destruct of {$name} starts beeping! borg-transponder-emagged-disabled-popup = Your transponder's lights go out! borg-transponder-emagged-destroyed-popup = Your transponder's fuse blows! diff --git a/Resources/Locale/en-US/research/components/robotics-console.ftl b/Resources/Locale/en-US/research/components/robotics-console.ftl index 978fa9a43c..a4c82bd032 100644 --- a/Resources/Locale/en-US/research/components/robotics-console.ftl +++ b/Resources/Locale/en-US/research/components/robotics-console.ftl @@ -16,4 +16,4 @@ robotics-console-locked-message = Controls locked, swipe ID. robotics-console-disable = Disable robotics-console-destroy = Destroy -robotics-console-cyborg-destroyed = The cyborg {$name} has been remotely destroyed. +robotics-console-cyborg-destroying = {$name} is being remotely detonated! diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml index baea453cb8..6ff9a9ec90 100644 --- a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml +++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml @@ -227,9 +227,20 @@ deviceNetId: Wireless receiveFrequencyId: CyborgControl transmitFrequencyId: RoboticsConsole + - type: OnUseTimerTrigger + delay: 10 + examinable: false + beepSound: + path: /Audio/Effects/Cargo/buzz_two.ogg + params: + volume: -4 + # prevent any funnies if someone makes a cyborg item... + - type: AutomatedTimer + - type: ExplodeOnTrigger # explosion does most of its damage in the center and less at the edges - type: Explosive explosionType: Minibomb + deleteAfterExplosion: false # let damage threshold gib the borg totalIntensity: 30 intensitySlope: 20 maxIntensity: 20 From ffcaf61ffae4332c8ace9fbea090fa71f0c282ed Mon Sep 17 00:00:00 2001 From: PJBot Date: Mon, 17 Jun 2024 03:31:16 +0000 Subject: [PATCH 134/142] Automatic changelog update --- Resources/Changelog/Changelog.yml | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 60f9065237..96921c96c5 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,14 +1,4 @@ Entries: -- author: Flareguy - changes: - - message: Security glasses have been moved from research to roundstart gear. All - officers now start with them instead of sunglasses by default. - type: Tweak - - message: You can now craft security glasses. - type: Add - id: 6264 - time: '2024-03-31T03:00:45.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/26487 - author: brainfood1183 changes: - message: Toilets can now be connected to the disposal system. @@ -3859,3 +3849,12 @@ id: 6763 time: '2024-06-17T03:21:29.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/26277 +- author: deltanedas + changes: + - message: Borgs now have a 10 second beeping timer that paralyzes them when being + exploded with the robotics console and a 5 second delay when being disabled + with it. + type: Tweak + id: 6764 + time: '2024-06-17T03:30:10.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/27876 From 4aa74c5e1dfa7adeda93e86053d93ef1b0fc2e45 Mon Sep 17 00:00:00 2001 From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> Date: Mon, 17 Jun 2024 01:20:47 -0400 Subject: [PATCH 135/142] improve meteor spawning (#29057) --- Content.Server/StationEvents/Events/MeteorSwarmSystem.cs | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Content.Server/StationEvents/Events/MeteorSwarmSystem.cs b/Content.Server/StationEvents/Events/MeteorSwarmSystem.cs index 6a67930c4d..3f51834e3a 100644 --- a/Content.Server/StationEvents/Events/MeteorSwarmSystem.cs +++ b/Content.Server/StationEvents/Events/MeteorSwarmSystem.cs @@ -66,7 +66,14 @@ public sealed class MeteorSwarmSystem : GameRuleSystem : new Random(uid.Id).NextAngle(); var offset = angle.RotateVec(new Vector2((maximumDistance - minimumDistance) * RobustRandom.NextFloat() + minimumDistance, 0)); - var subOffset = RobustRandom.NextAngle().RotateVec(new Vector2( (playableArea.TopRight - playableArea.Center).Length() / 2 * RobustRandom.NextFloat(), 0)); + + // the line at which spawns occur is perpendicular to the offset. + // This means the meteors are less likely to bunch up and hit the same thing. + var subOffsetAngle = RobustRandom.Prob(0.5f) + ? angle + Math.PI / 2 + : angle - Math.PI / 2; + var subOffset = subOffsetAngle.RotateVec(new Vector2( (playableArea.TopRight - playableArea.Center).Length() / 3 * RobustRandom.NextFloat(), 0)); + var spawnPosition = new MapCoordinates(center + offset + subOffset, mapId); var meteor = Spawn(spawnProto, spawnPosition); var physics = Comp(meteor); From b02e838926ff63199efa35ccc356c445a52700a3 Mon Sep 17 00:00:00 2001 From: PJBot Date: Mon, 17 Jun 2024 05:21:53 +0000 Subject: [PATCH 136/142] Automatic changelog update --- Resources/Changelog/Changelog.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 96921c96c5..ccf5a20aa0 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: brainfood1183 - changes: - - message: Toilets can now be connected to the disposal system. - type: Add - id: 6265 - time: '2024-03-31T03:21:18.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/22133 - author: DrMelon changes: - message: Syndicate Uplinks now have a searchbar to help those dirty, rotten antagonists @@ -3858,3 +3851,11 @@ id: 6764 time: '2024-06-17T03:30:10.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/27876 +- author: EmoGarbage404 + changes: + - message: Changed meteor swarm spawning to be less clumped up and favor hitting + multiple areas more. + type: Tweak + id: 6765 + time: '2024-06-17T05:20:47.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/29057 From 5038012b67c9689018e5bf362036ed8e0e4d5bbb Mon Sep 17 00:00:00 2001 From: Ubaser <134914314+UbaserB@users.noreply.github.com> Date: Mon, 17 Jun 2024 20:53:47 +1000 Subject: [PATCH 137/142] Add new lizard horns, Demonic (#29022) add --- Resources/Locale/en-US/markings/reptilian.ftl | 3 +++ .../Mobs/Customization/Markings/reptilian.yml | 9 +++++++++ .../reptilian_parts.rsi/horns_demonic.png | Bin 0 -> 1375 bytes .../Customization/reptilian_parts.rsi/meta.json | 6 +++++- 4 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/Mobs/Customization/reptilian_parts.rsi/horns_demonic.png diff --git a/Resources/Locale/en-US/markings/reptilian.ftl b/Resources/Locale/en-US/markings/reptilian.ftl index 470af07361..d66d3cb9e6 100644 --- a/Resources/Locale/en-US/markings/reptilian.ftl +++ b/Resources/Locale/en-US/markings/reptilian.ftl @@ -93,6 +93,9 @@ marking-LizardHornsMyrsore = Lizard Horns (Myrsore) marking-LizardHornsBighorn-horns_bighorn = Lizard Horns (Bighorn) marking-LizardHornsBighorn = Lizard Horns (Bighorn) +marking-LizardHornsDemonic-horns_demonic = Lizard Horns (Demonic) +marking-LizardHornsDemonic = Lizard Horns (Demonic) + marking-LizardHornsKoboldEars-horns_kobold_ears = Lizard Ears (Kobold) marking-LizardHornsKoboldEars = Lizard Ears (Kobold) diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml index 5a52e09bf2..19768f8dc2 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml @@ -294,6 +294,15 @@ - sprite: Mobs/Customization/reptilian_parts.rsi state: horns_bighorn +- type: marking + id: LizardHornsDemonic + bodyPart: HeadTop + markingCategory: HeadTop + speciesRestriction: [Reptilian] + sprites: + - sprite: Mobs/Customization/reptilian_parts.rsi + state: horns_demonic + - type: marking id: LizardHornsKoboldEars bodyPart: HeadTop diff --git a/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/horns_demonic.png b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/horns_demonic.png new file mode 100644 index 0000000000000000000000000000000000000000..63181ea08fa414e51f0c93d5fa9287eef0e8d6fa GIT binary patch literal 1375 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|_);T0(|mmy zw18|5AO?X;!IOa`XMsm#F$06fED&ZCw^H21z`)#=84^(v;p=0SoS&h?X&sHg;q@=(~U%$M(T(8_%FTW^V-_X+1Qs2Nx-^fT8s6w~6 zGOr}DLN~8i8Da>`9GBGM~RsBTId_|A5Z7NlCUU$t=l91qU45Kj08_%qc+?1*r!G zK~5$pWUX=%^U`gVDs)p)(-KQ_N|fyK^K?@SOEU`!Qd4xD9G$%bfY?SKq65_=h$yNB zHu_lHVgm{RtH_|#;{2RaP#oA9nVHyt!v#eY5gQO45mjZ9hZ$hJdfFNIi5O}0nE%1o-U3d6^w6ZISMr^@VG7&4_v?S-hZiG z0s0S{#N4f7Z*T~DTi33WaQb22zoThU$B$j>HedR*c*hiJA?sWJHTEqpygmER@|_6` zxwmf>%D9^8-81REq56o;$zb)q?6s>_HF2$eeJd*}aK+voLH0YC+Y%#ecTK)w{QCLy z)SKM%=bc`)f9{IX<=UZ}j_SW`XwNhIo0MI@@rSs*ovX-up}Z#qWEWGb0XiUz>flJ1bkXp>kgM#>KC* zrY=6A^8R3TmyiASI}($>D7G9sYhH2ThZ;Mk%}DNPJTJV1`S;Sw(&|=$y`aL))78&q Iol`;+03r0p$N&HU literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/meta.json b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/meta.json index 3770a771d8..bb12e3bf03 100644 --- a/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/meta.json +++ b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/Skyrat-SS13/Skyrat-tg/tree/40e3cdbb15b8bc0d5ef2fb46133adf805bda5297, while Argali, Ayrshire, Myrsore and Bighorn are drawn by Ubaser, and Kobold Ears are drawn by Pigeonpeas. Body_underbelly made by Nairod(github) for SS14. Large drawn by Ubaser. Wagging tail by SonicDC. Splotch modified from Sharp by KittenColony(github). Frills neckfull come from: https://github.com/Bubberstation/Bubberstation/commit/8bc6b83404803466a560b694bf22ef3c0ac266a2", + "copyright": "https://github.com/Skyrat-SS13/Skyrat-tg/tree/40e3cdbb15b8bc0d5ef2fb46133adf805bda5297, while Argali, Ayrshire, Myrsore, Bighorn and Demonic are drawn by Ubaser, and Kobold Ears are drawn by Pigeonpeas. Body_underbelly made by Nairod(github) for SS14. Large drawn by Ubaser. Wagging tail by SonicDC. Splotch modified from Sharp by KittenColony(github). Frills neckfull come from: https://github.com/Bubberstation/Bubberstation/commit/8bc6b83404803466a560b694bf22ef3c0ac266a2", "size": { "x": 32, "y": 32 @@ -581,6 +581,10 @@ "name": "horns_bighorn", "directions": 4 }, + { + "name": "horns_demonic", + "directions": 4 + }, { "name": "horns_kobold_ears", "directions": 4 From efbcce21bd1f7f891b962ad1530398cfab09bfbd Mon Sep 17 00:00:00 2001 From: PJBot Date: Mon, 17 Jun 2024 10:54:53 +0000 Subject: [PATCH 138/142] 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 ccf5a20aa0..65c7dd73de 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,12 +1,4 @@ Entries: -- author: DrMelon - changes: - - message: Syndicate Uplinks now have a searchbar to help those dirty, rotten antagonists - find appropriate equipment more easily! - type: Tweak - id: 6266 - time: '2024-03-31T04:09:15.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/24287 - author: chromiumboy changes: - message: Additional construction options have been added to the Rapid Construction @@ -3859,3 +3851,10 @@ id: 6765 time: '2024-06-17T05:20:47.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/29057 +- author: Ubaser + changes: + - message: Added new reptilian horns, "Demonic". + type: Add + id: 6766 + time: '2024-06-17T10:53:47.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/29022 From f1c4e9e38251572579bb736afb1270c9da52b5a1 Mon Sep 17 00:00:00 2001 From: Ed <96445749+TheShuEd@users.noreply.github.com> Date: Mon, 17 Jun 2024 14:48:40 +0300 Subject: [PATCH 139/142] Update transformable-container-component.ftl --- .../chemistry/components/transformable-container-component.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Locale/ru-RU/chemistry/components/transformable-container-component.ftl b/Resources/Locale/ru-RU/chemistry/components/transformable-container-component.ftl index de88f9fb97..8c72b95ad0 100644 --- a/Resources/Locale/ru-RU/chemistry/components/transformable-container-component.ftl +++ b/Resources/Locale/ru-RU/chemistry/components/transformable-container-component.ftl @@ -1 +1 @@ -transformable-container-component-glass = стакан { $name } +transformable-container-component-glass = стакан { $reagent } From ac3a7a5c1b5411841169c37b8aef6c38b88f4bb2 Mon Sep 17 00:00:00 2001 From: Ed <96445749+TheShuEd@users.noreply.github.com> Date: Mon, 17 Jun 2024 15:06:46 +0300 Subject: [PATCH 140/142] Update cluwne.ftl --- Resources/Locale/ru-RU/cluwne/cluwne.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Locale/ru-RU/cluwne/cluwne.ftl b/Resources/Locale/ru-RU/cluwne/cluwne.ftl index 726ab44e3e..f99fcc1ba4 100644 --- a/Resources/Locale/ru-RU/cluwne/cluwne.ftl +++ b/Resources/Locale/ru-RU/cluwne/cluwne.ftl @@ -1,2 +1,2 @@ cluwne-transform = { CAPITALIZE($target) } превратился в клувеня! -cluwne-name-prefix = клувень { $target } +cluwne-name-prefix = клувень { $baseName } From 917f2de69e3c433c82cfc963071ba4e0373d7cf8 Mon Sep 17 00:00:00 2001 From: Ed <96445749+TheShuEd@users.noreply.github.com> Date: Mon, 17 Jun 2024 16:16:09 +0300 Subject: [PATCH 141/142] Update glue.ftl --- Resources/Locale/ru-RU/glue/glue.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Locale/ru-RU/glue/glue.ftl b/Resources/Locale/ru-RU/glue/glue.ftl index 4c7ea77c11..bac1447a43 100644 --- a/Resources/Locale/ru-RU/glue/glue.ftl +++ b/Resources/Locale/ru-RU/glue/glue.ftl @@ -1,5 +1,5 @@ glue-success = Вы покрыли { $target } клеем! -glued-name-prefix = липкий { $target } +glued-name-prefix = липкий { $baseName } glue-failure = Не удалось покрыть { $target } клеем. glue-verb-text = Нанести клей glue-verb-message = Покрыть предмет клеем From 4ecdb6f296da40910c1a5c2d0d877e3ea29a694c Mon Sep 17 00:00:00 2001 From: Ed <96445749+TheShuEd@users.noreply.github.com> Date: Mon, 17 Jun 2024 16:32:55 +0300 Subject: [PATCH 142/142] Update lube.ftl --- Resources/Locale/ru-RU/lube/lube.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Locale/ru-RU/lube/lube.ftl b/Resources/Locale/ru-RU/lube/lube.ftl index 551772cb72..cdd46c4f57 100644 --- a/Resources/Locale/ru-RU/lube/lube.ftl +++ b/Resources/Locale/ru-RU/lube/lube.ftl @@ -1,5 +1,5 @@ lube-success = Вы покрыли { $target } смазкой! -lubed-name-prefix = смазанный { $target } +lubed-name-prefix = смазанный { $baseName } lube-failure = Не удалось покрыть { $target } смазкой! lube-slip = { $target } выскальзывает из ваших рук! lube-verb-text = Нанести смазку