From 71bcf32988819e2bf6696cff61a3cccdcffc2970 Mon Sep 17 00:00:00 2001 From: Alkheemist Date: Sun, 12 Jan 2025 17:44:50 +1100 Subject: [PATCH 01/35] Add basis of grid based shipments --- Content.Server/Cargo/Systems/CargoSystem.cs | 1 + .../Components/ShipmentPriceComponent.cs | 14 ++++++ .../Components/ShipmentRecieveComponent.cs | 10 +++++ .../_NF/Cargo/Systems/ShipmentPriceSystem.cs | 45 +++++++++++++++++++ 4 files changed, 70 insertions(+) create mode 100644 Content.Server/_NF/Cargo/Components/ShipmentPriceComponent.cs create mode 100644 Content.Server/_NF/Cargo/Components/ShipmentRecieveComponent.cs create mode 100644 Content.Server/_NF/Cargo/Systems/ShipmentPriceSystem.cs diff --git a/Content.Server/Cargo/Systems/CargoSystem.cs b/Content.Server/Cargo/Systems/CargoSystem.cs index 5744584b839..cc8241c38ae 100644 --- a/Content.Server/Cargo/Systems/CargoSystem.cs +++ b/Content.Server/Cargo/Systems/CargoSystem.cs @@ -74,6 +74,7 @@ public override void Initialize() InitializeBounty(); // Frontier: add specific initialization calls here. InitializePirateBounty(); + InitializeShipmentPrice(); // End Frontier } diff --git a/Content.Server/_NF/Cargo/Components/ShipmentPriceComponent.cs b/Content.Server/_NF/Cargo/Components/ShipmentPriceComponent.cs new file mode 100644 index 00000000000..e2722495983 --- /dev/null +++ b/Content.Server/_NF/Cargo/Components/ShipmentPriceComponent.cs @@ -0,0 +1,14 @@ +using Robust.Shared.Prototypes; + +namespace Content.Server.Cargo.Components; + +// Component to give an object an inflated apprasial price at certain shipyards. +[RegisterComponent] +public sealed partial class ShipmentPriceComponent : Component +{ + /// + /// The price of the object at the destination shipyard. + /// + [DataField("bonusPrice", required: true)] + public int BonusPrice; +} diff --git a/Content.Server/_NF/Cargo/Components/ShipmentRecieveComponent.cs b/Content.Server/_NF/Cargo/Components/ShipmentRecieveComponent.cs new file mode 100644 index 00000000000..3a2a27d395c --- /dev/null +++ b/Content.Server/_NF/Cargo/Components/ShipmentRecieveComponent.cs @@ -0,0 +1,10 @@ +using Robust.Shared.Prototypes; + +namespace Content.Server.Cargo.Components; + +// Component to mark a station as a valid destination for shipments +[RegisterComponent] +public sealed partial class ShipmentRecieveComponent : Component +{ + +} diff --git a/Content.Server/_NF/Cargo/Systems/ShipmentPriceSystem.cs b/Content.Server/_NF/Cargo/Systems/ShipmentPriceSystem.cs new file mode 100644 index 00000000000..d8c825ce52e --- /dev/null +++ b/Content.Server/_NF/Cargo/Systems/ShipmentPriceSystem.cs @@ -0,0 +1,45 @@ +using Content.Server.Cargo.Components; +using Content.Server.Shuttles.Systems; + +namespace Content.Server.Cargo.Systems; // Needs to collide with base namespace + +public sealed partial class CargoSystem +{ + + [Dependency] private readonly DockingSystem _docking = default!; + private void InitializeShipmentPrice() + { + SubscribeLocalEvent(OnShipmentGetPriceEvent); + } + + private void OnShipmentGetPriceEvent(Entity entity, ref PriceCalculationEvent ev) + { + if (!TryComp(entity, out var xform)) + { + return; //how do we not have a transform? + } + var currentShuttle = xform.GridUid; + if (currentShuttle != null) + { + var shuttleDocks = _docking.GetDocks((EntityUid)currentShuttle); //check we're docked to a destination grid + foreach (var shuttleDock in shuttleDocks) + { + if (shuttleDock.Comp.DockedWith != null) + { + if (TryComp(shuttleDock.Comp.DockedWith, out var dock)) + { + if (HasComp(dock.GridUid)) + { + ev.Price = entity.Comp.BonusPrice; + break; + } + } + + } + } + + } + + } + +} From 89425a325f60e3ac3d316f14b60f790290bb5780 Mon Sep 17 00:00:00 2001 From: Telos Date: Sun, 12 Jan 2025 13:16:46 -0600 Subject: [PATCH 02/35] test --- Content.Server/Chemistry/Components/ChemMasterComponent.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/Content.Server/Chemistry/Components/ChemMasterComponent.cs b/Content.Server/Chemistry/Components/ChemMasterComponent.cs index 9578755ba76..ffbd36a77d1 100644 --- a/Content.Server/Chemistry/Components/ChemMasterComponent.cs +++ b/Content.Server/Chemistry/Components/ChemMasterComponent.cs @@ -25,3 +25,4 @@ public sealed partial class ChemMasterComponent : Component public SoundSpecifier ClickSound = new SoundPathSpecifier("/Audio/Machines/machine_switch.ogg"); } } +//test From 9f9baf74011f29957f5a2a8697189060a7725ab5 Mon Sep 17 00:00:00 2001 From: blackknight954 <40075385+blackknight954@users.noreply.github.com> Date: Sun, 12 Jan 2025 14:40:09 -0600 Subject: [PATCH 03/35] Cargo Voucher added --- .../Entities/Objects/Devices/Misc/ship_vouchers.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/Misc/ship_vouchers.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/Misc/ship_vouchers.yml index c369948191b..46a9e04ff04 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Devices/Misc/ship_vouchers.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Devices/Misc/ship_vouchers.yml @@ -120,3 +120,16 @@ - type: ShipyardVoucher access: - Brig # odd, but potentially restricts cadets in lieu of a security guard-only access level + + + +- type: entity + parent: BaseShipVoucher + id: CargoVoucher + name: Cargo Crate Voucher + description: Allows for purchasing and selling of cargo containers. + components: + - type: CargoVoucher + destroyOnEmpty: false + access: + - Maintenance # An access every ID card starts with From 0d51d6c0f70478698fdb09105e2814fd4d75d78f Mon Sep 17 00:00:00 2001 From: blackknight954 <40075385+blackknight954@users.noreply.github.com> Date: Sun, 12 Jan 2025 17:22:41 -0600 Subject: [PATCH 04/35] reverted cargo voucher --- .../Entities/Objects/Devices/Misc/ship_vouchers.yml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/Misc/ship_vouchers.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/Misc/ship_vouchers.yml index 46a9e04ff04..c4d0ee7d2b4 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Devices/Misc/ship_vouchers.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Devices/Misc/ship_vouchers.yml @@ -121,15 +121,3 @@ access: - Brig # odd, but potentially restricts cadets in lieu of a security guard-only access level - - -- type: entity - parent: BaseShipVoucher - id: CargoVoucher - name: Cargo Crate Voucher - description: Allows for purchasing and selling of cargo containers. - components: - - type: CargoVoucher - destroyOnEmpty: false - access: - - Maintenance # An access every ID card starts with From 3e2f2e470ddb6b50d0df84b3f969dd11c9d94ef9 Mon Sep 17 00:00:00 2001 From: Alkheemist Date: Mon, 13 Jan 2025 11:22:47 +1100 Subject: [PATCH 05/35] code refactor --- .../_NF/Cargo/Systems/ShipmentPriceSystem.cs | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/Content.Server/_NF/Cargo/Systems/ShipmentPriceSystem.cs b/Content.Server/_NF/Cargo/Systems/ShipmentPriceSystem.cs index d8c825ce52e..9ab94287db1 100644 --- a/Content.Server/_NF/Cargo/Systems/ShipmentPriceSystem.cs +++ b/Content.Server/_NF/Cargo/Systems/ShipmentPriceSystem.cs @@ -14,7 +14,7 @@ private void InitializeShipmentPrice() private void OnShipmentGetPriceEvent(Entity entity, ref PriceCalculationEvent ev) { - if (!TryComp(entity, out var xform)) + if (!TryComp(entity, out TransformComponent? xform)) { return; //how do we not have a transform? } @@ -24,22 +24,13 @@ private void OnShipmentGetPriceEvent(Entity entity, ref var shuttleDocks = _docking.GetDocks((EntityUid)currentShuttle); //check we're docked to a destination grid foreach (var shuttleDock in shuttleDocks) { - if (shuttleDock.Comp.DockedWith != null) + // If the ship we're on is docked with a dock that is on a grid that is tagged, add bonus price and break. + if (shuttleDock.Comp.DockedWith != null && TryComp(shuttleDock.Comp.DockedWith, out var dock) && HasComp(dock.GridUid)) { - if (TryComp(shuttleDock.Comp.DockedWith, out var dock)) - { - if (HasComp(dock.GridUid)) - { - ev.Price = entity.Comp.BonusPrice; - break; - } - } - + ev.Price = entity.Comp.BonusPrice; + break; } } - } - } - } From 25844a6600e09034143c8764f2556a63a99c79a3 Mon Sep 17 00:00:00 2001 From: Telos Date: Sun, 12 Jan 2025 18:30:29 -0600 Subject: [PATCH 06/35] test shipment --- Resources/Maps/_NF/POI/trade.yml | 1 + Resources/Maps/_NF/POI/trademall.yml | 1 + .../_NF/Shuttles/Shipment/basicshipment1.yml | 567 ++++++++++++++++++ .../_NF/Shipyard/Shipment/basicshipment1.yml | 42 ++ 4 files changed, 611 insertions(+) create mode 100644 Resources/Maps/_NF/Shuttles/Shipment/basicshipment1.yml create mode 100644 Resources/Prototypes/_NF/Shipyard/Shipment/basicshipment1.yml diff --git a/Resources/Maps/_NF/POI/trade.yml b/Resources/Maps/_NF/POI/trade.yml index 27b2a1d9789..121fae7a637 100644 --- a/Resources/Maps/_NF/POI/trade.yml +++ b/Resources/Maps/_NF/POI/trade.yml @@ -2516,6 +2516,7 @@ entities: - type: NavMap - type: BecomesStation id: Trade + - type: ShipmentRecieve - proto: AirAlarm entities: - uid: 6079 diff --git a/Resources/Maps/_NF/POI/trademall.yml b/Resources/Maps/_NF/POI/trademall.yml index 34d2b9ab705..b2a5e299b19 100644 --- a/Resources/Maps/_NF/POI/trademall.yml +++ b/Resources/Maps/_NF/POI/trademall.yml @@ -5326,6 +5326,7 @@ entities: - type: IFF - type: StationMember - type: NavMap + - type: ShipmentRecieve - proto: AirAlarm entities: - uid: 216 diff --git a/Resources/Maps/_NF/Shuttles/Shipment/basicshipment1.yml b/Resources/Maps/_NF/Shuttles/Shipment/basicshipment1.yml new file mode 100644 index 00000000000..a8da0f99dc1 --- /dev/null +++ b/Resources/Maps/_NF/Shuttles/Shipment/basicshipment1.yml @@ -0,0 +1,567 @@ +meta: + format: 6 + postmapinit: false +tilemap: + 0: Space + 30: FloorDark + 35: FloorDarkMono + 105: FloorTechMaint + 121: Lattice + 122: Plating +entities: +- proto: "" + entities: + - uid: 1 + components: + - type: MetaData + name: shipment + - type: Transform + pos: -0.51420784,-0.5497939 + parent: invalid + - type: MapGrid + chunks: + 0,0: + ind: 0,0 + tiles: HgAAAAACHgAAAAACegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAADHgAAAAADegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAADHgAAAAACegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + -1,0: + ind: -1,0 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAHgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAHgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + 0,-1: + ind: 0,-1 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAACHgAAAAADegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAADHgAAAAABegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAHgAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + -1,-1: + ind: -1,-1 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAHgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAHgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAHgAAAAAA + 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: '#FFFFFFFF' + id: DeliveryGreyscale + decals: + 0: 2,-3 + - node: + angle: 1.5707963267948966 rad + color: '#FFFFFFFF' + id: StandClear + decals: + 27: -2,0 + - node: + angle: 4.71238898038469 rad + color: '#FFFFFFFF' + id: StandClear + decals: + 25: 2,0 + - node: + color: '#D4D4D496' + id: WarnLineGreyscaleE + decals: + 29: 1,0 + - node: + color: '#D4D4D496' + id: WarnLineGreyscaleW + decals: + 28: -1,0 + - type: GridAtmosphere + version: 2 + data: + tiles: + 0,0: + 0: 823 + 1: 16384 + 0,-1: + 0: 13104 + 1: 4 + -1,0: + 0: 2188 + 1: 16384 + -1,-1: + 0: 34944 + 1: 4 + 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 + - type: BecomesStation + id: BasicShipment1 +- proto: AirlockShuttle + entities: + - uid: 4 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,0.5 + parent: 1 + - uid: 54 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 2.5,0.5 + parent: 1 +- proto: APCBasic + entities: + - uid: 105 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,1.5 + parent: 1 +- proto: AtmosDeviceFanDirectional + entities: + - uid: 8 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 2.5,0.5 + parent: 1 +- proto: AtmosFixBlockerMarker + entities: + - uid: 39 + components: + - type: Transform + pos: 2.5,3.5 + parent: 1 + - uid: 113 + components: + - type: Transform + pos: 2.5,-3.5 + parent: 1 + - uid: 114 + components: + - type: Transform + pos: -1.5,3.5 + parent: 1 + - uid: 130 + components: + - type: Transform + pos: -1.5,-3.5 + parent: 1 +- proto: CableApcExtension + entities: + - uid: 7 + components: + - type: Transform + pos: -0.5,1.5 + parent: 1 + - uid: 15 + components: + - type: Transform + pos: 0.5,-0.5 + parent: 1 + - uid: 16 + components: + - type: Transform + pos: 0.5,-1.5 + parent: 1 + - uid: 29 + components: + - type: Transform + pos: -1.5,1.5 + parent: 1 + - uid: 37 + components: + - type: Transform + pos: -1.5,1.5 + parent: 1 + - uid: 43 + components: + - type: Transform + pos: 0.5,1.5 + parent: 1 + - uid: 50 + components: + - type: Transform + pos: 0.5,0.5 + parent: 1 + - uid: 52 + components: + - type: Transform + pos: 0.5,-2.5 + parent: 1 +- proto: CableHV + entities: + - uid: 2 + components: + - type: Transform + pos: -0.5,-2.5 + parent: 1 + - uid: 3 + components: + - type: Transform + pos: -0.5,-3.5 + parent: 1 + - uid: 38 + components: + - type: Transform + pos: -0.5,-1.5 + parent: 1 + - uid: 101 + components: + - type: Transform + pos: -1.5,-1.5 + parent: 1 +- proto: CableMV + entities: + - uid: 18 + components: + - type: Transform + pos: -1.5,-1.5 + parent: 1 + - uid: 19 + components: + - type: Transform + pos: -1.5,1.5 + parent: 1 + - uid: 27 + components: + - type: Transform + pos: -0.5,-1.5 + parent: 1 + - uid: 28 + components: + - type: Transform + pos: -0.5,-0.5 + parent: 1 + - uid: 34 + components: + - type: Transform + pos: -1.5,-1.5 + parent: 1 + - uid: 46 + components: + - type: Transform + pos: -0.5,0.5 + parent: 1 + - uid: 48 + components: + - type: Transform + pos: -1.5,1.5 + parent: 1 + - uid: 49 + components: + - type: Transform + pos: -0.5,1.5 + parent: 1 +- proto: Catwalk + entities: + - uid: 14 + components: + - type: Transform + pos: 1.5,0.5 + parent: 1 + - uid: 35 + components: + - type: Transform + pos: 0.5,0.5 + parent: 1 + - uid: 40 + components: + - type: Transform + pos: -0.5,0.5 + parent: 1 +- proto: ComputerShuttle + entities: + - uid: 60 + components: + - type: Transform + pos: 0.5,0.5 + parent: 1 +- proto: GeneratorWallmountAPU + entities: + - uid: 5 + components: + - type: Transform + pos: -0.5,-3.5 + parent: 1 +- proto: SignElectricalMed + entities: + - uid: 59 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,-2.5 + parent: 1 +- proto: SubstationWallBasic + entities: + - uid: 26 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,-1.5 + parent: 1 +- proto: TelecomServer + entities: + - uid: 11 + components: + - type: Transform + pos: 0.5,-1.5 + parent: 1 + - type: ShipmentPrice + bonusPrice: 10000 + - uid: 17 + components: + - type: Transform + pos: -0.5,-1.5 + parent: 1 + - type: ShipmentPrice + bonusPrice: 10000 + - uid: 20 + components: + - type: Transform + pos: 0.5,2.5 + parent: 1 + - type: ShipmentPrice + bonusPrice: 10000 + - uid: 21 + components: + - type: Transform + pos: -0.5,2.5 + parent: 1 + - type: ShipmentPrice + bonusPrice: 10000 + - uid: 22 + components: + - type: Transform + pos: 1.5,-0.5 + parent: 1 + - type: ShipmentPrice + bonusPrice: 10000 + - uid: 24 + components: + - type: Transform + pos: -0.5,-0.5 + parent: 1 + - type: ShipmentPrice + bonusPrice: 10000 + - uid: 30 + components: + - type: Transform + pos: -0.5,-2.5 + parent: 1 + - type: ShipmentPrice + bonusPrice: 10000 + - uid: 33 + components: + - type: Transform + pos: 1.5,-1.5 + parent: 1 + - type: ShipmentPrice + bonusPrice: 10000 + - uid: 41 + components: + - type: Transform + pos: 1.5,-2.5 + parent: 1 + - type: ShipmentPrice + bonusPrice: 10000 + - uid: 42 + components: + - type: Transform + pos: 1.5,1.5 + parent: 1 + - type: ShipmentPrice + bonusPrice: 10000 + - uid: 44 + components: + - type: Transform + pos: 0.5,-2.5 + parent: 1 + - type: ShipmentPrice + bonusPrice: 10000 + - uid: 45 + components: + - type: Transform + pos: 0.5,1.5 + parent: 1 + - type: ShipmentPrice + bonusPrice: 10000 + - uid: 47 + components: + - type: Transform + pos: -0.5,1.5 + parent: 1 + - type: ShipmentPrice + bonusPrice: 10000 + - uid: 53 + components: + - type: Transform + pos: 0.5,-0.5 + parent: 1 + - type: ShipmentPrice + bonusPrice: 10000 + - uid: 57 + components: + - type: Transform + pos: 1.5,2.5 + parent: 1 + - type: ShipmentPrice + bonusPrice: 10000 +- proto: WallSolid + entities: + - uid: 6 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,2.5 + parent: 1 + - uid: 9 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,1.5 + parent: 1 + - uid: 10 + components: + - type: Transform + pos: -1.5,2.5 + parent: 1 + - uid: 13 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 2.5,-1.5 + parent: 1 + - uid: 23 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,-3.5 + parent: 1 + - uid: 25 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,-3.5 + parent: 1 + - uid: 31 + components: + - type: Transform + pos: -0.5,3.5 + parent: 1 + - uid: 36 + components: + - type: Transform + pos: -1.5,-2.5 + parent: 1 + - uid: 51 + components: + - type: Transform + pos: 0.5,3.5 + parent: 1 + - uid: 56 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,-0.5 + parent: 1 + - uid: 58 + components: + - type: Transform + pos: 1.5,3.5 + parent: 1 + - uid: 67 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,-1.5 + parent: 1 + - uid: 75 + components: + - type: Transform + pos: -1.5,1.5 + parent: 1 + - uid: 80 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 2.5,-2.5 + parent: 1 + - uid: 88 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,-3.5 + parent: 1 + - uid: 138 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,-0.5 + parent: 1 +- proto: WallSolidDiagonal + entities: + - uid: 12 + components: + - type: Transform + pos: -1.5,3.5 + parent: 1 + - uid: 32 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,-3.5 + parent: 1 + - uid: 55 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,3.5 + parent: 1 + - uid: 87 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,-3.5 + parent: 1 +... diff --git a/Resources/Prototypes/_NF/Shipyard/Shipment/basicshipment1.yml b/Resources/Prototypes/_NF/Shipyard/Shipment/basicshipment1.yml new file mode 100644 index 00000000000..2c3525ebda5 --- /dev/null +++ b/Resources/Prototypes/_NF/Shipyard/Shipment/basicshipment1.yml @@ -0,0 +1,42 @@ +# Author Info +# GitHub: todo +# Discord: ??? + +# Maintainer Info +# GitHub: ??? +# Discord: ??? + +# Shuttle Notes: +# +- type: vessel + id: BasicShipment1 + #parent: BaseVessel #Todo: abstract shipment container parent + name: Shipment + description: A delivery to trade. + price: 4500 + category: Small + group: Shipyard #todo: change when we get a shipment shipyard + #access: Shipment #todo: change when we get a shipment deed/voucher + shuttlePath: /Maps/_NF/Shuttles/Shipment/basicshipment1.yml + guidebookPage: Null + addComponents: + - type: IFF + color: '#C0C0C0' + flags: [IsPlayerShuttle, HideLabel] + +- type: gameMap + id: BasicShipment1 + mapName: 'BasicShipment1' + mapPath: /Maps/_NF/Shuttles/Shipment/basicshipment1.yml + minPlayers: 0 + stations: + BasicShipment1: + stationProto: StandardFrontierVessel + components: + - type: StationNameSetup + mapNameTemplate: 'Shipment {1}' + nameGenerator: + !type:NanotrasenNameGenerator + prefixCreator: '14' + - type: StationJobs + availableJobs: {} From 6db361d876c5957963d3c2b5e2941569da7b175b Mon Sep 17 00:00:00 2001 From: blackknight954 <40075385+blackknight954@users.noreply.github.com> Date: Sun, 12 Jan 2025 18:31:21 -0600 Subject: [PATCH 07/35] Revert "reverted cargo voucher" This reverts commit 0d51d6c0f70478698fdb09105e2814fd4d75d78f. --- .../Entities/Objects/Devices/Misc/ship_vouchers.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/Misc/ship_vouchers.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/Misc/ship_vouchers.yml index c4d0ee7d2b4..46a9e04ff04 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Devices/Misc/ship_vouchers.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Devices/Misc/ship_vouchers.yml @@ -121,3 +121,15 @@ access: - Brig # odd, but potentially restricts cadets in lieu of a security guard-only access level + + +- type: entity + parent: BaseShipVoucher + id: CargoVoucher + name: Cargo Crate Voucher + description: Allows for purchasing and selling of cargo containers. + components: + - type: CargoVoucher + destroyOnEmpty: false + access: + - Maintenance # An access every ID card starts with From e5bd06df1ce3ccf642d9fe1f577aa99010fc46fe Mon Sep 17 00:00:00 2001 From: Telos Date: Sun, 12 Jan 2025 18:33:01 -0600 Subject: [PATCH 08/35] unwrench servers for power consumption --- .../_NF/Shuttles/Shipment/basicshipment1.yml | 47 ++++++++++++++++++- 1 file changed, 45 insertions(+), 2 deletions(-) diff --git a/Resources/Maps/_NF/Shuttles/Shipment/basicshipment1.yml b/Resources/Maps/_NF/Shuttles/Shipment/basicshipment1.yml index a8da0f99dc1..2eac881551b 100644 --- a/Resources/Maps/_NF/Shuttles/Shipment/basicshipment1.yml +++ b/Resources/Maps/_NF/Shuttles/Shipment/basicshipment1.yml @@ -133,8 +133,6 @@ entities: chunkSize: 4 - type: GasTileOverlay - type: RadiationGridResistance - - type: BecomesStation - id: BasicShipment1 - proto: AirlockShuttle entities: - uid: 4 @@ -345,106 +343,151 @@ entities: - uid: 11 components: - type: Transform + anchored: False pos: 0.5,-1.5 parent: 1 + - type: Physics + bodyType: Dynamic - type: ShipmentPrice bonusPrice: 10000 - uid: 17 components: - type: Transform + anchored: False pos: -0.5,-1.5 parent: 1 + - type: Physics + bodyType: Dynamic - type: ShipmentPrice bonusPrice: 10000 - uid: 20 components: - type: Transform + anchored: False pos: 0.5,2.5 parent: 1 + - type: Physics + bodyType: Dynamic - type: ShipmentPrice bonusPrice: 10000 - uid: 21 components: - type: Transform + anchored: False pos: -0.5,2.5 parent: 1 + - type: Physics + bodyType: Dynamic - type: ShipmentPrice bonusPrice: 10000 - uid: 22 components: - type: Transform + anchored: False pos: 1.5,-0.5 parent: 1 + - type: Physics + bodyType: Dynamic - type: ShipmentPrice bonusPrice: 10000 - uid: 24 components: - type: Transform + anchored: False pos: -0.5,-0.5 parent: 1 + - type: Physics + bodyType: Dynamic - type: ShipmentPrice bonusPrice: 10000 - uid: 30 components: - type: Transform + anchored: False pos: -0.5,-2.5 parent: 1 + - type: Physics + bodyType: Dynamic - type: ShipmentPrice bonusPrice: 10000 - uid: 33 components: - type: Transform + anchored: False pos: 1.5,-1.5 parent: 1 + - type: Physics + bodyType: Dynamic - type: ShipmentPrice bonusPrice: 10000 - uid: 41 components: - type: Transform + anchored: False pos: 1.5,-2.5 parent: 1 + - type: Physics + bodyType: Dynamic - type: ShipmentPrice bonusPrice: 10000 - uid: 42 components: - type: Transform + anchored: False pos: 1.5,1.5 parent: 1 + - type: Physics + bodyType: Dynamic - type: ShipmentPrice bonusPrice: 10000 - uid: 44 components: - type: Transform + anchored: False pos: 0.5,-2.5 parent: 1 + - type: Physics + bodyType: Dynamic - type: ShipmentPrice bonusPrice: 10000 - uid: 45 components: - type: Transform + anchored: False pos: 0.5,1.5 parent: 1 + - type: Physics + bodyType: Dynamic - type: ShipmentPrice bonusPrice: 10000 - uid: 47 components: - type: Transform + anchored: False pos: -0.5,1.5 parent: 1 + - type: Physics + bodyType: Dynamic - type: ShipmentPrice bonusPrice: 10000 - uid: 53 components: - type: Transform + anchored: False pos: 0.5,-0.5 parent: 1 + - type: Physics + bodyType: Dynamic - type: ShipmentPrice bonusPrice: 10000 - uid: 57 components: - type: Transform + anchored: False pos: 1.5,2.5 parent: 1 + - type: Physics + bodyType: Dynamic - type: ShipmentPrice bonusPrice: 10000 - proto: WallSolid From 8dfc392d7f183b04fe4b04c3be662863f054b30e Mon Sep 17 00:00:00 2001 From: Telos Date: Sun, 12 Jan 2025 18:34:59 -0600 Subject: [PATCH 09/35] Revert "test" This reverts commit 89425a325f60e3ac3d316f14b60f790290bb5780. --- Content.Server/Chemistry/Components/ChemMasterComponent.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/Content.Server/Chemistry/Components/ChemMasterComponent.cs b/Content.Server/Chemistry/Components/ChemMasterComponent.cs index ffbd36a77d1..9578755ba76 100644 --- a/Content.Server/Chemistry/Components/ChemMasterComponent.cs +++ b/Content.Server/Chemistry/Components/ChemMasterComponent.cs @@ -25,4 +25,3 @@ public sealed partial class ChemMasterComponent : Component public SoundSpecifier ClickSound = new SoundPathSpecifier("/Audio/Machines/machine_switch.ogg"); } } -//test From 5880a60c5726587ebdef2a959ed3ca7b81369020 Mon Sep 17 00:00:00 2001 From: Alkheemist Date: Mon, 13 Jan 2025 14:52:16 +1100 Subject: [PATCH 10/35] serverside recursive dock list method --- .../Shuttles/Systems/DockingSystem.Shuttle.cs | 33 +++++++++++++++++++ .../Components/DockPassthroughComponent.cs | 9 +++++ 2 files changed, 42 insertions(+) create mode 100644 Content.Server/_NF/Shuttles/Components/DockPassthroughComponent.cs diff --git a/Content.Server/Shuttles/Systems/DockingSystem.Shuttle.cs b/Content.Server/Shuttles/Systems/DockingSystem.Shuttle.cs index aabfaa31dd8..11f0960ff7f 100644 --- a/Content.Server/Shuttles/Systems/DockingSystem.Shuttle.cs +++ b/Content.Server/Shuttles/Systems/DockingSystem.Shuttle.cs @@ -1,6 +1,7 @@ using System.Linq; using System.Numerics; using Content.Server.Shuttles.Components; +using Content.Server._NF.Shuttles.Components; // Frontier using Robust.Shared.Map; using Robust.Shared.Map.Components; using Robust.Shared.Physics; @@ -358,4 +359,36 @@ public List> GetDocks(EntityUid uid) return _dockingSet.ToList(); } + + // Frontier Start + // Recursively create a list of all docks on the target grid and all other grids docked to that grid, if those grids have the DockPassthroughComponent + public List> GetDocksRecursive(EntityUid uid) + { + HashSet checkedGrids = []; + Queue gridsToCheck = new(); + + HashSet> fullDockingSet = new(); + + gridsToCheck.Enqueue(uid); + + while (gridsToCheck.Count > 0) + { + var grid = gridsToCheck.Dequeue(); + checkedGrids.Add(grid); + var docks = GetDocks(grid); + foreach (var dock in docks) + { + if (dock.Comp.DockedWith != null && + TryComp(dock.Comp.DockedWith, out var otherDock) && + HasComp(otherDock.GridUid) && + !checkedGrids.Contains((EntityUid)otherDock.GridUid)) + { + gridsToCheck.Enqueue((EntityUid)otherDock.GridUid); // Only add it to the queue if it hasn't already been checked + } + } + fullDockingSet.UnionWith(docks); + } + return fullDockingSet.ToList(); + } + // Frontier End } diff --git a/Content.Server/_NF/Shuttles/Components/DockPassthroughComponent.cs b/Content.Server/_NF/Shuttles/Components/DockPassthroughComponent.cs new file mode 100644 index 00000000000..d63d162e72a --- /dev/null +++ b/Content.Server/_NF/Shuttles/Components/DockPassthroughComponent.cs @@ -0,0 +1,9 @@ +namespace Content.Server._NF.Shuttles.Components; + +/// +/// Grids with this component will allow their docks to be controlled by any shuttle console on a grid docked to it, recursively. +/// +[RegisterComponent] +public sealed partial class DockPassthroughComponent : Component +{ +} From b8433054fa7d934cd37bc79b05391343298dd29f Mon Sep 17 00:00:00 2001 From: Alkheemist Date: Mon, 13 Jan 2025 15:33:54 +1100 Subject: [PATCH 11/35] added recursive "is it our dock" to the list of docks to view --- .../Shuttles/UI/DockingScreen.xaml.cs | 52 ++++++++++++++++++- 1 file changed, 51 insertions(+), 1 deletion(-) diff --git a/Content.Client/Shuttles/UI/DockingScreen.xaml.cs b/Content.Client/Shuttles/UI/DockingScreen.xaml.cs index 3ff4d4188c2..a46715e6693 100644 --- a/Content.Client/Shuttles/UI/DockingScreen.xaml.cs +++ b/Content.Client/Shuttles/UI/DockingScreen.xaml.cs @@ -79,7 +79,7 @@ private void BuildDocks(EntityUid? shuttle) var shuttleNent = _entManager.GetNetEntity(shuttle.Value); - if (!Docks.TryGetValue(shuttleNent, out var shuttleDocks) || shuttleDocks.Count <= 0) + if (!GetOurDocksRecursive(shuttleNent, out var shuttleDocks) || shuttleDocks == null) return; var dockText = new StringBuilder(); @@ -187,4 +187,54 @@ private void OnDockPress(DockingPortState state) { DockingControl.SetViewedDock(state); } + // Frontier Start + private bool GetOurDocks(NetEntity shuttleNent, out List? ShuttleDocks) + { + if (!Docks.TryGetValue(shuttleNent, out var shuttleDocks) || shuttleDocks.Count <= 0) + { + ShuttleDocks = null; + return false; + } + ShuttleDocks = shuttleDocks; + return true; + } + // Recursively create a list of all docks on the target grid and all other grids docked to that grid, if those grids have the DockPassthroughComponent + + + private bool GetOurDocksRecursive(NetEntity shuttleNent, out List? ShuttleDocks) + { + HashSet shuttleDocks = []; + HashSet checkedGrids = []; + Queue gridsToCheck = new(); + + gridsToCheck.Enqueue(shuttleNent); + while (gridsToCheck.Count > 0) + { + var grid = gridsToCheck.Dequeue(); + checkedGrids.Add(grid); + if (!GetOurDocks(grid, out var docks) || docks == null) + { + continue; + } + foreach (var dock in docks) + { + if (dock.GridDockedWith != null && + !checkedGrids.Contains((NetEntity)dock.GridDockedWith)) + { + gridsToCheck.Enqueue((NetEntity)dock.GridDockedWith); // Only add it to the queue if it hasn't already been checked + } + } + shuttleDocks.UnionWith(docks); + } + ShuttleDocks = shuttleDocks.ToList(); + if (ShuttleDocks.Count <= 0) + { + return false; + } + return true; + } + + // Frontier End + + } From fc202858a2c901f6d3a28fa4774a66f8450b263e Mon Sep 17 00:00:00 2001 From: Alkheemist Date: Mon, 13 Jan 2025 15:34:46 +1100 Subject: [PATCH 12/35] don't use recursive yet --- Content.Client/Shuttles/UI/DockingScreen.xaml.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Client/Shuttles/UI/DockingScreen.xaml.cs b/Content.Client/Shuttles/UI/DockingScreen.xaml.cs index a46715e6693..5a9ee9592ee 100644 --- a/Content.Client/Shuttles/UI/DockingScreen.xaml.cs +++ b/Content.Client/Shuttles/UI/DockingScreen.xaml.cs @@ -79,7 +79,7 @@ private void BuildDocks(EntityUid? shuttle) var shuttleNent = _entManager.GetNetEntity(shuttle.Value); - if (!GetOurDocksRecursive(shuttleNent, out var shuttleDocks) || shuttleDocks == null) + if (!GetOurDocks(shuttleNent, out var shuttleDocks) || shuttleDocks == null) return; var dockText = new StringBuilder(); From cc6052861451ae35ec9cd3557ac208dc8ac1a3bb Mon Sep 17 00:00:00 2001 From: Alkheemist Date: Mon, 13 Jan 2025 23:50:13 +1100 Subject: [PATCH 13/35] Revert "don't use recursive yet" This reverts commit fc202858a2c901f6d3a28fa4774a66f8450b263e. --- Content.Client/Shuttles/UI/DockingScreen.xaml.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Client/Shuttles/UI/DockingScreen.xaml.cs b/Content.Client/Shuttles/UI/DockingScreen.xaml.cs index 5a9ee9592ee..a46715e6693 100644 --- a/Content.Client/Shuttles/UI/DockingScreen.xaml.cs +++ b/Content.Client/Shuttles/UI/DockingScreen.xaml.cs @@ -79,7 +79,7 @@ private void BuildDocks(EntityUid? shuttle) var shuttleNent = _entManager.GetNetEntity(shuttle.Value); - if (!GetOurDocks(shuttleNent, out var shuttleDocks) || shuttleDocks == null) + if (!GetOurDocksRecursive(shuttleNent, out var shuttleDocks) || shuttleDocks == null) return; var dockText = new StringBuilder(); From 197a0fe15b8188fa77863ed3155ebb3b5dcdfed6 Mon Sep 17 00:00:00 2001 From: Alkheemist Date: Mon, 13 Jan 2025 23:50:28 +1100 Subject: [PATCH 14/35] Revert "added recursive "is it our dock" to the list of docks to view" This reverts commit b8433054fa7d934cd37bc79b05391343298dd29f. --- .../Shuttles/UI/DockingScreen.xaml.cs | 52 +------------------ 1 file changed, 1 insertion(+), 51 deletions(-) diff --git a/Content.Client/Shuttles/UI/DockingScreen.xaml.cs b/Content.Client/Shuttles/UI/DockingScreen.xaml.cs index a46715e6693..3ff4d4188c2 100644 --- a/Content.Client/Shuttles/UI/DockingScreen.xaml.cs +++ b/Content.Client/Shuttles/UI/DockingScreen.xaml.cs @@ -79,7 +79,7 @@ private void BuildDocks(EntityUid? shuttle) var shuttleNent = _entManager.GetNetEntity(shuttle.Value); - if (!GetOurDocksRecursive(shuttleNent, out var shuttleDocks) || shuttleDocks == null) + if (!Docks.TryGetValue(shuttleNent, out var shuttleDocks) || shuttleDocks.Count <= 0) return; var dockText = new StringBuilder(); @@ -187,54 +187,4 @@ private void OnDockPress(DockingPortState state) { DockingControl.SetViewedDock(state); } - // Frontier Start - private bool GetOurDocks(NetEntity shuttleNent, out List? ShuttleDocks) - { - if (!Docks.TryGetValue(shuttleNent, out var shuttleDocks) || shuttleDocks.Count <= 0) - { - ShuttleDocks = null; - return false; - } - ShuttleDocks = shuttleDocks; - return true; - } - // Recursively create a list of all docks on the target grid and all other grids docked to that grid, if those grids have the DockPassthroughComponent - - - private bool GetOurDocksRecursive(NetEntity shuttleNent, out List? ShuttleDocks) - { - HashSet shuttleDocks = []; - HashSet checkedGrids = []; - Queue gridsToCheck = new(); - - gridsToCheck.Enqueue(shuttleNent); - while (gridsToCheck.Count > 0) - { - var grid = gridsToCheck.Dequeue(); - checkedGrids.Add(grid); - if (!GetOurDocks(grid, out var docks) || docks == null) - { - continue; - } - foreach (var dock in docks) - { - if (dock.GridDockedWith != null && - !checkedGrids.Contains((NetEntity)dock.GridDockedWith)) - { - gridsToCheck.Enqueue((NetEntity)dock.GridDockedWith); // Only add it to the queue if it hasn't already been checked - } - } - shuttleDocks.UnionWith(docks); - } - ShuttleDocks = shuttleDocks.ToList(); - if (ShuttleDocks.Count <= 0) - { - return false; - } - return true; - } - - // Frontier End - - } From 50687ec39e20dc89fad47ae86ce99b78c9fba52e Mon Sep 17 00:00:00 2001 From: Alkheemist Date: Mon, 13 Jan 2025 23:50:33 +1100 Subject: [PATCH 15/35] Revert "serverside recursive dock list method" This reverts commit 5880a60c5726587ebdef2a959ed3ca7b81369020. --- .../Shuttles/Systems/DockingSystem.Shuttle.cs | 33 ------------------- .../Components/DockPassthroughComponent.cs | 9 ----- 2 files changed, 42 deletions(-) delete mode 100644 Content.Server/_NF/Shuttles/Components/DockPassthroughComponent.cs diff --git a/Content.Server/Shuttles/Systems/DockingSystem.Shuttle.cs b/Content.Server/Shuttles/Systems/DockingSystem.Shuttle.cs index 11f0960ff7f..aabfaa31dd8 100644 --- a/Content.Server/Shuttles/Systems/DockingSystem.Shuttle.cs +++ b/Content.Server/Shuttles/Systems/DockingSystem.Shuttle.cs @@ -1,7 +1,6 @@ using System.Linq; using System.Numerics; using Content.Server.Shuttles.Components; -using Content.Server._NF.Shuttles.Components; // Frontier using Robust.Shared.Map; using Robust.Shared.Map.Components; using Robust.Shared.Physics; @@ -359,36 +358,4 @@ public List> GetDocks(EntityUid uid) return _dockingSet.ToList(); } - - // Frontier Start - // Recursively create a list of all docks on the target grid and all other grids docked to that grid, if those grids have the DockPassthroughComponent - public List> GetDocksRecursive(EntityUid uid) - { - HashSet checkedGrids = []; - Queue gridsToCheck = new(); - - HashSet> fullDockingSet = new(); - - gridsToCheck.Enqueue(uid); - - while (gridsToCheck.Count > 0) - { - var grid = gridsToCheck.Dequeue(); - checkedGrids.Add(grid); - var docks = GetDocks(grid); - foreach (var dock in docks) - { - if (dock.Comp.DockedWith != null && - TryComp(dock.Comp.DockedWith, out var otherDock) && - HasComp(otherDock.GridUid) && - !checkedGrids.Contains((EntityUid)otherDock.GridUid)) - { - gridsToCheck.Enqueue((EntityUid)otherDock.GridUid); // Only add it to the queue if it hasn't already been checked - } - } - fullDockingSet.UnionWith(docks); - } - return fullDockingSet.ToList(); - } - // Frontier End } diff --git a/Content.Server/_NF/Shuttles/Components/DockPassthroughComponent.cs b/Content.Server/_NF/Shuttles/Components/DockPassthroughComponent.cs deleted file mode 100644 index d63d162e72a..00000000000 --- a/Content.Server/_NF/Shuttles/Components/DockPassthroughComponent.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace Content.Server._NF.Shuttles.Components; - -/// -/// Grids with this component will allow their docks to be controlled by any shuttle console on a grid docked to it, recursively. -/// -[RegisterComponent] -public sealed partial class DockPassthroughComponent : Component -{ -} From b5359b5a36a760cfd220e918f6ee71044090a469 Mon Sep 17 00:00:00 2001 From: Telos Date: Sat, 18 Jan 2025 18:56:28 -0600 Subject: [PATCH 16/35] need to swap branches, committing unfinished --- .../Entities/Structures/Shipping/Shipping.yml | 48 ++++++++++++++++++ .../Textures/_NF/Structures/Shipping/box1.png | Bin 0 -> 355 bytes .../Shipping/shippingboxes.rsi/box1.png | Bin 0 -> 355 bytes .../Shipping/shippingboxes.rsi/meta.json | 13 +++++ 4 files changed, 61 insertions(+) create mode 100644 Resources/Prototypes/_NF/Entities/Structures/Shipping/Shipping.yml create mode 100644 Resources/Textures/_NF/Structures/Shipping/box1.png create mode 100644 Resources/Textures/_NF/Structures/Shipping/shippingboxes.rsi/box1.png create mode 100644 Resources/Textures/_NF/Structures/Shipping/shippingboxes.rsi/meta.json diff --git a/Resources/Prototypes/_NF/Entities/Structures/Shipping/Shipping.yml b/Resources/Prototypes/_NF/Entities/Structures/Shipping/Shipping.yml new file mode 100644 index 00000000000..fd36b32e53a --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Structures/Shipping/Shipping.yml @@ -0,0 +1,48 @@ +- type: entity + id: TestPalette + parent: BaseStructure + suffix: barrel + name: shipping palette + description: A load of cargo to be delivered. + components: + - type: Sprite + sprite: _NF\Structures\Shipping\shippingboxes.rsi + state: box1 + noRot: true + #- type: Anchorable + # delay: 2 + - type: Physics + bodyType: Static + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeCircle + radius: 0.5 + density: 60 + mask: + - MachineMask + layer: + - MidImpassable + - LowImpassable + - BulletImpassable + - Opaque #?? + - type: Damageable + damageContainer: StructuralInorganic + damageModifierSet: Steel + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 200 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: GlassBreak + - !type:SpawnEntitiesBehavior + spawn: + ShardCrystalGreen: + min: 1 + max: 1 + - !type:DoActsBehavior + acts: [ "Destruction" ] \ No newline at end of file diff --git a/Resources/Textures/_NF/Structures/Shipping/box1.png b/Resources/Textures/_NF/Structures/Shipping/box1.png new file mode 100644 index 0000000000000000000000000000000000000000..b4adcd0729e1806d2a330fb81b62d9c0769142e0 GIT binary patch literal 355 zcmeAS@N?(olHy`uVBq!ia0vp^3P9|@!3-pQ0$S$)DaPU;cPEB*=VV?2IV|apzK#qG z8~eHcB(ehe5&=FTt{NH|^XJd+?Ci|S%JTB^x_0f_rcIlGk_`v$-vv?}B|(0{{~>_k zUi02apcrR?M`SSr1K(i~W;~w1A_XXTz|+Ms#KZgTBuBo(3Op>q8_xc(mtoFszQeTq zTR^H(WT5fg3fFZ-4+O3HFZ>jLcq^#&dYjskJ$o)GZ+RWg^f1QG$+U6PVLPiUagG*M zt+gdS9&Eoe92{a?YZ!z%I^Hd2p5dUZtnz~|YKO9Bx@>|_PioUgSH`_bz8n{{6&;Ng z7ECuwnV04CK{n$5ncN5M8=YNSmhL~4cQ2~rZ9=pQ_k zUi02apcrR?M`SSr1K(i~W;~w1A_XXTz|+Ms#KZgTBuBo(3Op>q8_xc(mtoFszQeTq zTR^H(WT5fg3fFZ-4+O3HFZ>jLcq^#&dYjskJ$o)GZ+RWg^f1QG$+U6PVLPiUagG*M zt+gdS9&Eoe92{a?YZ!z%I^Hd2p5dUZtnz~|YKO9Bx@>|_PioUgSH`_bz8n{{6&;Ng z7ECuwnV04CK{n$5ncN5M8=YNSmhL~4cQ2~rZ9=pQ Date: Sun, 19 Jan 2025 01:29:12 -0600 Subject: [PATCH 17/35] barrel base freight fill item done --- .../Entities/Structures/Shipping/Shipping.yml | 83 ++++++++++++------ .../Textures/_NF/Structures/Shipping/box1.png | Bin 355 -> 0 bytes .../Shipping/shippingbarrels.rsi/black.png | Bin 0 -> 379 bytes .../Shipping/shippingbarrels.rsi/blue.png | Bin 0 -> 378 bytes .../Shipping/shippingbarrels.rsi/gray.png | Bin 0 -> 378 bytes .../Shipping/shippingbarrels.rsi/green.png | Bin 0 -> 378 bytes .../Shipping/shippingbarrels.rsi/meta.json | 32 +++++++ .../Shipping/shippingbarrels.rsi/red.png | Bin 0 -> 378 bytes .../Shipping/shippingbarrels.rsi/white.png | Bin 0 -> 378 bytes .../Shipping/shippingbarrels.rsi/yellow.png | Bin 0 -> 378 bytes .../Shipping/shippingboxes.rsi/meta.json | 1 + .../shippingpallet.rsi/barrel_straps.png | Bin 0 -> 472 bytes .../Shipping/shippingpallet.rsi/base.png | Bin 0 -> 306 bytes .../Shipping/shippingpallet.rsi/meta.json | 17 ++++ 14 files changed, 108 insertions(+), 25 deletions(-) delete mode 100644 Resources/Textures/_NF/Structures/Shipping/box1.png create mode 100644 Resources/Textures/_NF/Structures/Shipping/shippingbarrels.rsi/black.png create mode 100644 Resources/Textures/_NF/Structures/Shipping/shippingbarrels.rsi/blue.png create mode 100644 Resources/Textures/_NF/Structures/Shipping/shippingbarrels.rsi/gray.png create mode 100644 Resources/Textures/_NF/Structures/Shipping/shippingbarrels.rsi/green.png create mode 100644 Resources/Textures/_NF/Structures/Shipping/shippingbarrels.rsi/meta.json create mode 100644 Resources/Textures/_NF/Structures/Shipping/shippingbarrels.rsi/red.png create mode 100644 Resources/Textures/_NF/Structures/Shipping/shippingbarrels.rsi/white.png create mode 100644 Resources/Textures/_NF/Structures/Shipping/shippingbarrels.rsi/yellow.png create mode 100644 Resources/Textures/_NF/Structures/Shipping/shippingpallet.rsi/barrel_straps.png create mode 100644 Resources/Textures/_NF/Structures/Shipping/shippingpallet.rsi/base.png create mode 100644 Resources/Textures/_NF/Structures/Shipping/shippingpallet.rsi/meta.json diff --git a/Resources/Prototypes/_NF/Entities/Structures/Shipping/Shipping.yml b/Resources/Prototypes/_NF/Entities/Structures/Shipping/Shipping.yml index fd36b32e53a..c1b4ec6dacb 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Shipping/Shipping.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Shipping/Shipping.yml @@ -1,12 +1,17 @@ - type: entity - id: TestPalette + id: ShippingBox1 parent: BaseStructure - suffix: barrel - name: shipping palette + #suffix: container + name: shipping container description: A load of cargo to be delivered. +# placement: +# mode: AlignTileAny components: + #- type: SpriteFade - type: Sprite - sprite: _NF\Structures\Shipping\shippingboxes.rsi + sprite: _NF/Structures/Shipping/shippingboxes.rsi + offset: 0,.5 + drawdepth: Mobs state: box1 noRot: true #- type: Anchorable @@ -17,8 +22,8 @@ fixtures: fix1: shape: - !type:PhysShapeCircle - radius: 0.5 + !type:PhysShapeAabb + bounds: "-.5,-.5,.5,.5" density: 60 mask: - MachineMask @@ -27,22 +32,50 @@ - LowImpassable - BulletImpassable - Opaque #?? - - type: Damageable - damageContainer: StructuralInorganic - damageModifierSet: Steel - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 200 - behaviors: - - !type:PlaySoundBehavior - sound: - collection: GlassBreak - - !type:SpawnEntitiesBehavior - spawn: - ShardCrystalGreen: - min: 1 - max: 1 - - !type:DoActsBehavior - acts: [ "Destruction" ] \ No newline at end of file +# - type: Damageable +# damageContainer: StructuralInorganic +# damageModifierSet: Steel +# - type: Destructible +# thresholds: +# - trigger: +# !type:DamageTrigger +# damage: 200 +# behaviors: +# - !type:PlaySoundBehavior +# sound: +# collection: GlassBreak +# - !type:SpawnEntitiesBehavior +# spawn: +# ShardCrystalGreen: +# min: 1 +# max: 1 +# - !type:DoActsBehavior +# acts: [ "Destruction" ] + +- type: entity + id: BarrelPallet + parent: BaseStructure + name: shipping pallete + components: + - type: Sprite + drawdepth: Mobs + layers: + - sprite: _NF/Structures/Shipping/shippingpallet.rsi + state: base + offset: 0,.5 + - sprite: _NF/Structures/Shipping/shippingbarrels.rsi + state: red + offset: -0.25,0.3125 #top left, options are -0.25,0.3125 and -0.21875,0.3125 + - sprite: _NF/Structures/Shipping/shippingbarrels.rsi + state: black + offset: 0.25,0.3125 #top right, options are 0.25,0.3125 and 0.21875,0.3125 + - sprite: _NF/Structures/Shipping/shippingbarrels.rsi + state: green + offset: -0.25,-0.03125 #bottom left, options are -0.25,0 and -0.25,-0.03125 + - sprite: _NF/Structures/Shipping/shippingbarrels.rsi + state: white + offset: 0.25,0 #bottom right, options are 0.25,0 and 0.25,-0.03125 + - sprite: _NF/Structures/Shipping/shippingpallet.rsi + state: barrel_straps + offset: 0,.5 + noRot: true \ No newline at end of file diff --git a/Resources/Textures/_NF/Structures/Shipping/box1.png b/Resources/Textures/_NF/Structures/Shipping/box1.png deleted file mode 100644 index b4adcd0729e1806d2a330fb81b62d9c0769142e0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 355 zcmeAS@N?(olHy`uVBq!ia0vp^3P9|@!3-pQ0$S$)DaPU;cPEB*=VV?2IV|apzK#qG z8~eHcB(ehe5&=FTt{NH|^XJd+?Ci|S%JTB^x_0f_rcIlGk_`v$-vv?}B|(0{{~>_k zUi02apcrR?M`SSr1K(i~W;~w1A_XXTz|+Ms#KZgTBuBo(3Op>q8_xc(mtoFszQeTq zTR^H(WT5fg3fFZ-4+O3HFZ>jLcq^#&dYjskJ$o)GZ+RWg^f1QG$+U6PVLPiUagG*M zt+gdS9&Eoe92{a?YZ!z%I^Hd2p5dUZtnz~|YKO9Bx@>|_PioUgSH`_bz8n{{6&;Ng z7ECuwnV04CK{n$5ncN5M8=YNSmhL~4cQ2~rZ9=pQ)FDDPnESfb6ya!r;l!5wasobnZtBOVx?5E-jnHxYy*uEUoUl zjEWcJ56t#>w6MRDaT4R4Ma+vCcDq!3F1RUh*5=EbhgW|pyFjWO`pjcth;40Q)lhXEF-5YOfv*OFcp^OPWQRbl;;26P}1vf;MJ)>zcF~a L`njxgN@xNA-3*Do literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Shipping/shippingbarrels.rsi/blue.png b/Resources/Textures/_NF/Structures/Shipping/shippingbarrels.rsi/blue.png new file mode 100644 index 0000000000000000000000000000000000000000..bb96c3f29b78f04ae1eefc4de97636d151f657e4 GIT binary patch literal 378 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCilo1AIbUo0gwAeC54n+En-M^;34eE2A zd0x+xfD~^@kYDhBB*0+%La7ZX!CBxDSfIBm1$SMe(T1u0Rs^<6WBW{RckGddPA^+6iTp*b1M z1~rX&94-tMX9|_nHry7JC{{Y>B-?20#JOOHZR4rQ3_my)q=~s5opXAl$_lMTr`CSp zQ`mJSDq7ps$Sj>J!T!MX9kL9aJD7JJd%MAjgVD|5+-<%cRSowZe~U7T+$Hl{WQM9e zLtWXj`5&hnPo1GE|C!-S#3kK8hAQy`On)wKVX&^{{!+)xu~$J)Y02i>K<_Yky85}S Ib4q9e0G0ZZQ2+n{ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Shipping/shippingbarrels.rsi/gray.png b/Resources/Textures/_NF/Structures/Shipping/shippingbarrels.rsi/gray.png new file mode 100644 index 0000000000000000000000000000000000000000..6593ef96b1f3bc7b444c8b59801cf7f802b635a1 GIT binary patch literal 378 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCilo1AIbU5AWFV=+2$`md@o17oItOJg2a{qp`6tGjqYrnJu-o>sGATy?ZxM z?LqzudmzPI666>B9|4nJ@ErzW#^d=bQh@9VcU3WGQ$s!1!-b#N9Ua0sIo$9(W$i` z_!M?siHg>CH8M-*O0YjLeTOVV=MLsw$KGym;$U=hICq^nQ(Ch5Hqbi^p00i_ I>zopr0KH|E@c;k- literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Shipping/shippingbarrels.rsi/green.png b/Resources/Textures/_NF/Structures/Shipping/shippingbarrels.rsi/green.png new file mode 100644 index 0000000000000000000000000000000000000000..9423ee101af4710d7b8469ee607f19a183ba5ffa GIT binary patch literal 378 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCilo1AIbUd)FqMxV}-dP$y!t$^3nd%F${%d73IgO5UA@TA3QDvux@%rUBJ{ zm9<<1qdi2;kKYevC=sw*+ye0&ILPc8&6GU_`$ItP0a1+oYNasR%k6cwe|y_ z!mcY((b}#?X6alB_6Mf#kY(uH!My9(+YL?}jBXC+Zu9M^YPk3KTa;1cE}7pVGgR#v z>dKbQ|2W-v>I_x+&kSE8F6jm`REZy8`g3^;gLN(UmpW#Sy$X6tOE%vIdWXT&)z4*} HQ$iB}8=8(+ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Shipping/shippingbarrels.rsi/meta.json b/Resources/Textures/_NF/Structures/Shipping/shippingbarrels.rsi/meta.json new file mode 100644 index 00000000000..8aec2e9ffd0 --- /dev/null +++ b/Resources/Textures/_NF/Structures/Shipping/shippingbarrels.rsi/meta.json @@ -0,0 +1,32 @@ +{ + "version": 1, + "license": "CC-BY-4.0", + "copyright": "Taken from tgstation PR https://github.com/tgstation/tgstation/pull/38977, modified by rosieposieeee, whatston3, & Telos", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "black" + }, + { + "name": "blue" + }, + { + "name": "gray" + }, + { + "name": "green" + }, + { + "name": "red" + }, + { + "name": "white" + }, + { + "name": "yellow" + } + ] +} diff --git a/Resources/Textures/_NF/Structures/Shipping/shippingbarrels.rsi/red.png b/Resources/Textures/_NF/Structures/Shipping/shippingbarrels.rsi/red.png new file mode 100644 index 0000000000000000000000000000000000000000..e54622d9e9ca0a15017a8576d3076eef45434450 GIT binary patch literal 378 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCilo1AIbUS6W+ND=6^L(rGj?+2-J&tD+X7scE95RBmYKuc6UxW;V~p2B=o3 zYvN}h#aj~O7yKUyFxb9OY6D7e7I;J!GcfQS24TkI`72U@f`>g_978Ppw@$b%bVz~6 z#W{>+%K!gylLb_L3T5(tUn(n3+pPIjyo!H8N|bGV*9@VVVk!HKjzvs;kj8RoP6o3< zO=BL13q!@3LM62gw*@7NmCiZIHX1u|F4$q)cxp1k4~_+CVs1z0oZhIiLTk~fwIBEt zc3p{z)^;^AOXo_kKQMiVEJNoG=3U3$ZgApYbaOa&n{P)|!@bAfqKqPU$@~_Xp=!@i zSGH{a$LYpXXQ;}5X800uNjH$8O8fxRpUYbqtZTWy)G>4HRnSvfviUa9I}Dz#elF{r G5}E)$s*3sm literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Shipping/shippingbarrels.rsi/white.png b/Resources/Textures/_NF/Structures/Shipping/shippingbarrels.rsi/white.png new file mode 100644 index 0000000000000000000000000000000000000000..0e85c3898ca17df8457ce2ac10f384fb047121c8 GIT binary patch literal 378 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCilo1AIbU@7;g!`t|GCi&q~xasKnik0q52vlgr_F0Ht9_Ux>=3-8{%dFR11 zpj!Tz)o+0mZ%L3}@P8!0VEaO;4Jg4`;1OBOz`%DHgc*g{3>9YzmDD!e7L+JfI_D(YXzawfV25qvsmTmKI2NRdxgDKzdZWq;twpES ze&AEsbtNiV+ttV{oh!lq!1Num44pfecO84X!HI*>&Eec_z8zH!_a1+XGK$0PMiyN*fyS;%mdK II;Vst0NRF=a{vGU literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Shipping/shippingboxes.rsi/meta.json b/Resources/Textures/_NF/Structures/Shipping/shippingboxes.rsi/meta.json index e89cc9990b7..6f912b55cae 100644 --- a/Resources/Textures/_NF/Structures/Shipping/shippingboxes.rsi/meta.json +++ b/Resources/Textures/_NF/Structures/Shipping/shippingboxes.rsi/meta.json @@ -9,5 +9,6 @@ "states": [ { "name": "box1" + } ] } diff --git a/Resources/Textures/_NF/Structures/Shipping/shippingpallet.rsi/barrel_straps.png b/Resources/Textures/_NF/Structures/Shipping/shippingpallet.rsi/barrel_straps.png new file mode 100644 index 0000000000000000000000000000000000000000..6ee5766d0f50858b81b5eca89d8ac849eb12a88e GIT binary patch literal 472 zcmeAS@N?(olHy`uVBq!ia0vp^3P9|@!3-pQ0$S$)DaPU;cPEB*=VV?2IV|apzK#qG z8~eHcB(eheasfUeuItvVJ9qBfzJ2=&3k#EzljqHw*WcgY(9jSX8VXc0S@Z(Pe6Erp zzu^Bcz_96z&Uv6HXMsm#F#`kNVGw3Kp1&dmXrZpBi(`m~_uGk)lUfu6Tmo0L{*JH6 zYSe0cS@3W9=Eb5Wo}Ut5>i?38iEn;AU-FbG+d6Hra|icI6-jY^m)K$S;e1=QX^dfS z%htm)Cv5fIAFw9+iHXoPU7&P+o9;t9t2ZL;iU)nyt+`Db6HT233soaUTVtNlmY ze)@f!_Tk2&U$y3ETGxhbU|eu_S;L=mYfTK=P+_?sXkZ@3u>3-}g1A$qzS_@?Ys5S~-)Fl96(0}dUTj&g^uwgsZ-QLT zlfwLet_q9v782{4EGcBqy+kC0Yfs>8&W?YMmJ_7Rm&(X{Z*XbrdgdS_a`?kTmC(x* z{Cz|M<_qy1o;D%i@`DEpdHy7vm^`1&c5?e0=dP;%i~<*(mh+Ywp96*_gQu&X%Q~lo FCIA=a!4?1j literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Shipping/shippingpallet.rsi/base.png b/Resources/Textures/_NF/Structures/Shipping/shippingpallet.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..9bb12910e1a5d077cc7c26865565f2ed27760328 GIT binary patch literal 306 zcmeAS@N?(olHy`uVBq!ia0vp^3P9|@!3-pQ0$S$)DaPU;cPEB*=VV?2IV|apzK#qG z8~eHcB(eheDgizru7$ClJNgnja|2p3{noU_)TH<{r1{RR4qx05wXi;7b!!Yz;rH|Z z3V;+(NswRge*|CCBeIx*f$uN~Gak=hkpdK~_jGX#@$i1z`I2brk>r literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Shipping/shippingpallet.rsi/meta.json b/Resources/Textures/_NF/Structures/Shipping/shippingpallet.rsi/meta.json new file mode 100644 index 00000000000..9a731cbd165 --- /dev/null +++ b/Resources/Textures/_NF/Structures/Shipping/shippingpallet.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "license": "CC-BY-4.0", + "copyright": "https://github.com/Temoffy, Discord: @telos2387", + "size": { + "x": 32, + "y": 64 + }, + "states": [ + { + "name": "barrel_straps" + }, + { + "name": "base" + } + ] +} From aa9550bc65c9b8f8f22aa1bb437a692ad066d62a Mon Sep 17 00:00:00 2001 From: Telos Date: Sun, 19 Jan 2025 02:27:53 -0600 Subject: [PATCH 18/35] crate base done as well --- .../Entities/Structures/Shipping/Shipping.yml | 70 ++++++++---------- .../Shipping/shippingpallet.rsi/base.png | Bin 306 -> 364 bytes .../shippingpallet.rsi/crate_straps.png | Bin 0 -> 383 bytes .../Shipping/shippingpallet.rsi/meta.json | 3 + 4 files changed, 34 insertions(+), 39 deletions(-) create mode 100644 Resources/Textures/_NF/Structures/Shipping/shippingpallet.rsi/crate_straps.png diff --git a/Resources/Prototypes/_NF/Entities/Structures/Shipping/Shipping.yml b/Resources/Prototypes/_NF/Entities/Structures/Shipping/Shipping.yml index c1b4ec6dacb..cddb491b80b 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Shipping/Shipping.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Shipping/Shipping.yml @@ -14,51 +14,16 @@ drawdepth: Mobs state: box1 noRot: true - #- type: Anchorable - # delay: 2 - - type: Physics - bodyType: Static - - type: Fixtures - fixtures: - fix1: - shape: - !type:PhysShapeAabb - bounds: "-.5,-.5,.5,.5" - density: 60 - mask: - - MachineMask - layer: - - MidImpassable - - LowImpassable - - BulletImpassable - - Opaque #?? -# - type: Damageable -# damageContainer: StructuralInorganic -# damageModifierSet: Steel -# - type: Destructible -# thresholds: -# - trigger: -# !type:DamageTrigger -# damage: 200 -# behaviors: -# - !type:PlaySoundBehavior -# sound: -# collection: GlassBreak -# - !type:SpawnEntitiesBehavior -# spawn: -# ShardCrystalGreen: -# min: 1 -# max: 1 -# - !type:DoActsBehavior -# acts: [ "Destruction" ] +#barrels pallets and spawner - type: entity - id: BarrelPallet - parent: BaseStructure + id: BarrelPallet1 + parent: ShippingBox1 name: shipping pallete components: - type: Sprite drawdepth: Mobs + offset: 0,0 layers: - sprite: _NF/Structures/Shipping/shippingpallet.rsi state: base @@ -78,4 +43,31 @@ - sprite: _NF/Structures/Shipping/shippingpallet.rsi state: barrel_straps offset: 0,.5 + noRot: true + +#crate pallets and spawner +- type: entity + id: CratePallet1 + parent: ShippingBox1 + name: shipping pallete + components: + - type: Sprite + drawdepth: Mobs + offset: 0,0 + layers: + - sprite: _NF/Structures/Shipping/shippingpallet.rsi + state: base + offset: 0,.5 + - sprite: Structures/Storage/Crates/electrical.rsi + state: icon + offset: 0,0.65625 + - sprite: Structures/Storage/Crates/engineering.rsi + state: icon + offset: 0,-0.03125 + - sprite: Structures/Storage/Crates/chemcrate_secure.rsi + state: icon + offset: 0,0.34375 + - sprite: _NF/Structures/Shipping/shippingpallet.rsi + state: crate_straps + offset: 0,.5 noRot: true \ No newline at end of file diff --git a/Resources/Textures/_NF/Structures/Shipping/shippingpallet.rsi/base.png b/Resources/Textures/_NF/Structures/Shipping/shippingpallet.rsi/base.png index 9bb12910e1a5d077cc7c26865565f2ed27760328..c7fa8091c4d4095f144015b9399fa26227c1e8c8 100644 GIT binary patch delta 308 zcmdnQ^oD7IW4(HSPl#(_tmne|h}EqzJNgn@GW|Mp1ME#S*R;jdr1;FO4sS^FUEC1G zz`$_m*xs{1ink=lFZe$aV6c6m)CQE`EbxddW?u%(v z|BjPI(TH6s=!4$$3=bz4hYPEC4kiK_0UuT>Sgcm$6r9+l#j!36D00O+^jNA;vBIKx z_aZ&cG=PdAuEM{QfI}E~%$MaXD00rwkT^vI^yx(?t3mrD# zaBlUTZ@ymjn8 z@AsRwZsU(L|E(gov1BX`HcaksO}?;lM&Xe|b}vGFE=OGG^*d_P$@;cLtL;F{1i$4; pJQ3W_D`V5Vu05|ed=Pd(obR0XZ-tZ1aX_~)c)I$ztaD0e0sw$VYrOyf diff --git a/Resources/Textures/_NF/Structures/Shipping/shippingpallet.rsi/crate_straps.png b/Resources/Textures/_NF/Structures/Shipping/shippingpallet.rsi/crate_straps.png new file mode 100644 index 0000000000000000000000000000000000000000..9d7a9ccfadccabccd3efbee0ff6f4f7e4827cb97 GIT binary patch literal 383 zcmeAS@N?(olHy`uVBq!ia0vp^3P9|@!3-pQ0$S$)DaPU;cPEB*=VV?2IV|apzK#qG z8~eHcB(eheasfUeuKV`wTeoiAxpU_l8XEfh`{&J@mz4SX_`J+q{%cCeH2H<8Y84z!?Fv7X7lz2P?8`eO%DGSK;U&j_&VZyDS*ry%@i-)O zYe$K6m)vHGp3qbunc!5Vv7>qYG6CHh)7Bmat{CCy53=7BJhDG!Z(G-#aAOx|@(YCz zrNUL09SZ_Z=tPAS9F!NEcT;4Mt2&cLNuHo6pIE?Tr)?D)VF#Q8*>W7k1SaXf+$(1D zIhXtW)(P7zG>-865&K{-F7 OXbhgNelF{r5}E)KK#$S@ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Shipping/shippingpallet.rsi/meta.json b/Resources/Textures/_NF/Structures/Shipping/shippingpallet.rsi/meta.json index 9a731cbd165..9fbb59ce637 100644 --- a/Resources/Textures/_NF/Structures/Shipping/shippingpallet.rsi/meta.json +++ b/Resources/Textures/_NF/Structures/Shipping/shippingpallet.rsi/meta.json @@ -10,6 +10,9 @@ { "name": "barrel_straps" }, + { + "name": "crate_straps" + }, { "name": "base" } From 95160ff9276e2d6592d5906621325086ae20ce29 Mon Sep 17 00:00:00 2001 From: blackknight954 <40075385+blackknight954@users.noreply.github.com> Date: Sun, 19 Jan 2025 11:53:36 -0600 Subject: [PATCH 19/35] Cargo console and Voucher. Get sprite for Voucher --- .../Shipyard/SharedShipyardSystem.cs | 1 + .../Objects/Devices/Misc/ship_vouchers.yml | 19 ++++++++++----- .../Machines/Computers/computers_shipyard.yml | 23 +++++++++++++++++++ 3 files changed, 37 insertions(+), 6 deletions(-) diff --git a/Content.Shared/Shipyard/SharedShipyardSystem.cs b/Content.Shared/Shipyard/SharedShipyardSystem.cs index 9a7f0ebc885..5a7a2980bb8 100644 --- a/Content.Shared/Shipyard/SharedShipyardSystem.cs +++ b/Content.Shared/Shipyard/SharedShipyardSystem.cs @@ -18,6 +18,7 @@ public enum ShipyardConsoleUiKey : byte Expedition, Scrap, Sr, + Cargo, // Add ships to this key if they are only available from mothership consoles. Shipyards using it are inherently empty and are populated using the ShipyardListingComponent. Custom } diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/Misc/ship_vouchers.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/Misc/ship_vouchers.yml index 46a9e04ff04..16a211c4a52 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Devices/Misc/ship_vouchers.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Devices/Misc/ship_vouchers.yml @@ -124,12 +124,19 @@ - type: entity - parent: BaseShipVoucher + parent: BaseItem id: CargoVoucher - name: Cargo Crate Voucher - description: Allows for purchasing and selling of cargo containers. + name: Cargo Voucher + description: Used to buy cargo containers from a cargo container console components: - - type: CargoVoucher + - type: Sprite + sprite: _NF/Objects/Misc/shipyard_voucher.rsi + - type: Item + size: Small + heldPrefix: default + storedRotation: -90 + - type: StaticPrice + price: 10000 + - type: ShipyardVoucher destroyOnEmpty: false - access: - - Maintenance # An access every ID card starts with + consoleType: Cargo diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/computers_shipyard.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/computers_shipyard.yml index d7bb48a319c..cea66fff709 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/computers_shipyard.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/computers_shipyard.yml @@ -236,3 +236,26 @@ state: shipyard_sr - map: ["computerLayerKeys"] state: telesci_key +- type: entity + id: ComputerShipyardCargo + parent: [BaseStructureDisableToolUse, BaseStructureIndestructible, ComputerShipyardBase] + name: cargo container console + description: Used to buy cargo containers + components: + - type: ActivatableUI + key: enum.ShipyardConsoleUiKey.Cargo + - type: UserInterface + interfaces: + enum.ShipyardConsoleUiKey.Cargo: + type: ShipyardConsoleBoundUserInterface + - type: Sprite + sprite: _NF/Structures/Machines/computers.rsi + layers: + - map: ["computerLayerBody"] + state: computer + - map: ["computerLayerKeyboard"] + state: generic_keyboard + - map: ["computerLayerScreen"] + state: shipyard + - map: ["computerLayerKeys"] + state: telesci_key From 2cc985dc8ce13d8e5430bed918871da05ab6aa11 Mon Sep 17 00:00:00 2001 From: Alkheemist Date: Wed, 22 Jan 2025 01:03:10 +1100 Subject: [PATCH 20/35] add special type of voucher that still requires money --- .../Components/ShipyardVoucherComponent.cs | 7 +++++++ .../Shipyard/Systems/ShipyardSystem.Consoles.cs | 15 +++++++++------ .../Objects/Devices/Misc/ship_vouchers.yml | 15 +++++++++++++++ .../_NF/Shipyard/Shipment/basicshipment1.yml | 4 ++-- 4 files changed, 33 insertions(+), 8 deletions(-) diff --git a/Content.Server/Shipyard/Components/ShipyardVoucherComponent.cs b/Content.Server/Shipyard/Components/ShipyardVoucherComponent.cs index 9a90ce503e6..b03785f215d 100644 --- a/Content.Server/Shipyard/Components/ShipyardVoucherComponent.cs +++ b/Content.Server/Shipyard/Components/ShipyardVoucherComponent.cs @@ -34,4 +34,11 @@ public sealed partial class ShipyardVoucherComponent : Component /// [DataField(required: true)] public ShipyardConsoleUiKey ConsoleType; + + // Frontier + /// + /// Whether this voucher allows for free purchase/sale or if it still costs money to purchase. Useful for allowing multiple ships without multiple IDs. + /// + [DataField] + public bool NoValue = true; } diff --git a/Content.Server/Shipyard/Systems/ShipyardSystem.Consoles.cs b/Content.Server/Shipyard/Systems/ShipyardSystem.Consoles.cs index 2d1e7eb2358..3eb7728cb1e 100644 --- a/Content.Server/Shipyard/Systems/ShipyardSystem.Consoles.cs +++ b/Content.Server/Shipyard/Systems/ShipyardSystem.Consoles.cs @@ -140,6 +140,7 @@ private void OnPurchaseMessage(EntityUid shipyardConsoleUid, ShipyardConsoleComp // Keep track of whether or not a voucher was used. // TODO: voucher purchase should be done in a separate function. bool voucherUsed = false; + bool hasValue = false; if (voucher is not null) { if (voucher!.RedemptionsLeft <= 0) @@ -161,7 +162,8 @@ private void OnPurchaseMessage(EntityUid shipyardConsoleUid, ShipyardConsoleComp voucher.RedemptionsLeft--; voucherUsed = true; } - else + // not using an else here because the voucher might still require a purchase cost + if (voucher is null || voucher.NoValue is false) { if (bank.Balance <= vessel.Price) { @@ -176,6 +178,7 @@ private void OnPurchaseMessage(EntityUid shipyardConsoleUid, ShipyardConsoleComp PlayDenySound(player, shipyardConsoleUid, component); return; } + hasValue = true; } @@ -267,7 +270,7 @@ private void OnPurchaseMessage(EntityUid shipyardConsoleUid, ShipyardConsoleComp EnsureComp(shuttleUid); var sellValue = 0; - if (!voucherUsed) + if (hasValue) { if (TryComp(targetId, out var deed)) sellValue = (int)_pricing.AppraiseGrid((EntityUid)(deed?.ShuttleUid!)); @@ -281,7 +284,7 @@ private void OnPurchaseMessage(EntityUid shipyardConsoleUid, ShipyardConsoleComp SendPurchaseMessage(shipyardConsoleUid, player, name, secretChannel, secret: true); PlayConfirmSound(player, shipyardConsoleUid, component); - if (voucherUsed) + if (voucherUsed && !hasValue) _adminLogger.Add(LogType.ShipYardUsage, LogImpact.Low, $"{ToPrettyString(player):actor} used {ToPrettyString(targetId)} to purchase shuttle {ToPrettyString(shuttleUid)} with a voucher via {ToPrettyString(component.Owner)}"); else _adminLogger.Add(LogType.ShipYardUsage, LogImpact.Low, $"{ToPrettyString(player):actor} used {ToPrettyString(targetId)} to purchase shuttle {ToPrettyString(shuttleUid)} for {vessel.Price} credits via {ToPrettyString(component.Owner)}"); @@ -296,7 +299,7 @@ private void OnPurchaseMessage(EntityUid shipyardConsoleUid, ShipyardConsoleComp suffix: deedShuttle.ShuttleNameSuffix ?? "", ownerName: shuttleOwner, entityUid: _entityManager.GetNetEntity(shuttleUid), - purchasedWithVoucher: voucherUsed, + purchasedWithVoucher: !hasValue, // replace voucherUsed with hasValue for this, so resale has some value. purchasePrice: (uint)vessel.Price ) ); @@ -573,7 +576,7 @@ private void OnItemSlotChanged(EntityUid uid, ShipyardConsoleComponent component int sellValue = 0; if (deed?.ShuttleUid != null) - sellValue = (int) _pricing.AppraiseGrid(deed.ShuttleUid.Value); + sellValue = (int)_pricing.AppraiseGrid(deed.ShuttleUid.Value); sellValue -= CalculateTotalSalesTax(component, sellValue); @@ -795,7 +798,7 @@ private void OnInitDeedSpawner(EntityUid uid, StationDeedSpawnerComponent compon if (xform.GridUid == null) return; - if (!TryComp(xform.GridUid.Value, out var shuttleDeed) || !TryComp(xform.GridUid.Value, out var shuttle) || !HasComp(xform.GridUid.Value) || shuttle == null || ShipyardMap == null) + if (!TryComp(xform.GridUid.Value, out var shuttleDeed) || !TryComp(xform.GridUid.Value, out var shuttle) || !HasComp(xform.GridUid.Value) || shuttle == null || ShipyardMap == null) return; var output = Regex.Replace($"{shuttleDeed.ShuttleOwner}", @"\s*\([^()]*\)", ""); // Removes content inside parentheses along with parentheses and a preceding space diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/Misc/ship_vouchers.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/Misc/ship_vouchers.yml index c369948191b..e58d4c436fe 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Devices/Misc/ship_vouchers.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Devices/Misc/ship_vouchers.yml @@ -120,3 +120,18 @@ - type: ShipyardVoucher access: - Brig # odd, but potentially restricts cadets in lieu of a security guard-only access level + +- type: entity + parent: ShipVoucherCargoShipment + id: ShipVoucherCargoShipment + name: cargo shipment docket + description: Allows for one cargo shipment purchase from the Cargo Shipyard. Destroyed on sale. + components: + - type: Sprite + layers: + - state: blue + - state: voucherstationguard + - type: ShipyardVoucher + access: + - Cargo + noValue: false diff --git a/Resources/Prototypes/_NF/Shipyard/Shipment/basicshipment1.yml b/Resources/Prototypes/_NF/Shipyard/Shipment/basicshipment1.yml index 2c3525ebda5..25605bca9cf 100644 --- a/Resources/Prototypes/_NF/Shipyard/Shipment/basicshipment1.yml +++ b/Resources/Prototypes/_NF/Shipyard/Shipment/basicshipment1.yml @@ -7,7 +7,7 @@ # Discord: ??? # Shuttle Notes: -# +# - type: vessel id: BasicShipment1 #parent: BaseVessel #Todo: abstract shipment container parent @@ -16,7 +16,7 @@ price: 4500 category: Small group: Shipyard #todo: change when we get a shipment shipyard - #access: Shipment #todo: change when we get a shipment deed/voucher + access: Cargo shuttlePath: /Maps/_NF/Shuttles/Shipment/basicshipment1.yml guidebookPage: Null addComponents: From a4b9272fe0013bc18f8689c67c40696b8e90c0dc Mon Sep 17 00:00:00 2001 From: Alkheemist Date: Wed, 22 Jan 2025 01:25:04 +1100 Subject: [PATCH 21/35] yml moment. (messed up parent) --- .../_NF/Entities/Objects/Devices/Misc/ship_vouchers.yml | 6 +++--- .../Prototypes/_NF/Shipyard/Shipment/basicshipment1.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/Misc/ship_vouchers.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/Misc/ship_vouchers.yml index aa7b4d50852..1bd28a4fcbe 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Devices/Misc/ship_vouchers.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Devices/Misc/ship_vouchers.yml @@ -122,7 +122,7 @@ - Brig # odd, but potentially restricts cadets in lieu of a security guard-only access level - type: entity - parent: ShipVoucherCargoShipment + parent: BaseShipVoucher id: ShipVoucherCargoShipment name: cargo shipment docket description: Allows for one cargo shipment purchase from the Cargo Shipyard. Destroyed on sale. @@ -132,6 +132,6 @@ - state: blue - state: voucherstationguard - type: ShipyardVoucher - access: - - Cargo + destroyOnEmpty: true + consoleType: Shipyard noValue: false diff --git a/Resources/Prototypes/_NF/Shipyard/Shipment/basicshipment1.yml b/Resources/Prototypes/_NF/Shipyard/Shipment/basicshipment1.yml index 25605bca9cf..9ccc6ef9f4f 100644 --- a/Resources/Prototypes/_NF/Shipyard/Shipment/basicshipment1.yml +++ b/Resources/Prototypes/_NF/Shipyard/Shipment/basicshipment1.yml @@ -16,7 +16,7 @@ price: 4500 category: Small group: Shipyard #todo: change when we get a shipment shipyard - access: Cargo + #access: Cargo shuttlePath: /Maps/_NF/Shuttles/Shipment/basicshipment1.yml guidebookPage: Null addComponents: From 7fc5e63b84780367664058ed05ba2985867c82ce Mon Sep 17 00:00:00 2001 From: Alkheemist Date: Wed, 22 Jan 2025 09:11:21 +1100 Subject: [PATCH 22/35] fix up cargo shipment voucher system UI --- .../Systems/ShipyardSystem.Consoles.cs | 10 ++++---- .../Shipyard/SharedShipyardSystem.cs | 1 + .../Objects/Devices/Misc/ship_vouchers.yml | 4 +++- .../Machines/Computers/computers_shipyard.yml | 24 +++++++++++++++++++ .../_NF/Shipyard/Shipment/basicshipment1.yml | 4 ++-- 5 files changed, 35 insertions(+), 8 deletions(-) diff --git a/Content.Server/Shipyard/Systems/ShipyardSystem.Consoles.cs b/Content.Server/Shipyard/Systems/ShipyardSystem.Consoles.cs index 3eb7728cb1e..d0ae1bd01bf 100644 --- a/Content.Server/Shipyard/Systems/ShipyardSystem.Consoles.cs +++ b/Content.Server/Shipyard/Systems/ShipyardSystem.Consoles.cs @@ -216,10 +216,10 @@ private void OnPurchaseMessage(EntityUid shipyardConsoleUid, ShipyardConsoleComp var deedID = EnsureComp(targetId); var shuttleOwner = Name(player).Trim(); - AssignShuttleDeedProperties(deedID, shuttleUid, name, shuttleOwner, voucherUsed); + AssignShuttleDeedProperties(deedID, shuttleUid, name, shuttleOwner, !hasValue); // replace voucherUsed with hasValue for this, so resale has some value. var deedShuttle = EnsureComp(shuttleUid); - AssignShuttleDeedProperties(deedShuttle, shuttleUid, name, shuttleOwner, voucherUsed); + AssignShuttleDeedProperties(deedShuttle, shuttleUid, name, shuttleOwner, !hasValue); // replace voucherUsed with hasValue for this, so resale has some value. if (!voucherUsed) { @@ -305,7 +305,7 @@ private void OnPurchaseMessage(EntityUid shipyardConsoleUid, ShipyardConsoleComp ); } - RefreshState(shipyardConsoleUid, bank.Balance, true, name, sellValue, targetId, (ShipyardConsoleUiKey)args.UiKey, voucherUsed); + RefreshState(shipyardConsoleUid, bank.Balance, true, name, sellValue, targetId, (ShipyardConsoleUiKey)args.UiKey, !hasValue); } private void TryParseShuttleName(ShuttleDeedComponent deed, string name) @@ -480,7 +480,7 @@ private void OnConsoleUIOpened(EntityUid uid, ShipyardConsoleComponent component } } - var voucherUsed = HasComp(targetId); + var voucherUsed = TryComp(targetId, out var voucher) && voucher.NoValue is true; int sellValue = 0; if (deed?.ShuttleUid != null) @@ -572,7 +572,7 @@ private void OnItemSlotChanged(EntityUid uid, ShipyardConsoleComponent component } } - var voucherUsed = HasComp(targetId); + var voucherUsed = TryComp(targetId, out var voucher) && voucher.NoValue is true; int sellValue = 0; if (deed?.ShuttleUid != null) diff --git a/Content.Shared/Shipyard/SharedShipyardSystem.cs b/Content.Shared/Shipyard/SharedShipyardSystem.cs index 9a7f0ebc885..5a7a2980bb8 100644 --- a/Content.Shared/Shipyard/SharedShipyardSystem.cs +++ b/Content.Shared/Shipyard/SharedShipyardSystem.cs @@ -18,6 +18,7 @@ public enum ShipyardConsoleUiKey : byte Expedition, Scrap, Sr, + Cargo, // Add ships to this key if they are only available from mothership consoles. Shipyards using it are inherently empty and are populated using the ShipyardListingComponent. Custom } diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/Misc/ship_vouchers.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/Misc/ship_vouchers.yml index 1bd28a4fcbe..9cfa3bdecf9 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Devices/Misc/ship_vouchers.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Devices/Misc/ship_vouchers.yml @@ -133,5 +133,7 @@ - state: voucherstationguard - type: ShipyardVoucher destroyOnEmpty: true - consoleType: Shipyard + consoleType: Cargo noValue: false + access: + - Cargo diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/computers_shipyard.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/computers_shipyard.yml index c0ab4994ab0..3566a065695 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/computers_shipyard.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/computers_shipyard.yml @@ -236,3 +236,27 @@ state: shipyard_sr - map: ["computerLayerKeys"] state: telesci_key + +- type: entity + id: ComputerShipyardCargo + parent: [BaseStructureDisableToolUse, BaseStructureIndestructible, ComputerShipyardBase] + name: cargo shipment console + description: Used to buy cargo shipments bound for Trade. + components: + - type: ActivatableUI + key: enum.ShipyardConsoleUiKey.Cargo + - type: UserInterface + interfaces: + enum.ShipyardConsoleUiKey.Cargo: + type: ShipyardConsoleBoundUserInterface + - type: Sprite + sprite: _NF/Structures/Machines/computers.rsi + layers: + - map: ["computerLayerBody"] + state: computer_sr + - map: ["computerLayerKeyboard"] + state: generic_keyboard + - map: ["computerLayerScreen"] + state: shipyard_sr + - map: ["computerLayerKeys"] + state: telesci_key diff --git a/Resources/Prototypes/_NF/Shipyard/Shipment/basicshipment1.yml b/Resources/Prototypes/_NF/Shipyard/Shipment/basicshipment1.yml index 9ccc6ef9f4f..b4e3b1b0285 100644 --- a/Resources/Prototypes/_NF/Shipyard/Shipment/basicshipment1.yml +++ b/Resources/Prototypes/_NF/Shipyard/Shipment/basicshipment1.yml @@ -15,8 +15,8 @@ description: A delivery to trade. price: 4500 category: Small - group: Shipyard #todo: change when we get a shipment shipyard - #access: Cargo + group: Cargo + access: Cargo shuttlePath: /Maps/_NF/Shuttles/Shipment/basicshipment1.yml guidebookPage: Null addComponents: From 1e9f8020b6d7e30346104844086df2ff42ed2631 Mon Sep 17 00:00:00 2001 From: Telos Date: Wed, 22 Jan 2025 03:37:35 -0600 Subject: [PATCH 23/35] Shipping permit sprite, and major freight rework --- .../Objects/Devices/Misc/ship_vouchers.yml | 4 +- .../Entities/Structures/Freight/freight.yml | 657 ++++++++++++++++++ .../Entities/Structures/Shipping/Shipping.yml | 73 -- .../Misc/shipyard_voucher.rsi/meta.json | 5 +- .../Misc/shipyard_voucher.rsi/shipping.png | Bin 0 -> 267 bytes .../freight_barrels.rsi}/black.png | Bin .../freight_barrels.rsi}/blue.png | Bin .../freight_barrels.rsi}/gray.png | Bin .../freight_barrels.rsi}/green.png | Bin .../freight_barrels.rsi}/meta.json | 0 .../freight_barrels.rsi}/red.png | Bin .../freight_barrels.rsi}/white.png | Bin .../freight_barrels.rsi}/yellow.png | Bin .../freight_boxes.rsi}/box1.png | Bin .../freight_boxes.rsi}/meta.json | 0 .../freight_pallet.rsi}/barrel_straps.png | Bin .../freight_pallet.rsi}/base.png | Bin .../freight_pallet.rsi}/crate_straps.png | Bin .../freight_pallet.rsi}/meta.json | 0 19 files changed, 663 insertions(+), 76 deletions(-) create mode 100644 Resources/Prototypes/_NF/Entities/Structures/Freight/freight.yml delete mode 100644 Resources/Prototypes/_NF/Entities/Structures/Shipping/Shipping.yml create mode 100644 Resources/Textures/_NF/Objects/Misc/shipyard_voucher.rsi/shipping.png rename Resources/Textures/_NF/Structures/{Shipping/shippingbarrels.rsi => Freight/freight_barrels.rsi}/black.png (100%) rename Resources/Textures/_NF/Structures/{Shipping/shippingbarrels.rsi => Freight/freight_barrels.rsi}/blue.png (100%) rename Resources/Textures/_NF/Structures/{Shipping/shippingbarrels.rsi => Freight/freight_barrels.rsi}/gray.png (100%) rename Resources/Textures/_NF/Structures/{Shipping/shippingbarrels.rsi => Freight/freight_barrels.rsi}/green.png (100%) rename Resources/Textures/_NF/Structures/{Shipping/shippingbarrels.rsi => Freight/freight_barrels.rsi}/meta.json (100%) rename Resources/Textures/_NF/Structures/{Shipping/shippingbarrels.rsi => Freight/freight_barrels.rsi}/red.png (100%) rename Resources/Textures/_NF/Structures/{Shipping/shippingbarrels.rsi => Freight/freight_barrels.rsi}/white.png (100%) rename Resources/Textures/_NF/Structures/{Shipping/shippingbarrels.rsi => Freight/freight_barrels.rsi}/yellow.png (100%) rename Resources/Textures/_NF/Structures/{Shipping/shippingboxes.rsi => Freight/freight_boxes.rsi}/box1.png (100%) rename Resources/Textures/_NF/Structures/{Shipping/shippingboxes.rsi => Freight/freight_boxes.rsi}/meta.json (100%) rename Resources/Textures/_NF/Structures/{Shipping/shippingpallet.rsi => Freight/freight_pallet.rsi}/barrel_straps.png (100%) rename Resources/Textures/_NF/Structures/{Shipping/shippingpallet.rsi => Freight/freight_pallet.rsi}/base.png (100%) rename Resources/Textures/_NF/Structures/{Shipping/shippingpallet.rsi => Freight/freight_pallet.rsi}/crate_straps.png (100%) rename Resources/Textures/_NF/Structures/{Shipping/shippingpallet.rsi => Freight/freight_pallet.rsi}/meta.json (100%) diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/Misc/ship_vouchers.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/Misc/ship_vouchers.yml index 9cfa3bdecf9..5dfce87be7f 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Devices/Misc/ship_vouchers.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Devices/Misc/ship_vouchers.yml @@ -129,11 +129,11 @@ components: - type: Sprite layers: - - state: blue - - state: voucherstationguard + - state: shipping - type: ShipyardVoucher destroyOnEmpty: true consoleType: Cargo noValue: false access: - Cargo + diff --git a/Resources/Prototypes/_NF/Entities/Structures/Freight/freight.yml b/Resources/Prototypes/_NF/Entities/Structures/Freight/freight.yml new file mode 100644 index 00000000000..037e440ee6e --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Structures/Freight/freight.yml @@ -0,0 +1,657 @@ +- type: entity + id: FreightBox1 + parent: BaseStructure + #suffix: container + name: freight container + description: A load of cargo to be delivered. +# placement: +# mode: AlignTileAny + categories: [ HideSpawnMenu ] + components: + - type: ShipmentPrice + bonusPrice: 2000 + - type: StaticPrice + price: 10000 + - type: Sprite + layers: + - sprite: _NF/Structures/Freight/freight_boxes.rsi + offset: 0,.5 + state: box1 + drawdepth: Mobs + noRot: true + +#barrel pallets +- type: entity + id: BarrelPallet1 + parent: FreightBox1 + name: freight pallet + suffix: Barrel + components: + - type: ShipmentPrice + bonusPrice: 1000 + - type: StaticPrice + price: 5000 + - type: Sprite + layers: + - sprite: _NF/Structures/Freight/freight_pallet.rsi + state: base + offset: 0,.5 + - sprite: _NF/Structures/Freight/freight_barrels.rsi + state: red + offset: -0.25,0.3125 #top left, options are -0.25,0.3125 and -0.21875,0.3125 + map: [ "topLeft" ] + - sprite: _NF/Structures/Freight/freight_barrels.rsi + state: black + offset: 0.25,0.3125 #top right, options are 0.25,0.3125 and 0.21875,0.3125 + map: [ "topRight" ] + - sprite: _NF/Structures/Freight/freight_barrels.rsi + state: green + offset: -0.25,-0.03125 #bottom left, options are -0.25,0 and -0.25,-0.03125 + map: [ "bottomLeft" ] + - sprite: _NF/Structures/Freight/freight_barrels.rsi + state: white + offset: 0.25,0 #bottom right, options are 0.25,0 and 0.25,-0.03125 + map: [ "bottomRight" ] + - sprite: _NF/Structures/Freight/freight_pallet.rsi + state: barrel_straps + offset: 0,.5 + - type: RandomSprite + available: + - topLeft: + black: "" + blue: "" + gray: "" + green: "" + red: "" + white: "" + yellow: "" + topRight: + black: "" + blue: "" + gray: "" + green: "" + red: "" + white: "" + yellow: "" + bottomLeft: + black: "" + blue: "" + gray: "" + green: "" + red: "" + white: "" + yellow: "" + bottomRight: + black: "" + blue: "" + gray: "" + green: "" + red: "" + white: "" + yellow: "" + +#crate pallets +- type: entity + id: CratePallet1 + parent: FreightBox1 + name: freight pallet + categories: [ HideSpawnMenu ] + components: + - type: ShipmentPrice + bonusPrice: 1000 + - type: StaticPrice + price: 5000 + - type: Sprite + layers: + - sprite: _NF/Structures/Freight/freight_pallet.rsi + state: base + offset: 0,.5 + - sprite: Structures/Storage/Crates/electrical.rsi + state: icon + offset: 0,0.65625 + - sprite: Structures/Storage/Crates/engineering.rsi + state: icon + offset: 0,-0.03125 + - sprite: Structures/Storage/Crates/chemcrate_secure.rsi + state: icon + offset: 0,0.34375 + - sprite: _NF/Structures/Freight/freight_pallet.rsi + state: crate_straps + offset: 0,.5 + + +- type: entity + id: CratePallet2 + parent: CratePallet1 + name: freight pallet + categories: [ HideSpawnMenu ] + components: + - type: Sprite + layers: + - sprite: _NF/Structures/Freight/freight_pallet.rsi + state: base + offset: 0,.5 + - sprite: Structures/Storage/Crates/chemcrate_secure.rsi + state: icon + offset: 0,0.65625 + - sprite: Structures/Storage/Crates/medicalcrate_secure.rsi + state: icon + offset: 0,-0.03125 + - sprite: Structures/Storage/Crates/scicrate_secure.rsi + state: icon + offset: 0,0.34375 + - sprite: _NF/Structures/Freight/freight_pallet.rsi + state: crate_straps + offset: 0,.5 + +- type: entity + id: CratePallet3 + parent: CratePallet1 + name: freight pallet + categories: [ HideSpawnMenu ] + components: + - type: Sprite + layers: + - sprite: _NF/Structures/Freight/freight_pallet.rsi + state: base + offset: 0,.5 + - sprite: Structures/Storage/Crates/o2.rsi + state: icon + offset: 0,0.65625 + - sprite: Structures/Storage/Crates/scicrate_secure.rsi + state: icon + offset: 0,-0.03125 + - sprite: Structures/Storage/Crates/hydro_secure.rsi + state: icon + offset: 0,0.34375 + - sprite: _NF/Structures/Freight/freight_pallet.rsi + state: crate_straps + offset: 0,.5 + +- type: entity + id: CratePallet4 + parent: CratePallet1 + name: freight pallet + categories: [ HideSpawnMenu ] + components: + - type: Sprite + layers: + - sprite: _NF/Structures/Freight/freight_pallet.rsi + state: base + offset: 0,.5 + - sprite: Structures/Storage/Crates/plasma.rsi + state: icon + offset: 0,0.65625 + - sprite: Structures/Storage/Crates/plasma.rsi + state: icon + offset: 0,-0.03125 + - sprite: Structures/Storage/Crates/engineering.rsi + state: icon + offset: 0,0.34375 + - sprite: _NF/Structures/Freight/freight_pallet.rsi + state: crate_straps + offset: 0,.5 + +- type: entity + id: CratePallet5 + parent: CratePallet1 + name: freight pallet + categories: [ HideSpawnMenu ] + components: + - type: Sprite + layers: + - sprite: _NF/Structures/Freight/freight_pallet.rsi + state: base + offset: 0,.5 + - sprite: Structures/Storage/Crates/radiation.rsi + state: icon + offset: 0,0.65625 + - sprite: Structures/Storage/Crates/plasma.rsi + state: icon + offset: 0,-0.03125 + - sprite: Structures/Storage/Crates/hydroponics.rsi + state: icon + offset: 0,0.34375 + - sprite: _NF/Structures/Freight/freight_pallet.rsi + state: crate_straps + offset: 0,.5 + +- type: entity + id: CratePallet6 + parent: CratePallet1 + name: freight pallet + categories: [ HideSpawnMenu ] + components: + - type: Sprite + layers: + - sprite: _NF/Structures/Freight/freight_pallet.rsi + state: base + offset: 0,.5 + - sprite: Structures/Storage/Crates/medical.rsi + state: icon + offset: 0,0.65625 + - sprite: Structures/Storage/Crates/radiation.rsi + state: icon + offset: 0,-0.03125 + - sprite: Structures/Storage/Crates/hydro_secure.rsi + state: icon + offset: 0,0.34375 + - sprite: _NF/Structures/Freight/freight_pallet.rsi + state: crate_straps + offset: 0,.5 + +- type: entity + id: CratePallet7 + parent: CratePallet1 + name: freight pallet + categories: [ HideSpawnMenu ] + components: + - type: Sprite + layers: + - sprite: _NF/Structures/Freight/freight_pallet.rsi + state: base + offset: 0,.5 + - sprite: Structures/Storage/Crates/o2.rsi + state: icon + offset: 0,0.65625 + - sprite: Structures/Storage/Crates/chemcrate_secure.rsi + state: icon + offset: 0,-0.03125 + - sprite: Structures/Storage/Crates/chemcrate_secure.rsi + state: icon + offset: 0,0.34375 + - sprite: _NF/Structures/Freight/freight_pallet.rsi + state: crate_straps + offset: 0,.5 + +- type: entity + id: CratePallet8 + parent: CratePallet1 + name: freight pallet + categories: [ HideSpawnMenu ] + components: + - type: Sprite + layers: + - sprite: _NF/Structures/Freight/freight_pallet.rsi + state: base + offset: 0,.5 + - sprite: Structures/Storage/Crates/electrical.rsi + state: icon + offset: 0,0.65625 + - sprite: Structures/Storage/Crates/surgery.rsi + state: icon + offset: 0,-0.03125 + - sprite: Structures/Storage/Crates/hydroponics.rsi + state: icon + offset: 0,0.34375 + - sprite: _NF/Structures/Freight/freight_pallet.rsi + state: crate_straps + offset: 0,.5 + +- type: entity + id: CratePallet9 + parent: CratePallet1 + name: freight pallet + categories: [ HideSpawnMenu ] + components: + - type: Sprite + layers: + - sprite: _NF/Structures/Freight/freight_pallet.rsi + state: base + offset: 0,.5 + - sprite: Structures/Storage/Crates/scicrate_secure.rsi + state: icon + offset: 0,0.65625 + - sprite: Structures/Storage/Crates/generic.rsi + state: icon + offset: 0,-0.03125 + - sprite: Structures/Storage/Crates/plastic.rsi + state: icon + offset: 0,0.34375 + - sprite: _NF/Structures/Freight/freight_pallet.rsi + state: crate_straps + offset: 0,.5 + +- type: entity + id: CratePallet10 + parent: CratePallet1 + name: freight pallet + categories: [ HideSpawnMenu ] + components: + - type: Sprite + layers: + - sprite: _NF/Structures/Freight/freight_pallet.rsi + state: base + offset: 0,.5 + - sprite: Structures/Storage/Crates/plastic.rsi + state: icon + offset: 0,0.65625 + - sprite: Structures/Storage/Crates/radiation.rsi + state: icon + offset: 0,-0.03125 + - sprite: Structures/Storage/Crates/engineering.rsi + state: icon + offset: 0,0.34375 + - sprite: _NF/Structures/Freight/freight_pallet.rsi + state: crate_straps + offset: 0,.5 + +- type: entity + id: CratePallet11 + parent: CratePallet1 + name: freight pallet + categories: [ HideSpawnMenu ] + components: + - type: Sprite + layers: + - sprite: _NF/Structures/Freight/freight_pallet.rsi + state: base + offset: 0,.5 + - sprite: Structures/Storage/Crates/generic.rsi + state: icon + offset: 0,0.65625 + - sprite: Structures/Storage/Crates/hydroponics.rsi + state: icon + offset: 0,-0.03125 + - sprite: Structures/Storage/Crates/plastic.rsi + state: icon + offset: 0,0.34375 + - sprite: _NF/Structures/Freight/freight_pallet.rsi + state: crate_straps + offset: 0,.5 + +- type: entity + id: CratePallet12 + parent: CratePallet1 + name: freight pallet + categories: [ HideSpawnMenu ] + components: + - type: Sprite + layers: + - sprite: _NF/Structures/Freight/freight_pallet.rsi + state: base + offset: 0,.5 + - sprite: Structures/Storage/Crates/scicrate_secure.rsi + state: icon + offset: 0,0.65625 + - sprite: Structures/Storage/Crates/generic.rsi + state: icon + offset: 0,-0.03125 + - sprite: Structures/Storage/Crates/medicalcrate_secure.rsi + state: icon + offset: 0,0.34375 + - sprite: _NF/Structures/Freight/freight_pallet.rsi + state: crate_straps + offset: 0,.5 + +- type: entity + id: CratePallet13 + parent: CratePallet1 + name: freight pallet + categories: [ HideSpawnMenu ] + components: + - type: Sprite + layers: + - sprite: _NF/Structures/Freight/freight_pallet.rsi + state: base + offset: 0,.5 + - sprite: Structures/Storage/Crates/chemcrate_secure.rsi + state: icon + offset: 0,0.65625 + - sprite: Structures/Storage/Crates/generic.rsi + state: icon + offset: 0,-0.03125 + - sprite: Structures/Storage/Crates/engineering.rsi + state: icon + offset: 0,0.34375 + - sprite: _NF/Structures/Freight/freight_pallet.rsi + state: crate_straps + offset: 0,.5 + +- type: entity + id: CratePallet14 + parent: CratePallet1 + name: freight pallet + categories: [ HideSpawnMenu ] + components: + - type: Sprite + layers: + - sprite: _NF/Structures/Freight/freight_pallet.rsi + state: base + offset: 0,.5 + - sprite: Structures/Storage/Crates/surgery.rsi + state: icon + offset: 0,0.65625 + - sprite: Structures/Storage/Crates/o2.rsi + state: icon + offset: 0,-0.03125 + - sprite: Structures/Storage/Crates/engineering.rsi + state: icon + offset: 0,0.34375 + - sprite: _NF/Structures/Freight/freight_pallet.rsi + state: crate_straps + offset: 0,.5 + +- type: entity + id: CratePallet15 + parent: CratePallet1 + name: freight pallet + categories: [ HideSpawnMenu ] + components: + - type: Sprite + layers: + - sprite: _NF/Structures/Freight/freight_pallet.rsi + state: base + offset: 0,.5 + - sprite: Structures/Storage/Crates/medical.rsi + state: icon + offset: 0,0.65625 + - sprite: Structures/Storage/Crates/scicrate_secure.rsi + state: icon + offset: 0,-0.03125 + - sprite: Structures/Storage/Crates/hydro_secure.rsi + state: icon + offset: 0,0.34375 + - sprite: _NF/Structures/Freight/freight_pallet.rsi + state: crate_straps + offset: 0,.5 + +- type: entity + id: CratePallet16 + parent: CratePallet1 + name: freight pallet + categories: [ HideSpawnMenu ] + components: + - type: Sprite + layers: + - sprite: _NF/Structures/Freight/freight_pallet.rsi + state: base + offset: 0,.5 + - sprite: Structures/Storage/Crates/surgery.rsi + state: icon + offset: 0,0.65625 + - sprite: Structures/Storage/Crates/science.rsi + state: icon + offset: 0,-0.03125 + - sprite: Structures/Storage/Crates/scicrate_secure.rsi + state: icon + offset: 0,0.34375 + - sprite: _NF/Structures/Freight/freight_pallet.rsi + state: crate_straps + offset: 0,.5 + +- type: entity + id: CratePallet17 + parent: CratePallet1 + name: freight pallet + categories: [ HideSpawnMenu ] + components: + - type: Sprite + layers: + - sprite: _NF/Structures/Freight/freight_pallet.rsi + state: base + offset: 0,.5 + - sprite: Structures/Storage/Crates/medical.rsi + state: icon + offset: 0,0.65625 + - sprite: Structures/Storage/Crates/plastic.rsi + state: icon + offset: 0,-0.03125 + - sprite: Structures/Storage/Crates/scicrate_secure.rsi + state: icon + offset: 0,0.34375 + - sprite: _NF/Structures/Freight/freight_pallet.rsi + state: crate_straps + offset: 0,.5 + +- type: entity + id: CratePallet18 + parent: CratePallet1 + name: freight pallet + categories: [ HideSpawnMenu ] + components: + - type: Sprite + layers: + - sprite: _NF/Structures/Freight/freight_pallet.rsi + state: base + offset: 0,.5 + - sprite: Structures/Storage/Crates/engineering.rsi + state: icon + offset: 0,0.65625 + - sprite: Structures/Storage/Crates/privatecrate_secure.rsi + state: icon + offset: 0,-0.03125 + - sprite: Structures/Storage/Crates/generic.rsi + state: icon + offset: 0,0.34375 + - sprite: _NF/Structures/Freight/freight_pallet.rsi + state: crate_straps + offset: 0,.5 + +- type: entity + id: CratePallet19 + parent: CratePallet1 + name: freight pallet + categories: [ HideSpawnMenu ] + components: + - type: Sprite + layers: + - sprite: _NF/Structures/Freight/freight_pallet.rsi + state: base + offset: 0,.5 + - sprite: Structures/Storage/Crates/privatecrate_secure.rsi + state: icon + offset: 0,0.65625 + - sprite: Structures/Storage/Crates/scicrate_secure.rsi + state: icon + offset: 0,-0.03125 + - sprite: Structures/Storage/Crates/hydro_secure.rsi + state: icon + offset: 0,0.34375 + - sprite: _NF/Structures/Freight/freight_pallet.rsi + state: crate_straps + offset: 0,.5 + +- type: entity + id: CratePallet20 + parent: CratePallet1 + name: freight pallet + categories: [ HideSpawnMenu ] + components: + - type: Sprite + layers: + - sprite: _NF/Structures/Freight/freight_pallet.rsi + state: base + offset: 0,.5 + - sprite: Structures/Storage/Crates/engineering.rsi + state: icon + offset: 0,0.65625 + - sprite: Structures/Storage/Crates/medical.rsi + state: icon + offset: 0,-0.03125 + - sprite: Structures/Storage/Crates/radiation.rsi + state: icon + offset: 0,0.34375 + - sprite: _NF/Structures/Freight/freight_pallet.rsi + state: crate_straps + offset: 0,.5 + +- type: entity + id: CratePallet21 + parent: CratePallet1 + name: freight pallet + categories: [ HideSpawnMenu ] + components: + - type: Sprite + layers: + - sprite: _NF/Structures/Freight/freight_pallet.rsi + state: base + offset: 0,.5 + - sprite: Structures/Storage/Crates/radiation.rsi + state: icon + offset: 0,0.65625 + - sprite: Structures/Storage/Crates/engicrate_secure.rsi + state: icon + offset: 0,-0.03125 + - sprite: Structures/Storage/Crates/electrical.rsi + state: icon + offset: 0,0.34375 + - sprite: _NF/Structures/Freight/freight_pallet.rsi + state: crate_straps + offset: 0,.5 + + + +#spawner +- type: entity + parent: MarkerBase + id: RandomCrateFreightT1 + name: random t1 crate freight spawner + components: + - type: Sprite + layers: + - state: red + - sprite: _NF/Structures/Freight/freight_pallet.rsi + state: base + - type: RandomSpawner + offset: 0 + prototypes: + - CratePallet1 + - CratePallet2 + - CratePallet3 + - CratePallet4 + - CratePallet5 + - CratePallet6 + - CratePallet7 + - CratePallet8 + - CratePallet9 + - CratePallet10 + - CratePallet11 + - CratePallet12 + - CratePallet13 + - CratePallet14 + - CratePallet15 + - CratePallet16 + - CratePallet17 + - CratePallet18 + - CratePallet19 + - CratePallet20 + - CratePallet21 + chance: 1 + +- type: entity + parent: MarkerBase + id: RandomFreightT1 + name: random t1 freight spawner + components: + - type: Sprite + layers: + - state: red + - sprite: _NF/Structures/Freight/freight_pallet.rsi + state: base + - type: RandomSpawner + offset: 0 + prototypes: + - BarrelPallet1 + - RandomCrateFreightT1 + chance: 1 diff --git a/Resources/Prototypes/_NF/Entities/Structures/Shipping/Shipping.yml b/Resources/Prototypes/_NF/Entities/Structures/Shipping/Shipping.yml deleted file mode 100644 index cddb491b80b..00000000000 --- a/Resources/Prototypes/_NF/Entities/Structures/Shipping/Shipping.yml +++ /dev/null @@ -1,73 +0,0 @@ -- type: entity - id: ShippingBox1 - parent: BaseStructure - #suffix: container - name: shipping container - description: A load of cargo to be delivered. -# placement: -# mode: AlignTileAny - components: - #- type: SpriteFade - - type: Sprite - sprite: _NF/Structures/Shipping/shippingboxes.rsi - offset: 0,.5 - drawdepth: Mobs - state: box1 - noRot: true - -#barrels pallets and spawner -- type: entity - id: BarrelPallet1 - parent: ShippingBox1 - name: shipping pallete - components: - - type: Sprite - drawdepth: Mobs - offset: 0,0 - layers: - - sprite: _NF/Structures/Shipping/shippingpallet.rsi - state: base - offset: 0,.5 - - sprite: _NF/Structures/Shipping/shippingbarrels.rsi - state: red - offset: -0.25,0.3125 #top left, options are -0.25,0.3125 and -0.21875,0.3125 - - sprite: _NF/Structures/Shipping/shippingbarrels.rsi - state: black - offset: 0.25,0.3125 #top right, options are 0.25,0.3125 and 0.21875,0.3125 - - sprite: _NF/Structures/Shipping/shippingbarrels.rsi - state: green - offset: -0.25,-0.03125 #bottom left, options are -0.25,0 and -0.25,-0.03125 - - sprite: _NF/Structures/Shipping/shippingbarrels.rsi - state: white - offset: 0.25,0 #bottom right, options are 0.25,0 and 0.25,-0.03125 - - sprite: _NF/Structures/Shipping/shippingpallet.rsi - state: barrel_straps - offset: 0,.5 - noRot: true - -#crate pallets and spawner -- type: entity - id: CratePallet1 - parent: ShippingBox1 - name: shipping pallete - components: - - type: Sprite - drawdepth: Mobs - offset: 0,0 - layers: - - sprite: _NF/Structures/Shipping/shippingpallet.rsi - state: base - offset: 0,.5 - - sprite: Structures/Storage/Crates/electrical.rsi - state: icon - offset: 0,0.65625 - - sprite: Structures/Storage/Crates/engineering.rsi - state: icon - offset: 0,-0.03125 - - sprite: Structures/Storage/Crates/chemcrate_secure.rsi - state: icon - offset: 0,0.34375 - - sprite: _NF/Structures/Shipping/shippingpallet.rsi - state: crate_straps - offset: 0,.5 - noRot: true \ No newline at end of file diff --git a/Resources/Textures/_NF/Objects/Misc/shipyard_voucher.rsi/meta.json b/Resources/Textures/_NF/Objects/Misc/shipyard_voucher.rsi/meta.json index acb06485cd7..45d163d19be 100644 --- a/Resources/Textures/_NF/Objects/Misc/shipyard_voucher.rsi/meta.json +++ b/Resources/Textures/_NF/Objects/Misc/shipyard_voucher.rsi/meta.json @@ -2,7 +2,7 @@ "version": 1, "license": "CC-BY-SA-3.0", "copyright": "blue-inhand-left, blue-inhand-right, voucherstationguard taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e.", - "copyright": "blue, nfsd, voucher* by Whatstone (Discord)", + "copyright": "blue, nfsd, voucher* by Whatstone (Discord); shippping by https://github.com/Temoffy Discord: @telos2387", "size": { "x": 32, "y": 32 @@ -47,6 +47,9 @@ }, { "name": "vouchervalet" + }, + { + "name": "shipping" } ] } diff --git a/Resources/Textures/_NF/Objects/Misc/shipyard_voucher.rsi/shipping.png b/Resources/Textures/_NF/Objects/Misc/shipyard_voucher.rsi/shipping.png new file mode 100644 index 0000000000000000000000000000000000000000..c64e547bb7408912a19734f6677e1a165e456ba9 GIT binary patch literal 267 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCil21AIbUlf4wD6&P)9vxzt5o>64noTM|q+|=0E7%1OyZ$T%J;w%aB3;quU z48i^tLLk8ckH}&M2EM}}%y>M1MG8fIif{SD{AH Date: Wed, 22 Jan 2025 23:49:53 +1100 Subject: [PATCH 24/35] add vending machine that stocks shipment dockets + misc stuff --- .../VendingMachines/Inventories/cargovend.yml | 14 +++++++++ .../Objects/Devices/Misc/ship_vouchers.yml | 5 ++-- .../Structures/Machines/vending_machines.yml | 29 ++++++++++++++++++- 3 files changed, 45 insertions(+), 3 deletions(-) create mode 100644 Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/cargovend.yml diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/cargovend.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/cargovend.yml new file mode 100644 index 00000000000..7eee329762e --- /dev/null +++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/cargovend.yml @@ -0,0 +1,14 @@ +- type: vendingMachineInventory + id: CargoVendInventory + startingInventory: + ShipVoucherCargoShipment: 4294967295 # Infinite + Paper: 4294967295 # Infinite + PaperOffice: 4294967295 # Infinite + AppraisalTool: 4 + HandLabeler: 3 + BoxFolderClipboard: 3 + ClothingHeadsetCargo: 3 + EncryptionKeyCargo: 10 + CheapLighter: 3 + CigPackBlack: 8 + diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/Misc/ship_vouchers.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/Misc/ship_vouchers.yml index 15117ad2174..2ea07058894 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Devices/Misc/ship_vouchers.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Devices/Misc/ship_vouchers.yml @@ -131,10 +131,11 @@ layers: - state: shipping - type: StaticPrice - price: 10000 + price: 1000 + vendPrice: 1000 - type: ShipyardVoucher destroyOnEmpty: true consoleType: Cargo noValue: false access: - - Cargo \ No newline at end of file + - Cargo diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml index 5cf1eded1a5..aca66186575 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml @@ -684,6 +684,33 @@ energy: 1.6 color: "#4b93ad" +- type: entity + parent: [BaseStructureDisableAnchoring, VendingMachine] + id: VendingMachineCargo + name: CargoVend + description: A one stop shop for space truckers. + components: + - type: VendingMachine + pack: CargoVendInventory + offState: off + brokenState: broken + normalState: normal-unshaded + # ejectState: eject-unshaded No sprite, see chefvend/dinnerware/BODA/etc for expamples + - type: Sprite + sprite: _NF/Structures/Machines/VendingMachines/astrovend.rsi + layers: + - state: "off" + map: ["enum.VendingMachineVisualLayers.Base"] + - state: "off" + map: ["enum.VendingMachineVisualLayers.BaseUnshaded"] + shader: unshaded + - state: panel + map: ["enum.WiresVisualLayers.MaintenancePanel"] + - type: PointLight + radius: 1.5 + energy: 1.6 + color: "#4b93ad" + # POI versions of upstream machines - type: entity @@ -744,4 +771,4 @@ suffix: Dungeon components: - type: VendingMachine - initialStockQuality: 0 # This isnt actully empty, just always missing stuff. \ No newline at end of file + initialStockQuality: 0 # This isnt actully empty, just always missing stuff. From 1b0ca1965b41cea3cdf610744473507a387eda21 Mon Sep 17 00:00:00 2001 From: Telos Date: Wed, 22 Jan 2025 12:14:18 -0600 Subject: [PATCH 25/35] Gray? in my overly colorful mix? unthinkable --- .../Entities/Structures/Freight/freight.yml | 234 +++++++++++++----- .../Freight/freight_barrels.rsi/meta.json | 3 + .../Freight/freight_barrels.rsi/steel.png | Bin 0 -> 340 bytes 3 files changed, 176 insertions(+), 61 deletions(-) create mode 100644 Resources/Textures/_NF/Structures/Freight/freight_barrels.rsi/steel.png diff --git a/Resources/Prototypes/_NF/Entities/Structures/Freight/freight.yml b/Resources/Prototypes/_NF/Entities/Structures/Freight/freight.yml index 037e440ee6e..b5bec537419 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Freight/freight.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Freight/freight.yml @@ -37,19 +37,19 @@ state: base offset: 0,.5 - sprite: _NF/Structures/Freight/freight_barrels.rsi - state: red + state: steel offset: -0.25,0.3125 #top left, options are -0.25,0.3125 and -0.21875,0.3125 map: [ "topLeft" ] - sprite: _NF/Structures/Freight/freight_barrels.rsi - state: black + state: steel offset: 0.25,0.3125 #top right, options are 0.25,0.3125 and 0.21875,0.3125 map: [ "topRight" ] - sprite: _NF/Structures/Freight/freight_barrels.rsi - state: green + state: steel offset: -0.25,-0.03125 #bottom left, options are -0.25,0 and -0.25,-0.03125 map: [ "bottomLeft" ] - sprite: _NF/Structures/Freight/freight_barrels.rsi - state: white + state: steel offset: 0.25,0 #bottom right, options are 0.25,0 and 0.25,-0.03125 map: [ "bottomRight" ] - sprite: _NF/Structures/Freight/freight_pallet.rsi @@ -57,7 +57,8 @@ offset: 0,.5 - type: RandomSprite available: - - topLeft: + #no weighting possible, so I have to get REAL messy to weight towards steel barrels. Only one random section is applied, and each one does not randomize one of the barrels + - topRight: black: "" blue: "" gray: "" @@ -65,6 +66,61 @@ red: "" white: "" yellow: "" + steel: "" + bottomLeft: + black: "" + blue: "" + gray: "" + green: "" + red: "" + white: "" + yellow: "" + steel: "" + bottomRight: + black: "" + blue: "" + gray: "" + green: "" + red: "" + white: "" + yellow: "" + steel: "" + - topLeft: #new selection + black: "" + blue: "" + gray: "" + green: "" + red: "" + white: "" + yellow: "" + steel: "" + bottomLeft: + black: "" + blue: "" + gray: "" + green: "" + red: "" + white: "" + yellow: "" + steel: "" + bottomRight: + black: "" + blue: "" + gray: "" + green: "" + red: "" + white: "" + yellow: "" + steel: "" + - topLeft: #new selection + black: "" + blue: "" + gray: "" + green: "" + red: "" + white: "" + yellow: "" + steel: "" topRight: black: "" blue: "" @@ -73,6 +129,34 @@ red: "" white: "" yellow: "" + steel: "" + bottomRight: + black: "" + blue: "" + gray: "" + green: "" + red: "" + white: "" + yellow: "" + steel: "" + - topLeft: #new selection + black: "" + blue: "" + gray: "" + green: "" + red: "" + white: "" + yellow: "" + steel: "" + topRight: + black: "" + blue: "" + gray: "" + green: "" + red: "" + white: "" + yellow: "" + steel: "" bottomLeft: black: "" blue: "" @@ -81,6 +165,16 @@ red: "" white: "" yellow: "" + steel: "" + - bottomLeft: #new selection + black: "" + blue: "" + gray: "" + green: "" + red: "" + white: "" + yellow: "" + steel: "" bottomRight: black: "" blue: "" @@ -89,6 +183,25 @@ red: "" white: "" yellow: "" + steel: "" + - topLeft: #new selection + black: "" + blue: "" + gray: "" + green: "" + red: "" + white: "" + yellow: "" + steel: "" + topRight: + black: "" + blue: "" + gray: "" + green: "" + red: "" + white: "" + yellow: "" + steel: "" #crate pallets - type: entity @@ -131,13 +244,13 @@ - sprite: _NF/Structures/Freight/freight_pallet.rsi state: base offset: 0,.5 - - sprite: Structures/Storage/Crates/chemcrate_secure.rsi + - sprite: Structures/Storage/Crates/privatecrate_secure.rsi state: icon offset: 0,0.65625 - - sprite: Structures/Storage/Crates/medicalcrate_secure.rsi + - sprite: Structures/Storage/Crates/hydro_secure.rsi state: icon offset: 0,-0.03125 - - sprite: Structures/Storage/Crates/scicrate_secure.rsi + - sprite: Structures/Storage/Crates/chemcrate_secure.rsi state: icon offset: 0,0.34375 - sprite: _NF/Structures/Freight/freight_pallet.rsi @@ -155,13 +268,13 @@ - sprite: _NF/Structures/Freight/freight_pallet.rsi state: base offset: 0,.5 - - sprite: Structures/Storage/Crates/o2.rsi + - sprite: Structures/Storage/Crates/generic.rsi state: icon offset: 0,0.65625 - - sprite: Structures/Storage/Crates/scicrate_secure.rsi + - sprite: Structures/Storage/Crates/generic.rsi state: icon offset: 0,-0.03125 - - sprite: Structures/Storage/Crates/hydro_secure.rsi + - sprite: Structures/Storage/Crates/generic.rsi state: icon offset: 0,0.34375 - sprite: _NF/Structures/Freight/freight_pallet.rsi @@ -179,13 +292,13 @@ - sprite: _NF/Structures/Freight/freight_pallet.rsi state: base offset: 0,.5 - - sprite: Structures/Storage/Crates/plasma.rsi + - sprite: Structures/Storage/Crates/medicalcrate_secure.rsi state: icon offset: 0,0.65625 - - sprite: Structures/Storage/Crates/plasma.rsi + - sprite: Structures/Storage/Crates/generic.rsi state: icon offset: 0,-0.03125 - - sprite: Structures/Storage/Crates/engineering.rsi + - sprite: Structures/Storage/Crates/generic.rsi state: icon offset: 0,0.34375 - sprite: _NF/Structures/Freight/freight_pallet.rsi @@ -203,13 +316,13 @@ - sprite: _NF/Structures/Freight/freight_pallet.rsi state: base offset: 0,.5 - - sprite: Structures/Storage/Crates/radiation.rsi + - sprite: Structures/Storage/Crates/privatecrate_secure.rsi state: icon offset: 0,0.65625 - - sprite: Structures/Storage/Crates/plasma.rsi + - sprite: Structures/Storage/Crates/generic.rsi state: icon offset: 0,-0.03125 - - sprite: Structures/Storage/Crates/hydroponics.rsi + - sprite: Structures/Storage/Crates/science.rsi state: icon offset: 0,0.34375 - sprite: _NF/Structures/Freight/freight_pallet.rsi @@ -227,13 +340,13 @@ - sprite: _NF/Structures/Freight/freight_pallet.rsi state: base offset: 0,.5 - - sprite: Structures/Storage/Crates/medical.rsi + - sprite: Structures/Storage/Crates/generic.rsi state: icon offset: 0,0.65625 - - sprite: Structures/Storage/Crates/radiation.rsi + - sprite: Structures/Storage/Crates/engineering.rsi state: icon offset: 0,-0.03125 - - sprite: Structures/Storage/Crates/hydro_secure.rsi + - sprite: Structures/Storage/Crates/medical.rsi state: icon offset: 0,0.34375 - sprite: _NF/Structures/Freight/freight_pallet.rsi @@ -251,13 +364,13 @@ - sprite: _NF/Structures/Freight/freight_pallet.rsi state: base offset: 0,.5 - - sprite: Structures/Storage/Crates/o2.rsi + - sprite: Structures/Storage/Crates/science.rsi state: icon offset: 0,0.65625 - - sprite: Structures/Storage/Crates/chemcrate_secure.rsi + - sprite: Structures/Storage/Crates/engicrate_secure.rsi state: icon offset: 0,-0.03125 - - sprite: Structures/Storage/Crates/chemcrate_secure.rsi + - sprite: Structures/Storage/Crates/generic.rsi state: icon offset: 0,0.34375 - sprite: _NF/Structures/Freight/freight_pallet.rsi @@ -275,13 +388,13 @@ - sprite: _NF/Structures/Freight/freight_pallet.rsi state: base offset: 0,.5 - - sprite: Structures/Storage/Crates/electrical.rsi + - sprite: Structures/Storage/Crates/privatecrate_secure.rsi state: icon offset: 0,0.65625 - - sprite: Structures/Storage/Crates/surgery.rsi + - sprite: Structures/Storage/Crates/hydro_secure.rsi state: icon offset: 0,-0.03125 - - sprite: Structures/Storage/Crates/hydroponics.rsi + - sprite: Structures/Storage/Crates/privatecrate_secure.rsi state: icon offset: 0,0.34375 - sprite: _NF/Structures/Freight/freight_pallet.rsi @@ -299,13 +412,13 @@ - sprite: _NF/Structures/Freight/freight_pallet.rsi state: base offset: 0,.5 - - sprite: Structures/Storage/Crates/scicrate_secure.rsi + - sprite: Structures/Storage/Crates/generic.rsi state: icon offset: 0,0.65625 - - sprite: Structures/Storage/Crates/generic.rsi + - sprite: Structures/Storage/Crates/chemcrate_secure.rsi state: icon offset: 0,-0.03125 - - sprite: Structures/Storage/Crates/plastic.rsi + - sprite: Structures/Storage/Crates/hydro_secure.rsi state: icon offset: 0,0.34375 - sprite: _NF/Structures/Freight/freight_pallet.rsi @@ -323,13 +436,13 @@ - sprite: _NF/Structures/Freight/freight_pallet.rsi state: base offset: 0,.5 - - sprite: Structures/Storage/Crates/plastic.rsi + - sprite: Structures/Storage/Crates/generic.rsi state: icon offset: 0,0.65625 - - sprite: Structures/Storage/Crates/radiation.rsi + - sprite: Structures/Storage/Crates/generic.rsi state: icon offset: 0,-0.03125 - - sprite: Structures/Storage/Crates/engineering.rsi + - sprite: Structures/Storage/Crates/generic.rsi state: icon offset: 0,0.34375 - sprite: _NF/Structures/Freight/freight_pallet.rsi @@ -350,10 +463,10 @@ - sprite: Structures/Storage/Crates/generic.rsi state: icon offset: 0,0.65625 - - sprite: Structures/Storage/Crates/hydroponics.rsi + - sprite: Structures/Storage/Crates/generic.rsi state: icon offset: 0,-0.03125 - - sprite: Structures/Storage/Crates/plastic.rsi + - sprite: Structures/Storage/Crates/generic.rsi state: icon offset: 0,0.34375 - sprite: _NF/Structures/Freight/freight_pallet.rsi @@ -371,7 +484,7 @@ - sprite: _NF/Structures/Freight/freight_pallet.rsi state: base offset: 0,.5 - - sprite: Structures/Storage/Crates/scicrate_secure.rsi + - sprite: Structures/Storage/Crates/generic.rsi state: icon offset: 0,0.65625 - sprite: Structures/Storage/Crates/generic.rsi @@ -395,13 +508,13 @@ - sprite: _NF/Structures/Freight/freight_pallet.rsi state: base offset: 0,.5 - - sprite: Structures/Storage/Crates/chemcrate_secure.rsi + - sprite: Structures/Storage/Crates/generic.rsi state: icon offset: 0,0.65625 - sprite: Structures/Storage/Crates/generic.rsi state: icon offset: 0,-0.03125 - - sprite: Structures/Storage/Crates/engineering.rsi + - sprite: Structures/Storage/Crates/medicalcrate_secure.rsi state: icon offset: 0,0.34375 - sprite: _NF/Structures/Freight/freight_pallet.rsi @@ -419,13 +532,13 @@ - sprite: _NF/Structures/Freight/freight_pallet.rsi state: base offset: 0,.5 - - sprite: Structures/Storage/Crates/surgery.rsi + - sprite: Structures/Storage/Crates/generic.rsi state: icon offset: 0,0.65625 - - sprite: Structures/Storage/Crates/o2.rsi + - sprite: Structures/Storage/Crates/generic.rsi state: icon offset: 0,-0.03125 - - sprite: Structures/Storage/Crates/engineering.rsi + - sprite: Structures/Storage/Crates/privatecrate_secure.rsi state: icon offset: 0,0.34375 - sprite: _NF/Structures/Freight/freight_pallet.rsi @@ -443,13 +556,13 @@ - sprite: _NF/Structures/Freight/freight_pallet.rsi state: base offset: 0,.5 - - sprite: Structures/Storage/Crates/medical.rsi + - sprite: Structures/Storage/Crates/engineering.rsi state: icon offset: 0,0.65625 - - sprite: Structures/Storage/Crates/scicrate_secure.rsi + - sprite: Structures/Storage/Crates/generic.rsi state: icon offset: 0,-0.03125 - - sprite: Structures/Storage/Crates/hydro_secure.rsi + - sprite: Structures/Storage/Crates/hydroponics.rsi state: icon offset: 0,0.34375 - sprite: _NF/Structures/Freight/freight_pallet.rsi @@ -467,10 +580,10 @@ - sprite: _NF/Structures/Freight/freight_pallet.rsi state: base offset: 0,.5 - - sprite: Structures/Storage/Crates/surgery.rsi + - sprite: Structures/Storage/Crates/generic.rsi state: icon offset: 0,0.65625 - - sprite: Structures/Storage/Crates/science.rsi + - sprite: Structures/Storage/Crates/generic.rsi state: icon offset: 0,-0.03125 - sprite: Structures/Storage/Crates/scicrate_secure.rsi @@ -491,13 +604,13 @@ - sprite: _NF/Structures/Freight/freight_pallet.rsi state: base offset: 0,.5 - - sprite: Structures/Storage/Crates/medical.rsi + - sprite: Structures/Storage/Crates/generic.rsi state: icon offset: 0,0.65625 - - sprite: Structures/Storage/Crates/plastic.rsi + - sprite: Structures/Storage/Crates/generic.rsi state: icon offset: 0,-0.03125 - - sprite: Structures/Storage/Crates/scicrate_secure.rsi + - sprite: Structures/Storage/Crates/generic.rsi state: icon offset: 0,0.34375 - sprite: _NF/Structures/Freight/freight_pallet.rsi @@ -515,13 +628,13 @@ - sprite: _NF/Structures/Freight/freight_pallet.rsi state: base offset: 0,.5 - - sprite: Structures/Storage/Crates/engineering.rsi + - sprite: Structures/Storage/Crates/hydro_secure.rsi state: icon offset: 0,0.65625 - - sprite: Structures/Storage/Crates/privatecrate_secure.rsi + - sprite: Structures/Storage/Crates/generic.rsi state: icon offset: 0,-0.03125 - - sprite: Structures/Storage/Crates/generic.rsi + - sprite: Structures/Storage/Crates/hydro_secure.rsi state: icon offset: 0,0.34375 - sprite: _NF/Structures/Freight/freight_pallet.rsi @@ -539,13 +652,13 @@ - sprite: _NF/Structures/Freight/freight_pallet.rsi state: base offset: 0,.5 - - sprite: Structures/Storage/Crates/privatecrate_secure.rsi + - sprite: Structures/Storage/Crates/generic.rsi state: icon offset: 0,0.65625 - - sprite: Structures/Storage/Crates/scicrate_secure.rsi + - sprite: Structures/Storage/Crates/plasma.rsi state: icon offset: 0,-0.03125 - - sprite: Structures/Storage/Crates/hydro_secure.rsi + - sprite: Structures/Storage/Crates/science.rsi state: icon offset: 0,0.34375 - sprite: _NF/Structures/Freight/freight_pallet.rsi @@ -563,13 +676,13 @@ - sprite: _NF/Structures/Freight/freight_pallet.rsi state: base offset: 0,.5 - - sprite: Structures/Storage/Crates/engineering.rsi + - sprite: Structures/Storage/Crates/secure.rsi state: icon offset: 0,0.65625 - - sprite: Structures/Storage/Crates/medical.rsi + - sprite: Structures/Storage/Crates/generic.rsi state: icon offset: 0,-0.03125 - - sprite: Structures/Storage/Crates/radiation.rsi + - sprite: Structures/Storage/Crates/generic.rsi state: icon offset: 0,0.34375 - sprite: _NF/Structures/Freight/freight_pallet.rsi @@ -587,13 +700,13 @@ - sprite: _NF/Structures/Freight/freight_pallet.rsi state: base offset: 0,.5 - - sprite: Structures/Storage/Crates/radiation.rsi + - sprite: Structures/Storage/Crates/hydro_secure.rsi state: icon offset: 0,0.65625 - - sprite: Structures/Storage/Crates/engicrate_secure.rsi + - sprite: Structures/Storage/Crates/generic.rsi state: icon offset: 0,-0.03125 - - sprite: Structures/Storage/Crates/electrical.rsi + - sprite: Structures/Storage/Crates/generic.rsi state: icon offset: 0,0.34375 - sprite: _NF/Structures/Freight/freight_pallet.rsi @@ -601,7 +714,6 @@ offset: 0,.5 - #spawner - type: entity parent: MarkerBase diff --git a/Resources/Textures/_NF/Structures/Freight/freight_barrels.rsi/meta.json b/Resources/Textures/_NF/Structures/Freight/freight_barrels.rsi/meta.json index 8aec2e9ffd0..b8f342ab8c2 100644 --- a/Resources/Textures/_NF/Structures/Freight/freight_barrels.rsi/meta.json +++ b/Resources/Textures/_NF/Structures/Freight/freight_barrels.rsi/meta.json @@ -27,6 +27,9 @@ }, { "name": "yellow" + }, + { + "name": "steel" } ] } diff --git a/Resources/Textures/_NF/Structures/Freight/freight_barrels.rsi/steel.png b/Resources/Textures/_NF/Structures/Freight/freight_barrels.rsi/steel.png new file mode 100644 index 0000000000000000000000000000000000000000..8cce0a29700bcceb8386661adb7f39a8ca34532b GIT binary patch literal 340 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij?1AIbUv$C@0&!4ZMq0!md>E-3c&CLyznJQyA8%VL21o;L32LlEvZ)P{3 z5NCl$WHAE+-(e7DJf6QI1t_@H)5S5w!hdT&H{W3c4rfiqclA%C4hbn4`u^S-y%j==ov4hb?vZp&T^pYL}>!TnWSqBG~N9B18^8HU4EvJ?-8a!hBF>A|dE&+yT z4R$JPB{*)k%NWl6Tf_8bf;@x$?zFha`qxX6+GGAQMexoP3t=#3FjTO2X20+<`oJ5u Y%v_;RDW*(Ipa&Q{UHx3vIVCg!038Z*h5!Hn literal 0 HcmV?d00001 From f2c82c816c6c4b92674e039a7b377b6eeeca2939 Mon Sep 17 00:00:00 2001 From: Telos Date: Fri, 24 Jan 2025 02:45:44 -0600 Subject: [PATCH 26/35] finish spriting and map it all. Minor tweaks elsewhere (cargovend seemed overly broad) --- Resources/Maps/_NF/POI/cargodepot.yml | 70 +++++--- Resources/Maps/_NF/POI/cargodepotalt.yml | 70 +++++--- .../_NF/Shuttles/Shipment/basicshipment1.yml | 165 ++++++------------ .../{cargovend.yml => shippingvend.yml} | 2 +- .../Entities/Structures/Freight/freight.yml | 12 +- .../Machines/Computers/computers_shipyard.yml | 2 +- .../Structures/Machines/vending_machines.yml | 11 +- .../_NF/Shipyard/Shipment/basicshipment1.yml | 4 +- .../shippingvend.rsi/meta.json | 22 +++ .../shippingvend.rsi/normal-unshaded.png | Bin 0 -> 458 bytes .../Machines/computers.rsi/meta.json | 31 ++++ .../computers.rsi/shipyard_shipping.png | Bin 0 -> 1853 bytes 12 files changed, 214 insertions(+), 175 deletions(-) rename Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/{cargovend.yml => shippingvend.yml} (92%) create mode 100644 Resources/Textures/_NF/Structures/Machines/VendingMachines/shippingvend.rsi/meta.json create mode 100644 Resources/Textures/_NF/Structures/Machines/VendingMachines/shippingvend.rsi/normal-unshaded.png create mode 100644 Resources/Textures/_NF/Structures/Machines/computers.rsi/shipyard_shipping.png diff --git a/Resources/Maps/_NF/POI/cargodepot.yml b/Resources/Maps/_NF/POI/cargodepot.yml index 28b181ff68e..f8200bcf249 100644 --- a/Resources/Maps/_NF/POI/cargodepot.yml +++ b/Resources/Maps/_NF/POI/cargodepot.yml @@ -19,6 +19,7 @@ entities: components: - type: MetaData - type: Transform + parent: invalid - type: MapGrid chunks: 0,0: @@ -894,6 +895,30 @@ entities: rot: 1.5707963267948966 rad pos: 13.5,1.5 parent: 10 + - uid: 439 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -12.5,-28.5 + parent: 10 + - uid: 470 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -12.5,-18.5 + parent: 10 + - uid: 471 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 13.5,-18.5 + parent: 10 + - uid: 472 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 13.5,-28.5 + parent: 10 - proto: AntiAnomalyZone50 entities: - uid: 451 @@ -3474,10 +3499,6 @@ entities: - type: Transform pos: 0.5,-0.5 parent: 10 - - type: ContainerContainer - containers: - board: !type:Container - ents: [] - proto: ComputerPalletConsoleNFHighMarket entities: - uid: 7 @@ -3512,6 +3533,13 @@ entities: parent: 10 - type: CargoPalletConsole palletDistance: 4 +- proto: ComputerShipyardCargo + entities: + - uid: 468 + components: + - type: Transform + pos: 2.5,6.5 + parent: 10 - proto: ComputerTabletopAlert entities: - uid: 289 @@ -3533,6 +3561,13 @@ entities: - type: Transform pos: 1.5,-10.5 parent: 10 +- proto: ComputerWallmountRadar + entities: + - uid: 440 + components: + - type: Transform + pos: 4.5,7.5 + parent: 10 - proto: ConveyorBelt entities: - uid: 135 @@ -5421,31 +5456,11 @@ entities: - type: Transform pos: -8.5,-28.5 parent: 10 - - uid: 439 - components: - - type: Transform - pos: -11.5,-28.5 - parent: 10 - - uid: 440 - components: - - type: Transform - pos: -12.5,-28.5 - parent: 10 - uid: 463 components: - type: Transform pos: 7.5,-22.5 parent: 10 - - uid: 486 - components: - - type: Transform - pos: 13.5,-28.5 - parent: 10 - - uid: 487 - components: - - type: Transform - pos: 12.5,-28.5 - parent: 10 - uid: 488 components: - type: Transform @@ -6940,6 +6955,13 @@ entities: - Left: Forward - Right: Reverse - Middle: Off +- proto: VendingMachineShipping + entities: + - uid: 469 + components: + - type: Transform + pos: -1.5,6.5 + parent: 10 - proto: WallReinforced entities: - uid: 2 diff --git a/Resources/Maps/_NF/POI/cargodepotalt.yml b/Resources/Maps/_NF/POI/cargodepotalt.yml index 3b938b034f8..763dc7229fa 100644 --- a/Resources/Maps/_NF/POI/cargodepotalt.yml +++ b/Resources/Maps/_NF/POI/cargodepotalt.yml @@ -19,6 +19,7 @@ entities: components: - type: MetaData - type: Transform + parent: invalid - type: MapGrid chunks: 0,0: @@ -964,6 +965,30 @@ entities: rot: 1.5707963267948966 rad pos: 13.5,1.5 parent: 10 + - uid: 439 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -12.5,-28.5 + parent: 10 + - uid: 440 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 13.5,-28.5 + parent: 10 + - uid: 486 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 13.5,-18.5 + parent: 10 + - uid: 487 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -12.5,-18.5 + parent: 10 - proto: AntiAnomalyZone50 entities: - uid: 451 @@ -3537,10 +3562,6 @@ entities: - type: Transform pos: 0.5,-0.5 parent: 10 - - type: ContainerContainer - containers: - board: !type:Container - ents: [] - proto: ComputerPalletConsoleNFHighMarket entities: - uid: 7 @@ -3575,6 +3596,13 @@ entities: parent: 10 - type: CargoPalletConsole palletDistance: 4 +- proto: ComputerShipyardCargo + entities: + - uid: 619 + components: + - type: Transform + pos: 2.5,6.5 + parent: 10 - proto: ComputerTabletopAlert entities: - uid: 289 @@ -3596,6 +3624,13 @@ entities: - type: Transform pos: 1.5,-10.5 parent: 10 +- proto: ComputerWallmountRadar + entities: + - uid: 513 + components: + - type: Transform + pos: 4.5,7.5 + parent: 10 - proto: ConveyorBelt entities: - uid: 135 @@ -5464,31 +5499,11 @@ entities: - type: Transform pos: -8.5,-28.5 parent: 10 - - uid: 439 - components: - - type: Transform - pos: -11.5,-28.5 - parent: 10 - - uid: 440 - components: - - type: Transform - pos: -12.5,-28.5 - parent: 10 - uid: 463 components: - type: Transform pos: 7.5,-22.5 parent: 10 - - uid: 486 - components: - - type: Transform - pos: 13.5,-28.5 - parent: 10 - - uid: 487 - components: - - type: Transform - pos: 12.5,-28.5 - parent: 10 - uid: 488 components: - type: Transform @@ -6997,6 +7012,13 @@ entities: - Left: Forward - Right: Reverse - Middle: Off +- proto: VendingMachineShipping + entities: + - uid: 618 + components: + - type: Transform + pos: -1.5,6.5 + parent: 10 - proto: WallReinforced entities: - uid: 2 diff --git a/Resources/Maps/_NF/Shuttles/Shipment/basicshipment1.yml b/Resources/Maps/_NF/Shuttles/Shipment/basicshipment1.yml index 2eac881551b..9e64c215da3 100644 --- a/Resources/Maps/_NF/Shuttles/Shipment/basicshipment1.yml +++ b/Resources/Maps/_NF/Shuttles/Shipment/basicshipment1.yml @@ -185,6 +185,23 @@ entities: - type: Transform pos: -1.5,-3.5 parent: 1 +- proto: BarrelPallet1 + entities: + - uid: 20 + components: + - type: Transform + pos: 0.5,2.5 + parent: 1 + - uid: 21 + components: + - type: Transform + pos: -0.5,2.5 + parent: 1 + - uid: 57 + components: + - type: Transform + pos: 1.5,2.5 + parent: 1 - proto: CableApcExtension entities: - uid: 7 @@ -322,174 +339,94 @@ entities: - type: Transform pos: -0.5,-3.5 parent: 1 -- proto: SignElectricalMed +- proto: PoweredSmallLight entities: - - uid: 59 + - uid: 61 components: - type: Transform rot: -1.5707963267948966 rad - pos: -1.5,-2.5 + pos: 1.5,1.5 parent: 1 -- proto: SubstationWallBasic +- proto: RandomCrateFreightT1 entities: - - uid: 26 + - uid: 42 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -1.5,-1.5 + pos: 1.5,-2.5 parent: 1 -- proto: TelecomServer - entities: - - uid: 11 + - uid: 45 components: - type: Transform - anchored: False - pos: 0.5,-1.5 + pos: 0.5,-2.5 parent: 1 - - type: Physics - bodyType: Dynamic - - type: ShipmentPrice - bonusPrice: 10000 - - uid: 17 + - uid: 47 components: - type: Transform - anchored: False - pos: -0.5,-1.5 + pos: -0.5,-2.5 parent: 1 - - type: Physics - bodyType: Dynamic - - type: ShipmentPrice - bonusPrice: 10000 - - uid: 20 +- proto: RandomFreightT1 + entities: + - uid: 11 components: - type: Transform - anchored: False - pos: 0.5,2.5 + pos: 1.5,-0.5 parent: 1 - - type: Physics - bodyType: Dynamic - - type: ShipmentPrice - bonusPrice: 10000 - - uid: 21 + - uid: 17 components: - type: Transform - anchored: False - pos: -0.5,2.5 + pos: 0.5,1.5 parent: 1 - - type: Physics - bodyType: Dynamic - - type: ShipmentPrice - bonusPrice: 10000 - uid: 22 components: - type: Transform - anchored: False - pos: 1.5,-0.5 + pos: 0.5,-0.5 parent: 1 - - type: Physics - bodyType: Dynamic - - type: ShipmentPrice - bonusPrice: 10000 - uid: 24 components: - type: Transform - anchored: False - pos: -0.5,-0.5 + pos: 1.5,1.5 parent: 1 - - type: Physics - bodyType: Dynamic - - type: ShipmentPrice - bonusPrice: 10000 - uid: 30 components: - type: Transform - anchored: False - pos: -0.5,-2.5 + pos: -0.5,1.5 parent: 1 - - type: Physics - bodyType: Dynamic - - type: ShipmentPrice - bonusPrice: 10000 - uid: 33 components: - type: Transform - anchored: False - pos: 1.5,-1.5 + pos: -0.5,-1.5 parent: 1 - - type: Physics - bodyType: Dynamic - - type: ShipmentPrice - bonusPrice: 10000 - uid: 41 components: - type: Transform - anchored: False - pos: 1.5,-2.5 - parent: 1 - - type: Physics - bodyType: Dynamic - - type: ShipmentPrice - bonusPrice: 10000 - - uid: 42 - components: - - type: Transform - anchored: False - pos: 1.5,1.5 + pos: -0.5,-0.5 parent: 1 - - type: Physics - bodyType: Dynamic - - type: ShipmentPrice - bonusPrice: 10000 - uid: 44 components: - type: Transform - anchored: False - pos: 0.5,-2.5 - parent: 1 - - type: Physics - bodyType: Dynamic - - type: ShipmentPrice - bonusPrice: 10000 - - uid: 45 - components: - - type: Transform - anchored: False - pos: 0.5,1.5 + pos: 1.5,-1.5 parent: 1 - - type: Physics - bodyType: Dynamic - - type: ShipmentPrice - bonusPrice: 10000 - - uid: 47 + - uid: 53 components: - type: Transform - anchored: False - pos: -0.5,1.5 + pos: 0.5,-1.5 parent: 1 - - type: Physics - bodyType: Dynamic - - type: ShipmentPrice - bonusPrice: 10000 - - uid: 53 +- proto: SignElectricalMed + entities: + - uid: 59 components: - type: Transform - anchored: False - pos: 0.5,-0.5 + rot: -1.5707963267948966 rad + pos: -1.5,-2.5 parent: 1 - - type: Physics - bodyType: Dynamic - - type: ShipmentPrice - bonusPrice: 10000 - - uid: 57 +- proto: SubstationWallBasic + entities: + - uid: 26 components: - type: Transform - anchored: False - pos: 1.5,2.5 + rot: 1.5707963267948966 rad + pos: -1.5,-1.5 parent: 1 - - type: Physics - bodyType: Dynamic - - type: ShipmentPrice - bonusPrice: 10000 - proto: WallSolid entities: - uid: 6 diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/cargovend.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/shippingvend.yml similarity index 92% rename from Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/cargovend.yml rename to Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/shippingvend.yml index 7eee329762e..025a595dfe2 100644 --- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/cargovend.yml +++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/shippingvend.yml @@ -1,5 +1,5 @@ - type: vendingMachineInventory - id: CargoVendInventory + id: ShippingVendInventory startingInventory: ShipVoucherCargoShipment: 4294967295 # Infinite Paper: 4294967295 # Infinite diff --git a/Resources/Prototypes/_NF/Entities/Structures/Freight/freight.yml b/Resources/Prototypes/_NF/Entities/Structures/Freight/freight.yml index b5bec537419..730df09d6f7 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Freight/freight.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Freight/freight.yml @@ -28,7 +28,7 @@ suffix: Barrel components: - type: ShipmentPrice - bonusPrice: 1000 + bonusPrice: 1500 - type: StaticPrice price: 5000 - type: Sprite @@ -211,7 +211,7 @@ categories: [ HideSpawnMenu ] components: - type: ShipmentPrice - bonusPrice: 1000 + bonusPrice: 1500 - type: StaticPrice price: 5000 - type: Sprite @@ -722,9 +722,12 @@ components: - type: Sprite layers: - - state: red - sprite: _NF/Structures/Freight/freight_pallet.rsi state: base + offset: 0,.5 + - sprite: Structures/Storage/Crates/generic.rsi + state: icon + - state: red - type: RandomSpawner offset: 0 prototypes: @@ -758,9 +761,10 @@ components: - type: Sprite layers: - - state: red - sprite: _NF/Structures/Freight/freight_pallet.rsi state: base + offset: 0,.5 + - state: red - type: RandomSpawner offset: 0 prototypes: diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/computers_shipyard.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/computers_shipyard.yml index f931eaa7f9f..c8bcac256d0 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/computers_shipyard.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/computers_shipyard.yml @@ -281,6 +281,6 @@ - map: ["computerLayerKeyboard"] state: generic_keyboard - map: ["computerLayerScreen"] - state: shipyard + state: shipyard_shipping - map: ["computerLayerKeys"] state: telesci_key \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml index aca66186575..12ee326565d 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml @@ -686,24 +686,25 @@ - type: entity parent: [BaseStructureDisableAnchoring, VendingMachine] - id: VendingMachineCargo - name: CargoVend + id: VendingMachineShipping + name: HaulVend description: A one stop shop for space truckers. components: - type: VendingMachine - pack: CargoVendInventory + pack: ShippingVendInventory offState: off brokenState: broken normalState: normal-unshaded # ejectState: eject-unshaded No sprite, see chefvend/dinnerware/BODA/etc for expamples - type: Sprite - sprite: _NF/Structures/Machines/VendingMachines/astrovend.rsi + sprite: Structures/Machines/VendingMachines/cargodrobe.rsi layers: - state: "off" map: ["enum.VendingMachineVisualLayers.Base"] - - state: "off" + - state: "normal-unshaded" map: ["enum.VendingMachineVisualLayers.BaseUnshaded"] shader: unshaded + sprite: _NF/Structures/Machines/VendingMachines/shippingvend.rsi - state: panel map: ["enum.WiresVisualLayers.MaintenancePanel"] - type: PointLight diff --git a/Resources/Prototypes/_NF/Shipyard/Shipment/basicshipment1.yml b/Resources/Prototypes/_NF/Shipyard/Shipment/basicshipment1.yml index b4e3b1b0285..56b13264e31 100644 --- a/Resources/Prototypes/_NF/Shipyard/Shipment/basicshipment1.yml +++ b/Resources/Prototypes/_NF/Shipyard/Shipment/basicshipment1.yml @@ -10,10 +10,10 @@ # - type: vessel id: BasicShipment1 - #parent: BaseVessel #Todo: abstract shipment container parent + parent: BaseVessel name: Shipment description: A delivery to trade. - price: 4500 + price: 80000 #appraises 77k spesos category: Small group: Cargo access: Cargo diff --git a/Resources/Textures/_NF/Structures/Machines/VendingMachines/shippingvend.rsi/meta.json b/Resources/Textures/_NF/Structures/Machines/VendingMachines/shippingvend.rsi/meta.json new file mode 100644 index 00000000000..527b8c48a7f --- /dev/null +++ b/Resources/Textures/_NF/Structures/Machines/VendingMachines/shippingvend.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-4.0", + "copyright": "https://github.com/Temoffy , Discord: @telos2387", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "normal-unshaded", + "delays": [ + [ + 1.5, + 0.1, + 1.5, + 0.1 + ] + ] + } + ] +} diff --git a/Resources/Textures/_NF/Structures/Machines/VendingMachines/shippingvend.rsi/normal-unshaded.png b/Resources/Textures/_NF/Structures/Machines/VendingMachines/shippingvend.rsi/normal-unshaded.png new file mode 100644 index 0000000000000000000000000000000000000000..edf2f6150b2660cbe631d0388927022d785801a3 GIT binary patch literal 458 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O_~q1o(uw^6>D8ii#>LE6bY4$ji&?>gqZ*-pg3@DL6RT!^6Ye-2BF)4{@=v z8X6joj*d=FP7MtW|Ni}3zI^%2nKLh3xF8`R@%QiFWG}^O1xB0OY~oG1XA~LFFE?#Y z(lItR23m5mzGFU+QYZ=X3;vHEFvP@2zXhu0EbxddW?*1P-Vl5W4a1TS&x_Z47+JgNygIgr>wh6z2vtT=7pZW!&zc zsJxDI$NtAmxwlKdY~gGW7i!qIe0!(ItONW9+2s6{G|U{7_grF#W8!!)rvvSAd3m@Tmj8=9 z004*GT%CNxKIyB;%81AQ)0alX4utb@aR6$^)!E`e>KY1-0)U2W1;Hh0aV&SsH4p~? zNBX}SXegrk3INEwb#p@b#a;Zk;CWsBygGRMeRNo(Tf0GxNLhiDS`b$qXL{z`Wz7>$ zPc7^C6RHcYvr#vsk}D0Icb3YMtYix(zj#e2ftAR|CE*okeNmgenP4Lo5q|lZ^~KeZ zMSd^YlvX zOj+(oL2OB@4!k4O3NG5UTU7`Gg{5(lueuLr6NGa7PI;Aeq`85`%nX@5LZOu5n-OGm zO_9oKLF@{FyQXoO!?^HiuR1P8`t+y97M-C9iEA#{(pa`FPdXlJD{QWZuq2xpe)rGY*egTc!SX;Xl zE1~1TUxfj97I-+M$>S3Y1{)8%WrEvIkzTdRqVvHo!5`=}+J9}M$#|D{gi;%&W_ z2U%V4qdzxck*wTq4tO~xE`CT)>;I{;Ql&kjJXrH!dS)82wTGT7EPVO{=J&-W-X9Lh z1y9+;+ zlIb269)4_}%fX+Bd%0vcy20%sguw|h_bd^Cto7>i%f7;|JCkMYACdWmSEhWcJDE=LsC4K(VT8svQhEG4edpA{}T+q&NtJq`gGj8SgTI)CguV&~2C{@GR}Z z?iD*BM3d6nQxv=v^5K!}n?<-%bkHAepLG!H1$?5aXhX;n{4|hlC|)!4BkY;8By<=h<;e)U(1#^Y@cw10aX%sPgv92LVZ z-eUSR9-X44TP_)+_W=%GewHGuz5;+5dwqT*1GTz-mBzGoQhPr{f49#vfQ zSHenG3tXI?Kln9OzClKV%HJD}Cp9RCHv~%E(oIBf&hMm$KY^YRRw&q)fS8Wa$k)@s zGcp5sqF!NTJCR1NTN{KVD$Bl@=wy%BNAy`!P}cQFmt3z~-w~%W1P;aia?m?ABZIUT z)QrOC%pqbJrm~lY9GYw{n#6!q!?9twXW>s$c+F%$t=#VuQbfTXbnYhjylreJTrr zSMosblvSTfk=n@=x(`)cBUZZn(@zJ+rC9iuXAn8Q{y^zjzE7_fw8GsO!pE~YkG#Ulm*RU4@M56h|e3}up; zMAy2=rRztT|1zoS3=FD*yjgWI%Bhhg)3a2CY>{qNAyYWsk;@P0GFMZ literal 0 HcmV?d00001 From 01f062829c57654753eb8db1aa2594dcaa31690b Mon Sep 17 00:00:00 2001 From: Alkheemist Date: Sat, 25 Jan 2025 10:38:14 +1100 Subject: [PATCH 27/35] fix voucher decrementing without purchasing a ship --- .../Shipyard/Systems/ShipyardSystem.Consoles.cs | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Content.Server/Shipyard/Systems/ShipyardSystem.Consoles.cs b/Content.Server/Shipyard/Systems/ShipyardSystem.Consoles.cs index d0ae1bd01bf..e739759771d 100644 --- a/Content.Server/Shipyard/Systems/ShipyardSystem.Consoles.cs +++ b/Content.Server/Shipyard/Systems/ShipyardSystem.Consoles.cs @@ -159,7 +159,6 @@ private void OnPurchaseMessage(EntityUid shipyardConsoleUid, ShipyardConsoleComp PlayDenySound(player, shipyardConsoleUid, component); return; } - voucher.RedemptionsLeft--; voucherUsed = true; } // not using an else here because the voucher might still require a purchase cost @@ -193,6 +192,14 @@ private void OnPurchaseMessage(EntityUid shipyardConsoleUid, ShipyardConsoleComp PlayDenySound(player, shipyardConsoleUid, component); return; } + + // Defer decrementing voucher redemptions to after successfully purchasing the shuttle. + if (voucherUsed) + { + voucher!.RedemptionsLeft--; + } + + EntityUid? shuttleStation = null; // setting up any stations if we have a matching game map prototype to allow late joins directly onto the vessel if (_prototypeManager.TryIndex(vessel.ID, out var stationProto)) From a305895beda41f8953deffe6ad69bb5ecdc142e4 Mon Sep 17 00:00:00 2001 From: Alkheemist Date: Sat, 25 Jan 2025 11:09:49 +1100 Subject: [PATCH 28/35] breaks the cargo shipment --- .../_NF/Shuttles/Shipment/shipment_basic.yml | 561 ++++++++++++++++++ .../_NF/Shuttles/Shipment/shipment_chem.yml | 532 +++++++++++++++++ .../_NF/Shipyard/Shipment/basicshipment1.yml | 10 +- 3 files changed, 1098 insertions(+), 5 deletions(-) create mode 100644 Resources/Maps/_NF/Shuttles/Shipment/shipment_basic.yml create mode 100644 Resources/Maps/_NF/Shuttles/Shipment/shipment_chem.yml diff --git a/Resources/Maps/_NF/Shuttles/Shipment/shipment_basic.yml b/Resources/Maps/_NF/Shuttles/Shipment/shipment_basic.yml new file mode 100644 index 00000000000..18ca6460bfe --- /dev/null +++ b/Resources/Maps/_NF/Shuttles/Shipment/shipment_basic.yml @@ -0,0 +1,561 @@ +meta: + format: 6 + postmapinit: false +tilemap: + 0: Space + 30: FloorDark + 35: FloorDarkMono + 105: FloorTechMaint + 121: Lattice + 122: Plating +entities: +- proto: "" + entities: + - uid: 1 + components: + - type: MetaData + name: shipment + - type: Transform + pos: -0.51420784,-0.5497939 + parent: invalid + - type: MapGrid + chunks: + 0,0: + ind: 0,0 + tiles: HgAAAAACHgAAAAACegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAADHgAAAAADegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAADHgAAAAACegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + -1,0: + ind: -1,0 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAHgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAHgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + 0,-1: + ind: 0,-1 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAACHgAAAAADegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAADHgAAAAABegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAHgAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + -1,-1: + ind: -1,-1 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAHgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAHgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAHgAAAAAA + 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: '#FFFFFFFF' + id: DeliveryGreyscale + decals: + 0: 2,-3 + - node: + color: '#FFFF00FF' + id: WarnLineGreyscaleE + decals: + 32: 1,0 + 33: 1,-1 + - node: + color: '#FFFF00FF' + id: WarnLineGreyscaleW + decals: + 30: -1,0 + 31: -1,-1 + - type: GridAtmosphere + version: 2 + data: + tiles: + 0,0: + 0: 823 + 1: 16384 + 0,-1: + 0: 29488 + 1: 4 + -1,0: + 0: 2188 + 1: 16384 + -1,-1: + 0: 51328 + 1: 4 + 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: AirlockShuttle + entities: + - uid: 4 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,0.5 + parent: 1 + - uid: 11 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 2.5,0.5 + parent: 1 + - uid: 22 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 2.5,-0.5 + parent: 1 + - uid: 35 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,-0.5 + parent: 1 +- proto: APCBasic + entities: + - uid: 105 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,1.5 + parent: 1 +- proto: AtmosDeviceFanDirectional + entities: + - uid: 8 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 2.5,0.5 + parent: 1 + - uid: 63 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,-0.5 + parent: 1 + - uid: 64 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,0.5 + parent: 1 + - uid: 65 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 2.5,-0.5 + parent: 1 +- proto: AtmosFixBlockerMarker + entities: + - uid: 39 + components: + - type: Transform + pos: 2.5,3.5 + parent: 1 + - uid: 113 + components: + - type: Transform + pos: 2.5,-3.5 + parent: 1 + - uid: 114 + components: + - type: Transform + pos: -1.5,3.5 + parent: 1 + - uid: 130 + components: + - type: Transform + pos: -1.5,-3.5 + parent: 1 +- proto: BarrelPallet1 + entities: + - uid: 20 + components: + - type: Transform + pos: 0.5,2.5 + parent: 1 + - uid: 21 + components: + - type: Transform + pos: -0.5,2.5 + parent: 1 + - uid: 57 + components: + - type: Transform + pos: 1.5,2.5 + parent: 1 +- proto: CableApcExtension + entities: + - uid: 7 + components: + - type: Transform + pos: -0.5,1.5 + parent: 1 + - uid: 15 + components: + - type: Transform + pos: 0.5,-0.5 + parent: 1 + - uid: 16 + components: + - type: Transform + pos: 0.5,-1.5 + parent: 1 + - uid: 29 + components: + - type: Transform + pos: -1.5,1.5 + parent: 1 + - uid: 37 + components: + - type: Transform + pos: -1.5,1.5 + parent: 1 + - uid: 43 + components: + - type: Transform + pos: 0.5,1.5 + parent: 1 + - uid: 50 + components: + - type: Transform + pos: 0.5,0.5 + parent: 1 + - uid: 52 + components: + - type: Transform + pos: 0.5,-2.5 + parent: 1 +- proto: CableHV + entities: + - uid: 2 + components: + - type: Transform + pos: -0.5,-2.5 + parent: 1 + - uid: 3 + components: + - type: Transform + pos: -0.5,-3.5 + parent: 1 + - uid: 38 + components: + - type: Transform + pos: -0.5,-1.5 + parent: 1 + - uid: 101 + components: + - type: Transform + pos: -1.5,-1.5 + parent: 1 +- proto: CableMV + entities: + - uid: 18 + components: + - type: Transform + pos: -1.5,-1.5 + parent: 1 + - uid: 19 + components: + - type: Transform + pos: -1.5,1.5 + parent: 1 + - uid: 27 + components: + - type: Transform + pos: -0.5,-1.5 + parent: 1 + - uid: 28 + components: + - type: Transform + pos: -0.5,-0.5 + parent: 1 + - uid: 34 + components: + - type: Transform + pos: -1.5,-1.5 + parent: 1 + - uid: 46 + components: + - type: Transform + pos: -0.5,0.5 + parent: 1 + - uid: 48 + components: + - type: Transform + pos: -1.5,1.5 + parent: 1 + - uid: 49 + components: + - type: Transform + pos: -0.5,1.5 + parent: 1 +- proto: Catwalk + entities: + - uid: 14 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,-0.5 + parent: 1 + - uid: 40 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,-0.5 + parent: 1 + - uid: 41 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,0.5 + parent: 1 + - uid: 54 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,0.5 + parent: 1 + - uid: 56 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,-0.5 + parent: 1 + - uid: 62 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,0.5 + parent: 1 +- proto: ComputerShuttle + entities: + - uid: 60 + components: + - type: Transform + pos: 0.5,0.5 + parent: 1 +- proto: GeneratorWallmountAPU + entities: + - uid: 5 + components: + - type: Transform + pos: -0.5,-3.5 + parent: 1 +- proto: PoweredSmallLight + entities: + - uid: 61 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,1.5 + parent: 1 +- proto: RandomCrateFreightT1 + entities: + - uid: 42 + components: + - type: Transform + pos: 1.5,-2.5 + parent: 1 + - uid: 45 + components: + - type: Transform + pos: 0.5,-2.5 + parent: 1 + - uid: 47 + components: + - type: Transform + pos: -0.5,-2.5 + parent: 1 +- proto: RandomFreightT1 + entities: + - uid: 17 + components: + - type: Transform + pos: 0.5,1.5 + parent: 1 + - uid: 24 + components: + - type: Transform + pos: 1.5,1.5 + parent: 1 + - uid: 30 + components: + - type: Transform + pos: -0.5,1.5 + parent: 1 + - uid: 33 + components: + - type: Transform + pos: -0.5,-1.5 + parent: 1 + - uid: 44 + components: + - type: Transform + pos: 1.5,-1.5 + parent: 1 + - uid: 53 + components: + - type: Transform + pos: 0.5,-1.5 + parent: 1 +- proto: SignElectricalMed + entities: + - uid: 59 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,-2.5 + parent: 1 +- proto: SubstationWallBasic + entities: + - uid: 26 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,-1.5 + parent: 1 +- proto: WallSolid + entities: + - uid: 6 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,2.5 + parent: 1 + - uid: 9 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,1.5 + parent: 1 + - uid: 10 + components: + - type: Transform + pos: -1.5,2.5 + parent: 1 + - uid: 13 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 2.5,-1.5 + parent: 1 + - uid: 23 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,-3.5 + parent: 1 + - uid: 25 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,-3.5 + parent: 1 + - uid: 31 + components: + - type: Transform + pos: -0.5,3.5 + parent: 1 + - uid: 36 + components: + - type: Transform + pos: -1.5,-2.5 + parent: 1 + - uid: 51 + components: + - type: Transform + pos: 0.5,3.5 + parent: 1 + - uid: 58 + components: + - type: Transform + pos: 1.5,3.5 + parent: 1 + - uid: 67 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,-1.5 + parent: 1 + - uid: 75 + components: + - type: Transform + pos: -1.5,1.5 + parent: 1 + - uid: 80 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 2.5,-2.5 + parent: 1 + - uid: 88 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,-3.5 + parent: 1 +- proto: WallSolidDiagonal + entities: + - uid: 12 + components: + - type: Transform + pos: -1.5,3.5 + parent: 1 + - uid: 32 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,-3.5 + parent: 1 + - uid: 55 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,3.5 + parent: 1 + - uid: 87 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,-3.5 + parent: 1 +... diff --git a/Resources/Maps/_NF/Shuttles/Shipment/shipment_chem.yml b/Resources/Maps/_NF/Shuttles/Shipment/shipment_chem.yml new file mode 100644 index 00000000000..a9b1342130c --- /dev/null +++ b/Resources/Maps/_NF/Shuttles/Shipment/shipment_chem.yml @@ -0,0 +1,532 @@ +meta: + format: 6 + postmapinit: false +tilemap: + 0: Space + 30: FloorDark + 35: FloorDarkMono + 105: FloorTechMaint + 1: FloorWhiteMono + 121: Lattice + 122: Plating +entities: +- proto: "" + entities: + - uid: 1 + components: + - type: MetaData + name: shipment + - type: Transform + pos: -0.51420784,-0.5497939 + parent: invalid + - type: MapGrid + chunks: + 0,0: + ind: 0,0 + tiles: AQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + -1,0: + ind: -1,0 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + 0,-1: + ind: 0,-1 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + -1,-1: + ind: -1,-1 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAA + 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: + angle: 1.5707963267948966 rad + color: '#FFFFFFFF' + id: StandClear + decals: + 27: -2,0 + - node: + color: '#FFFF00FF' + id: WarnLineGreyscaleE + decals: + 30: 1,-1 + 31: 1,0 + - node: + color: '#FFFF00FF' + id: WarnLineGreyscaleW + decals: + 32: -1,-1 + 33: -1,0 + - type: GridAtmosphere + version: 2 + data: + tiles: + 0,0: + 0: 823 + 1: 16384 + 0,-1: + 0: 29488 + 1: 4 + -1,0: + 0: 2188 + 1: 16384 + -1,-1: + 0: 51328 + 1: 4 + 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: AirlockShuttle + entities: + - uid: 4 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,0.5 + parent: 1 + - uid: 6 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 2.5,-0.5 + parent: 1 + - uid: 42 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,-0.5 + parent: 1 + - uid: 54 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 2.5,0.5 + parent: 1 +- proto: APCBasic + entities: + - uid: 105 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,1.5 + parent: 1 +- proto: AtmosDeviceFanDirectional + entities: + - uid: 8 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 2.5,0.5 + parent: 1 +- proto: AtmosFixBlockerMarker + entities: + - uid: 39 + components: + - type: Transform + pos: 2.5,3.5 + parent: 1 + - uid: 66 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 2.5,-3.5 + parent: 1 + - uid: 114 + components: + - type: Transform + pos: -1.5,3.5 + parent: 1 + - uid: 130 + components: + - type: Transform + pos: -1.5,-3.5 + parent: 1 +- proto: BarrelPallet1 + entities: + - uid: 10 + components: + - type: Transform + pos: -0.5,1.5 + parent: 1 + - uid: 11 + components: + - type: Transform + pos: 1.5,1.5 + parent: 1 + - uid: 12 + components: + - type: Transform + pos: 0.5,1.5 + parent: 1 + - uid: 13 + components: + - type: Transform + pos: -0.5,-1.5 + parent: 1 + - uid: 14 + components: + - type: Transform + pos: 0.5,-1.5 + parent: 1 + - uid: 17 + components: + - type: Transform + pos: 1.5,-1.5 + parent: 1 + - uid: 20 + components: + - type: Transform + pos: 0.5,2.5 + parent: 1 + - uid: 21 + components: + - type: Transform + pos: -0.5,2.5 + parent: 1 + - uid: 25 + components: + - type: Transform + pos: 1.5,-2.5 + parent: 1 + - uid: 31 + components: + - type: Transform + pos: -0.5,-2.5 + parent: 1 + - uid: 32 + components: + - type: Transform + pos: 0.5,-2.5 + parent: 1 + - uid: 57 + components: + - type: Transform + pos: 1.5,2.5 + parent: 1 +- proto: CableApcExtension + entities: + - uid: 7 + components: + - type: Transform + pos: -0.5,1.5 + parent: 1 + - uid: 15 + components: + - type: Transform + pos: 0.5,-0.5 + parent: 1 + - uid: 16 + components: + - type: Transform + pos: 0.5,-1.5 + parent: 1 + - uid: 29 + components: + - type: Transform + pos: -1.5,1.5 + parent: 1 + - uid: 37 + components: + - type: Transform + pos: -1.5,1.5 + parent: 1 + - uid: 43 + components: + - type: Transform + pos: 0.5,1.5 + parent: 1 + - uid: 50 + components: + - type: Transform + pos: 0.5,0.5 + parent: 1 + - uid: 52 + components: + - type: Transform + pos: 0.5,-2.5 + parent: 1 +- proto: CableHV + entities: + - uid: 2 + components: + - type: Transform + pos: -0.5,-2.5 + parent: 1 + - uid: 3 + components: + - type: Transform + pos: -0.5,-3.5 + parent: 1 + - uid: 38 + components: + - type: Transform + pos: -0.5,-1.5 + parent: 1 + - uid: 101 + components: + - type: Transform + pos: -1.5,-1.5 + parent: 1 +- proto: CableMV + entities: + - uid: 18 + components: + - type: Transform + pos: -1.5,-1.5 + parent: 1 + - uid: 19 + components: + - type: Transform + pos: -1.5,1.5 + parent: 1 + - uid: 27 + components: + - type: Transform + pos: -0.5,-1.5 + parent: 1 + - uid: 28 + components: + - type: Transform + pos: -0.5,-0.5 + parent: 1 + - uid: 34 + components: + - type: Transform + pos: -1.5,-1.5 + parent: 1 + - uid: 46 + components: + - type: Transform + pos: -0.5,0.5 + parent: 1 + - uid: 48 + components: + - type: Transform + pos: -1.5,1.5 + parent: 1 + - uid: 49 + components: + - type: Transform + pos: -0.5,1.5 + parent: 1 +- proto: ComputerShuttle + entities: + - uid: 9 + components: + - type: Transform + pos: 0.5,0.5 + parent: 1 +- proto: GeneratorWallmountAPU + entities: + - uid: 5 + components: + - type: Transform + pos: -0.5,-3.5 + parent: 1 +- proto: PoweredSmallLight + entities: + - uid: 61 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,1.5 + parent: 1 +- proto: SignElectricalMed + entities: + - uid: 59 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,-2.5 + parent: 1 +- proto: SignFlammableMed + entities: + - uid: 22 + components: + - type: Transform + pos: 2.5,2.5 + parent: 1 + - uid: 23 + components: + - type: Transform + pos: 1.5,-3.5 + parent: 1 + - uid: 24 + components: + - type: Transform + pos: -1.5,2.5 + parent: 1 + - uid: 30 + components: + - type: Transform + pos: 1.5,3.5 + parent: 1 +- proto: SubstationWallBasic + entities: + - uid: 26 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,-1.5 + parent: 1 +- proto: WallShuttle + entities: + - uid: 33 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,2.5 + parent: 1 + - uid: 36 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,-3.5 + parent: 1 + - uid: 41 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,3.5 + parent: 1 + - uid: 44 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,-3.5 + parent: 1 + - uid: 45 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,2.5 + parent: 1 + - uid: 47 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,-2.5 + parent: 1 + - uid: 53 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,-1.5 + parent: 1 + - uid: 55 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,1.5 + parent: 1 + - uid: 56 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,-2.5 + parent: 1 + - uid: 60 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,3.5 + parent: 1 + - uid: 62 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,-1.5 + parent: 1 + - uid: 63 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,-3.5 + parent: 1 + - uid: 64 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,3.5 + parent: 1 + - uid: 65 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,1.5 + parent: 1 +- proto: WallShuttleDiagonal + entities: + - uid: 35 + components: + - type: Transform + pos: -1.5,3.5 + parent: 1 + - uid: 40 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,-3.5 + parent: 1 + - uid: 51 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,3.5 + parent: 1 + - uid: 58 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,-3.5 + parent: 1 +... diff --git a/Resources/Prototypes/_NF/Shipyard/Shipment/basicshipment1.yml b/Resources/Prototypes/_NF/Shipyard/Shipment/basicshipment1.yml index 56b13264e31..d3f5341b4d9 100644 --- a/Resources/Prototypes/_NF/Shipyard/Shipment/basicshipment1.yml +++ b/Resources/Prototypes/_NF/Shipyard/Shipment/basicshipment1.yml @@ -9,7 +9,7 @@ # Shuttle Notes: # - type: vessel - id: BasicShipment1 + id: ShipmentBasic parent: BaseVessel name: Shipment description: A delivery to trade. @@ -17,7 +17,7 @@ category: Small group: Cargo access: Cargo - shuttlePath: /Maps/_NF/Shuttles/Shipment/basicshipment1.yml + shuttlePath: /Maps/_NF/Shuttles/Shipment/shipment_basic.yml guidebookPage: Null addComponents: - type: IFF @@ -25,9 +25,9 @@ flags: [IsPlayerShuttle, HideLabel] - type: gameMap - id: BasicShipment1 - mapName: 'BasicShipment1' - mapPath: /Maps/_NF/Shuttles/Shipment/basicshipment1.yml + id: ShipmentBasic + mapName: 'ShipmentBasic' + mapPath: /Maps/_NF/Shuttles/Shipment/shipment_basic.yml minPlayers: 0 stations: BasicShipment1: From 27ecc51f7b1026f3e6393a63af7fb80c8119a151 Mon Sep 17 00:00:00 2001 From: Alkheemist Date: Sat, 25 Jan 2025 11:10:14 +1100 Subject: [PATCH 29/35] breaks the cargo shipment even more --- .../Shipyard/Shipment/{basicshipment1.yml => shipment_basic.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Resources/Prototypes/_NF/Shipyard/Shipment/{basicshipment1.yml => shipment_basic.yml} (100%) diff --git a/Resources/Prototypes/_NF/Shipyard/Shipment/basicshipment1.yml b/Resources/Prototypes/_NF/Shipyard/Shipment/shipment_basic.yml similarity index 100% rename from Resources/Prototypes/_NF/Shipyard/Shipment/basicshipment1.yml rename to Resources/Prototypes/_NF/Shipyard/Shipment/shipment_basic.yml From ae2be26d360648923800c98cfaac3c8e70df06f0 Mon Sep 17 00:00:00 2001 From: Alkheemist Date: Sat, 25 Jan 2025 11:34:15 +1100 Subject: [PATCH 30/35] Revert "breaks the cargo shipment even more" This reverts commit 27ecc51f7b1026f3e6393a63af7fb80c8119a151. --- .../Shipyard/Shipment/{shipment_basic.yml => basicshipment1.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Resources/Prototypes/_NF/Shipyard/Shipment/{shipment_basic.yml => basicshipment1.yml} (100%) diff --git a/Resources/Prototypes/_NF/Shipyard/Shipment/shipment_basic.yml b/Resources/Prototypes/_NF/Shipyard/Shipment/basicshipment1.yml similarity index 100% rename from Resources/Prototypes/_NF/Shipyard/Shipment/shipment_basic.yml rename to Resources/Prototypes/_NF/Shipyard/Shipment/basicshipment1.yml From f235c48d70b599418a61070afe368816a8556b6e Mon Sep 17 00:00:00 2001 From: Alkheemist Date: Sat, 25 Jan 2025 11:34:20 +1100 Subject: [PATCH 31/35] Revert "breaks the cargo shipment" This reverts commit a305895beda41f8953deffe6ad69bb5ecdc142e4. --- .../_NF/Shuttles/Shipment/shipment_basic.yml | 561 ------------------ .../_NF/Shuttles/Shipment/shipment_chem.yml | 532 ----------------- .../_NF/Shipyard/Shipment/basicshipment1.yml | 10 +- 3 files changed, 5 insertions(+), 1098 deletions(-) delete mode 100644 Resources/Maps/_NF/Shuttles/Shipment/shipment_basic.yml delete mode 100644 Resources/Maps/_NF/Shuttles/Shipment/shipment_chem.yml diff --git a/Resources/Maps/_NF/Shuttles/Shipment/shipment_basic.yml b/Resources/Maps/_NF/Shuttles/Shipment/shipment_basic.yml deleted file mode 100644 index 18ca6460bfe..00000000000 --- a/Resources/Maps/_NF/Shuttles/Shipment/shipment_basic.yml +++ /dev/null @@ -1,561 +0,0 @@ -meta: - format: 6 - postmapinit: false -tilemap: - 0: Space - 30: FloorDark - 35: FloorDarkMono - 105: FloorTechMaint - 121: Lattice - 122: Plating -entities: -- proto: "" - entities: - - uid: 1 - components: - - type: MetaData - name: shipment - - type: Transform - pos: -0.51420784,-0.5497939 - parent: invalid - - type: MapGrid - chunks: - 0,0: - ind: 0,0 - tiles: HgAAAAACHgAAAAACegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAADHgAAAAADegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAADHgAAAAACegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - version: 6 - -1,0: - ind: -1,0 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAHgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAHgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - version: 6 - 0,-1: - ind: 0,-1 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAACHgAAAAADegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAADHgAAAAABegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAHgAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - version: 6 - -1,-1: - ind: -1,-1 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAHgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAHgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAHgAAAAAA - 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: '#FFFFFFFF' - id: DeliveryGreyscale - decals: - 0: 2,-3 - - node: - color: '#FFFF00FF' - id: WarnLineGreyscaleE - decals: - 32: 1,0 - 33: 1,-1 - - node: - color: '#FFFF00FF' - id: WarnLineGreyscaleW - decals: - 30: -1,0 - 31: -1,-1 - - type: GridAtmosphere - version: 2 - data: - tiles: - 0,0: - 0: 823 - 1: 16384 - 0,-1: - 0: 29488 - 1: 4 - -1,0: - 0: 2188 - 1: 16384 - -1,-1: - 0: 51328 - 1: 4 - 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: AirlockShuttle - entities: - - uid: 4 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -1.5,0.5 - parent: 1 - - uid: 11 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 2.5,0.5 - parent: 1 - - uid: 22 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 2.5,-0.5 - parent: 1 - - uid: 35 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -1.5,-0.5 - parent: 1 -- proto: APCBasic - entities: - - uid: 105 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -1.5,1.5 - parent: 1 -- proto: AtmosDeviceFanDirectional - entities: - - uid: 8 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 2.5,0.5 - parent: 1 - - uid: 63 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -1.5,-0.5 - parent: 1 - - uid: 64 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -1.5,0.5 - parent: 1 - - uid: 65 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 2.5,-0.5 - parent: 1 -- proto: AtmosFixBlockerMarker - entities: - - uid: 39 - components: - - type: Transform - pos: 2.5,3.5 - parent: 1 - - uid: 113 - components: - - type: Transform - pos: 2.5,-3.5 - parent: 1 - - uid: 114 - components: - - type: Transform - pos: -1.5,3.5 - parent: 1 - - uid: 130 - components: - - type: Transform - pos: -1.5,-3.5 - parent: 1 -- proto: BarrelPallet1 - entities: - - uid: 20 - components: - - type: Transform - pos: 0.5,2.5 - parent: 1 - - uid: 21 - components: - - type: Transform - pos: -0.5,2.5 - parent: 1 - - uid: 57 - components: - - type: Transform - pos: 1.5,2.5 - parent: 1 -- proto: CableApcExtension - entities: - - uid: 7 - components: - - type: Transform - pos: -0.5,1.5 - parent: 1 - - uid: 15 - components: - - type: Transform - pos: 0.5,-0.5 - parent: 1 - - uid: 16 - components: - - type: Transform - pos: 0.5,-1.5 - parent: 1 - - uid: 29 - components: - - type: Transform - pos: -1.5,1.5 - parent: 1 - - uid: 37 - components: - - type: Transform - pos: -1.5,1.5 - parent: 1 - - uid: 43 - components: - - type: Transform - pos: 0.5,1.5 - parent: 1 - - uid: 50 - components: - - type: Transform - pos: 0.5,0.5 - parent: 1 - - uid: 52 - components: - - type: Transform - pos: 0.5,-2.5 - parent: 1 -- proto: CableHV - entities: - - uid: 2 - components: - - type: Transform - pos: -0.5,-2.5 - parent: 1 - - uid: 3 - components: - - type: Transform - pos: -0.5,-3.5 - parent: 1 - - uid: 38 - components: - - type: Transform - pos: -0.5,-1.5 - parent: 1 - - uid: 101 - components: - - type: Transform - pos: -1.5,-1.5 - parent: 1 -- proto: CableMV - entities: - - uid: 18 - components: - - type: Transform - pos: -1.5,-1.5 - parent: 1 - - uid: 19 - components: - - type: Transform - pos: -1.5,1.5 - parent: 1 - - uid: 27 - components: - - type: Transform - pos: -0.5,-1.5 - parent: 1 - - uid: 28 - components: - - type: Transform - pos: -0.5,-0.5 - parent: 1 - - uid: 34 - components: - - type: Transform - pos: -1.5,-1.5 - parent: 1 - - uid: 46 - components: - - type: Transform - pos: -0.5,0.5 - parent: 1 - - uid: 48 - components: - - type: Transform - pos: -1.5,1.5 - parent: 1 - - uid: 49 - components: - - type: Transform - pos: -0.5,1.5 - parent: 1 -- proto: Catwalk - entities: - - uid: 14 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -0.5,-0.5 - parent: 1 - - uid: 40 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 1.5,-0.5 - parent: 1 - - uid: 41 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 1.5,0.5 - parent: 1 - - uid: 54 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 0.5,0.5 - parent: 1 - - uid: 56 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 0.5,-0.5 - parent: 1 - - uid: 62 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -0.5,0.5 - parent: 1 -- proto: ComputerShuttle - entities: - - uid: 60 - components: - - type: Transform - pos: 0.5,0.5 - parent: 1 -- proto: GeneratorWallmountAPU - entities: - - uid: 5 - components: - - type: Transform - pos: -0.5,-3.5 - parent: 1 -- proto: PoweredSmallLight - entities: - - uid: 61 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 1.5,1.5 - parent: 1 -- proto: RandomCrateFreightT1 - entities: - - uid: 42 - components: - - type: Transform - pos: 1.5,-2.5 - parent: 1 - - uid: 45 - components: - - type: Transform - pos: 0.5,-2.5 - parent: 1 - - uid: 47 - components: - - type: Transform - pos: -0.5,-2.5 - parent: 1 -- proto: RandomFreightT1 - entities: - - uid: 17 - components: - - type: Transform - pos: 0.5,1.5 - parent: 1 - - uid: 24 - components: - - type: Transform - pos: 1.5,1.5 - parent: 1 - - uid: 30 - components: - - type: Transform - pos: -0.5,1.5 - parent: 1 - - uid: 33 - components: - - type: Transform - pos: -0.5,-1.5 - parent: 1 - - uid: 44 - components: - - type: Transform - pos: 1.5,-1.5 - parent: 1 - - uid: 53 - components: - - type: Transform - pos: 0.5,-1.5 - parent: 1 -- proto: SignElectricalMed - entities: - - uid: 59 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -1.5,-2.5 - parent: 1 -- proto: SubstationWallBasic - entities: - - uid: 26 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -1.5,-1.5 - parent: 1 -- proto: WallSolid - entities: - - uid: 6 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 2.5,2.5 - parent: 1 - - uid: 9 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 2.5,1.5 - parent: 1 - - uid: 10 - components: - - type: Transform - pos: -1.5,2.5 - parent: 1 - - uid: 13 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 2.5,-1.5 - parent: 1 - - uid: 23 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -0.5,-3.5 - parent: 1 - - uid: 25 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 1.5,-3.5 - parent: 1 - - uid: 31 - components: - - type: Transform - pos: -0.5,3.5 - parent: 1 - - uid: 36 - components: - - type: Transform - pos: -1.5,-2.5 - parent: 1 - - uid: 51 - components: - - type: Transform - pos: 0.5,3.5 - parent: 1 - - uid: 58 - components: - - type: Transform - pos: 1.5,3.5 - parent: 1 - - uid: 67 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -1.5,-1.5 - parent: 1 - - uid: 75 - components: - - type: Transform - pos: -1.5,1.5 - parent: 1 - - uid: 80 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 2.5,-2.5 - parent: 1 - - uid: 88 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 0.5,-3.5 - parent: 1 -- proto: WallSolidDiagonal - entities: - - uid: 12 - components: - - type: Transform - pos: -1.5,3.5 - parent: 1 - - uid: 32 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -1.5,-3.5 - parent: 1 - - uid: 55 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 2.5,3.5 - parent: 1 - - uid: 87 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 2.5,-3.5 - parent: 1 -... diff --git a/Resources/Maps/_NF/Shuttles/Shipment/shipment_chem.yml b/Resources/Maps/_NF/Shuttles/Shipment/shipment_chem.yml deleted file mode 100644 index a9b1342130c..00000000000 --- a/Resources/Maps/_NF/Shuttles/Shipment/shipment_chem.yml +++ /dev/null @@ -1,532 +0,0 @@ -meta: - format: 6 - postmapinit: false -tilemap: - 0: Space - 30: FloorDark - 35: FloorDarkMono - 105: FloorTechMaint - 1: FloorWhiteMono - 121: Lattice - 122: Plating -entities: -- proto: "" - entities: - - uid: 1 - components: - - type: MetaData - name: shipment - - type: Transform - pos: -0.51420784,-0.5497939 - parent: invalid - - type: MapGrid - chunks: - 0,0: - ind: 0,0 - tiles: AQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - version: 6 - -1,0: - ind: -1,0 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - version: 6 - 0,-1: - ind: 0,-1 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - version: 6 - -1,-1: - ind: -1,-1 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAA - 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: - angle: 1.5707963267948966 rad - color: '#FFFFFFFF' - id: StandClear - decals: - 27: -2,0 - - node: - color: '#FFFF00FF' - id: WarnLineGreyscaleE - decals: - 30: 1,-1 - 31: 1,0 - - node: - color: '#FFFF00FF' - id: WarnLineGreyscaleW - decals: - 32: -1,-1 - 33: -1,0 - - type: GridAtmosphere - version: 2 - data: - tiles: - 0,0: - 0: 823 - 1: 16384 - 0,-1: - 0: 29488 - 1: 4 - -1,0: - 0: 2188 - 1: 16384 - -1,-1: - 0: 51328 - 1: 4 - 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: AirlockShuttle - entities: - - uid: 4 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -1.5,0.5 - parent: 1 - - uid: 6 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 2.5,-0.5 - parent: 1 - - uid: 42 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -1.5,-0.5 - parent: 1 - - uid: 54 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 2.5,0.5 - parent: 1 -- proto: APCBasic - entities: - - uid: 105 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -1.5,1.5 - parent: 1 -- proto: AtmosDeviceFanDirectional - entities: - - uid: 8 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 2.5,0.5 - parent: 1 -- proto: AtmosFixBlockerMarker - entities: - - uid: 39 - components: - - type: Transform - pos: 2.5,3.5 - parent: 1 - - uid: 66 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 2.5,-3.5 - parent: 1 - - uid: 114 - components: - - type: Transform - pos: -1.5,3.5 - parent: 1 - - uid: 130 - components: - - type: Transform - pos: -1.5,-3.5 - parent: 1 -- proto: BarrelPallet1 - entities: - - uid: 10 - components: - - type: Transform - pos: -0.5,1.5 - parent: 1 - - uid: 11 - components: - - type: Transform - pos: 1.5,1.5 - parent: 1 - - uid: 12 - components: - - type: Transform - pos: 0.5,1.5 - parent: 1 - - uid: 13 - components: - - type: Transform - pos: -0.5,-1.5 - parent: 1 - - uid: 14 - components: - - type: Transform - pos: 0.5,-1.5 - parent: 1 - - uid: 17 - components: - - type: Transform - pos: 1.5,-1.5 - parent: 1 - - uid: 20 - components: - - type: Transform - pos: 0.5,2.5 - parent: 1 - - uid: 21 - components: - - type: Transform - pos: -0.5,2.5 - parent: 1 - - uid: 25 - components: - - type: Transform - pos: 1.5,-2.5 - parent: 1 - - uid: 31 - components: - - type: Transform - pos: -0.5,-2.5 - parent: 1 - - uid: 32 - components: - - type: Transform - pos: 0.5,-2.5 - parent: 1 - - uid: 57 - components: - - type: Transform - pos: 1.5,2.5 - parent: 1 -- proto: CableApcExtension - entities: - - uid: 7 - components: - - type: Transform - pos: -0.5,1.5 - parent: 1 - - uid: 15 - components: - - type: Transform - pos: 0.5,-0.5 - parent: 1 - - uid: 16 - components: - - type: Transform - pos: 0.5,-1.5 - parent: 1 - - uid: 29 - components: - - type: Transform - pos: -1.5,1.5 - parent: 1 - - uid: 37 - components: - - type: Transform - pos: -1.5,1.5 - parent: 1 - - uid: 43 - components: - - type: Transform - pos: 0.5,1.5 - parent: 1 - - uid: 50 - components: - - type: Transform - pos: 0.5,0.5 - parent: 1 - - uid: 52 - components: - - type: Transform - pos: 0.5,-2.5 - parent: 1 -- proto: CableHV - entities: - - uid: 2 - components: - - type: Transform - pos: -0.5,-2.5 - parent: 1 - - uid: 3 - components: - - type: Transform - pos: -0.5,-3.5 - parent: 1 - - uid: 38 - components: - - type: Transform - pos: -0.5,-1.5 - parent: 1 - - uid: 101 - components: - - type: Transform - pos: -1.5,-1.5 - parent: 1 -- proto: CableMV - entities: - - uid: 18 - components: - - type: Transform - pos: -1.5,-1.5 - parent: 1 - - uid: 19 - components: - - type: Transform - pos: -1.5,1.5 - parent: 1 - - uid: 27 - components: - - type: Transform - pos: -0.5,-1.5 - parent: 1 - - uid: 28 - components: - - type: Transform - pos: -0.5,-0.5 - parent: 1 - - uid: 34 - components: - - type: Transform - pos: -1.5,-1.5 - parent: 1 - - uid: 46 - components: - - type: Transform - pos: -0.5,0.5 - parent: 1 - - uid: 48 - components: - - type: Transform - pos: -1.5,1.5 - parent: 1 - - uid: 49 - components: - - type: Transform - pos: -0.5,1.5 - parent: 1 -- proto: ComputerShuttle - entities: - - uid: 9 - components: - - type: Transform - pos: 0.5,0.5 - parent: 1 -- proto: GeneratorWallmountAPU - entities: - - uid: 5 - components: - - type: Transform - pos: -0.5,-3.5 - parent: 1 -- proto: PoweredSmallLight - entities: - - uid: 61 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 1.5,1.5 - parent: 1 -- proto: SignElectricalMed - entities: - - uid: 59 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -1.5,-2.5 - parent: 1 -- proto: SignFlammableMed - entities: - - uid: 22 - components: - - type: Transform - pos: 2.5,2.5 - parent: 1 - - uid: 23 - components: - - type: Transform - pos: 1.5,-3.5 - parent: 1 - - uid: 24 - components: - - type: Transform - pos: -1.5,2.5 - parent: 1 - - uid: 30 - components: - - type: Transform - pos: 1.5,3.5 - parent: 1 -- proto: SubstationWallBasic - entities: - - uid: 26 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -1.5,-1.5 - parent: 1 -- proto: WallShuttle - entities: - - uid: 33 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -1.5,2.5 - parent: 1 - - uid: 36 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 1.5,-3.5 - parent: 1 - - uid: 41 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 0.5,3.5 - parent: 1 - - uid: 44 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -0.5,-3.5 - parent: 1 - - uid: 45 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 2.5,2.5 - parent: 1 - - uid: 47 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -1.5,-2.5 - parent: 1 - - uid: 53 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -1.5,-1.5 - parent: 1 - - uid: 55 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 2.5,1.5 - parent: 1 - - uid: 56 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 2.5,-2.5 - parent: 1 - - uid: 60 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -0.5,3.5 - parent: 1 - - uid: 62 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 2.5,-1.5 - parent: 1 - - uid: 63 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 0.5,-3.5 - parent: 1 - - uid: 64 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 1.5,3.5 - parent: 1 - - uid: 65 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -1.5,1.5 - parent: 1 -- proto: WallShuttleDiagonal - entities: - - uid: 35 - components: - - type: Transform - pos: -1.5,3.5 - parent: 1 - - uid: 40 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 2.5,-3.5 - parent: 1 - - uid: 51 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 2.5,3.5 - parent: 1 - - uid: 58 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -1.5,-3.5 - parent: 1 -... diff --git a/Resources/Prototypes/_NF/Shipyard/Shipment/basicshipment1.yml b/Resources/Prototypes/_NF/Shipyard/Shipment/basicshipment1.yml index d3f5341b4d9..56b13264e31 100644 --- a/Resources/Prototypes/_NF/Shipyard/Shipment/basicshipment1.yml +++ b/Resources/Prototypes/_NF/Shipyard/Shipment/basicshipment1.yml @@ -9,7 +9,7 @@ # Shuttle Notes: # - type: vessel - id: ShipmentBasic + id: BasicShipment1 parent: BaseVessel name: Shipment description: A delivery to trade. @@ -17,7 +17,7 @@ category: Small group: Cargo access: Cargo - shuttlePath: /Maps/_NF/Shuttles/Shipment/shipment_basic.yml + shuttlePath: /Maps/_NF/Shuttles/Shipment/basicshipment1.yml guidebookPage: Null addComponents: - type: IFF @@ -25,9 +25,9 @@ flags: [IsPlayerShuttle, HideLabel] - type: gameMap - id: ShipmentBasic - mapName: 'ShipmentBasic' - mapPath: /Maps/_NF/Shuttles/Shipment/shipment_basic.yml + id: BasicShipment1 + mapName: 'BasicShipment1' + mapPath: /Maps/_NF/Shuttles/Shipment/basicshipment1.yml minPlayers: 0 stations: BasicShipment1: From 491f8dfcd8386953ea1aa4898781ac3f01bf1fdb Mon Sep 17 00:00:00 2001 From: Alkheemist Date: Sat, 25 Jan 2025 11:55:59 +1100 Subject: [PATCH 32/35] Revert "Revert "breaks the cargo shipment"" This reverts commit f235c48d70b599418a61070afe368816a8556b6e. --- .../_NF/Shuttles/Shipment/shipment_basic.yml | 561 ++++++++++++++++++ .../_NF/Shuttles/Shipment/shipment_chem.yml | 532 +++++++++++++++++ .../_NF/Shipyard/Shipment/basicshipment1.yml | 10 +- 3 files changed, 1098 insertions(+), 5 deletions(-) create mode 100644 Resources/Maps/_NF/Shuttles/Shipment/shipment_basic.yml create mode 100644 Resources/Maps/_NF/Shuttles/Shipment/shipment_chem.yml diff --git a/Resources/Maps/_NF/Shuttles/Shipment/shipment_basic.yml b/Resources/Maps/_NF/Shuttles/Shipment/shipment_basic.yml new file mode 100644 index 00000000000..18ca6460bfe --- /dev/null +++ b/Resources/Maps/_NF/Shuttles/Shipment/shipment_basic.yml @@ -0,0 +1,561 @@ +meta: + format: 6 + postmapinit: false +tilemap: + 0: Space + 30: FloorDark + 35: FloorDarkMono + 105: FloorTechMaint + 121: Lattice + 122: Plating +entities: +- proto: "" + entities: + - uid: 1 + components: + - type: MetaData + name: shipment + - type: Transform + pos: -0.51420784,-0.5497939 + parent: invalid + - type: MapGrid + chunks: + 0,0: + ind: 0,0 + tiles: HgAAAAACHgAAAAACegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAADHgAAAAADegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAADHgAAAAACegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + -1,0: + ind: -1,0 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAHgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAHgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + 0,-1: + ind: 0,-1 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAACHgAAAAADegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAADHgAAAAABegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAHgAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + -1,-1: + ind: -1,-1 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAHgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAHgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAHgAAAAAA + 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: '#FFFFFFFF' + id: DeliveryGreyscale + decals: + 0: 2,-3 + - node: + color: '#FFFF00FF' + id: WarnLineGreyscaleE + decals: + 32: 1,0 + 33: 1,-1 + - node: + color: '#FFFF00FF' + id: WarnLineGreyscaleW + decals: + 30: -1,0 + 31: -1,-1 + - type: GridAtmosphere + version: 2 + data: + tiles: + 0,0: + 0: 823 + 1: 16384 + 0,-1: + 0: 29488 + 1: 4 + -1,0: + 0: 2188 + 1: 16384 + -1,-1: + 0: 51328 + 1: 4 + 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: AirlockShuttle + entities: + - uid: 4 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,0.5 + parent: 1 + - uid: 11 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 2.5,0.5 + parent: 1 + - uid: 22 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 2.5,-0.5 + parent: 1 + - uid: 35 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,-0.5 + parent: 1 +- proto: APCBasic + entities: + - uid: 105 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,1.5 + parent: 1 +- proto: AtmosDeviceFanDirectional + entities: + - uid: 8 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 2.5,0.5 + parent: 1 + - uid: 63 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,-0.5 + parent: 1 + - uid: 64 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,0.5 + parent: 1 + - uid: 65 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 2.5,-0.5 + parent: 1 +- proto: AtmosFixBlockerMarker + entities: + - uid: 39 + components: + - type: Transform + pos: 2.5,3.5 + parent: 1 + - uid: 113 + components: + - type: Transform + pos: 2.5,-3.5 + parent: 1 + - uid: 114 + components: + - type: Transform + pos: -1.5,3.5 + parent: 1 + - uid: 130 + components: + - type: Transform + pos: -1.5,-3.5 + parent: 1 +- proto: BarrelPallet1 + entities: + - uid: 20 + components: + - type: Transform + pos: 0.5,2.5 + parent: 1 + - uid: 21 + components: + - type: Transform + pos: -0.5,2.5 + parent: 1 + - uid: 57 + components: + - type: Transform + pos: 1.5,2.5 + parent: 1 +- proto: CableApcExtension + entities: + - uid: 7 + components: + - type: Transform + pos: -0.5,1.5 + parent: 1 + - uid: 15 + components: + - type: Transform + pos: 0.5,-0.5 + parent: 1 + - uid: 16 + components: + - type: Transform + pos: 0.5,-1.5 + parent: 1 + - uid: 29 + components: + - type: Transform + pos: -1.5,1.5 + parent: 1 + - uid: 37 + components: + - type: Transform + pos: -1.5,1.5 + parent: 1 + - uid: 43 + components: + - type: Transform + pos: 0.5,1.5 + parent: 1 + - uid: 50 + components: + - type: Transform + pos: 0.5,0.5 + parent: 1 + - uid: 52 + components: + - type: Transform + pos: 0.5,-2.5 + parent: 1 +- proto: CableHV + entities: + - uid: 2 + components: + - type: Transform + pos: -0.5,-2.5 + parent: 1 + - uid: 3 + components: + - type: Transform + pos: -0.5,-3.5 + parent: 1 + - uid: 38 + components: + - type: Transform + pos: -0.5,-1.5 + parent: 1 + - uid: 101 + components: + - type: Transform + pos: -1.5,-1.5 + parent: 1 +- proto: CableMV + entities: + - uid: 18 + components: + - type: Transform + pos: -1.5,-1.5 + parent: 1 + - uid: 19 + components: + - type: Transform + pos: -1.5,1.5 + parent: 1 + - uid: 27 + components: + - type: Transform + pos: -0.5,-1.5 + parent: 1 + - uid: 28 + components: + - type: Transform + pos: -0.5,-0.5 + parent: 1 + - uid: 34 + components: + - type: Transform + pos: -1.5,-1.5 + parent: 1 + - uid: 46 + components: + - type: Transform + pos: -0.5,0.5 + parent: 1 + - uid: 48 + components: + - type: Transform + pos: -1.5,1.5 + parent: 1 + - uid: 49 + components: + - type: Transform + pos: -0.5,1.5 + parent: 1 +- proto: Catwalk + entities: + - uid: 14 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,-0.5 + parent: 1 + - uid: 40 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,-0.5 + parent: 1 + - uid: 41 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,0.5 + parent: 1 + - uid: 54 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,0.5 + parent: 1 + - uid: 56 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,-0.5 + parent: 1 + - uid: 62 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,0.5 + parent: 1 +- proto: ComputerShuttle + entities: + - uid: 60 + components: + - type: Transform + pos: 0.5,0.5 + parent: 1 +- proto: GeneratorWallmountAPU + entities: + - uid: 5 + components: + - type: Transform + pos: -0.5,-3.5 + parent: 1 +- proto: PoweredSmallLight + entities: + - uid: 61 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,1.5 + parent: 1 +- proto: RandomCrateFreightT1 + entities: + - uid: 42 + components: + - type: Transform + pos: 1.5,-2.5 + parent: 1 + - uid: 45 + components: + - type: Transform + pos: 0.5,-2.5 + parent: 1 + - uid: 47 + components: + - type: Transform + pos: -0.5,-2.5 + parent: 1 +- proto: RandomFreightT1 + entities: + - uid: 17 + components: + - type: Transform + pos: 0.5,1.5 + parent: 1 + - uid: 24 + components: + - type: Transform + pos: 1.5,1.5 + parent: 1 + - uid: 30 + components: + - type: Transform + pos: -0.5,1.5 + parent: 1 + - uid: 33 + components: + - type: Transform + pos: -0.5,-1.5 + parent: 1 + - uid: 44 + components: + - type: Transform + pos: 1.5,-1.5 + parent: 1 + - uid: 53 + components: + - type: Transform + pos: 0.5,-1.5 + parent: 1 +- proto: SignElectricalMed + entities: + - uid: 59 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,-2.5 + parent: 1 +- proto: SubstationWallBasic + entities: + - uid: 26 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,-1.5 + parent: 1 +- proto: WallSolid + entities: + - uid: 6 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,2.5 + parent: 1 + - uid: 9 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,1.5 + parent: 1 + - uid: 10 + components: + - type: Transform + pos: -1.5,2.5 + parent: 1 + - uid: 13 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 2.5,-1.5 + parent: 1 + - uid: 23 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,-3.5 + parent: 1 + - uid: 25 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,-3.5 + parent: 1 + - uid: 31 + components: + - type: Transform + pos: -0.5,3.5 + parent: 1 + - uid: 36 + components: + - type: Transform + pos: -1.5,-2.5 + parent: 1 + - uid: 51 + components: + - type: Transform + pos: 0.5,3.5 + parent: 1 + - uid: 58 + components: + - type: Transform + pos: 1.5,3.5 + parent: 1 + - uid: 67 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,-1.5 + parent: 1 + - uid: 75 + components: + - type: Transform + pos: -1.5,1.5 + parent: 1 + - uid: 80 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 2.5,-2.5 + parent: 1 + - uid: 88 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,-3.5 + parent: 1 +- proto: WallSolidDiagonal + entities: + - uid: 12 + components: + - type: Transform + pos: -1.5,3.5 + parent: 1 + - uid: 32 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,-3.5 + parent: 1 + - uid: 55 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,3.5 + parent: 1 + - uid: 87 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,-3.5 + parent: 1 +... diff --git a/Resources/Maps/_NF/Shuttles/Shipment/shipment_chem.yml b/Resources/Maps/_NF/Shuttles/Shipment/shipment_chem.yml new file mode 100644 index 00000000000..a9b1342130c --- /dev/null +++ b/Resources/Maps/_NF/Shuttles/Shipment/shipment_chem.yml @@ -0,0 +1,532 @@ +meta: + format: 6 + postmapinit: false +tilemap: + 0: Space + 30: FloorDark + 35: FloorDarkMono + 105: FloorTechMaint + 1: FloorWhiteMono + 121: Lattice + 122: Plating +entities: +- proto: "" + entities: + - uid: 1 + components: + - type: MetaData + name: shipment + - type: Transform + pos: -0.51420784,-0.5497939 + parent: invalid + - type: MapGrid + chunks: + 0,0: + ind: 0,0 + tiles: AQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + -1,0: + ind: -1,0 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + 0,-1: + ind: 0,-1 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + -1,-1: + ind: -1,-1 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAA + 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: + angle: 1.5707963267948966 rad + color: '#FFFFFFFF' + id: StandClear + decals: + 27: -2,0 + - node: + color: '#FFFF00FF' + id: WarnLineGreyscaleE + decals: + 30: 1,-1 + 31: 1,0 + - node: + color: '#FFFF00FF' + id: WarnLineGreyscaleW + decals: + 32: -1,-1 + 33: -1,0 + - type: GridAtmosphere + version: 2 + data: + tiles: + 0,0: + 0: 823 + 1: 16384 + 0,-1: + 0: 29488 + 1: 4 + -1,0: + 0: 2188 + 1: 16384 + -1,-1: + 0: 51328 + 1: 4 + 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: AirlockShuttle + entities: + - uid: 4 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,0.5 + parent: 1 + - uid: 6 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 2.5,-0.5 + parent: 1 + - uid: 42 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,-0.5 + parent: 1 + - uid: 54 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 2.5,0.5 + parent: 1 +- proto: APCBasic + entities: + - uid: 105 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,1.5 + parent: 1 +- proto: AtmosDeviceFanDirectional + entities: + - uid: 8 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 2.5,0.5 + parent: 1 +- proto: AtmosFixBlockerMarker + entities: + - uid: 39 + components: + - type: Transform + pos: 2.5,3.5 + parent: 1 + - uid: 66 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 2.5,-3.5 + parent: 1 + - uid: 114 + components: + - type: Transform + pos: -1.5,3.5 + parent: 1 + - uid: 130 + components: + - type: Transform + pos: -1.5,-3.5 + parent: 1 +- proto: BarrelPallet1 + entities: + - uid: 10 + components: + - type: Transform + pos: -0.5,1.5 + parent: 1 + - uid: 11 + components: + - type: Transform + pos: 1.5,1.5 + parent: 1 + - uid: 12 + components: + - type: Transform + pos: 0.5,1.5 + parent: 1 + - uid: 13 + components: + - type: Transform + pos: -0.5,-1.5 + parent: 1 + - uid: 14 + components: + - type: Transform + pos: 0.5,-1.5 + parent: 1 + - uid: 17 + components: + - type: Transform + pos: 1.5,-1.5 + parent: 1 + - uid: 20 + components: + - type: Transform + pos: 0.5,2.5 + parent: 1 + - uid: 21 + components: + - type: Transform + pos: -0.5,2.5 + parent: 1 + - uid: 25 + components: + - type: Transform + pos: 1.5,-2.5 + parent: 1 + - uid: 31 + components: + - type: Transform + pos: -0.5,-2.5 + parent: 1 + - uid: 32 + components: + - type: Transform + pos: 0.5,-2.5 + parent: 1 + - uid: 57 + components: + - type: Transform + pos: 1.5,2.5 + parent: 1 +- proto: CableApcExtension + entities: + - uid: 7 + components: + - type: Transform + pos: -0.5,1.5 + parent: 1 + - uid: 15 + components: + - type: Transform + pos: 0.5,-0.5 + parent: 1 + - uid: 16 + components: + - type: Transform + pos: 0.5,-1.5 + parent: 1 + - uid: 29 + components: + - type: Transform + pos: -1.5,1.5 + parent: 1 + - uid: 37 + components: + - type: Transform + pos: -1.5,1.5 + parent: 1 + - uid: 43 + components: + - type: Transform + pos: 0.5,1.5 + parent: 1 + - uid: 50 + components: + - type: Transform + pos: 0.5,0.5 + parent: 1 + - uid: 52 + components: + - type: Transform + pos: 0.5,-2.5 + parent: 1 +- proto: CableHV + entities: + - uid: 2 + components: + - type: Transform + pos: -0.5,-2.5 + parent: 1 + - uid: 3 + components: + - type: Transform + pos: -0.5,-3.5 + parent: 1 + - uid: 38 + components: + - type: Transform + pos: -0.5,-1.5 + parent: 1 + - uid: 101 + components: + - type: Transform + pos: -1.5,-1.5 + parent: 1 +- proto: CableMV + entities: + - uid: 18 + components: + - type: Transform + pos: -1.5,-1.5 + parent: 1 + - uid: 19 + components: + - type: Transform + pos: -1.5,1.5 + parent: 1 + - uid: 27 + components: + - type: Transform + pos: -0.5,-1.5 + parent: 1 + - uid: 28 + components: + - type: Transform + pos: -0.5,-0.5 + parent: 1 + - uid: 34 + components: + - type: Transform + pos: -1.5,-1.5 + parent: 1 + - uid: 46 + components: + - type: Transform + pos: -0.5,0.5 + parent: 1 + - uid: 48 + components: + - type: Transform + pos: -1.5,1.5 + parent: 1 + - uid: 49 + components: + - type: Transform + pos: -0.5,1.5 + parent: 1 +- proto: ComputerShuttle + entities: + - uid: 9 + components: + - type: Transform + pos: 0.5,0.5 + parent: 1 +- proto: GeneratorWallmountAPU + entities: + - uid: 5 + components: + - type: Transform + pos: -0.5,-3.5 + parent: 1 +- proto: PoweredSmallLight + entities: + - uid: 61 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,1.5 + parent: 1 +- proto: SignElectricalMed + entities: + - uid: 59 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,-2.5 + parent: 1 +- proto: SignFlammableMed + entities: + - uid: 22 + components: + - type: Transform + pos: 2.5,2.5 + parent: 1 + - uid: 23 + components: + - type: Transform + pos: 1.5,-3.5 + parent: 1 + - uid: 24 + components: + - type: Transform + pos: -1.5,2.5 + parent: 1 + - uid: 30 + components: + - type: Transform + pos: 1.5,3.5 + parent: 1 +- proto: SubstationWallBasic + entities: + - uid: 26 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,-1.5 + parent: 1 +- proto: WallShuttle + entities: + - uid: 33 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,2.5 + parent: 1 + - uid: 36 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,-3.5 + parent: 1 + - uid: 41 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,3.5 + parent: 1 + - uid: 44 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,-3.5 + parent: 1 + - uid: 45 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,2.5 + parent: 1 + - uid: 47 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,-2.5 + parent: 1 + - uid: 53 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,-1.5 + parent: 1 + - uid: 55 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,1.5 + parent: 1 + - uid: 56 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,-2.5 + parent: 1 + - uid: 60 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,3.5 + parent: 1 + - uid: 62 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,-1.5 + parent: 1 + - uid: 63 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,-3.5 + parent: 1 + - uid: 64 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,3.5 + parent: 1 + - uid: 65 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,1.5 + parent: 1 +- proto: WallShuttleDiagonal + entities: + - uid: 35 + components: + - type: Transform + pos: -1.5,3.5 + parent: 1 + - uid: 40 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,-3.5 + parent: 1 + - uid: 51 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,3.5 + parent: 1 + - uid: 58 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,-3.5 + parent: 1 +... diff --git a/Resources/Prototypes/_NF/Shipyard/Shipment/basicshipment1.yml b/Resources/Prototypes/_NF/Shipyard/Shipment/basicshipment1.yml index 56b13264e31..d3f5341b4d9 100644 --- a/Resources/Prototypes/_NF/Shipyard/Shipment/basicshipment1.yml +++ b/Resources/Prototypes/_NF/Shipyard/Shipment/basicshipment1.yml @@ -9,7 +9,7 @@ # Shuttle Notes: # - type: vessel - id: BasicShipment1 + id: ShipmentBasic parent: BaseVessel name: Shipment description: A delivery to trade. @@ -17,7 +17,7 @@ category: Small group: Cargo access: Cargo - shuttlePath: /Maps/_NF/Shuttles/Shipment/basicshipment1.yml + shuttlePath: /Maps/_NF/Shuttles/Shipment/shipment_basic.yml guidebookPage: Null addComponents: - type: IFF @@ -25,9 +25,9 @@ flags: [IsPlayerShuttle, HideLabel] - type: gameMap - id: BasicShipment1 - mapName: 'BasicShipment1' - mapPath: /Maps/_NF/Shuttles/Shipment/basicshipment1.yml + id: ShipmentBasic + mapName: 'ShipmentBasic' + mapPath: /Maps/_NF/Shuttles/Shipment/shipment_basic.yml minPlayers: 0 stations: BasicShipment1: From 056d434157f12f6d8d5e997547c0a46a3e1d6ca8 Mon Sep 17 00:00:00 2001 From: Alkheemist Date: Sat, 25 Jan 2025 11:56:03 +1100 Subject: [PATCH 33/35] Revert "Revert "breaks the cargo shipment even more"" This reverts commit ae2be26d360648923800c98cfaac3c8e70df06f0. --- .../Shipyard/Shipment/{basicshipment1.yml => shipment_basic.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Resources/Prototypes/_NF/Shipyard/Shipment/{basicshipment1.yml => shipment_basic.yml} (100%) diff --git a/Resources/Prototypes/_NF/Shipyard/Shipment/basicshipment1.yml b/Resources/Prototypes/_NF/Shipyard/Shipment/shipment_basic.yml similarity index 100% rename from Resources/Prototypes/_NF/Shipyard/Shipment/basicshipment1.yml rename to Resources/Prototypes/_NF/Shipyard/Shipment/shipment_basic.yml From 63f0f665955c45689cd32bf2d71b618587eb877f Mon Sep 17 00:00:00 2001 From: Alkheemist Date: Sat, 25 Jan 2025 12:07:44 +1100 Subject: [PATCH 34/35] unbreak the cargo shipment (thanks Telos!) --- Resources/Prototypes/_NF/Shipyard/Shipment/shipment_basic.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_NF/Shipyard/Shipment/shipment_basic.yml b/Resources/Prototypes/_NF/Shipyard/Shipment/shipment_basic.yml index d3f5341b4d9..c7f8bc61600 100644 --- a/Resources/Prototypes/_NF/Shipyard/Shipment/shipment_basic.yml +++ b/Resources/Prototypes/_NF/Shipyard/Shipment/shipment_basic.yml @@ -30,7 +30,7 @@ mapPath: /Maps/_NF/Shuttles/Shipment/shipment_basic.yml minPlayers: 0 stations: - BasicShipment1: + ShipmentBasic: stationProto: StandardFrontierVessel components: - type: StationNameSetup From 4c740aa0190cc904daf8e6dd64e25c46ca604044 Mon Sep 17 00:00:00 2001 From: Alkheemist Date: Sat, 25 Jan 2025 12:08:48 +1100 Subject: [PATCH 35/35] tweaked bonus price --- .../Prototypes/_NF/Entities/Structures/Freight/freight.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_NF/Entities/Structures/Freight/freight.yml b/Resources/Prototypes/_NF/Entities/Structures/Freight/freight.yml index 730df09d6f7..d6edf7e6e2d 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Freight/freight.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Freight/freight.yml @@ -28,7 +28,7 @@ suffix: Barrel components: - type: ShipmentPrice - bonusPrice: 1500 + bonusPrice: 2500 - type: StaticPrice price: 5000 - type: Sprite