From 7f5476b5551a44a2138038bd785f43d307bf8fbc Mon Sep 17 00:00:00 2001 From: Doomsdrayk Date: Thu, 13 Jun 2024 12:10:56 -0600 Subject: [PATCH 01/43] 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 dd1e3e21f42..b86356306cb 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 02/43] 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 74de6c10c98..67ae17e0dac 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 03/43] 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 08dd139ef4c..6cc430b74f6 100644 --- a/Content.Server/Construction/ConstructionSystem.Initial.cs +++ b/Content.Server/Construction/ConstructionSystem.Initial.cs @@ -271,7 +271,7 @@ void ShutdownContainers() } 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 04/43] 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 67ae17e0dac..04f991f5dae 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 05/43] 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 c519362945e..a288d7b07d4 100644 --- a/Content.Server/Cargo/Systems/CargoSystem.Orders.cs +++ b/Content.Server/Cargo/Systems/CargoSystem.Orders.cs @@ -506,6 +506,7 @@ private bool FulfillOrder(CargoOrderData order, EntityCoordinates spawn, string? "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 532481f4a23..3c032488b52 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 06/43] 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 04f991f5dae..1124ee7acf1 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 07/43] 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 d54e103a70f..378f8cb7588 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 08/43] 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 5700fc82969..3dfb5c154a1 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 09/43] 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 32cf1cac6f8..2ba4603a9bd 100644 --- a/Content.Server/Atmos/Piping/Unary/Components/GasVentPumpComponent.cs +++ b/Content.Server/Atmos/Piping/Unary/Components/GasVentPumpComponent.cs @@ -135,6 +135,10 @@ public float InternalPressureBound [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 @@ public GasVentPumpData ToAirAlarmData() PumpDirection = PumpDirection, PressureChecks = PressureChecks, ExternalPressureBound = ExternalPressureBound, - InternalPressureBound = InternalPressureBound + InternalPressureBound = InternalPressureBound, + PressureLockoutOverride = PressureLockoutOverride }; } @@ -158,6 +163,7 @@ public void FromAirAlarmData(GasVentPumpData data) 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 7c12cf3f77f..8951f8a9474 100644 --- a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentPumpSystem.cs +++ b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentPumpSystem.cs @@ -108,7 +108,8 @@ private void OnGasVentPumpUpdated(EntityUid uid, GasVentPumpComponent vent, ref // (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 @@ private void OnExamine(EntityUid uid, GasVentPumpComponent component, ExaminedEv 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 404c1978682..15fece204d0 100644 --- a/Content.Shared/Atmos/Piping/Unary/Components/SharedVentPumpComponent.cs +++ b/Content.Shared/Atmos/Piping/Unary/Components/SharedVentPumpComponent.cs @@ -13,6 +13,7 @@ public sealed class GasVentPumpData : IAtmosDeviceData 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 @@ public sealed class GasVentPumpData : IAtmosDeviceData 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 @@ public sealed class GasVentPumpData : IAtmosDeviceData 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 @@ public sealed class GasVentPumpData : IAtmosDeviceData 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 @@ public sealed class GasVentPumpData : IAtmosDeviceData 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 e2c83956cc6..916a89444fd 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 10/43] 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 ab3cf20ac3d..0ef76381f00 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 11/43] 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 fc9ab289429..b388f3a6d49 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.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(args.Target, out var artifact) || artifact.CurrentNodeId == null) + if (!TryComp(target, out var artifact) || artifact.CurrentNodeId == null) return; - if (args.Handled) - return; + CreatePopup(uid, target, artifact); args.Handled = true; + } + + private void AddScanVerb(EntityUid uid, NodeScannerComponent component, GetVerbsEvent args) + { + if (!args.CanAccess) + return; - var target = args.Target.Value; + if (!TryComp(args.Target, out var artifact) || artifact.CurrentNodeId == null) + return; + + var verb = new UtilityVerb() + { + Act = () => + { + CreatePopup(uid, args.Target, artifact); + }, + Text = Loc.GetString("node-scan-tooltip") + }; + 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 14b07941a64..4a05414c460 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 12/43] 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 1124ee7acf1..25b97beffe3 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 13/43] 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 cb893299a93..7f7c7ba8557 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.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 override void Shoot(EntityUid gunUid, GunComponent gun, List<(EntityUid? 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 14/43] 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 25b97beffe3..96a868d131f 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 15/43] 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 3e44d1a2811..a5dfab07a50 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 16/43] 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 d3b0971be08..04918578fa3 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 17/43] 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 addf855bf36..00000000000 --- 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 49021c142f4..ee43cff26de 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 5e4f0eddb52..00000000000 --- 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 186fc91c46e..bc61c5d141a 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 c6248c88f77..00000000000 --- 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 cd468440f40..cbea0a0516f 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 00000000000..aac3e7bb18c --- /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 09f80327ba7..2fe92951f07 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 18/43] 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 825d3cc4a70..56011160090 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 19/43] 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 96a868d131f..92cab63ea21 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 20/43] 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 971d05823a5..f216e05cf9a 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 a490c734d3d..bc3cffb3596 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 21/43] 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 92cab63ea21..112dbfb313e 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 22/43] 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 00000000000..8b5dac4d927 --- /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 a4cc6eb43d6..dd6990ac8c6 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 23/43] 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 5f970da1840..f7038861279 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 24/43] 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 112dbfb313e..083f8575378 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 25/43] 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 d2ca08e1166..0f930ddfd6a 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 5b16b91f8b4..1876de6a53b 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 b9c2b752dba..5fb81aa6d48 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 8f46a0ca53b..bb5b49e1850 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 26/43] 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 083f8575378..d2c819747f1 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 27/43] 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 28/43] 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 | 73 ++++++++++++------- .../Station/Systems/StationSpawningSystem.cs | 12 ++- Content.Shared/CCVar/CCVars.cs | 12 +++ 3 files changed, 70 insertions(+), 27 deletions(-) diff --git a/Content.Server/Shuttles/Systems/ArrivalsSystem.cs b/Content.Server/Shuttles/Systems/ArrivalsSystem.cs index eb1f9796b27..47ccc3c3c41 100644 --- a/Content.Server/Shuttles/Systems/ArrivalsSystem.cs +++ b/Content.Server/Shuttles/Systems/ArrivalsSystem.cs @@ -15,6 +15,7 @@ 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 override void Initialize() // 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 @@ private void OnArrivalsFTL(EntityUid shuttleUid, ArrivalsShuttleComponent compon // 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 void HandlePlayerSpawning(PlayerSpawningEvent ev) 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 void HandlePlayerSpawning(PlayerSpawningEvent ev) TryGetArrivals(out var arrivals); - if (TryComp(arrivals, out TransformComponent? arrivalsXform)) - { - var mapId = arrivalsXform.MapID; + if (!TryComp(arrivals, out TransformComponent? arrivalsXform)) + return; - 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; + var mapId = arrivalsXform.MapID; - possiblePositions.Add(xform.Coordinates); - } + 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; - 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 b91082ff261..d30c9fc111d 100644 --- a/Content.Server/Station/Systems/StationSpawningSystem.cs +++ b/Content.Server/Station/Systems/StationSpawningSystem.cs @@ -65,7 +65,15 @@ public override void Initialize() _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 PlayerSpawningEvent(JobComponent? job, HumanoidCharacterProfile? humanoid 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 f3025f326aa..e3f0f654387 100644 --- a/Content.Shared/CCVar/CCVars.cs +++ b/Content.Shared/CCVar/CCVars.cs @@ -1425,6 +1425,18 @@ public static readonly CVarDef 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 29/43] 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 85616627cec..4a59c01d096 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 8fcbe50997a..87c0bd4d347 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 7fa6edb9ece..3eb8229d247 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 f09e2c07d22ab9a91b942a2c3ec4a84031b0fd27 Mon Sep 17 00:00:00 2001 From: VigersRay Date: Fri, 14 Jun 2024 17:39:47 +0300 Subject: [PATCH 30/43] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=B2=20=D0=B8=D0=BD=D0=B2=D0=B5=D1=80=D1=82=D0=B0?= =?UTF-8?q?=D1=80=D1=8C=20=D0=9A=D0=9F=D0=91=20=D1=82=D1=80=D0=B5=D0=B1?= =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=BA=20=D0=BD=D0=BE?= =?UTF-8?q?=D1=81=D0=B8=D0=BC=D0=BE=D0=B9=20=D0=BE=D0=B4=D0=B5=D0=B6=D0=B4?= =?UTF-8?q?=D0=B5=20=D0=B4=D0=BB=D1=8F=20=D0=BE=D1=82=D0=BA=D1=80=D1=8B?= =?UTF-8?q?=D1=82=D0=B8=D1=8F=20suitstorage?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../_Sunrise/InventoryTemplates/synth_inventory_template.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Resources/Prototypes/_Sunrise/InventoryTemplates/synth_inventory_template.yml b/Resources/Prototypes/_Sunrise/InventoryTemplates/synth_inventory_template.yml index fb9761ea910..1bc1529643e 100644 --- a/Resources/Prototypes/_Sunrise/InventoryTemplates/synth_inventory_template.yml +++ b/Resources/Prototypes/_Sunrise/InventoryTemplates/synth_inventory_template.yml @@ -88,6 +88,8 @@ uiWindowPos: 2,0 strippingWindowPos: 2,5 dependsOn: outerClothing + dependsOnComponents: + - type: AllowSuitStorage displayName: Suit Storage - name: id slotTexture: id From 1b773b67b133855b3a409c9bb3e1a83177fbf00f Mon Sep 17 00:00:00 2001 From: Rinary <72972221+Rinary1@users.noreply.github.com> Date: Fri, 14 Jun 2024 18:03:39 +0300 Subject: [PATCH 31/43] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=B2=D0=BE?= =?UTF-8?q?=D0=B4=20=D0=92=D0=BE=D0=BA=D1=81=D0=BE=D0=B2=20=D0=B8=20=D0=A2?= =?UTF-8?q?=D1=80=D0=BE=D1=82=D1=82=D0=B8=D0=BD=D0=BE=D0=B2=20(#119)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Locale/ru-RU/_sunrise/markings/swine.ftl | 1 + .../markings/{vox_tattoos.ftl => vox.ftl} | 22 +++++++++++++++---- 2 files changed, 19 insertions(+), 4 deletions(-) create mode 100644 Resources/Locale/ru-RU/_sunrise/markings/swine.ftl rename Resources/Locale/ru-RU/markings/{vox_tattoos.ftl => vox.ftl} (55%) diff --git a/Resources/Locale/ru-RU/_sunrise/markings/swine.ftl b/Resources/Locale/ru-RU/_sunrise/markings/swine.ftl new file mode 100644 index 00000000000..719c42cd95c --- /dev/null +++ b/Resources/Locale/ru-RU/_sunrise/markings/swine.ftl @@ -0,0 +1 @@ +marking-SwineEars = Уши Троттина \ No newline at end of file diff --git a/Resources/Locale/ru-RU/markings/vox_tattoos.ftl b/Resources/Locale/ru-RU/markings/vox.ftl similarity index 55% rename from Resources/Locale/ru-RU/markings/vox_tattoos.ftl rename to Resources/Locale/ru-RU/markings/vox.ftl index c76962312e7..095d7baf1ca 100644 --- a/Resources/Locale/ru-RU/markings/vox_tattoos.ftl +++ b/Resources/Locale/ru-RU/markings/vox.ftl @@ -1,8 +1,22 @@ -marking-TattooVoxHeartLeftArm-heart_l_arm = Вокс, Левая рука, Татуировка (Сердце) -marking-TattooVoxHeartLeftArm = Вокс, Левая рука, Татуировка (Сердце) -marking-TattooVoxHeartRightArm-heart_r_arm = Вокс, Правая рука, Татуировка (Сердце) -marking-TattooVoxHeartRightArm = Вокс, Правая рука, Татуировка (Сердце) +marking-VoxBeak = Вокс, Клюв + marking-TattooVoxHiveChest-hive_s = Вокс, Грудь, Татуировка (Улей) marking-TattooVoxHiveChest = Вокс, Грудь, Татуировка (Улей) marking-TattooVoxNightlingChest-nightling_s = Вокс, Грудь, Татуировка (Найтлинг) marking-TattooVoxNightlingChest = Вокс, Грудь, Татуировка (Найтлинг) + +marking-TattooVoxHeartLeftArm-heart_l_arm = Вокс, Левая рука, Татуировка (Сердце) +marking-TattooVoxHeartLeftArm = Вокс, Левая рука, Татуировка (Сердце) +marking-TattooVoxHeartRightArm-heart_r_arm = Вокс, Правая рука, Татуировка (Сердце) +marking-TattooVoxHeartRightArm = Вокс, Правая рука, Татуировка (Сердце) +marking-VoxLArmScales = Вокс, Левая рука, Чешуя +marking-VoxLHandScales = Вокс, Левая ладонь, Чешуя +marking-VoxRArmScales = Вокс, Правая рука, Чешуя +marking-VoxRHandScales = Вокс, Правая ладонь, Чешуя + +marking-VoxLFootScales = Вокс, Левая ступня, Чешуя +marking-VoxLLegScales = Вокс, Левая нога, Чешуя +marking-VoxRFootScales = Вокс, Правая ступня, Чешуя +marking-VoxRLegScales = Вокс, Правая нога, Чешуя + +marking-VoxTail = Вокс, Хвост \ No newline at end of file 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 32/43] 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 e15dcfaa2bc..0cc4ea86c22 100644 --- a/Content.Server/PDA/Ringer/RingerSystem.cs +++ b/Content.Server/PDA/Ringer/RingerSystem.cs @@ -43,13 +43,19 @@ public override void Initialize() 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 0fd92cfb965..c13a9583beb 100644 --- a/Content.Server/Store/Systems/StoreSystem.cs +++ b/Content.Server/Store/Systems/StoreSystem.cs @@ -5,11 +5,11 @@ 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 33/43] 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 d2c819747f1..ede76750a44 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 31dd47ae40779451abd7158f1911a4d773871d42 Mon Sep 17 00:00:00 2001 From: VigersRay Date: Fri, 14 Jun 2024 18:38:37 +0300 Subject: [PATCH 34/43] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=20=D0=B0=D0=B2?= =?UTF-8?q?=D1=82=D0=BE=D1=87=D0=B5=D0=B9=D0=BD=D0=B6=D0=BB=D0=BE=D0=B3?= =?UTF-8?q?=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/automatic_changelog.yml | 17 +++++++++++++++++ .github/workflows/update_changelog.yml | 18 ++++++++++-------- 2 files changed, 27 insertions(+), 8 deletions(-) create mode 100644 .github/workflows/automatic_changelog.yml diff --git a/.github/workflows/automatic_changelog.yml b/.github/workflows/automatic_changelog.yml new file mode 100644 index 00000000000..2d1d070a52e --- /dev/null +++ b/.github/workflows/automatic_changelog.yml @@ -0,0 +1,17 @@ +name: Update sunrise changelog + +on: + push: + branches: [master] + pull_request: + types: [closed] + branches: [master] + +jobs: + update_changelog: + if: github.event.pull_request.merged == true && github.event.commits[0].author.name != 'GitHubActions' + uses: space-sunrise/space-station-14/.github/workflows/update_changelog.yml@master + with: + pr_body: ${{ github.event.pull_request.body }} + secrets: + envPAT: ${{ secrets.GH_TOKEN }} diff --git a/.github/workflows/update_changelog.yml b/.github/workflows/update_changelog.yml index c46ef924b3a..312566b6dba 100644 --- a/.github/workflows/update_changelog.yml +++ b/.github/workflows/update_changelog.yml @@ -1,15 +1,17 @@ name: Update sunrise changelog on: - push: - branches: [master] - pull_request: - types: [closed] - branches: [master] + workflow_call: + inputs: + pr_body: + required: true + type: string + secrets: + envPAT: + required: true jobs: update_changelog: - if: github.event.pull_request.merged == true && github.event.commits[0].author.name != 'GitHubActions' runs-on: ubuntu-latest steps: @@ -17,7 +19,7 @@ jobs: uses: actions/checkout@v3 with: fetch-depth: 0 - token: ${{ secrets.GH_TOKEN }} + token: ${{ secrets.envPAT }} - name: Configure git run: | @@ -33,7 +35,7 @@ jobs: run: pip install pyyaml requests - name: Save PR Body to File - run: echo "${{ github.event.pull_request.body }}" > pr_body.txt + run: echo "${{ inputs.pr_body }}" > pr_body.txt - name: Extract Changelog from PR env: From a755d613c15f27bcb9d9434db672a6c4dd51cc72 Mon Sep 17 00:00:00 2001 From: Rinary <72972221+Rinary1@users.noreply.github.com> Date: Fri, 14 Jun 2024 18:39:10 +0300 Subject: [PATCH 35/43] Accents ru-RU translate (#118) --- Resources/Locale/ru-RU/traits/traits.ftl | 26 +++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/Resources/Locale/ru-RU/traits/traits.ftl b/Resources/Locale/ru-RU/traits/traits.ftl index 51012cf9fea..2e206d49606 100644 --- a/Resources/Locale/ru-RU/traits/traits.ftl +++ b/Resources/Locale/ru-RU/traits/traits.ftl @@ -1,35 +1,55 @@ trait-blindness-name = Слепота trait-blindness-desc = Вы совершенно слепы и не можете видеть дальше нескольких метров перед собой. +permanent-blindness-trait-examined = [color=lightblue]{ CAPITALIZE(POSS-PRONOUN($target)) } глаза остекленелые и расфокусированные. Не похоже, что { SUBJECT($target) } может хорошо вас видеть, если может вообще.[/color] + trait-narcolepsy-name = Нарколепсия +trait-narcolepsy-desc = Вас одолевают приступы сонливости + trait-poor-vision-name = Близорукость trait-poor-vision-desc = Ваши глаза уже не те, что раньше, и вы с трудом видите предметы вдали без корректирующих очков. -trait-narcolepsy-desc = Вас одолевают приступы сонливости + trait-pacifist-name = Пацифист trait-pacifist-desc = Вы не можете нападать и причинять вред живым существам. -permanent-blindness-trait-examined = [color=lightblue]{ CAPITALIZE(POSS-PRONOUN($target)) } глаза остекленелые и расфокусированные. Не похоже, что { SUBJECT($target) } может хорошо вас видеть, если может вообще.[/color] + trait-lightweight-name = Быстрое опьянение trait-lightweight-desc = Алкоголь оказывает на вас более сильное воздействие + trait-muted-name = Немота trait-muted-desc = Вы не можете говорить + trait-paracusia-name = Паракузия +trait-paracusia-desc = Вы слышите звуки, которых на самом деле нет + trait-unrevivable-name = Невозрождаемость trait-unrevivable-desc = Вас невозможно оживить при помощи дефибриллятора. -trait-paracusia-desc = Вы слышите звуки, которых на самом деле нет + trait-pirate-accent-name = Пиратский акцент trait-pirate-accent-desc = Вы не можете перестать говорить как пират! + trait-accentless-name = Отсутствие акцента trait-accentless-desc = У вас нет того акцента, который характерен для представителей вашего вида. + trait-frontal-lisp-name = Сигматизм trait-frontal-lisp-desc = У ваф имеютшя проблемы ш произношением. + trait-socialanxiety-name = Социофобия trait-socialanxiety-desc = Вы испытываете тревожность, когда говорите, что приводит к заиканию. + trait-southern-name = Диалект юга США trait-southern-desc = У вас другая манера речи. Работает только с английским. + trait-snoring-name = Храп trait-snoring-desc = Вы храпите во время сна. + trait-liar-name = Патологический лжец trait-liar-desc = Вы с трудом заставляете себя говорить правду. Иногда вы всё равно лжёте. +trait-cowboy-name = Ковбойский акцент +trait-cowboy-desc = Вы говорите с явным ковбойским акцентом! + +trait-italian-name = Итальянский акцент +trait-italian-desc = Мамма мия! Кажется, вы жили в космической Италии! + trait-colorblindness-name = Дальтонизм trait-colorblindness-desc = Вы видите мир не так, как все. From 76e1c5ae3fae470fd15c63dfef89241bcc2fe915 Mon Sep 17 00:00:00 2001 From: Vigers Ray <60344369+VigersRay@users.noreply.github.com> Date: Fri, 14 Jun 2024 18:41:30 +0300 Subject: [PATCH 36/43] =?UTF-8?q?=D0=9E=D1=82=D0=BA=D0=BB=D1=8E=D1=87?= =?UTF-8?q?=D0=B8=D0=BB=20=D0=9F=D0=A6=D0=9A,=20=D0=9E=D0=A6=D0=9A=20?= =?UTF-8?q?=D1=87=D0=B5=D1=80=D0=B5=D0=B7=20=D1=80=D0=BE=D0=BB=D1=8C=20?= =?UTF-8?q?=D0=B2=20=D0=B4=D0=B8=D1=81=D0=BA=D0=BE=D1=80=D0=B4=D0=B5.=20(#?= =?UTF-8?q?121)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Prototypes/_Sunrise/Roles/Jobs/departments.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/Resources/Prototypes/_Sunrise/Roles/Jobs/departments.yml b/Resources/Prototypes/_Sunrise/Roles/Jobs/departments.yml index baeea4f96ee..fe8716465d3 100644 --- a/Resources/Prototypes/_Sunrise/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/_Sunrise/Roles/Jobs/departments.yml @@ -14,7 +14,6 @@ color: "#048e0f" # Sunrise-Edit weight: 120 roles: - - CentCommOfficial - CentCommOperator primary: false From 7a942fb73b52ec728f1636b0450692f4f80fb916 Mon Sep 17 00:00:00 2001 From: GitHubActions <> Date: Fri, 14 Jun 2024 15:42:41 +0000 Subject: [PATCH 37/43] Update changelog from PR #121 --- Resources/Changelog/ChangelogSunrise.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Resources/Changelog/ChangelogSunrise.yml b/Resources/Changelog/ChangelogSunrise.yml index 4b11093100c..98f7b2eea24 100644 --- a/Resources/Changelog/ChangelogSunrise.yml +++ b/Resources/Changelog/ChangelogSunrise.yml @@ -684,3 +684,10 @@ type: Tweak id: 56 time: '2024-06-13T11:10:38.448415+00:00' +- author: Rinary + changes: + - message: "\u0411\u044B\u043B\u0438 \u0434\u043E\u043F\u0435\u0440\u0435\u0432\u0435\ + \u0434\u0435\u043D\u044B \u0430\u043A\u0446\u0435\u043D\u0442\u044B" + type: Tweak + id: 57 + time: '2024-06-14T15:42:40.736697+00:00' From d901eea9372dd14ed50c0e6116b0cd6eac7d57b1 Mon Sep 17 00:00:00 2001 From: VigersRay Date: Fri, 14 Jun 2024 18:45:56 +0300 Subject: [PATCH 38/43] =?UTF-8?q?=D0=90=D0=B2=D1=82=D0=BE=D0=BE=D0=B1?= =?UTF-8?q?=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D1=87=D0=B5?= =?UTF-8?q?=D0=B9=D0=BD=D0=B6=D0=BB=D0=BE=D0=B3=D0=B0=20=D0=B1=D0=BE=D0=BB?= =?UTF-8?q?=D1=8C=D1=88=D0=B5=20=D0=BD=D0=B5=20=D0=B2=D1=8B=D0=B7=D1=8B?= =?UTF-8?q?=D0=B2=D0=B0=D0=B5=D1=82=20=D0=B2=D0=BE=D1=80=D0=BA=D1=84=D0=BB?= =?UTF-8?q?=D0=BE=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build-map-renderer.yml | 2 +- .github/workflows/build-test-debug.yml | 2 +- .github/workflows/conflict-labeler.yml | 2 +- .github/workflows/labeler-pr.yml | 2 +- .github/workflows/test-packaging.yml | 2 +- .github/workflows/validate-rgas.yml | 2 +- .github/workflows/validate_mapfiles.yml | 2 +- .github/workflows/yaml-linter.yml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build-map-renderer.yml b/.github/workflows/build-map-renderer.yml index 35aed1a7f7f..a040b6062b6 100644 --- a/.github/workflows/build-map-renderer.yml +++ b/.github/workflows/build-map-renderer.yml @@ -10,7 +10,7 @@ on: jobs: build: - if: github.actor != 'PJBot' && github.event.pull_request.draft == false + if: github.actor != 'GitHubActions' && github.event.pull_request.draft == false strategy: matrix: os: [ubuntu-latest] diff --git a/.github/workflows/build-test-debug.yml b/.github/workflows/build-test-debug.yml index 47f9fd1a514..6f6ac639466 100644 --- a/.github/workflows/build-test-debug.yml +++ b/.github/workflows/build-test-debug.yml @@ -10,7 +10,7 @@ on: jobs: build: - if: github.actor != 'PJBot' && github.event.pull_request.draft == false + if: github.actor != 'GitHubActions' && github.event.pull_request.draft == false strategy: matrix: os: [ubuntu-latest] diff --git a/.github/workflows/conflict-labeler.yml b/.github/workflows/conflict-labeler.yml index 1e2125c30a2..6b500d11228 100644 --- a/.github/workflows/conflict-labeler.yml +++ b/.github/workflows/conflict-labeler.yml @@ -10,7 +10,7 @@ on: jobs: Label: - if: ( github.event.pull_request.draft == false ) && ( github.actor != 'PJBot' ) + if: ( github.event.pull_request.draft == false ) && ( github.actor != 'GitHubActions' ) runs-on: ubuntu-latest steps: - name: Check for Merge Conflicts diff --git a/.github/workflows/labeler-pr.yml b/.github/workflows/labeler-pr.yml index 42ed1009812..cfbd4f0f02a 100644 --- a/.github/workflows/labeler-pr.yml +++ b/.github/workflows/labeler-pr.yml @@ -5,7 +5,7 @@ on: jobs: labeler: - if: github.actor != 'PJBot' + if: github.actor != 'GitHubActions' permissions: contents: read pull-requests: write diff --git a/.github/workflows/test-packaging.yml b/.github/workflows/test-packaging.yml index 2dce502697d..903b28a760e 100644 --- a/.github/workflows/test-packaging.yml +++ b/.github/workflows/test-packaging.yml @@ -29,7 +29,7 @@ on: jobs: build: name: Test Packaging - if: github.actor != 'PJBot' && github.event.pull_request.draft == false + if: github.actor != 'GitHubActions' && github.event.pull_request.draft == false runs-on: ubuntu-latest steps: diff --git a/.github/workflows/validate-rgas.yml b/.github/workflows/validate-rgas.yml index ffb643feea8..680d6819c4e 100644 --- a/.github/workflows/validate-rgas.yml +++ b/.github/workflows/validate-rgas.yml @@ -9,7 +9,7 @@ on: jobs: yaml-schema-validation: name: YAML RGA schema validator - if: github.actor != 'PJBot' && github.event.pull_request.draft == false + if: github.actor != 'GitHubActions' && github.event.pull_request.draft == false runs-on: ubuntu-latest steps: - uses: actions/checkout@v3.6.0 diff --git a/.github/workflows/validate_mapfiles.yml b/.github/workflows/validate_mapfiles.yml index fb11e1a4697..fd0ee5c4e36 100644 --- a/.github/workflows/validate_mapfiles.yml +++ b/.github/workflows/validate_mapfiles.yml @@ -9,7 +9,7 @@ on: jobs: yaml-schema-validation: name: YAML map schema validator - if: github.actor != 'PJBot' && github.event.pull_request.draft == false + if: github.actor != 'GitHubActions' && github.event.pull_request.draft == false runs-on: ubuntu-latest steps: - uses: actions/checkout@v3.6.0 diff --git a/.github/workflows/yaml-linter.yml b/.github/workflows/yaml-linter.yml index 691eb29f1de..e79853a56a7 100644 --- a/.github/workflows/yaml-linter.yml +++ b/.github/workflows/yaml-linter.yml @@ -10,7 +10,7 @@ on: jobs: build: name: YAML Linter - if: github.actor != 'PJBot' && github.event.pull_request.draft == false + if: github.actor != 'GitHubActions' && github.event.pull_request.draft == false runs-on: ubuntu-latest steps: - uses: actions/checkout@v3.6.0 From f1b905836f77fdc25b511a24a5a8df2ada8a5ed2 Mon Sep 17 00:00:00 2001 From: Rinary <72972221+Rinary1@users.noreply.github.com> Date: Fri, 14 Jun 2024 18:46:53 +0300 Subject: [PATCH 39/43] Translate (#112) --- .../entities/clothing/uniforms/jumpskirts.ftl | 126 ++++++++++ .../entities/clothing/uniforms/jumpsuits.ftl | 219 ++++++++++++++++++ 2 files changed, 345 insertions(+) create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/uniforms/jumpskirts.ftl create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/uniforms/jumpsuits.ftl diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/uniforms/jumpskirts.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/uniforms/jumpskirts.ftl new file mode 100644 index 00000000000..559ef42f67b --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/uniforms/jumpskirts.ftl @@ -0,0 +1,126 @@ +ent-ClothingUniformJumpskirtBartender = униформа бармена + .desc = Красивая и опрятная форма. Жаль только, что про бар этого не скажешь. +ent-ClothingUniformJumpskirtCaptain = юбка-комбинезон капитана + .desc = Синяя юбка-комбинезон с золотыми нашивками, указывающими на звание капитана. +ent-ClothingUniformJumpskirtCargo = юбка-комбинезон грузчика + .desc = Прочная юбка-комбинезон, выдаваемая сотрудникам отдела снабжения. +ent-ClothingUniformJumpskirtChiefEngineer = юбка-комбинезон старшего инженера + .desc = Эта юбка-комбинезон повышенной заметности, которая выдаётся тем инженерам, которые достаточно безумны и живучи, чтобы достичь звания главного инженера. Имеет слабую защиту от радиации. +ent-ClothingUniformJumpskirtChiefEngineerTurtle = юбка-водолазка старшего инженера + .desc = Жёлтая водолазка, разработанная специально для работы в условиях инженерного отдела. +ent-ClothingUniformJumpskirtChaplain = юбка-комбинезон священника + .desc = Это чёрная юбка-комбинезон, зачастую носимая религиозными людьми. +ent-ClothingUniformJumpskirtChef = униформа шеф-повара + .desc = Без неё ничего не приготовить. +ent-ClothingUniformJumpskirtChemistry = юбка-комбинезон химика + .desc = На этом комбинезоне какие-то странные пятна. Хм. +ent-ClothingUniformJumpskirtVirology = юбка-комбинезон вирусолога + .desc = Изготовлена из особого волокна, которое обеспечивает специальную защиту от биологических опасностей. На ней есть обозначения, указывающие что носитель является вирусологом. +ent-ClothingUniformJumpskirtGenetics = юбка-комбинезон генетика + .desc = Изготовлена из особого волокна, которое обеспечивает специальную защиту от биологических опасностей. На ней есть обозначения, указывающие что носитель является генетиком. +ent-ClothingUniformJumpskirtCMO = юбка-комбинезон главного врача + .desc = Это юбка-комбинезон, носимая теми, у кого есть опыт работы на должности главного врача. Она обеспечивает слабую биологическую защиту. +ent-ClothingUniformJumpskirtCMOTurtle = юбка-водолазка главного врача + .desc = Это комбинезон, носимый теми, у кого есть опыт работы на должности главного врача. Она обеспечивает слабую биологическую защиту. +ent-ClothingUniformJumpskirtDetective = поношенный костюм + .desc = Тот, кто носит это, олицетворяет занятость. +ent-ClothingUniformJumpskirtDetectiveGrey = нуарный костюм + .desc = Крутой серый костюм частного сыщика с зажимом для галстука. +ent-ClothingUniformJumpskirtEngineering = инженерная юбка-комбинезон + .desc = Если бы этот костюм был изолированным, возможно, инженеры действительно выполняли бы свою чёртову работу. +ent-ClothingUniformJumpskirtHoP = юбка-комбинезон главы персонала + .desc = Довольно безвкусная и невзрачная. Идеально подходит для того, чтобы исчезнуть с лица Вселенной. +ent-ClothingUniformJumpskirtHoS = юбка-комбинезон главы службы безопасности + .desc = Она ярко-красная и хрустящая, какими часто бывают жертвы службы безопасности. +ent-ClothingUniformJumpskirtHoSAlt = юбка-водолазка главы службы безопасности + .desc = Это водолазка, носимая теми, кто достаточно силён и дисциплинирован, чтобы достичь должности главы службы безопасности. Её прочная ткань обеспечивает слабую защиту от механических повреждений. +ent-ClothingUniformJumpskirtHoSParadeMale = парадная форма главы службы безопасности + .desc = Роскошная униформа главы службы безопасности, для особых случаев. +ent-ClothingUniformJumpskirtHydroponics = юбка-комбинезон ботаника + .desc = Имеет сильный запах земли. Будем надеяться, что она просто грязная, а не вся в земле. +ent-ClothingUniformJumpskirtJanitor = юбка-комбинезон уборщика + .desc = Юбка-комбинезон для бедняги со шваброй. +ent-ClothingUniformJumpskirtMedicalDoctor = юбка-комбинезон врача + .desc = Она изготовлена из специального волокна, обеспечивающего слабую защиту от биологических опасностей. На груди имеется крест, обозначающий, что носитель является медицинским работником. +ent-ClothingUniformJumpskirtMime = юбка-комбинезон мима + .desc = ... +ent-ClothingUniformJumpskirtParamedic = юбка-комбинезон парамедика + .desc = На ней есть плюс, это хорошо, верно? +ent-ClothingUniformJumpskirtBrigmedic = юбка-комбинезон бригмедика + .desc = Форма, выдаваемая квалифицированным и прошедшим обучение лицам. Никого не волнует, что обучение продлилось полдня. +ent-ClothingUniformJumpskirtPrisoner = юбка-комбинезон заключённого + .desc = Потрачено. +ent-ClothingUniformJumpskirtQM = юбка-комбинезон квартирмейстера + .desc = Что Браун может сделать для вас? +ent-ClothingUniformJumpskirtQMTurtleneck = юбка-водолазка квартирмейстера + .desc = Строгая водолазка, предназначенная для суровых условий работы в области снабжения. +ent-ClothingUniformJumpskirtResearchDirector = юбка-водолазка научного руководителя + .desc = Это водолазка, носимая умными людьми, чтобы достичь должности научного руководителя. Её ткань обеспечивает слабую биологическую защиту. +ent-ClothingUniformJumpskirtScientist = юбка-комбинезон учёного + .desc = Она сделана из специального волокна, которое обеспечивает слабую защиту от взрывов. На ней есть обозначения, указывающие что носитель является учёным. +ent-ClothingUniformJumpskirtRoboticist = юбка-комбинезон робототехника + .desc = Стройнящий чёрный цвет и усиленные швы; отлично подходит для работы на производстве. +ent-ClothingUniformJumpskirtSec = юбка-комбинезон службы безопасности + .desc = Юбка-комбинезон из прочного материала, обеспечивающая надёжную защиту. +ent-ClothingUniformJumpskirtWarden = униформа смотрителя + .desc = Формальный костюм службы безопасности для офицеров в комплекте с пряжкой для ремня Nanotrasen. +ent-ClothingUniformJumpskirtLibrarian = юбка-комбинезон библиотекаря + .desc = Уютный красный джемпер, подходящий для хранителя книг. +ent-ClothingUniformJumpskirtCurator = практичная юбка + .desc = Она практична. Слишком практична... +ent-ClothingUniformJumpskirtPerformer = юбка-комбинезон артиста + .desc = Привет, я Скотт, президент Donk Pizza. Вы слышали про [ИЗВЕСТНЫЙ ВИРТУАЛЬНЫЙ ИСПОЛНИТЕЛЬ]? +ent-ClothingUniformJumpskirtCapFormalDress = торжественное платье капитана + .desc = Платье для особых случаев. +ent-ClothingUniformJumpskirtCentcomFormalDress = торжественное платье Центком + .desc = Платье для особых случаев. +ent-ClothingUniformJumpskirtHosFormal = торжественное платье главы службы безопасности + .desc = Платье для особых случаев. +# Corvax-HiddenDesc-Start +ent-ClothingUniformJumpskirtOperative = юбка-комбинезон оперативника + .desc = Униформа для проведения тактических операций в глубоком космосе. +# Corvax-HiddenDesc-End +ent-ClothingUniformJumpskirtTacticool = тактическая юбка-комбинезон + .desc = Униформа для оперативных LARPеров, выполняющих тактические кражи изолированных перчаток в глубоком космосе. +ent-ClothingUniformJumpskirtAtmos = юбка-комбинезон атмосферного техника + .desc = Я на работе. Я не могу бросить работу. Работа - это дыхание. Я проверяю качество воздуха. +ent-ClothingUniformJumpskirtJanimaid = форма горничной + .desc = Для профессионалов, а не позёров. +ent-ClothingUniformJumpskirtJanimaidmini = форма горничной с миниюбкой + .desc = Элитный сервис, а не просто яркая обёртка. +ent-ClothingUniformJumpskirtLawyerRed = красная адвокатская юбка-костюм + .desc = Яркий красный костюм с юбкой, который носят адвокаты и хвастуны. +ent-ClothingUniformJumpskirtLawyerBlue = синяя адвокатская юбка-костюм + .desc = Яркий синий костюм с юбкой, который носят адвокаты и хвастуны. +ent-ClothingUniformJumpskirtLawyerBlack = чёрная адвокатская юбка-костюм + .desc = Изысканный чёрный костюм с юбкой, который носят адвокаты и гангстеры. +ent-ClothingUniformJumpskirtLawyerPurple = фиолетовая адвокатская юбка-костюм + .desc = Стильный фиолетовый костюм с юбкой, который носят адвокаты и шоумены. +ent-ClothingUniformJumpskirtLawyerGood = хорошая адвокатская юбка-костюм + .desc = Кричащий костюм с юбкой, идеально подходящий УГОЛОВНОМУ адвокату! +ent-ClothingUniformJumpskirtSyndieFormalDress = торжественное платье Синдиката + .desc = Форма Синдиката выполнена в элегантном стиле, в ней даже жалко проделывать грязные трюки. +ent-ClothingUniformJumpskirtTacticalMaid = тактическая юбка-костюм горничной + .desc = Предполагается, что у лучших горничных должны быть дизайнерские костюмы. +ent-ClothingUniformJumpskirtOfLife = юбка жизни + .desc = Юбка, символизирующая позитив и радость нашей жизни. +ent-ClothingUniformJumpskirtSeniorEngineer = юбка-комбинезон ведущего инженера + .desc = Признак мастерства и престижа инженерного отдела. +ent-ClothingUniformJumpskirtSeniorResearcher = юбка-комбинезон ведущего учёного + .desc = Признак мастерства и престижа научного отдела. +ent-ClothingUniformJumpskirtSeniorPhysician = юбка-комбинезон ведущего врача + .desc = Признак мастерства и престижа медицинского отдела. +ent-ClothingUniformJumpskirtSeniorOfficer = юбка-комбинезон инструктора службы безопасности + .desc = Признак мастерства и престижа отдела службы безопасности. +ent-ClothingUniformJumpskirtSecGrey = серая юбка-комбинезон службы безопасности + .desc = Пережиток прошлых лет, они использовались до того, как в Nanotrasen решили, что дешевле красить костюмы в красный цвет вместо того, чтобы смывать кровь. +ent-ClothingUniformJumpskirtWeb = паутинная юбка-комбинезон + .desc = Даёт понять, что вы едины с паутиной. +ent-ClothingUniformJumpskirtCasualBlue = повседневная синяя юбка-комбинезон + .desc = Свободная потёртая синяя рубашка с серой юбкой - идеальный вариант для тех, кто хочет расслабиться. +ent-ClothingUniformJumpskirtCasualPurple = повседневная фиолетовая юбка-комбинезон + .desc = Свободная потёртая фиолетовая рубашка с серой юбкой - идеальный вариант для тех, кто хочет расслабиться. +ent-ClothingUniformJumpskirtCasualRed = повседневная красная юбка-комбинезон + .desc = Свободная потёртая красная рубашка с серой юбкой - идеальный вариант для тех, кто хочет расслабиться. +ent-ClothingUniformJumpskirtOldDress = старое платье + .desc = Очень старое поношенное платье. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/uniforms/jumpsuits.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/uniforms/jumpsuits.ftl new file mode 100644 index 00000000000..305b1fac044 --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/uniforms/jumpsuits.ftl @@ -0,0 +1,219 @@ +ent-ClothingUniformJumpsuitDeathSquad = униформа Эскадрона смерти + .desc = Усовершенствованный бронированный комбинезон, используемый спецподразделениями при проведении специальных операций. +ent-ClothingUniformJumpsuitAncient = старинный комбинезон + .desc = Ужасно поношенный и потрёпанный серый комбинезон. Он выглядит так, будто его не стирали более десяти лет. +ent-ClothingUniformJumpsuitBartender = униформа бармена + .desc = Красивая и опрятная форма. Жаль только, что про бар этого не скажешь. +ent-ClothingUniformJumpsuitJacketMonkey = обезьянья жилетка бармена + .desc = Приличная жилетка, для приличной обезьяны. +ent-ClothingUniformJumpsuitBartenderPurple = фиолетовая униформа бармена + .desc = Специальный фиолетовый наряд для подачи напитков. +ent-ClothingUniformJumpsuitCaptain = комбинезон капитана + .desc = Синий комбинезон с золотыми нашивками, указывающими на звание капитана. +ent-ClothingUniformJumpsuitCargo = комбинезон грузчика + .desc = Прочный комбинезон, выдаваемый сотрудникам отдела снабжения. +ent-ClothingUniformJumpsuitSalvageSpecialist = комбинезон специалиста по утилизации + .desc = Удобный прочный комбинезон. Очень грязный. +ent-ClothingUniformJumpsuitChiefEngineer = комбинезон старшего инженера + .desc = Это комбинезон повышенной заметности, который выдаётся тем инженерам, которые достаточно безумны и живучи, чтобы достичь звания главного инженера. Имеет слабую защиту от радиации. +ent-ClothingUniformJumpsuitChiefEngineerTurtle = водолазка старшего инженера + .desc = Жёлтая водолазка, разработанная специально для работы в условиях инженерного отдела. +ent-ClothingUniformJumpsuitChaplain = комбинезон священника + .desc = Это чёрный комбинезон, зачастую носимый религиозными людьми. +ent-ClothingUniformJumpsuitCentcomAgent = комбинезон агента Центком + .desc = Костюм, который носят юристы Центком. Пахнет подгоревшим кофе. +ent-ClothingUniformJumpsuitCentcomOfficial = костюм офицера Центком + .desc = Это комбинезон, который носят офицеры Центком высшего звена. +ent-ClothingUniformJumpsuitCentcomOfficer = водолазка Центком + .desc = Повседневная, но элегантная водолазка зелёного цвета, используемая офицерами Центком. От неё веет алоэ. +ent-ClothingUniformJumpsuitChef = униформа шеф-повара + .desc = Без этого нельзя готовить. +ent-ClothingUniformJumpsuitChemistry = комбинезон химика + .desc = На этом комбинезоне какие-то странные пятна. Хм. +ent-ClothingUniformJumpsuitVirology = комбинезон вирусолога + .desc = Изготовлен из особого волокна, которое обеспечивает специальную защиту от биологических опасностей. На нём есть обозначения, указывающие что носитель является вирусологом. +ent-ClothingUniformJumpsuitGenetics = комбинезон генетика + .desc = Изготовлен из особого волокна, которое обеспечивает специальную защиту от биологических опасностей. На нём есть обозначения, указывающие что носитель является генетиком. +ent-ClothingUniformJumpsuitClown = костюм клоуна + .desc = ХОНК! +ent-ClothingUniformJumpsuitClownBanana = банановый костюм клоуна + .desc = { ent-ClothingUniformJumpsuitClown.desc } +ent-ClothingUniformJumpsuitJester = костюм шута + .desc = Весёлый наряд, отлично подходящий для развлечения вашего господина. +ent-ClothingUniformJumpsuitJesterAlt = { ent-ClothingUniformJumpsuitJester } + .desc = { ent-ClothingUniformJumpsuitJester.desc } +ent-ClothingUniformJumpsuitCMO = комбинезон главного врача + .desc = Это комбинезон, носимый теми, у кого есть опыт работы на должности главного врача. Он обеспечивает слабую биологическую защиту. +ent-ClothingUniformJumpsuitCMOTurtle = водолазка главного врача + .desc = Это комбинезон, носимый теми, у кого есть опыт работы на должности главного врача. Он обеспечивает слабую биологическую защиту. +ent-ClothingUniformJumpsuitDetective = поношенный костюм + .desc = Тот, кто носит это, олицетворяет занятость. +ent-ClothingUniformJumpsuitDetectiveGrey = нуарный костюм + .desc = Крутой серый костюм частного сыщика с зажимом для галстука. +ent-ClothingUniformJumpsuitEngineering = инженерный комбинезон + .desc = Если бы этот костюм был изолированным, возможно, инженеры действительно выполняли бы свою чёртову работу. +ent-ClothingUniformJumpsuitEngineeringHazard = защитный комбинезон + .desc = Соткан в тёплом оранжевом цвете. Даёт окружающим понять, что вы действительно серьёзно относитесь к делу, когда речь идёт о работе. +ent-ClothingUniformJumpsuitHoP = комбинезон главы персонала + .desc = Довольно безвкусный и невзрачный. Идеально подходит для того, чтобы исчезнуть с лица Вселенной. +ent-ClothingUniformJumpsuitHoS = комбинезон главы службы безопасности + .desc = Он ярко-красный и хрустящий, какими часто бывают жертвы службы безопасности. +ent-ClothingUniformJumpsuitHoSAlt = водолазка главы службы безопасности + .desc = Это водолазка, носимая теми, кто достаточно силён и дисциплинирован, чтобы достичь должности главы службы безопасности. +ent-ClothingUniformJumpsuitHoSBlue = синий комбинезон главы службы безопасности + .desc = Синий комбинезон главы службы безопасности. +ent-ClothingUniformJumpsuitHoSGrey = серый комбинезон главы службы безопасности + .desc = Серый комбинезон главы службы безопасности, который делает его несколько похожим на ассистента. +ent-ClothingUniformJumpsuitHoSParadeMale = парадная форма главы службы безопасности + .desc = Одежда класса люкс для мужчин, возглавляющих службу безопасности, для особых случаев. +ent-ClothingUniformJumpsuitHydroponics = комбинезон ботаника + .desc = Имеет сильный запах земли. Будем надеяться, что он просто грязный, а не весь в земле. +ent-ClothingUniformJumpsuitJanitor = комбинезон уборщика + .desc = Комбинезон для бедняги со шваброй. +ent-ClothingUniformJumpsuitKimono = кимоно + .desc = Традиционное китайское одеяние. +ent-ClothingUniformJumpsuitMedicalDoctor = комбинезон врача + .desc = Он изготовлен из специального волокна, обеспечивающего слабую биологическую защиту. На груди имеется крест, обозначающий, что носитель является медицинским работником. +ent-ClothingUniformJumpsuitMime = костюм мима + .desc = ... +ent-ClothingUniformJumpsuitParamedic = комбинезон парамедика + .desc = На нём есть плюс, это хорошо, верно? +ent-ClothingUniformJumpsuitBrigmedic = комбинезон бригмедика + .desc = Форма, выдаваемая квалифицированным и прошедшим обучение лицам. Никого не волнует, что обучение продлилось полдня. +ent-ClothingUniformJumpsuitPrisoner = комбинезон заключённого + .desc = Арестован. +ent-ClothingUniformJumpsuitQM = комбинезон квартирмейстера + .desc = Что Браун может сделать для вас? +ent-ClothingUniformJumpsuitQMTurtleneck = водолазка квартирмейстера + .desc = Строгая водолазка, предназначенная для суровых условий работы в области снабжения. +ent-ClothingUniformJumpsuitQMFormal = торжественный костюм квартирмейстера + .desc = Вдохновлённый военными квартирмейстерами прошлого, прекрасный наряд для торжественных случаев. +ent-ClothingUniformJumpsuitResearchDirector = водолазка научного руководителя + .desc = Это водолазка, носимая достаточно умными людьми, чтобы достичь должности научного руководителя. Её ткань обеспечивает слабую биологическую защиту. +ent-ClothingUniformJumpsuitScientist = комбинезон учёного + .desc = Он сделан из специального волокна, которое обеспечивает слабую защиту от взрывов. На нём есть обозначения, указывающие что носитель является учёным. +ent-ClothingUniformJumpsuitScientistFormal = торжественный комбинезон учёного + .desc = Униформа для взыскательных учёных, которую лучше всего носить с подходящим к ней галстуком. +ent-ClothingUniformJumpsuitRoboticist = комбинезон робототехника + .desc = Стройнящий чёрный цвет и усиленные швы; отлично подходит для работы на производстве. +ent-ClothingUniformJumpsuitSec = комбинезон службы безопасности + .desc = Комбинезон из прочного материала, обеспечивающий надёжную защиту. +ent-ClothingUniformJumpsuitSecBlue = голубая рубашка и галстук + .desc = Я сейчас немного занят, Калхаун. +ent-ClothingUniformJumpsuitSecGrey = серый комбинезон службы безопасности + .desc = Пережиток прошлых лет, они использовались до того, как в Nanotrasen решили, что дешевле красить костюмы в красный цвет вместо того, чтобы смывать кровь. +ent-ClothingUniformJumpsuitWarden = униформа смотрителя + .desc = Формальный костюм службы безопасности для офицеров в комплекте с пряжкой для ремня Nanotrasen. +ent-ClothingUniformOveralls = комбинезон на лямках + .desc = Отлично подходит для работы на открытом воздухе. +ent-ClothingUniformJumpsuitLibrarian = костюм библиотекаря + .desc = Он очень... практичный. +ent-ClothingUniformJumpsuitCurator = практичный костюм + .desc = Практично. Слишком практично... +ent-ClothingUniformJumpsuitLawyerRed = красный адвокатский костюм + .desc = Яркий красный костюм, который носят адвокаты и хвастуны. +ent-ClothingUniformJumpsuitLawyerBlue = синий адвокатский костюм + .desc = Яркий синий костюм, который носят адвокаты и хвастуны. +ent-ClothingUniformJumpsuitLawyerBlack = чёрный адвокатский костюм + .desc = Изысканный чёрный костюм, который носят адвокаты и гангстеры. +ent-ClothingUniformJumpsuitLawyerPurple = фиолетовый адвокатский костюм + .desc = Стильный фиолетовый костюм, который носят адвокаты и шоумены. +ent-ClothingUniformJumpsuitLawyerGood = хороший адвокатский костюм + .desc = Кричащий костюм, идеально подходящий УГОЛОВНОМУ адвокату! +ent-ClothingUniformJumpsuitPyjamaSyndicateBlack = чёрная пижама синдиката + .desc = Для долгих ночей в перме. +ent-ClothingUniformJumpsuitPyjamaSyndicatePink = розовая пижама синдиката + .desc = Для долгих ночей в перме. +ent-ClothingUniformJumpsuitPyjamaSyndicateRed = красная пижама синдиката + .desc = Для долгих ночей в перме. +ent-ClothingUniformJumpsuitNanotrasen = комбинезон Nanotrasen + .desc = Статный синий комбинезон представителя Nanotrasen. +ent-ClothingUniformJumpsuitCapFormal = торжественный костюм капитана + .desc = Костюм для особых случаев. +ent-ClothingUniformJumpsuitCentcomFormal = торжественный костюм Центком + .desc = Костюм для особых случаев. +ent-ClothingUniformJumpsuitHosFormal = торжественный костюм главы службы безопасности + .desc = Костюм для особых случаев. +# Corvax-HiddenDesc-Start +ent-ClothingUniformJumpsuitOperative = комбинезон оперативника + .desc = Униформа для сложных и опасных операций в глубоком космосе. +# Corvax-HiddenDesc-End +ent-ClothingUniformJumpsuitTacticool = тактический комбинезон + .desc = Униформа для оперативных LARPеров, выполняющих тактические кражи изолированных перчаток в глубоком космосе. +ent-ClothingUniformJumpsuitMercenary = комбинезон наёмника + .desc = Одежда настоящего наёмника, прошедшего сквозь огонь, воду и джунгли планет, кишащих опасными монстрами или целями, за которые назначена награда. +ent-ClothingUniformJumpsuitNinja = комбинезон ниндзя + .desc = Комбинезон с наноусилением, разработанный для максимального комфорта и тактичности. +ent-ClothingUniformJumpsuitAtmos = комбинезон атмосферного техника + .desc = Я на работе. Я не могу бросить работу. Работа - это дыхание. Я проверяю качество воздуха. +ent-ClothingUniformJumpsuitAtmosCasual = повседневный комбинезон атмосферного техника + .desc = С такой простой работой, как у вас, можно и расслабиться. +ent-ClothingUniformJumpsuitPsychologist = костюм психолога + .desc = Я не теряю вещи. Я кладу вещи в места, которые потом ускользают от меня. +ent-ClothingUniformJumpsuitReporter = костюм репортёра + .desc = Хороший репортёр остаётся скептиком всю свою жизнь. +ent-ClothingUniformJumpsuitSafari = костюм для сафари + .desc = Идеально для экскурсии по джунглям. +ent-ClothingUniformJumpsuitJournalist = костюм журналиста + .desc = Если журналистская работа хороша, она противоречива по своей природе. +ent-ClothingUniformJumpsuitMonasticRobeDark = тёмная монашеская ряса + .desc = Это тёмная ряса, которую часто носят религиозные люди. +ent-ClothingUniformJumpsuitMonasticRobeLight = светлая монашеская ряса + .desc = Это светлая ряса, которую часто носят религиозные люди. +ent-ClothingUniformJumpsuitMusician = костюм из карпокожи + .desc = Роскошный костюм, сшитый только из лучших чешуек, идеально подходит для любого концерта в стиле лаунж! +ent-ClothingUniformJumpsuitERTChaplain = униформа священника ОБР + .desc = Специальный костюм, созданный для элитных священников Центкома. +ent-ClothingUniformJumpsuitERTEngineer = униформа инженера ОБР + .desc = Специальный костюм, созданный для элитных инженеров Центкома. +ent-ClothingUniformJumpsuitERTJanitor = униформа уборщика ОБР + .desc = Специальный костюм, созданный для элитных уборщиков Центкома. +ent-ClothingUniformJumpsuitERTLeader = униформа лидера ОБР + .desc = Специальный костюм, созданный для самой элиты Центкома. +ent-ClothingUniformJumpsuitERTMedic = униформа медика ОБР + .desc = Специальный костюм, созданный для элитных медиков Центкома. +ent-ClothingUniformJumpsuitERTSecurity = униформа офицера безопасности ОБР + .desc = Специальный костюм, созданный для элитных офицеров безопасности Центкома. +ent-ClothingUniformJumpsuitCluwne = костюм клувеня + .desc = Проклятый костюм клувеня. + .suffix = Неснимаемый +ent-ClothingUniformJumpsuitDameDane = костюм якудзы + .desc = Какой же я дурак... +ent-ClothingUniformJumpsuitPirate = пиратская форма + .desc = Пиратская вариация комбинезона космического моряка. +ent-ClothingUniformJumpsuitCossack = казачий костюм + .desc = Старые добрые штаны да бригантина. +ent-ClothingUniformJumpsuitHawaiBlack = чёрная гавайская рубашка + .desc = Чёрная, как звёздная ночь. +ent-ClothingUniformJumpsuitHawaiBlue = синяя гавайская рубашка + .desc = Синяя, как бескрайний океан. +ent-ClothingUniformJumpsuitHawaiRed = красная гавайская рубашка + .desc = Красная, как сочные арбузы. +ent-ClothingUniformJumpsuitHawaiYellow = жёлтая гавайская рубашка + .desc = Жёлтая, как яркое солнце. +ent-ClothingUniformJumpsuitSyndieFormal = торжественный костюм Синдиката + .desc = Форма Синдиката выполнена в элегантном стиле, в ней даже жалко проделывать грязные трюки. +ent-ClothingUniformJumpsuitFlannel = фланелевый комбинезон + .desc = Пахнет так, будто кто-то жарил на гриле. +ent-ClothingUniformJumpsuitSeniorEngineer = комбинезон ведущего инженера + .desc = Признак мастерства и престижа инженерного отдела. +ent-ClothingUniformJumpsuitSeniorResearcher = комбинезон ведущего учёного + .desc = Признак мастерства и престижа научного отдела. +ent-ClothingUniformJumpsuitSeniorPhysician = комбинезон ведущего врача + .desc = Признак мастерства и престижа медицинского отдела. +ent-ClothingUniformJumpsuitSeniorOfficer = комбинезон инструктора службы безопасности + .desc = Признак мастерства и престижа отдела службы безопасности. +ent-ClothingUniformJumpsuitWeb = паутинный комбинезон + .desc = Даёт понять, что вы едины с паутиной. +ent-ClothingUniformJumpsuitLoungewear = домашняя одежда + .desc = Длинный кусок ткани, который облегает тело, обеспечивая комфорт. +ent-ClothingUniformJumpsuitGladiator = форма гладиатора + .desc = Создана для настоящих гладиаторов (или пеплоходцев). +ent-ClothingUniformJumpsuitCasualBlue = повседневный синий комбинезон + .desc = Свободная потёртая синяя рубашка с серыми штанами - идеальный вариант для тех, кто хочет расслабиться. +ent-ClothingUniformJumpsuitCasualPurple = повседневный фиолетовый комбинезон + .desc = Свободная потёртая фиолетовая рубашка с серыми штанами - идеальный вариант для тех, кто хочет расслабиться. +ent-ClothingUniformJumpsuitCasualRed = повседневный красный комбинезон + .desc = Свободная потёртая красная рубашка с серыми штанами - идеальный вариант для тех, кто хочет расслабиться. +ent-ClothingUniformJumpsuitFamilyGuy = семейный наряд + .desc = Напоминает о времени, когда вы сделали что-то смешное. From 9067d120081b99468a845dd30187fd5b9a791dec Mon Sep 17 00:00:00 2001 From: Vigers Ray <60344369+VigersRay@users.noreply.github.com> Date: Fri, 14 Jun 2024 18:49:56 +0300 Subject: [PATCH 40/43] =?UTF-8?q?=D0=9F=D1=83=D1=81=D1=82=D0=BE=D0=B9=20?= =?UTF-8?q?=D0=BA=D0=BE=D0=BC=D0=BC=D0=B8=D1=82=20(#122)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/automatic_changelog.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/automatic_changelog.yml b/.github/workflows/automatic_changelog.yml index 2d1d070a52e..098ae2e5f8e 100644 --- a/.github/workflows/automatic_changelog.yml +++ b/.github/workflows/automatic_changelog.yml @@ -14,4 +14,4 @@ jobs: with: pr_body: ${{ github.event.pull_request.body }} secrets: - envPAT: ${{ secrets.GH_TOKEN }} + envPAT: ${{ secrets.GH_TOKEN }} \ No newline at end of file From f339030ebd0e05734502320b4e7e972f0b375073 Mon Sep 17 00:00:00 2001 From: GitHubActions <> Date: Fri, 14 Jun 2024 15:53:15 +0000 Subject: [PATCH 41/43] Update changelog from PR #122 --- Resources/Changelog/ChangelogSunrise.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/Resources/Changelog/ChangelogSunrise.yml b/Resources/Changelog/ChangelogSunrise.yml index 98f7b2eea24..7bf19679a5a 100644 --- a/Resources/Changelog/ChangelogSunrise.yml +++ b/Resources/Changelog/ChangelogSunrise.yml @@ -691,3 +691,16 @@ type: Tweak id: 57 time: '2024-06-14T15:42:40.736697+00:00' +- author: VigersRay + changes: + - message: "\u0417\u043B\u043E\u0439 \u0434\u0432\u043E\u0439\u043D\u0438\u043A\ + \ \u0431\u043E\u043B\u044C\u0448\u0435 \u043D\u0435 \u043F\u043E\u044F\u0432\ + \u043B\u044F\u0435\u0442\u0441\u044F \u0433\u043E\u043B\u044B\u043C." + type: Fix + - message: "\u0423 \u0437\u043B\u043E\u0433\u043E \u0434\u0432\u043E\u0439\u043D\ + \u0438\u043A\u0430 \u0442\u0435\u043F\u0435\u0440\u044C \u0414\u041D\u041A \u0438\ + \u0434\u0435\u043D\u0442\u0438\u0447\u043D\u0430\u044F \u0435\u0433\u043E \u0446\ + \u0435\u043B\u0438." + type: Tweak + id: 58 + time: '2024-06-14T15:53:14.992380+00:00' From 35a35919fb61ce7b6b145e905f74fd3150ab32dc Mon Sep 17 00:00:00 2001 From: Rinary <72972221+Rinary1@users.noreply.github.com> Date: Fri, 14 Jun 2024 18:54:51 +0300 Subject: [PATCH 42/43] Ping for all PRs (#110) --- .github/CODEOWNERS | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index da9d4d693a8..9cd7bb877ee 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -55,3 +55,7 @@ #Jezi /Content.*/Medical @Jezithyr /Content.*/Body @Jezithyr + + +# Ping for all PRs +* @VigersRay \ No newline at end of file From c65680080678e3f4070d01dfd5b18e8ece41d33b Mon Sep 17 00:00:00 2001 From: icekot8 <93311212+icekot8@users.noreply.github.com> Date: Thu, 13 Jun 2024 23:58:01 +0300 Subject: [PATCH 43/43] =?UTF-8?q?=D0=B2=D1=8B=D0=BD=D0=B5=D1=81=20hos=5Fgr?= =?UTF-8?q?eatcoat.rsi?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entities/Clothing/OuterClothing/coats.yml | 13 +++++-------- .../hos_greatcoat.rsi/equipped-OUTERCLOTHING.png | Bin .../OuterClothing/Coats/hos_greatcoat.rsi/icon.png | Bin .../Coats/hos_greatcoat.rsi/inhand-left.png | Bin .../Coats/hos_greatcoat.rsi/inhand-right.png | Bin .../Coats/hos_greatcoat.rsi/meta.json | 0 6 files changed, 5 insertions(+), 8 deletions(-) rename Resources/Textures/{ => _Sunrise}/Clothing/OuterClothing/Coats/hos_greatcoat.rsi/equipped-OUTERCLOTHING.png (100%) rename Resources/Textures/{ => _Sunrise}/Clothing/OuterClothing/Coats/hos_greatcoat.rsi/icon.png (100%) rename Resources/Textures/{ => _Sunrise}/Clothing/OuterClothing/Coats/hos_greatcoat.rsi/inhand-left.png (100%) rename Resources/Textures/{ => _Sunrise}/Clothing/OuterClothing/Coats/hos_greatcoat.rsi/inhand-right.png (100%) rename Resources/Textures/{ => _Sunrise}/Clothing/OuterClothing/Coats/hos_greatcoat.rsi/meta.json (100%) diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/coats.yml index 964913fb55c..f9be4edc552 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/coats.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/coats.yml @@ -1,13 +1,13 @@ - type: entity - parent: ClothingOuterStorageBase + parent: ClothingOuterCoatHoSTrench id: ClothingOuterCoatHoSGreatcoat name: armored greatcoat description: A greatcoat enhanced with a special alloy for some extra protection and style for those with a commanding presence. components: - type: Sprite - sprite: Clothing/OuterClothing/Coats/hos_greatcoat.rsi + sprite: _Sunrise/OuterClothing/Coats/hos_greatcoat.rsi - type: Clothing - sprite: Clothing/OuterClothing/Coats/hos_greatcoat.rsi + sprite: _Sunrise/OuterClothing/Coats/hos_greatcoat.rsi - type: Armor modifiers: coefficients: @@ -17,7 +17,7 @@ Heat: 0.7 - type: entity - parent: ClothingOuterStorageBase + parent: ClothingOuterCoatDetectiveLoadout id: ClothingOuterCoatDetectiveDark name: noir trenchcoat description: A hard-boiled private investigator's dark trenchcoat. @@ -26,9 +26,6 @@ sprite: _Sunrise/Clothing/OuterClothing/Coats/noirdet.rsi - type: Clothing sprite: _Sunrise/Clothing/OuterClothing/Coats/noirdet.rsi - - type: StorageFill - contents: - - id: SmokingPipeFilledTobacco - type: Armor modifiers: coefficients: @@ -38,7 +35,7 @@ Heat: 0.9 - type: entity - parent: ClothingOuterStorageBase + parent: ClothingOuterCoatWarden id: ClothingOuterCoatWardenAlt name: warden's jacket description: A navy-blue armored jacket with blue shoulder designations and '/Warden/' stitched into one of the chest pockets. diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/hos_greatcoat.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_Sunrise/Clothing/OuterClothing/Coats/hos_greatcoat.rsi/equipped-OUTERCLOTHING.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/Coats/hos_greatcoat.rsi/equipped-OUTERCLOTHING.png rename to Resources/Textures/_Sunrise/Clothing/OuterClothing/Coats/hos_greatcoat.rsi/equipped-OUTERCLOTHING.png diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/hos_greatcoat.rsi/icon.png b/Resources/Textures/_Sunrise/Clothing/OuterClothing/Coats/hos_greatcoat.rsi/icon.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/Coats/hos_greatcoat.rsi/icon.png rename to Resources/Textures/_Sunrise/Clothing/OuterClothing/Coats/hos_greatcoat.rsi/icon.png diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/hos_greatcoat.rsi/inhand-left.png b/Resources/Textures/_Sunrise/Clothing/OuterClothing/Coats/hos_greatcoat.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/Coats/hos_greatcoat.rsi/inhand-left.png rename to Resources/Textures/_Sunrise/Clothing/OuterClothing/Coats/hos_greatcoat.rsi/inhand-left.png diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/hos_greatcoat.rsi/inhand-right.png b/Resources/Textures/_Sunrise/Clothing/OuterClothing/Coats/hos_greatcoat.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/Coats/hos_greatcoat.rsi/inhand-right.png rename to Resources/Textures/_Sunrise/Clothing/OuterClothing/Coats/hos_greatcoat.rsi/inhand-right.png diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/hos_greatcoat.rsi/meta.json b/Resources/Textures/_Sunrise/Clothing/OuterClothing/Coats/hos_greatcoat.rsi/meta.json similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/Coats/hos_greatcoat.rsi/meta.json rename to Resources/Textures/_Sunrise/Clothing/OuterClothing/Coats/hos_greatcoat.rsi/meta.json