From edcd01f4d225569e7a130f56c37961447df76e4e Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Sat, 30 Dec 2023 11:42:41 +0200 Subject: [PATCH 01/66] Squeeze Bottles (#781) * squeeze-bottle * squeeze * Update condiments.yml * Update condiments.yml * Update condiments.yml * playTransferSound * Update condiments.yml --- .../EntitySystems/SolutionTransferSystem.cs | 12 +++ .../Components/SolutionTransferComponent.cs | 15 ++++ Resources/Audio/_NF/Effects/splat.ogg | Bin 0 -> 8953 bytes .../Inventories/condiments.yml | 4 +- .../Consumable/Food/Containers/condiments.yml | 77 ++++++++++++++++++ .../SoundCollections/drink_open_sounds.yml | 4 + .../Consumable/Food/condiments.rsi/meta.json | 17 ++++ .../condiments.rsi/squeeze-bottle-ketchup.png | Bin 0 -> 338 bytes .../condiments.rsi/squeeze-bottle-mustard.png | Bin 0 -> 354 bytes 9 files changed, 128 insertions(+), 1 deletion(-) create mode 100644 Resources/Audio/_NF/Effects/splat.ogg create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/Containers/condiments.yml create mode 100644 Resources/Prototypes/_NF/SoundCollections/drink_open_sounds.yml create mode 100644 Resources/Textures/_NF/Objects/Consumable/Food/condiments.rsi/meta.json create mode 100644 Resources/Textures/_NF/Objects/Consumable/Food/condiments.rsi/squeeze-bottle-ketchup.png create mode 100644 Resources/Textures/_NF/Objects/Consumable/Food/condiments.rsi/squeeze-bottle-mustard.png diff --git a/Content.Server/Chemistry/EntitySystems/SolutionTransferSystem.cs b/Content.Server/Chemistry/EntitySystems/SolutionTransferSystem.cs index d2666417cf8..9f95548c02e 100644 --- a/Content.Server/Chemistry/EntitySystems/SolutionTransferSystem.cs +++ b/Content.Server/Chemistry/EntitySystems/SolutionTransferSystem.cs @@ -20,6 +20,7 @@ public sealed class SolutionTransferSystem : EntitySystem [Dependency] private readonly SolutionContainerSystem _solutionContainerSystem = default!; [Dependency] private readonly UserInterfaceSystem _userInterfaceSystem = default!; [Dependency] private readonly IAdminLogManager _adminLogger = default!; + [Dependency] private readonly SharedAudioSystem _audio = default!; /// /// Default transfer amounts for the set-transfer verb. @@ -139,6 +140,9 @@ private void OnAfterInteract(EntityUid uid, SolutionTransferComponent component, var message = Loc.GetString("comp-solution-transfer-transfer-solution", ("amount", transferred), ("target", target)); _popupSystem.PopupEntity(message, uid, args.User); + if (component.PlayTransferSound) // Frontier + EmitSoundOnTransfer(uid, component); // Frontier + args.Handled = true; } } @@ -195,6 +199,14 @@ public FixedPoint2 Transfer(EntityUid user, return actualAmount; } + + /// + /// Frontier - Play sound on solution transfer. + /// + private void EmitSoundOnTransfer(EntityUid uid, SolutionTransferComponent component) + { + _audio.PlayPvs(_audio.GetSound(component.TransferSound), uid); + } } /// diff --git a/Content.Shared/Chemistry/Components/SolutionTransferComponent.cs b/Content.Shared/Chemistry/Components/SolutionTransferComponent.cs index b130304afc8..5ee25c97b14 100644 --- a/Content.Shared/Chemistry/Components/SolutionTransferComponent.cs +++ b/Content.Shared/Chemistry/Components/SolutionTransferComponent.cs @@ -1,5 +1,6 @@ using Content.Shared.FixedPoint; using Robust.Shared.GameStates; +using Robust.Shared.Audio; // Frontier namespace Content.Shared.Chemistry.Components; @@ -50,4 +51,18 @@ public sealed partial class SolutionTransferComponent : Component [DataField("canChangeTransferAmount")] [ViewVariables(VVAccess.ReadWrite)] public bool CanChangeTransferAmount { get; set; } = false; + + /// + /// Frontier - Play a sound when transfering liquid + /// + [DataField("playTransferSound")] + [ViewVariables(VVAccess.ReadWrite)] + public bool PlayTransferSound { get; set; } = false; + + /// + /// Frontier - What sound to play when transfering liquid + /// + [DataField("transferSound")] + public SoundSpecifier TransferSound = + new SoundPathSpecifier("/Audio/_NF/Effects/splat.ogg"); } diff --git a/Resources/Audio/_NF/Effects/splat.ogg b/Resources/Audio/_NF/Effects/splat.ogg new file mode 100644 index 0000000000000000000000000000000000000000..c66720197e7fe64bf4fa0a7b0ef6a94279b18133 GIT binary patch literal 8953 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/condiments.rsi/squeeze-bottle-mustard.png b/Resources/Textures/_NF/Objects/Consumable/Food/condiments.rsi/squeeze-bottle-mustard.png new file mode 100644 index 0000000000000000000000000000000000000000..36083ca8708f3743375039502c604874b7deea28 GIT binary patch literal 354 zcmV-o0iFJdP)Px$97#k$R9J=WmO*L)F&IYQOzXNZw5Z@A)RmjAy6e7o=nZ<6UZV#P7lMm|pn`}{ zP^?r3Y^cjpOcO3Edp-XBf>?atU_T-yx({%q3u__K+? zkq(^Ii(4zdy>E%KM1yAaqM1&{_)3%YTzsVgcz9Nk^F&8bYYg#jTmX85g(PB4WaH|q zX8^LEyKc+n3$(i<)LirQ@)If3J>2C#;mN}UyK-~^fUC^rdpa3QW8?y6DW20_z*icr zx7$kPN-_d!t`B!Qra;`pARsQLaS0fV#dUO}+2uR9ptOEPU z Date: Sat, 30 Dec 2023 09:43:07 +0000 Subject: [PATCH 02/66] Automatic Changelog (#781) --- Resources/Changelog/Changelog.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 53e3c15dec8..022876fc7e6 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -2583,3 +2583,9 @@ Entries: massive after being cloned! id: 4713 time: '2023-12-29T17:09:12.0000000+00:00' +- author: dvir001 + changes: + - type: Add + message: Added squeeze bottles for ketchup & mustard. + id: 4714 + time: '2023-12-30T09:42:41.0000000+00:00' From e830515700032f5d6a5aae3dfa2bd71e412d1a93 Mon Sep 17 00:00:00 2001 From: crystalHex <148453998+crystalHex@users.noreply.github.com> Date: Sat, 30 Dec 2023 17:59:00 +0100 Subject: [PATCH 03/66] Additions to EngiVend and Vendomat inventory (#761) * Added to EngiVend and Vendomat inventory * Update engivend.yml --------- Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> --- .../Prototypes/Catalog/VendingMachines/Inventories/engivend.yml | 2 ++ .../Prototypes/Catalog/VendingMachines/Inventories/vendomat.yml | 1 + 2 files changed, 3 insertions(+) diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/engivend.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/engivend.yml index 48110a3a5bd..292d93ab452 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/engivend.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/engivend.yml @@ -5,7 +5,9 @@ Multitool: 10 ClothingEyesGlassesMeson: 10 ClothingHeadHatWelding: 6 +# HolofanProjector: 10 # Frontier InflatableWallStack1: 24 InflatableDoorStack1: 8 + GeigerCounter: 10 # Frontier PowerCellMedium: 15 # NetworkConfigurator: 15 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/vendomat.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/vendomat.yml index 684f3d90f16..f494bbc2c4c 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/vendomat.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/vendomat.yml @@ -10,5 +10,6 @@ MatterBinStockPart: 8 CapacitorStockPart: 8 MicroManipulatorStockPart: 8 + Beaker: 8 # Frontier - beakers are required for some machines VulpTranslator: 10 AirFreshener: 10 From 540d9069392783f395862b83a25f32b456f30988 Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Sat, 30 Dec 2023 16:59:24 +0000 Subject: [PATCH 04/66] Automatic Changelog (#761) --- Resources/Changelog/Changelog.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 022876fc7e6..5e08fad9aab 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -2589,3 +2589,11 @@ Entries: message: Added squeeze bottles for ketchup & mustard. id: 4714 time: '2023-12-30T09:42:41.0000000+00:00' +- author: crystalHex + changes: + - type: Tweak + message: The EngiVend now sells geiger counters and holofan projectors. + - type: Tweak + message: The Vendomat now sells glass beakers. + id: 4715 + time: '2023-12-30T16:59:00.0000000+00:00' From cefc2db832c5106bcf90de54e18d924bfdb8cce4 Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Mon, 1 Jan 2024 04:37:00 +0200 Subject: [PATCH 05/66] Shuttle Gun Safes (#724) * Create guns.yml * Rework * Update revolvers.yml * Rubber * Adding more guns * Safe Guns * Melee * No Spawn * Adding notes --- .../Fills/Backpacks/duffelbag_guns.yml | 194 ++++++++++++ .../_NF/Catalog/Fills/Lockers/guns.yml | 287 ++++++++++++++++++ .../Objects/Weapons/Guns/Guns/revolvers.yml | 27 +- .../Objects/Weapons/Shotguns/shotguns.yml | 17 ++ 4 files changed, 524 insertions(+), 1 deletion(-) create mode 100644 Resources/Prototypes/_NF/Catalog/Fills/Backpacks/duffelbag_guns.yml create mode 100644 Resources/Prototypes/_NF/Catalog/Fills/Lockers/guns.yml create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Weapons/Shotguns/shotguns.yml diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/duffelbag_guns.yml b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/duffelbag_guns.yml new file mode 100644 index 00000000000..c8326dfc5ae --- /dev/null +++ b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/duffelbag_guns.yml @@ -0,0 +1,194 @@ +# BaseEntity +- type: entity + parent: ClothingBackpackDuffelMercenary + id: ClothingBackpackDuffelShuttle + suffix: Shuttle Guns + noSpawn: true + abstract: true + +# T1: +# WeaponLaserGun +- type: entity + parent: ClothingBackpackDuffelShuttle + id: ShuttleWeaponLaserGun + noSpawn: true + components: + - type: StorageFill + contents: + - id: WeaponLaserGun + +# WeaponDisabler +- type: entity + parent: ClothingBackpackDuffelShuttle + id: ShuttleWeaponDisabler + noSpawn: true + components: + - type: StorageFill + contents: + - id: WeaponDisabler + +# WeaponRevolverArgenti +- type: entity + parent: ClothingBackpackDuffelShuttle + id: ShuttleWeaponRevolverArgenti + noSpawn: true + components: + - type: StorageFill + contents: + - id: WeaponRevolverArgenti + - id: MagazineBoxRifle + +# WeaponRevolverArgentiNonlethal +- type: entity + parent: ClothingBackpackDuffelShuttle + id: ShuttleWeaponRevolverArgentiNonlethal + noSpawn: true + components: + - type: StorageFill + contents: + - id: WeaponRevolverArgentiNonlethal + - id: MagazineBoxRifleRubber + +# WeaponSniperMosin +- type: entity + parent: ClothingBackpackDuffelShuttle + id: ShuttleWeaponSniperMosin + noSpawn: true + components: + - type: StorageFill + contents: + - id: WeaponSniperMosin + - id: MagazineBoxLightRifle + +# Kardashev-MosinNonlethal +- type: entity + parent: ClothingBackpackDuffelShuttle + id: ShuttleKardashev-MosinNonlethal + noSpawn: true + components: + - type: StorageFill + contents: + - id: Kardashev-MosinNonlethal + - id: MagazineBoxLightRifleRubber + +# T2: +# WeaponPistolMk58lethal +- type: entity + parent: ClothingBackpackDuffelShuttle + id: ShuttleWeaponPistolMk58 + noSpawn: true + components: + - type: StorageFill + contents: + - id: WeaponPistolMk58 + - id: MagazinePistol + +# WeaponPistolMk58Nonlethal +- type: entity + parent: ClothingBackpackDuffelShuttle + id: ShuttleWeaponPistolMk58Nonlethal + noSpawn: true + components: + - type: StorageFill + contents: + - id: WeaponPistolMk58Nonlethal + - id: MagazinePistolRubber + +# WeaponRevolverDeckard +- type: entity + parent: ClothingBackpackDuffelShuttle + id: ShuttleWeaponRevolverDeckard + noSpawn: true + components: + - type: StorageFill + contents: + - id: WeaponRevolverDeckard + - id: SpeedLoaderMagnum + +# WeaponRevolverDeckardNonlethal +- type: entity + parent: ClothingBackpackDuffelShuttle + id: ShuttleWeaponRevolverDeckardNonlethal + noSpawn: true + components: + - type: StorageFill + contents: + - id: WeaponRevolverDeckardNonlethal + - id: SpeedLoaderMagnumRubber + +# WeaponShotgunDoubleBarreled +- type: entity + parent: ClothingBackpackDuffelShuttle + id: ShuttleWeaponShotgunDoubleBarreled + noSpawn: true + components: + - type: StorageFill + contents: + - id: WeaponShotgunDoubleBarreled + - id: BoxLethalshot + +# WeaponShotgunDoubleBarreledRubber +- type: entity + parent: ClothingBackpackDuffelShuttle + id: ShuttleWeaponShotgunDoubleBarreledRubber + noSpawn: true + components: + - type: StorageFill + contents: + - id: WeaponShotgunDoubleBarreledRubber + - id: BoxBeanbag + +# WeaponShotgunSawn +- type: entity + parent: ClothingBackpackDuffelShuttle + id: ShuttleWeaponShotgunSawn + noSpawn: true + components: + - type: StorageFill + contents: + - id: WeaponShotgunSawn + - id: BoxLethalshot + +# WeaponShotgunSawnNonlethal +- type: entity + parent: ClothingBackpackDuffelShuttle + id: ShuttleWeaponShotgunSawnNonlethal + noSpawn: true + components: + - type: StorageFill + contents: + - id: WeaponShotgunSawnNonlethal + - id: BoxBeanbag + +# T3: +# WeaponEnergyGun +- type: entity + parent: ClothingBackpackDuffelShuttle + id: ShuttleWeaponEnergyGun + noSpawn: true + components: + - type: StorageFill + contents: + - id: WeaponEnergyGun + +# WeaponShotgunKammerer +- type: entity + parent: ClothingBackpackDuffelShuttle + id: ShuttleWeaponShotgunKammerer + noSpawn: true + components: + - type: StorageFill + contents: + - id: WeaponShotgunKammerer + - id: BoxLethalshot + +# WeaponShotgunKammererNonlethal +- type: entity + parent: ClothingBackpackDuffelShuttle + id: ShuttleWeaponShotgunKammererNonlethal + noSpawn: true + components: + - type: StorageFill + contents: + - id: WeaponShotgunKammererNonlethal + - id: BoxBeanbag diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/guns.yml b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/guns.yml new file mode 100644 index 00000000000..5ba572fe688 --- /dev/null +++ b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/guns.yml @@ -0,0 +1,287 @@ +- type: entity + parent: GunSafe + id: GunSafeShuttleCaptain + name: shuttle safe + suffix: Empty, Captain + components: + - type: AccessReader + access: [["Captain"], ["Mercenary"]] + +- type: entity + parent: GunSafeShuttleCaptain + id: GunSafeShuttleT1 + name: shuttle gun safe + suffix: T1 + noSpawn: true + components: + - type: StorageFill + contents: + # T1-1 + - id: ShuttleWeaponLaserGun + orGroup: T1-1 + prob: 0.1 + - id: ShuttleWeaponDisabler + orGroup: T1-1 + prob: 0.1 + - id: ShuttleWeaponRevolverArgenti + orGroup: T1-1 + prob: 0.1 + - id: ShuttleWeaponRevolverArgentiNonlethal + orGroup: T1-1 + prob: 0.1 + - id: ShuttleWeaponSniperMosin + orGroup: T1-1 + prob: 0.1 + - id: ShuttleKardashev-MosinNonlethal + orGroup: T1-1 + prob: 0.1 + # T1-2 + - id: ShuttleWeaponLaserGun + orGroup: T1-2 + prob: 0.1 + - id: ShuttleWeaponDisabler + orGroup: T1-2 + prob: 0.1 + - id: ShuttleWeaponRevolverArgenti + orGroup: T1-2 + prob: 0.1 + - id: ShuttleWeaponRevolverArgentiNonlethal + orGroup: T1-2 + prob: 0.1 + - id: ShuttleWeaponSniperMosin + orGroup: T1-2 + prob: 0.1 + - id: ShuttleKardashev-MosinNonlethal + orGroup: T1-2 + prob: 0.1 + # T1 Melee + - id: BaseBallBat + orGroup: Melee + prob: 0.05 + - id: Spear + orGroup: Melee + prob: 0.05 + - id: SurvivalKnife + orGroup: Melee + prob: 0.05 + - id: MakeshiftShield + orGroup: Melee + prob: 0.05 + - id: Null # Nothing + orGroup: Melee + prob: 0.8 + +- type: entity + parent: GunSafeShuttleCaptain + id: GunSafeShuttleT2 + name: shuttle gun safe + suffix: T2 + noSpawn: true + components: + - type: StorageFill + contents: + # T1-1 + - id: ShuttleWeaponLaserGun + orGroup: T1-1 + prob: 0.1 + - id: ShuttleWeaponDisabler + orGroup: T1-1 + prob: 0.1 + - id: ShuttleWeaponRevolverArgenti + orGroup: T1-1 + prob: 0.1 + - id: ShuttleWeaponRevolverArgentiNonlethal + orGroup: T1-1 + prob: 0.1 + - id: ShuttleWeaponSniperMosin + orGroup: T1-1 + prob: 0.1 + - id: ShuttleKardashev-MosinNonlethal + orGroup: T1-1 + prob: 0.1 + # T1-2 + - id: ShuttleWeaponLaserGun + orGroup: T1-2 + prob: 0.1 + - id: ShuttleWeaponDisabler + orGroup: T1-2 + prob: 0.1 + - id: ShuttleWeaponRevolverArgenti + orGroup: T1-2 + prob: 0.1 + - id: ShuttleWeaponRevolverArgentiNonlethal + orGroup: T1-2 + prob: 0.1 + - id: ShuttleWeaponSniperMosin + orGroup: T1-2 + prob: 0.1 + - id: ShuttleKardashev-MosinNonlethal + orGroup: T1-2 + prob: 0.1 + # T2-1 + - id: ShuttleWeaponPistolMk58 + orGroup: T2-1 + prob: 0.1 + - id: ShuttleWeaponPistolMk58Nonlethal + orGroup: T2-1 + prob: 0.1 + - id: ShuttleWeaponRevolverDeckard + orGroup: T2-1 + prob: 0.1 + - id: ShuttleWeaponRevolverDeckardNonlethal + orGroup: T2-1 + prob: 0.1 + - id: ShuttleWeaponShotgunDoubleBarreled + orGroup: T2-1 + prob: 0.1 + - id: ShuttleWeaponShotgunDoubleBarreledRubber + orGroup: T2-1 + prob: 0.1 + - id: ShuttleWeaponShotgunSawn + orGroup: T2-1 + prob: 0.1 + - id: ShuttleWeaponShotgunSawnNonlethal + orGroup: T2-1 + prob: 0.1 + # T2 Melee + - id: SpearReinforced + orGroup: Melee + prob: 0.1 + - id: CombatKnife + orGroup: Melee + prob: 0.1 + - id: Null # Nothing + orGroup: Melee + prob: 0.8 + +- type: entity + parent: GunSafeShuttleCaptain + id: GunSafeShuttleT3 + name: shuttle gun safe + suffix: T3 + noSpawn: true + components: + - type: StorageFill + contents: + # T2-1 + - id: ShuttleWeaponPistolMk58 + orGroup: T2-1 + prob: 0.1 + - id: ShuttleWeaponPistolMk58Nonlethal + orGroup: T2-1 + prob: 0.1 + - id: ShuttleWeaponRevolverDeckard + orGroup: T2-1 + prob: 0.1 + - id: ShuttleWeaponRevolverDeckardNonlethal + orGroup: T2-1 + prob: 0.1 + - id: ShuttleWeaponShotgunDoubleBarreled + orGroup: T2-1 + prob: 0.1 + - id: ShuttleWeaponShotgunDoubleBarreledRubber + orGroup: T2-1 + prob: 0.1 + - id: ShuttleWeaponShotgunSawn + orGroup: T2-1 + prob: 0.1 + - id: ShuttleWeaponShotgunSawnNonlethal + orGroup: T2-1 + prob: 0.1 + # T2-2 + - id: ShuttleWeaponPistolMk58 + orGroup: T2-2 + prob: 0.1 + - id: ShuttleWeaponPistolMk58Nonlethal + orGroup: T2-2 + prob: 0.1 + - id: ShuttleWeaponRevolverDeckard + orGroup: T2-2 + prob: 0.1 + - id: ShuttleWeaponRevolverDeckardNonlethal + orGroup: T2-2 + prob: 0.1 + - id: ShuttleWeaponShotgunDoubleBarreled + orGroup: T2-2 + prob: 0.1 + - id: ShuttleWeaponShotgunDoubleBarreledRubber + orGroup: T2-2 + prob: 0.1 + - id: ShuttleWeaponShotgunSawn + orGroup: T2-2 + prob: 0.1 + - id: ShuttleWeaponShotgunSawnNonlethal + orGroup: T2-2 + prob: 0.1 + # T3-1 + - id: ShuttleWeaponEnergyGun + orGroup: T3-1 + prob: 0.1 + - id: ShuttleWeaponShotgunKammerer + orGroup: T3-1 + prob: 0.1 + - id: ShuttleWeaponShotgunKammererNonlethal + orGroup: T3-1 + prob: 0.1 + # T3 Melee + - id: KukriKnife + orGroup: Melee + prob: 0.07 + amount: 2 + - id: SpearPlasma + orGroup: Melee + prob: 0.07 + - id: SpearUranium + orGroup: Melee + prob: 0.07 + - id: Null # Nothing + orGroup: Melee + prob: 0.79 + +- type: entity + parent: MarkerBase + id: GunSafeShuttleT1Spawner + name: shuttle gun safe + suffix: T1 + components: + - type: Sprite + layers: + - state: red + - sprite: Structures/Storage/closet.rsi + state: shotguncase + - type: RandomSpawner + offset: 0.0 + prototypes: + - GunSafeShuttleT1 + +- type: entity + parent: MarkerBase + id: GunSafeShuttleT2Spawner + name: shuttle gun safe + suffix: T2 + components: + - type: Sprite + layers: + - state: red + - sprite: Structures/Storage/closet.rsi + state: shotguncase + - type: RandomSpawner + offset: 0.0 + prototypes: + - GunSafeShuttleT2 + +- type: entity + parent: MarkerBase + id: GunSafeShuttleT3Spawner + name: shuttle gun safe + suffix: T3 + components: + - type: Sprite + layers: + - state: red + - sprite: Structures/Storage/closet.rsi + state: shotguncase + - type: RandomSpawner + offset: 0.0 + prototypes: + - GunSafeShuttleT3 diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/revolvers.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/revolvers.yml index 38845703154..4ce4ee7df02 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/revolvers.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/revolvers.yml @@ -20,4 +20,29 @@ chambers: [ True, True, True, True, True, True ] ammoSlots: [ null, null, null, null, null, null ] - type: StaticPrice - price: 200 \ No newline at end of file + price: 200 + +- type: entity + parent: WeaponRevolverArgenti + id: WeaponRevolverArgentiNonlethal + suffix: Non-lethal + components: + - type: RevolverAmmoProvider + whitelist: + tags: + - CartridgeRifle + proto: CartridgeRifleRubber + capacity: 6 + chambers: [ True, True, True, True, True, True ] + ammoSlots: [ null, null, null, null, null, null ] + +- type: entity + parent: WeaponRevolverDeckard + id: WeaponRevolverDeckardNonlethal + suffix: Non-lethal + components: + - type: RevolverAmmoProvider + capacity: 5 + proto: CartridgeMagnumRubber + chambers: [ True, True, True, True, True ] + ammoSlots: [ null, null, null, null, null ] diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Shotguns/shotguns.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Shotguns/shotguns.yml new file mode 100644 index 00000000000..3a526d271ad --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Shotguns/shotguns.yml @@ -0,0 +1,17 @@ +- type: entity + parent: WeaponShotgunSawn + id: WeaponShotgunSawnNonlethal + suffix: Non-lethal + components: + - type: BallisticAmmoProvider + capacity: 2 + proto: ShellShotgunBeanbag + +- type: entity + parent: WeaponShotgunKammerer + id: WeaponShotgunKammererNonlethal + suffix: Non-lethal + components: + - type: BallisticAmmoProvider + capacity: 4 + proto: ShellShotgunBeanbag From d1abbbb3da3234c58b977bd18914f9b270d93aff Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Mon, 1 Jan 2024 04:48:58 +0200 Subject: [PATCH 06/66] remove throw damage from mail (#609) (#802) Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com> --- .../_Nyano/Entities/Objects/Specific/Mail/base_mail.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Resources/Prototypes/_Nyano/Entities/Objects/Specific/Mail/base_mail.yml b/Resources/Prototypes/_Nyano/Entities/Objects/Specific/Mail/base_mail.yml index 3924a690a86..b65655b5d17 100644 --- a/Resources/Prototypes/_Nyano/Entities/Objects/Specific/Mail/base_mail.yml +++ b/Resources/Prototypes/_Nyano/Entities/Objects/Specific/Mail/base_mail.yml @@ -92,10 +92,6 @@ damage: types: Blunt: 10 - - type: DamageOtherOnHit - damage: - types: - Blunt: 1 # Frontier - 5<1, death by 1000 cuts. - type: CargoSellBlacklist - type: Food # Frontier - Moth food requiresSpecialDigestion: true From cfb1a724e4d735e1f64c535c562114a322c6d68f Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Mon, 1 Jan 2024 04:51:13 +0200 Subject: [PATCH 07/66] Nyano port of digging (#400) (#800) * Velcroboy changes * Fix compilation errors * Fix borked path * Fix * Moved to shared, fixed some problems with code * Cleanup * Fix paths * Fix * Move files around * Moved DiggingSystem to Server Co-authored-by: Ygg01 --- .../Nyanotrasen/Digging/DiggingSystem.cs | 102 ++++++++++++++++++ Content.Shared/Maps/ContentTileDefinition.cs | 4 + Content.Shared/Maps/TileSystem.cs | 15 +++ .../Nyanotrasen/Digging/DiggingEvents.cs | 29 +++++ .../Digging/EarthDiggingComponent.cs | 22 ++++ .../Audio/Nyanotrasen/Items/attributions.yml | 4 + .../Audio/Nyanotrasen/Items/shovel_dig.ogg | Bin 0 -> 11448 bytes .../nyanotrasen/tools/tool-qualities.ftl | 2 + .../Entities/Objects/Tools/tools.yml | 7 ++ .../Entities/Objects/Misc/tiles.yml | 63 +++++++++++ .../Nyanotrasen/Stacks/floor_tile_stacks.yml | 23 ++++ .../Prototypes/Nyanotrasen/Tiles/floors.yml | 20 ++++ .../Prototypes/Nyanotrasen/tool_qualities.yml | 6 ++ Resources/Prototypes/Tiles/floors.yml | 27 ++--- Resources/Prototypes/Tiles/planet.yml | 6 +- .../Tiles/tiles.rsi/bedrock-inhand-left.png | Bin 0 -> 209 bytes .../Tiles/tiles.rsi/bedrock-inhand-right.png | Bin 0 -> 210 bytes .../Objects/Tiles/tiles.rsi/bedrock.png | Bin 0 -> 438 bytes .../Tiles/tiles.rsi/dirt-inhand-left.png | Bin 0 -> 209 bytes .../Tiles/tiles.rsi/dirt-inhand-right.png | Bin 0 -> 210 bytes .../Objects/Tiles/tiles.rsi/dirt.png | Bin 0 -> 478 bytes .../Tiles/tiles.rsi/grassdark-inhand-left.png | Bin 0 -> 209 bytes .../tiles.rsi/grassdark-inhand-right.png | Bin 0 -> 210 bytes .../Objects/Tiles/tiles.rsi/grassdark.png | Bin 0 -> 983 bytes .../tiles.rsi/grassjungle-inhand-left.png | Bin 0 -> 209 bytes .../tiles.rsi/grassjungle-inhand-right.png | Bin 0 -> 210 bytes .../tiles.rsi/grasslight-inhand-left.png | Bin 0 -> 209 bytes .../tiles.rsi/grasslight-inhand-right.png | Bin 0 -> 226 bytes .../Objects/Tiles/tiles.rsi/grasslight.png | Bin 0 -> 1000 bytes .../Objects/Tiles/tiles.rsi/meta.json | 63 +++++++++++ .../Textures/Nyanotrasen/Tiles/bedrock.png | Bin 0 -> 729 bytes 31 files changed, 379 insertions(+), 14 deletions(-) create mode 100644 Content.Server/Nyanotrasen/Digging/DiggingSystem.cs create mode 100644 Content.Shared/Nyanotrasen/Digging/DiggingEvents.cs create mode 100644 Content.Shared/Nyanotrasen/Digging/EarthDiggingComponent.cs create mode 100644 Resources/Audio/Nyanotrasen/Items/attributions.yml create mode 100644 Resources/Audio/Nyanotrasen/Items/shovel_dig.ogg create mode 100644 Resources/Locale/en-US/nyanotrasen/tools/tool-qualities.ftl create mode 100644 Resources/Prototypes/Nyanotrasen/Entities/Objects/Misc/tiles.yml create mode 100644 Resources/Prototypes/Nyanotrasen/Stacks/floor_tile_stacks.yml create mode 100644 Resources/Prototypes/Nyanotrasen/Tiles/floors.yml create mode 100644 Resources/Prototypes/Nyanotrasen/tool_qualities.yml create mode 100644 Resources/Textures/Nyanotrasen/Objects/Tiles/tiles.rsi/bedrock-inhand-left.png create mode 100644 Resources/Textures/Nyanotrasen/Objects/Tiles/tiles.rsi/bedrock-inhand-right.png create mode 100644 Resources/Textures/Nyanotrasen/Objects/Tiles/tiles.rsi/bedrock.png create mode 100644 Resources/Textures/Nyanotrasen/Objects/Tiles/tiles.rsi/dirt-inhand-left.png create mode 100644 Resources/Textures/Nyanotrasen/Objects/Tiles/tiles.rsi/dirt-inhand-right.png create mode 100644 Resources/Textures/Nyanotrasen/Objects/Tiles/tiles.rsi/dirt.png create mode 100644 Resources/Textures/Nyanotrasen/Objects/Tiles/tiles.rsi/grassdark-inhand-left.png create mode 100644 Resources/Textures/Nyanotrasen/Objects/Tiles/tiles.rsi/grassdark-inhand-right.png create mode 100644 Resources/Textures/Nyanotrasen/Objects/Tiles/tiles.rsi/grassdark.png create mode 100644 Resources/Textures/Nyanotrasen/Objects/Tiles/tiles.rsi/grassjungle-inhand-left.png create mode 100644 Resources/Textures/Nyanotrasen/Objects/Tiles/tiles.rsi/grassjungle-inhand-right.png create mode 100644 Resources/Textures/Nyanotrasen/Objects/Tiles/tiles.rsi/grasslight-inhand-left.png create mode 100644 Resources/Textures/Nyanotrasen/Objects/Tiles/tiles.rsi/grasslight-inhand-right.png create mode 100644 Resources/Textures/Nyanotrasen/Objects/Tiles/tiles.rsi/grasslight.png create mode 100644 Resources/Textures/Nyanotrasen/Objects/Tiles/tiles.rsi/meta.json create mode 100644 Resources/Textures/Nyanotrasen/Tiles/bedrock.png diff --git a/Content.Server/Nyanotrasen/Digging/DiggingSystem.cs b/Content.Server/Nyanotrasen/Digging/DiggingSystem.cs new file mode 100644 index 00000000000..8d2e951cfcc --- /dev/null +++ b/Content.Server/Nyanotrasen/Digging/DiggingSystem.cs @@ -0,0 +1,102 @@ +using Content.Shared.Interaction; +using Content.Shared.Maps; +using Content.Shared.Nyanotrasen.Digging; +using Content.Shared.Physics; +using Content.Shared.Tools.Components; +using Content.Shared.Tools.Systems; +using Robust.Shared.Map; +using Robust.Shared.Map.Components; + +namespace Content.Server.Digging; + +public sealed class DiggingSystem : EntitySystem +{ + [Dependency] private readonly TileSystem _tiles = default!; + [Dependency] private readonly SharedMapSystem _maps = default!; + [Dependency] private readonly SharedToolSystem _tools = default!; + [Dependency] private readonly TurfSystem _turfs = default!; + [Dependency] private readonly ITileDefinitionManager _tileDefManager = default!; + [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!; + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnDiggingAfterInteract); + SubscribeLocalEvent(OnEarthDigComplete); + } + + + private void OnEarthDigComplete(EntityUid shovel, EarthDiggingComponent comp, EarthDiggingDoAfterEvent args) + { + var coordinates = GetCoordinates(args.Coordinates); + if (!TryComp(shovel, out var _)) + return; + + var gridUid = coordinates.GetGridUid(EntityManager); + if (gridUid == null) + return; + + var grid = Comp(gridUid.Value); + var tile = _maps.GetTileRef(gridUid.Value, grid, coordinates); + + if (_tileDefManager[tile.Tile.TypeId] is not ContentTileDefinition tileDef + || !tileDef.CanShovel + || string.IsNullOrEmpty(tileDef.BaseTurf) + || _turfs.IsTileBlocked(tile, CollisionGroup.MobMask)) + { + return; + } + + _tiles.DigTile(tile); + } + + private void OnDiggingAfterInteract(EntityUid uid, EarthDiggingComponent component, + AfterInteractEvent args) + { + if (args.Handled || !args.CanReach || args.Target != null) + return; + + if (TryDig(args.User, uid, component, args.ClickLocation)) + args.Handled = true; + } + + private bool TryDig(EntityUid user, EntityUid shovel, EarthDiggingComponent component, + EntityCoordinates clickLocation) + { + ToolComponent? tool = null; + if (component.ToolComponentNeeded && !TryComp(shovel, out tool)) + return false; + + var mapUid = clickLocation.GetGridUid(EntityManager); + if (mapUid == null || !TryComp(mapUid, out MapGridComponent? mapGrid)) + return false; + + var tile = _maps.GetTileRef(mapUid.Value, mapGrid, clickLocation); + + var coordinates = _maps.GridTileToLocal(mapUid.Value, mapGrid, tile.GridIndices); + + if (!_interactionSystem.InRangeUnobstructed(user, coordinates, popup: false)) + return false; + + if (_tileDefManager[tile.Tile.TypeId] is not ContentTileDefinition tileDef + || !tileDef.CanShovel + || string.IsNullOrEmpty(tileDef.BaseTurf) + || _tileDefManager[tileDef.BaseTurf] is not ContentTileDefinition + || _turfs.IsTileBlocked(tile, CollisionGroup.MobMask)) + { + return false; + } + + var ev = new EarthDiggingDoAfterEvent(GetNetCoordinates(clickLocation)); + return _tools.UseTool( + shovel, + user, + target: shovel, + doAfterDelay: component.Delay, + toolQualitiesNeeded: new[] { component.QualityNeeded }, + doAfterEv: ev, + toolComponent: tool + ); + } +} diff --git a/Content.Shared/Maps/ContentTileDefinition.cs b/Content.Shared/Maps/ContentTileDefinition.cs index eab373a4630..a4f76df37ae 100644 --- a/Content.Shared/Maps/ContentTileDefinition.cs +++ b/Content.Shared/Maps/ContentTileDefinition.cs @@ -40,6 +40,10 @@ public sealed class ContentTileDefinition : IPrototype, IInheritingPrototype, IT [DataField("canCrowbar")] public bool CanCrowbar { get; private set; } + // Delta V + [DataField("canShovel")] public bool CanShovel { get; private set; } + //Delta V + /// /// Whether this tile can be pried by an advanced prying tool if not pryable otherwise. /// diff --git a/Content.Shared/Maps/TileSystem.cs b/Content.Shared/Maps/TileSystem.cs index 19ce0bfb16e..e27d6842b48 100644 --- a/Content.Shared/Maps/TileSystem.cs +++ b/Content.Shared/Maps/TileSystem.cs @@ -86,7 +86,22 @@ public bool CutTile(TileRef tileRef) return DeconstructTile(tileRef); } + // Delta V + public bool DigTile(TileRef tileRef) + { + var tile = tileRef.Tile; + + if (tile.IsEmpty) + return false; + var tileDef = (ContentTileDefinition) _tileDefinitionManager[tile.TypeId]; + + if (!tileDef.CanShovel) + return false; + + return DeconstructTile(tileRef); + } + // Delta V public bool ReplaceTile(TileRef tileref, ContentTileDefinition replacementTile) { if (!TryComp(tileref.GridUid, out var grid)) diff --git a/Content.Shared/Nyanotrasen/Digging/DiggingEvents.cs b/Content.Shared/Nyanotrasen/Digging/DiggingEvents.cs new file mode 100644 index 00000000000..89565da4c86 --- /dev/null +++ b/Content.Shared/Nyanotrasen/Digging/DiggingEvents.cs @@ -0,0 +1,29 @@ +using Content.Shared.DoAfter; +using Robust.Shared.Map; +using Robust.Shared.Serialization; + +namespace Content.Shared.Nyanotrasen.Digging; + + +[Serializable, NetSerializable] +public sealed partial class EarthDiggingDoAfterEvent : DoAfterEvent +{ + public NetCoordinates Coordinates { get; set; } + + private EarthDiggingDoAfterEvent(){} + + public EarthDiggingDoAfterEvent(NetCoordinates coordinates) + { + Coordinates = coordinates; + } + public override DoAfterEvent Clone() + { + return this; + } +} + +[Serializable, NetSerializable] +public sealed class EarthDiggingCancelledEvent : EntityEventArgs +{ + public NetEntity Shovel; +} diff --git a/Content.Shared/Nyanotrasen/Digging/EarthDiggingComponent.cs b/Content.Shared/Nyanotrasen/Digging/EarthDiggingComponent.cs new file mode 100644 index 00000000000..65b6a1b6bf3 --- /dev/null +++ b/Content.Shared/Nyanotrasen/Digging/EarthDiggingComponent.cs @@ -0,0 +1,22 @@ +using System.Threading; +using Content.Shared.Tools; +using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; + +namespace Content.Shared.Nyanotrasen.Digging; + +[RegisterComponent] +public sealed partial class EarthDiggingComponent : Component +{ + [ViewVariables] + [DataField("toolComponentNeeded")] + public bool ToolComponentNeeded = true; + + [ViewVariables] + [DataField("qualityNeeded", customTypeSerializer:typeof(PrototypeIdSerializer))] + public string QualityNeeded = "Digging"; + + [ViewVariables] + [DataField("delay")] + public float Delay = 2f; + +} diff --git a/Resources/Audio/Nyanotrasen/Items/attributions.yml b/Resources/Audio/Nyanotrasen/Items/attributions.yml new file mode 100644 index 00000000000..294cfe38bc4 --- /dev/null +++ b/Resources/Audio/Nyanotrasen/Items/attributions.yml @@ -0,0 +1,4 @@ +- files: ["shovel_dig.ogg"] + license: "CC-BY-3.0" + copyright: "https://freesound.org/people/cameronmusic/" + source: "https://freesound.org/people/cameronmusic/sounds/138411/" diff --git a/Resources/Audio/Nyanotrasen/Items/shovel_dig.ogg b/Resources/Audio/Nyanotrasen/Items/shovel_dig.ogg new file mode 100644 index 0000000000000000000000000000000000000000..16cf42eb9ad4fe89b42926b06cf11d59f96633e1 GIT binary patch literal 11448 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 aYU1O)xQB`M3tp>h=oaEs;Sfm(;r|1Z!>tqm literal 0 HcmV?d00001 diff --git a/Resources/Locale/en-US/nyanotrasen/tools/tool-qualities.ftl b/Resources/Locale/en-US/nyanotrasen/tools/tool-qualities.ftl new file mode 100644 index 00000000000..c3c4e6ad2f5 --- /dev/null +++ b/Resources/Locale/en-US/nyanotrasen/tools/tool-qualities.ftl @@ -0,0 +1,2 @@ +tool-quality-digging-name = Digging +tool-quality-digging-tool-name = Shovel diff --git a/Resources/Prototypes/Entities/Objects/Tools/tools.yml b/Resources/Prototypes/Entities/Objects/Tools/tools.yml index c92b1a63ce8..353b8453b79 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/tools.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/tools.yml @@ -504,6 +504,13 @@ Wood: 50 - type: StaticPrice price: 25 + # Delta V: Adds tool quality for digging + - type: Tool + qualities: + - Digging + useSound: + path: /Audio/Nyanotrasen/Items/shovel_dig.ogg + - type: EarthDigging - type: entity parent: BaseItem diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Misc/tiles.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Misc/tiles.yml new file mode 100644 index 00000000000..0ab386f96dd --- /dev/null +++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Misc/tiles.yml @@ -0,0 +1,63 @@ +- type: entity + name: dark grass tile + parent: FloorTileItemBase + id: FloorTileItemGrassDark + components: + - type: Sprite + sprite: /Textures/Nyanotrasen/Objects/Tiles/tiles.rsi + state: grassdark + - type: Item + heldPrefix: grassdark + - type: FloorTile + outputs: + - FloorGrassDark + - type: Stack + stackType: FloorTileGrassDark + +- type: entity + name: light grass tile + parent: FloorTileItemBase + id: FloorTileItemGrassLight + components: + - type: Sprite + sprite: /Textures/Nyanotrasen/Objects/Tiles/tiles.rsi + state: grasslight + - type: Item + heldPrefix: grasslight + - type: FloorTile + outputs: + - FloorGrassLight + - type: Stack + stackType: FloorTileGrassLight + +- type: entity + name: dirt tile + parent: FloorTileItemBase + id: FloorTileItemDirt + components: + - type: Sprite + sprite: /Textures/Nyanotrasen/Objects/Tiles/tiles.rsi + state: dirt + - type: Item + heldPrefix: dirt + - type: FloorTile + outputs: + - FloorDirt + - type: Stack + stackType: FloorTileDirt + +- type: entity + name: bedrock tile + parent: FloorTileItemBase + id: FloorTileItemBedrock + components: + - type: Sprite + sprite: /Textures/Nyanotrasen/Objects/Tiles/tiles.rsi + state: bedrock + - type: Item + heldPrefix: bedrock + - type: FloorTile + outputs: + - FloorBedrock + - type: Stack + stackType: FloorTileBedrock diff --git a/Resources/Prototypes/Nyanotrasen/Stacks/floor_tile_stacks.yml b/Resources/Prototypes/Nyanotrasen/Stacks/floor_tile_stacks.yml new file mode 100644 index 00000000000..d472b3054b9 --- /dev/null +++ b/Resources/Prototypes/Nyanotrasen/Stacks/floor_tile_stacks.yml @@ -0,0 +1,23 @@ +- type: stack + id: FloorTileGrassDark + name: dark grass floor tile + spawn: FloorTileItemGrassDark + maxCount: 30 + +- type: stack + id: FloorTileGrassLight + name: light grass floor tile + spawn: FloorTileItemGrassLight + maxCount: 30 + +- type: stack + id: FloorTileDirt + name: dirt floor tile + spawn: FloorTileItemDirt + maxCount: 30 + +- type: stack + id: FloorTileBedrock + name: bedrock floor tile + spawn: FloorTileItemBedrock + maxCount: 30 diff --git a/Resources/Prototypes/Nyanotrasen/Tiles/floors.yml b/Resources/Prototypes/Nyanotrasen/Tiles/floors.yml new file mode 100644 index 00000000000..d537e0bdb3e --- /dev/null +++ b/Resources/Prototypes/Nyanotrasen/Tiles/floors.yml @@ -0,0 +1,20 @@ +- type: tile + id: FloorBedrock + name: tiles-bedrock-floor + sprite: /Textures/Nyanotrasen/Tiles/bedrock.png + variants: 4 + placementVariants: + - 1.0 + - 1.0 + - 1.0 + - 1.0 + baseTurf: Space + isSubfloor: true + #canCrowbar: true # Come back + # Maybe if there's ever some way to combine grids or prevent overly simple spacing. + # canShovel: true + footstepSounds: + collection: FootstepAsteroid + itemDrop: FloorTileItemBedrock # Delta V + heatCapacity: 10000 + weather: true diff --git a/Resources/Prototypes/Nyanotrasen/tool_qualities.yml b/Resources/Prototypes/Nyanotrasen/tool_qualities.yml new file mode 100644 index 00000000000..6780b2ee210 --- /dev/null +++ b/Resources/Prototypes/Nyanotrasen/tool_qualities.yml @@ -0,0 +1,6 @@ +- type: tool + id: Digging + name: tool-quality-digging-name + toolName: tool-quality-digging-tool-name + spawn: Shovel + icon: { sprite: Objects/Tools/shovel.rsi, state: icon } diff --git a/Resources/Prototypes/Tiles/floors.yml b/Resources/Prototypes/Tiles/floors.yml index 43dbd76b104..163a869ad91 100644 --- a/Resources/Prototypes/Tiles/floors.yml +++ b/Resources/Prototypes/Tiles/floors.yml @@ -1266,8 +1266,8 @@ name: tiles-planet-grass-floor sprite: /Textures/Tiles/grass.png baseTurf: FloorDirt - isSubfloor: true - canCrowbar: false + #canCrowbar: false # Come back + canShovel: true # Delta V footstepSounds: collection: FootstepGrass itemDrop: FloorTileItemGrass @@ -1279,8 +1279,8 @@ name: tiles-jungle-grass-floor sprite: /Textures/Tiles/grassjungle.png baseTurf: FloorDirt - isSubfloor: true - canCrowbar: false + #canCrowbar: false # Come back + canShovel: true # Delta V footstepSounds: collection: FootstepGrass itemDrop: FloorTileItemGrassJungle @@ -1298,10 +1298,11 @@ - 1.0 - 1.0 baseTurf: FloorDirt - isSubfloor: true - canCrowbar: false + #canCrowbar: false # Come back + canShovel: true # Delta V footstepSounds: collection: FootstepGrass + itemDrop: FloorTileItemGrassDark # Delta V heatCapacity: 10000 weather: true @@ -1316,10 +1317,11 @@ - 1.0 - 1.0 baseTurf: FloorDirt - isSubfloor: true - canCrowbar: false + #canCrowbar: false # Come back + canShovel: true # Delta V footstepSounds: collection: FootstepGrass + itemDrop: FloorTileItemGrassLight heatCapacity: 10000 weather: true @@ -1333,13 +1335,14 @@ - 1.0 - 1.0 - 1.0 - baseTurf: Plating - isSubfloor: true - canCrowbar: false + baseTurf: FloorBedrock # Delta V + #canCrowbar: false # Come back + canShovel: true # Delta V footstepSounds: collection: FootstepAsteroid + itemDrop: FloorTileItemDirt # Delta V heatCapacity: 10000 - weather: true + weather: True # Asteroid diff --git a/Resources/Prototypes/Tiles/planet.yml b/Resources/Prototypes/Tiles/planet.yml index c5095eb5d0a..1452a7a66e7 100644 --- a/Resources/Prototypes/Tiles/planet.yml +++ b/Resources/Prototypes/Tiles/planet.yml @@ -121,8 +121,10 @@ East: /Textures/Tiles/Planet/Snow/snow_double_edge_east.png North: /Textures/Tiles/Planet/Snow/snow_double_edge_north.png West: /Textures/Tiles/Planet/Snow/snow_double_edge_west.png - isSubfloor: true - canCrowbar: false + baseTurf: FloorDirt + itemDrop: FloorTileItemSnow # Delta V + canCrowbar: false # Come back + canShovel: true # Delta V footstepSounds: collection: FootstepSnow heatCapacity: 10000 diff --git a/Resources/Textures/Nyanotrasen/Objects/Tiles/tiles.rsi/bedrock-inhand-left.png b/Resources/Textures/Nyanotrasen/Objects/Tiles/tiles.rsi/bedrock-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..0f35af1aa89aa66bca9c39b4b3ae8fd30a9b5c9b GIT binary patch literal 209 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|etpJ}8S0K&6z%8L>A#EHWqwOGP z=qa!3q@ZrBpk<|?Wus;rs%0Oh=M-k>8XmXu$SLv+HYtI?3CL-lu6{1-oD!MA#EHWqwOGP z=qa!3q@ZrBpk<|?Wus;rs%0Oh=M-k>8XmXu$Ss)S5jTL?>3ly$RY+!Oc_)wOcfisQs@m(WbOP~!5p00i_>zopr0FeMX A#{d8T literal 0 HcmV?d00001 diff --git a/Resources/Textures/Nyanotrasen/Objects/Tiles/tiles.rsi/bedrock.png b/Resources/Textures/Nyanotrasen/Objects/Tiles/tiles.rsi/bedrock.png new file mode 100644 index 0000000000000000000000000000000000000000..f2c93199ca8d8913232881a4ece37835d5fbfe73 GIT binary patch literal 438 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjR8I(u0UEsLS8~bK|)eN5`+{b zrIaM4l%;@3T184)RT_w7fJjYRMqOG~T}D<-21IJe$Z5*RX~_bSJP>Ki0g(a_>BuYU zDkuSwo+1z_>no`Mk%6+Rp^6$18L6rpt7(|1Ynp0knQ3a9Yw1|5+`rlj=m^G=AirP+ zhi5m^fSkvkE{-7*l5Yn^=(UYmIY?u^!v<#SR>(5lXjm56#v-EqH3z zolfRCLJ3h32`aua=L#9h+|TGtGZZa+74^ZSrDN;Yd!;6YQl+<+3k3Y`<;DH zqT=*hyXC^M`U zdEU&ha*L$qLpPZXThjz%?jP4Y%JA`*uk8J4t5b8FC)ht@5121I`9>Y<6rgt*JYD@< J);T3K0RZMQjK=@~ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Nyanotrasen/Objects/Tiles/tiles.rsi/dirt-inhand-left.png b/Resources/Textures/Nyanotrasen/Objects/Tiles/tiles.rsi/dirt-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..08e74e1f79d7c3bd6f463e86a5fb15aedfbd8dd0 GIT binary patch literal 209 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|etpJ}8S0HU5FXW~t<*p~~p)c)e z07NoghB7`zvc5*L{>E}aX7a&i@?jPVl~u(`K-G*TL4Lsu4$p3+0XdE}aX7a&i@?jPVl~u(`K-G*TL4Lsu4$p3+0XbowE{-7{$CDEz zSQj_katLT>*wMolRw>6jgUL{TjhjMC>-OZ(27zgNx&ZFm%ejD%yo-Un ztAYH>+yh!bCo+}<`2{mLJiCzwdUH_ z)S~IQmnqSEbHWYpM;|>bzrNb1wfgk5rCTRmNV5$pnaX^xvM)@C*NlM;SJiCXGUpZn6j{al9U(~|ak jg5S(5o|=DpzdirHh!pGP-q#{Pk283>`njxgN@xNAB>kN@ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Nyanotrasen/Objects/Tiles/tiles.rsi/grassdark-inhand-left.png b/Resources/Textures/Nyanotrasen/Objects/Tiles/tiles.rsi/grassdark-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..89c8980e0e4aa1144c201f6c08ba770a8be8f905 GIT binary patch literal 209 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|etpJ}8S0K&c#lWc4jb|ut`lQ6$f&53%>J+StrA~I6;Jm zQQ?4t0y}qsP(Z`#83%Rp3m9XL@}yN7>o73fJ;|0ke?Za?TB(2K149Ns1e z-Xb@5dZEy2RLneeqo6fnPrTL*Sb?BAlj%)QBO~VMtFU6wY)se~`g^2kQfdWH%1~H3GX%`-zG6 zM+x~e5pL5%AOMNJ!Y988a61kPS2Ff*OxRTwg%2W*{tRRGJ%V)4f$h84ycKcydj#>4 zO}}l_E)`h&PA~wr&v@ZV!g`Bg|2YbyYM^{4p#7-9zms6?S!jO^Bh}WCnOdm6gwXp@ zgOD-Me-)7$E5QKhJ33D_RpdrC>dyjN_Y!K?5-J2DJ+Vm!0@pT3B8I_>1TkwMJJZm3 zRA4p?4Ci7n09zA-Z=OlZFR^MGdanZN9~ERy;&9qF4(2h~HH*GlTFSD2YeL;-(8>%h z0ZWd}U;wOrkN4(b@_-AEwDx)mlp;gtYZPkHB13A(^eq%Gqu3aEQ1Ut|7bpI8>pVgv3+bJa}>k76A|x@V7^$0vQ5d5ks#TI zp94yeqb%nyM2eS(!a*D^vCt(({96gxj*9YQ6mBby(g{QUGDaqKknWH%pH#%QY&71& z!2ozY#@$W~g>ejZ%J~NA>~=iJ1p^mE z3ww%~RRR8AGDT!tnwGNMQpsVnjnxy&&E+I9$_g6$)f09nBRB*zNxK1s-t z_O|a~?~{Vj7X?mNTe6TH#+IIF-OK3z97g?ik$;)kq9nXUP&f=&#k(IAzIDGwy{;mA zDnibi%VXm|kt{<-?da0;-(JYh#O1E}CeVK>yuM3p*a&=*>HbsnREnUC!J7z16`Y_> zpqr08MK4L-aOhZhbdtxvu8|3q<$g355L(S@R`Y+De*pEqmy^1C@pS+I002ovPDHLk FV1leB$B_U4 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Nyanotrasen/Objects/Tiles/tiles.rsi/grassjungle-inhand-left.png b/Resources/Textures/Nyanotrasen/Objects/Tiles/tiles.rsi/grassjungle-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..396b8bff7857651ff07606ce0404de50973731d4 GIT binary patch literal 209 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|etpJ}8S0F9xE-arRFW(@jnxd>) zDWu*cu300Ym7%1cscMv_VU(w6oUCM-qqb8yAP1J+StrA~I6;Jm zQQ?4t0y}qsa6rTA83%Rp3m9XL@}yN7>o70~) zDWu*cu300Ym7%1cscMv_VU(w6oUCM-qqb8yAP1~ry)>Fzz%-)~Yt&~%@zw`vN3su@dy{DK)Ap4~_TazZ^_978;g zCnrd-E^Y{O2w<4%#(rk=0--~jH)v1r6mm#jz{r`;Xu>8nfma;J*)90aBW9fp>*53v z9!7-&4hrnt1%d$$t7jb4$uD4xIm(k(X{^J*p#7YkXS4jHBR~rnJYD@<);T3K0RWW+ BK41U< literal 0 HcmV?d00001 diff --git a/Resources/Textures/Nyanotrasen/Objects/Tiles/tiles.rsi/grasslight-inhand-right.png b/Resources/Textures/Nyanotrasen/Objects/Tiles/tiles.rsi/grasslight-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..f119a7f9a5a79487c03dc60c11ae7751860eca68 GIT binary patch literal 226 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|emUKs7M+SzC{oH>NS%G}50G|+7 zAgxlaV!F)CY^|OB3MYqku1=GKT&MWBO$hSrbMc(%?mgAtZ&E8B2ov zf*Bm1-ADs+!aQ9ZLp+WrCrGd^Zn)(T(9p2sgU*^yXErBrrA*o&)hICS!?9HiiaOGL zp^Q!u0=u>P)*@44a|~1@x>qbS)Wp%QnUDGU}Yklk+(7S(k~cIO#)`Y%_sf^+X1FerK94hci@m4*$)(uko zDnb-*u0@2m9=+QtcGV+XcIYh`bkt1JzZ-}-pPx@9qy?XmQ;~2*N6)z|+{f|X`N#_% zLKNf22_`Q^X20qr-&)L^tMqL+q}CmrlF8`4$?%rV@NW`Q&S&aO<>7(JP$N!PEs30U z5u)hZQRv-H(pPhNb{=Q?CeDj}9lL1Ky<-yAEJjZZl*NG5o+EaMVx1w7ud z5u#8QeTMcGGG7$>4-z~&NHBjV;;p$%ooZyhX{75qUd`jz+Ze%$&+9MkWN$@;8Jnq_ z1VR)&dls3`GFr8h=etR|*8>KQB-EvVk%mcXFF`yXki8WNssTNlA?fpWv{JyreH+@6 zhY&^I2b11i7r$&U_9;f`?-*(+L@xyl*Ci5pkFe@9a40j>NT6mN+(nyLSM5AH)|vUF zAViURuh3IVl52`6vlcI}VmzvuOy0yW%0819CPRk`*{?EA(Il+-s9A@hj|yrj#9DF@ zqIiC$A-%B~zmy3pHh$5-uXz;ylJF}!10QviyifW_W#LbeCr2*Ml7+wKVU;~H%{GK6 z%!)(4DdLrqOkT(7s3uA6DhzJg^lT-W`mE5qtzoVNOk7Kt1&`5-IC3E%-H=JGI|xzv zRfCxu5jp2GP&b&lP*5rzy!>d=y_q1}jA0cl?6r{Pf7*Glt~325PX1OxXlZHrKlm5b We!LRO(?p2?0000d literal 0 HcmV?d00001 diff --git a/Resources/Textures/Nyanotrasen/Objects/Tiles/tiles.rsi/meta.json b/Resources/Textures/Nyanotrasen/Objects/Tiles/tiles.rsi/meta.json new file mode 100644 index 00000000000..c83cdb81ec0 --- /dev/null +++ b/Resources/Textures/Nyanotrasen/Objects/Tiles/tiles.rsi/meta.json @@ -0,0 +1,63 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24, additional copyrights see tiles folder.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "grassdark" + }, + { + "name": "grasslight" + }, + { + "name": "dirt" + }, + { + "name": "bedrock" + }, + { + "name": "grassjungle-inhand-left", + "directions": 4 + }, + { + "name": "grassjungle-inhand-right", + "directions": 4 + }, + { + "name": "grassdark-inhand-left", + "directions": 4 + }, + { + "name": "grassdark-inhand-right", + "directions": 4 + }, + { + "name": "grasslight-inhand-left", + "directions": 4 + }, + { + "name": "grasslight-inhand-right", + "directions": 4 + }, + { + "name": "dirt-inhand-left", + "directions": 4 + }, + { + "name": "dirt-inhand-right", + "directions": 4 + }, + { + "name": "bedrock-inhand-left", + "directions": 4 + }, + { + "name": "bedrock-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Nyanotrasen/Tiles/bedrock.png b/Resources/Textures/Nyanotrasen/Tiles/bedrock.png new file mode 100644 index 0000000000000000000000000000000000000000..9292305dfb9ec3c44d62e8f869cb32c08fd9c9d1 GIT binary patch literal 729 zcmV;~0w(>5P)IP<%m3IgLDt>0cMm4a$s+NQOngjCI8)t@UoxhdCsL8v?wEjzNKl?J^J$_oiTval z2-0MoI~7!HADT!l>0*efbJ zGo{--$4@XeGk~Y4`9HZ>G*s1umxNAPLhe*(A~3J`jZ=msk*W`-Cp5C;El^qQ2wb+B zNYZmYVS6p>Tk0LIruD5e*l-IA4f4H*Zr+xjDpB7zp~oE7_k5abG{Qn`yMx`LsGXB!}-jj4te~M&a@qnbKRzC&XWQ@Unr?1rjE%;44}8 zTIo!2EGnZ2k_+raL9OMX*jT{D)*+|4V4OYQA_e-&_oY0qWS$F@Tm#7kc0!in@O#nn z@5{Xr-kk9?P Date: Mon, 1 Jan 2024 02:51:33 +0000 Subject: [PATCH 08/66] Automatic Changelog (#800) --- Resources/Changelog/Changelog.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 5e08fad9aab..8ce2fa30c4a 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -2597,3 +2597,9 @@ Entries: message: The Vendomat now sells glass beakers. id: 4715 time: '2023-12-30T16:59:00.0000000+00:00' +- author: dvir01 + changes: + - type: Add + message: Added digging dirt. + id: 4716 + time: '2024-01-01T02:51:14.0000000+00:00' From 490338f4092283e5cd790bf89b10c92b0bdb987d Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Mon, 1 Jan 2024 04:52:03 +0200 Subject: [PATCH 09/66] Update misc_startinggear.yml (#799) --- .../_NF/Roles/Jobs/Fun/misc_startinggear.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Fun/misc_startinggear.yml b/Resources/Prototypes/_NF/Roles/Jobs/Fun/misc_startinggear.yml index 8f5581890f9..4def14f6655 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/Fun/misc_startinggear.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/Fun/misc_startinggear.yml @@ -1,7 +1,7 @@ - type: startingGear id: MobEmotionalSupportGear - equipment: - id: PassengerIDCard +# equipment: +# id: PassengerIDCard - type: startingGear id: MobClippyGear @@ -17,11 +17,11 @@ - type: startingGear id: MobCrispyGear - equipment: +# equipment: # ears: ClothingHeadsetService - id: AgentIDCard +# id: ChefIDCard - type: startingGear id: MobMistakeGear - equipment: - id: PassengerIDCard +# equipment: +# id: PassengerIDCard From f0eafe58871fbb98307e4b3943c8d6649dce9431 Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Mon, 1 Jan 2024 04:52:47 +0200 Subject: [PATCH 10/66] Lockers (#798) --- Resources/Prototypes/Catalog/Fills/Lockers/service.yml | 6 +++--- Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/service.yml b/Resources/Prototypes/Catalog/Fills/Lockers/service.yml index 55fac8ce52b..18d6ecc2f6a 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/service.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/service.yml @@ -6,7 +6,7 @@ - type: StorageFill contents: - id: ClothingOuterArmorBasicSlim - - id: WeaponShotgunDoubleBarreledRubber +# - id: WeaponShotgunDoubleBarreledRubber # Frontier - id: DrinkShaker - id: ClothingEyesHudBeer - id: DrinkBottleBeer @@ -15,8 +15,8 @@ prob: 0.5 - id: DrinkBottleBeer prob: 0.5 - - id: BoxBeanbag - amount: 2 +# - id: BoxBeanbag # Frontier +# amount: 2 # Frontier - id: RagItem amount: 2 diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml index a79bfe1c2fa..fb5d745d965 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml @@ -357,7 +357,6 @@ - id: ClothingNeckCloakPirateCap # Frontier - id: JetpackBlackFilled # Frontier - id: HandheldGPSBasic # Frontier - - id: HandheldGPSBasic # Frontier - id: ClothingShoesBootsMagPirateFilled # Frontier #Wizard From ed96f6fa29e5876f6f3527f4bf1e02f5b674b932 Mon Sep 17 00:00:00 2001 From: ErhardSteinhauer <65374927+ErhardSteinhauer@users.noreply.github.com> Date: Mon, 1 Jan 2024 06:01:59 +0300 Subject: [PATCH 11/66] mail truck :sad_trombone: (#771) --- Resources/Maps/Shuttles/mail.yml | 375 ++++++++++++++++++------------- 1 file changed, 220 insertions(+), 155 deletions(-) diff --git a/Resources/Maps/Shuttles/mail.yml b/Resources/Maps/Shuttles/mail.yml index a73e8dc4966..f324b6730bf 100644 --- a/Resources/Maps/Shuttles/mail.yml +++ b/Resources/Maps/Shuttles/mail.yml @@ -1,14 +1,14 @@ meta: - format: 5 + format: 6 postmapinit: false tilemap: 0: Space - 31: FloorDarkMono - 75: FloorSteel - 83: FloorSteelMono - 87: FloorTechMaint - 103: Lattice - 104: Plating + 32: FloorDarkMono + 84: FloorSteel + 92: FloorSteelMono + 96: FloorTechMaint + 112: Lattice + 113: Plating entities: - proto: "" entities: @@ -21,16 +21,20 @@ entities: - chunks: 0,0: ind: 0,0 - tiles: SwAAAGgAAABnAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEsAAABoAAAAZwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABLAAADHwAAAWcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAASwAAAWgAAABnAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGgAAABnAAAAZwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA== + tiles: VAAAAAAAcQAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAcQAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAADIAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAABcQAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 0,-1: ind: 0,-1 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaAAAAGgAAABnAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEsAAABXAAAAaAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABLAAAAVwAAAGgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAASwAAA2gAAABnAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA== + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAYAAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAYAAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAADcQAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 -1,-1: ind: -1,-1 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABnAAAAZwAAAGgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaAAAAGgAAABLAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFcAAABTAAACSwAAAA== + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcAAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAVAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAXAAAAAACVAAAAAAA + version: 6 -1,0: ind: -1,0 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGgAAABLAAACSwAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABXAAAAUwAAAUsAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaAAAAGgAAABLAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGcAAABoAAAASwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZwAAAGgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA== + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAVAAAAAACVAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAXAAAAAABVAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAVAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcQAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 type: MapGrid - type: Broadphase - bodyStatus: InAir @@ -55,14 +59,14 @@ entities: color: '#95E5FFFF' id: ArrowsGreyscale decals: - 14: -2,1 - 15: -2,-1 + 12: -2,1 + 13: -2,-1 - node: color: '#95E5FFB2' id: BotGreyscale decals: - 12: -2,1 - 13: -2,-1 + 10: -2,1 + 11: -2,-1 - node: color: '#FFFFFFFF' id: BrickTileDarkLineE @@ -76,31 +80,39 @@ entities: color: '#66A2FFFF' id: BrickTileWhiteLineE decals: - 7: 0,3 - 8: 0,2 - 9: 0,1 - 10: 0,0 - 11: 0,-1 + 5: 0,3 + 6: 0,2 + 7: 0,1 + 8: 0,0 + 9: 0,-1 - node: color: '#FFFFFFFF' - id: WarnLineE + id: WarnCornerSE decals: - 5: 0,-2 - 6: 0,-3 + 14: 0,-2 + - node: + color: '#FFFFFFFF' + id: WarnCornerSmallSE + decals: + 15: -1,-2 type: DecalGrid - version: 2 data: tiles: 0,0: - 0: 30583 + 0: 29555 + 1: 1028 0,-1: 0: 30583 -1,-1: - 0: 61160 + 1: 32 + 0: 61128 -1,0: - 0: 61166 + 0: 52974 + 1: 8192 0,1: - 0: 7 + 0: 3 + 1: 4 -1,1: 0: 12 uniqueMixes: @@ -119,6 +131,21 @@ entities: - 0 - 0 - 0 + - volume: 2500 + temperature: 293.15 + moles: + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 chunkSize: 4 type: GridAtmosphere - type: GasTileOverlay @@ -126,6 +153,29 @@ entities: - id: MailTruck type: BecomesStation - type: SpreaderGrid +- proto: AirAlarm + entities: + - uid: 109 + components: + - rot: -1.5707963267948966 rad + pos: 1.5,1.5 + parent: 103 + type: Transform + - ShutdownSubscribers: + - 99 + - 51 + type: DeviceNetwork + - devices: + - 99 + - 51 + type: DeviceList +- proto: AirCanister + entities: + - uid: 50 + components: + - pos: -0.5,-1.5 + parent: 103 + type: Transform - proto: AirlockGlassShuttle entities: - uid: 13 @@ -140,17 +190,6 @@ entities: pos: -2.5,-0.5 parent: 103 type: Transform -- proto: AirTankFilled - entities: - - uid: 50 - components: - - flags: InContainer - type: MetaData - - parent: 49 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage - proto: APCBasic entities: - uid: 66 @@ -176,6 +215,33 @@ entities: - pos: -2.5,-0.5 parent: 103 type: Transform +- proto: AtmosFixBlockerMarker + entities: + - uid: 97 + components: + - pos: -2.5,-2.5 + parent: 103 + type: Transform + - uid: 98 + components: + - pos: 2.5,0.5 + parent: 103 + type: Transform + - uid: 110 + components: + - pos: -2.5,3.5 + parent: 103 + type: Transform + - uid: 111 + components: + - pos: 2.5,4.5 + parent: 103 + type: Transform + - uid: 112 + components: + - pos: 2.5,2.5 + parent: 103 + type: Transform - proto: CableApcExtension entities: - uid: 67 @@ -183,8 +249,6 @@ entities: - pos: 1.5,-0.5 parent: 103 type: Transform - - enabled: True - type: AmbientSound - uid: 68 components: - pos: 0.5,-0.5 @@ -235,8 +299,6 @@ entities: - pos: 1.5,3.5 parent: 103 type: Transform - - enabled: True - type: AmbientSound - uid: 78 components: - pos: -0.5,3.5 @@ -264,61 +326,16 @@ entities: type: Transform - proto: CableHV entities: - - uid: 58 - components: - - pos: -1.5,-1.5 - parent: 103 - type: Transform - - enabled: True - type: AmbientSound - - uid: 59 - components: - - pos: -0.5,-1.5 - parent: 103 - type: Transform - uid: 60 components: - pos: -0.5,-2.5 parent: 103 type: Transform - - enabled: True - type: AmbientSound - - uid: 96 - components: - - pos: -1.5,-0.5 - parent: 103 - type: Transform - - uid: 97 - components: - - pos: -1.5,0.5 - parent: 103 - type: Transform - - uid: 98 - components: - - pos: -1.5,1.5 - parent: 103 - type: Transform - - uid: 99 - components: - - pos: -1.5,2.5 - parent: 103 - type: Transform - - enabled: True - type: AmbientSound - - uid: 100 + - uid: 106 components: - - pos: -1.5,3.5 - parent: 103 - type: Transform - - enabled: True - type: AmbientSound - - uid: 101 - components: - - pos: -2.5,0.5 + - pos: 0.5,-2.5 parent: 103 type: Transform - - enabled: True - type: AmbientSound - proto: CableMV entities: - uid: 61 @@ -326,8 +343,6 @@ entities: - pos: -0.5,-2.5 parent: 103 type: Transform - - enabled: True - type: AmbientSound - uid: 62 components: - pos: 0.5,-2.5 @@ -348,8 +363,6 @@ entities: - pos: 1.5,-0.5 parent: 103 type: Transform - - enabled: True - type: AmbientSound - proto: Chair entities: - uid: 85 @@ -358,44 +371,14 @@ entities: pos: 0.5,2.5 parent: 103 type: Transform -- proto: ClosetEmergencyFilledRandom +- proto: ClosetWallEmergencyFilledRandom entities: - - uid: 49 + - uid: 52 components: - - pos: 0.5,-0.5 + - rot: 3.141592653589793 rad + pos: -1.5,-1.5 parent: 103 type: Transform - - air: - volume: 200 - immutable: False - temperature: 75.31249 - moles: - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - type: EntityStorage - - containers: - entity_storage: !type:Container - showEnts: False - occludes: True - ents: - - 50 - - 51 - - 52 - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - type: ContainerContainer - proto: ClothingHeadMailCarrier entities: - uid: 92 @@ -403,28 +386,6 @@ entities: - pos: 0.29172873,0.90015525 parent: 103 type: Transform -- proto: ClothingMaskBreath - entities: - - uid: 51 - components: - - flags: InContainer - type: MetaData - - parent: 49 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage -- proto: ClothingOuterSuitEmergency - entities: - - uid: 52 - components: - - flags: InContainer - type: MetaData - - parent: 49 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage - proto: ClothingOuterWinterCoatMail entities: - uid: 93 @@ -439,6 +400,14 @@ entities: - pos: 0.5,3.5 parent: 103 type: Transform +- proto: EmergencyLight + entities: + - uid: 58 + components: + - rot: -1.5707963267948966 rad + pos: 0.5,0.5 + parent: 103 + type: Transform - proto: FaxMachineShip entities: - uid: 53 @@ -446,18 +415,79 @@ entities: - pos: -0.5,3.5 parent: 103 type: Transform -- proto: GeneratorWallmountAPU +- proto: GasPassiveVent + entities: + - uid: 100 + components: + - rot: -1.5707963267948966 rad + pos: 2.5,2.5 + parent: 103 + type: Transform + - color: '#990000FF' + type: AtmosPipeColor +- proto: GasPipeBend entities: - uid: 56 components: - - pos: -1.5,-1.5 + - rot: -1.5707963267948966 rad + pos: 0.5,1.5 parent: 103 type: Transform - - uid: 95 + - color: '#990000FF' + type: AtmosPipeColor + - uid: 101 components: - - pos: -1.5,3.5 + - rot: 1.5707963267948966 rad + pos: 0.5,2.5 + parent: 103 + type: Transform + - color: '#990000FF' + type: AtmosPipeColor +- proto: GasPipeStraight + entities: + - uid: 105 + components: + - rot: -1.5707963267948966 rad + pos: 1.5,2.5 + parent: 103 + type: Transform + - color: '#990000FF' + type: AtmosPipeColor +- proto: GasPort + entities: + - uid: 96 + components: + - rot: 3.141592653589793 rad + pos: -0.5,-1.5 + parent: 103 + type: Transform + - color: '#03FCD3FF' + type: AtmosPipeColor +- proto: GasVentPump + entities: + - uid: 51 + components: + - pos: -0.5,-0.5 + parent: 103 + type: Transform + - ShutdownSubscribers: + - 109 + type: DeviceNetwork + - color: '#03FCD3FF' + type: AtmosPipeColor +- proto: GasVentScrubber + entities: + - uid: 99 + components: + - rot: 1.5707963267948966 rad + pos: -0.5,1.5 parent: 103 type: Transform + - ShutdownSubscribers: + - 109 + type: DeviceNetwork + - color: '#990000FF' + type: AtmosPipeColor - proto: GravityGeneratorMini entities: - uid: 24 @@ -539,6 +569,20 @@ entities: - pos: 1.5,2.5 parent: 103 type: Transform +- proto: PortableGeneratorPacman + entities: + - uid: 49 + components: + - anchored: True + pos: 0.5,-2.5 + parent: 103 + type: Transform + - storage: + Plasma: 1500 + type: MaterialStorage + - bodyType: Static + type: Physics + - type: InsertingMaterialStorage - proto: Poweredlight entities: - uid: 88 @@ -563,6 +607,17 @@ entities: - pos: -0.5,2.5 parent: 103 type: Transform +- proto: SheetPlasma + entities: + - uid: 108 + components: + - pos: 0.541206,0.48403737 + parent: 103 + type: Transform + - count: 15 + type: Stack + - size: 15 + type: Item - proto: ShuttersWindow entities: - uid: 84 @@ -570,9 +625,12 @@ entities: - pos: 1.5,2.5 parent: 103 type: Transform - - SecondsUntilStateChange: -1448.6954 - state: Opening + - canCollide: False + type: Physics + - state: Open type: Door + - airBlocked: False + type: Airtight - links: - 90 type: DeviceLinkSink @@ -828,4 +886,11 @@ entities: type: Transform - location: Mail Truck type: WarpPoint +- proto: Wrench + entities: + - uid: 107 + components: + - pos: 0.4699145,0.6320103 + parent: 103 + type: Transform ... From 8a9223f4be31c552f77e74a788da54250f87b218 Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Mon, 1 Jan 2024 03:02:22 +0000 Subject: [PATCH 12/66] Automatic Changelog (#771) --- Resources/Changelog/Changelog.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 8ce2fa30c4a..f7bfd3188b1 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -2603,3 +2603,11 @@ Entries: message: Added digging dirt. id: 4716 time: '2024-01-01T02:51:14.0000000+00:00' +- author: erhardsteinhauer + changes: + - type: Tweak + message: >- + Tweaked Mail Truck - added rudimentary atmos, replaced APUs with + P.A.C.M.A.N. + id: 4717 + time: '2024-01-01T03:02:00.0000000+00:00' From 774e307f3ed9ef2cc8fcd6ff566d0636ab2a6d81 Mon Sep 17 00:00:00 2001 From: ErhardSteinhauer <65374927+ErhardSteinhauer@users.noreply.github.com> Date: Mon, 1 Jan 2024 06:05:22 +0300 Subject: [PATCH 13/66] Pulse Update (#775) --- Resources/Maps/Shuttles/pulse.yml | 305 +++++++++++++++++++----------- 1 file changed, 198 insertions(+), 107 deletions(-) diff --git a/Resources/Maps/Shuttles/pulse.yml b/Resources/Maps/Shuttles/pulse.yml index 0aade9ae82a..f27fd4480d1 100644 --- a/Resources/Maps/Shuttles/pulse.yml +++ b/Resources/Maps/Shuttles/pulse.yml @@ -113,30 +113,55 @@ entities: data: tiles: -1,-1: - 0: 65535 + 0: 1 + 1: 65534 -1,0: - 0: 65535 + 1: 61183 + 0: 4352 0,0: - 0: 65535 + 1: 16383 + 0: 49152 0,-1: - 0: 65535 + 1: 65523 + 0: 12 -2,-1: - 0: 34952 + 0: 8 + 1: 34944 -1,-2: - 0: 65024 + 0: 4096 + 1: 60928 -2,0: - 0: 2184 + 1: 136 + 0: 2048 -1,1: - 0: 14 + 1: 14 0,1: - 0: 7 + 1: 3 + 0: 4 1,0: - 0: 273 + 1: 273 0,-2: - 0: 29440 + 1: 13056 + 0: 16384 1,-1: - 0: 4352 + 0: 256 + 1: 4096 uniqueMixes: + - volume: 2500 + temperature: 293.15 + moles: + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 - volume: 2500 temperature: 293.15 moles: @@ -168,38 +193,32 @@ entities: parent: 1 type: Transform - ShutdownSubscribers: - - 183 - - 54 - - 53 + - 182 + - 195 - 184 - - 197 - 180 - - 149 - - 182 - - 198 - 181 - - 195 + - 149 + - 197 - 199 + - 198 type: DeviceNetwork - devices: - - 183 - - 54 - - 53 - 184 - - 197 - - 180 - - 149 + - 195 - 182 - - 198 + - 180 - 181 - - 195 + - 149 + - 197 - 199 + - 198 type: DeviceList - proto: AirCanister entities: - - uid: 200 + - uid: 58 components: - - pos: 0.5,3.5 + - pos: -0.5,3.5 parent: 1 type: Transform - proto: AirlockCommandGlass @@ -255,9 +274,6 @@ entities: pos: -1.5,3.5 parent: 1 type: Transform - - ShutdownSubscribers: - - 62 - type: DeviceNetwork - uid: 197 components: - rot: -1.5707963267948966 rad @@ -307,6 +323,73 @@ entities: pos: -4.5,0.5 parent: 1 type: Transform +- proto: AtmosFixBlockerMarker + entities: + - uid: 37 + components: + - pos: 2.5,4.5 + parent: 1 + type: Transform + - uid: 59 + components: + - pos: 3.5,3.5 + parent: 1 + type: Transform + - uid: 202 + components: + - pos: 2.5,3.5 + parent: 1 + type: Transform + - uid: 204 + components: + - pos: 4.5,-1.5 + parent: 1 + type: Transform + - uid: 205 + components: + - pos: 3.5,-3.5 + parent: 1 + type: Transform + - uid: 206 + components: + - pos: 2.5,-3.5 + parent: 1 + type: Transform + - uid: 207 + components: + - pos: 2.5,-4.5 + parent: 1 + type: Transform + - uid: 208 + components: + - pos: -3.5,-4.5 + parent: 1 + type: Transform + - uid: 209 + components: + - pos: -3.5,-3.5 + parent: 1 + type: Transform + - uid: 210 + components: + - pos: -4.5,-3.5 + parent: 1 + type: Transform + - uid: 211 + components: + - pos: -4.5,2.5 + parent: 1 + type: Transform + - uid: 212 + components: + - pos: -3.5,2.5 + parent: 1 + type: Transform + - uid: 213 + components: + - pos: -3.5,3.5 + parent: 1 + type: Transform - proto: CableApcExtension entities: - uid: 12 @@ -436,14 +519,9 @@ entities: type: Transform - proto: CableHV entities: - - uid: 37 - components: - - pos: -1.5,1.5 - parent: 1 - type: Transform - uid: 38 components: - - pos: -0.5,1.5 + - pos: 0.5,3.5 parent: 1 type: Transform - uid: 39 @@ -453,7 +531,7 @@ entities: type: Transform - uid: 40 components: - - pos: 1.5,1.5 + - pos: 0.5,2.5 parent: 1 type: Transform - proto: CableMV @@ -538,6 +616,14 @@ entities: pos: 1.5,-3.5 parent: 1 type: Transform +- proto: EmergencyLight + entities: + - uid: 217 + components: + - rot: 1.5707963267948966 rad + pos: -1.5,-0.5 + parent: 1 + type: Transform - proto: EncryptionKeyMedical entities: - uid: 41 @@ -552,6 +638,23 @@ entities: - pos: 3.5,1.5 parent: 1 type: Transform +- proto: FirelockGlass + entities: + - uid: 214 + components: + - pos: -0.5,1.5 + parent: 1 + type: Transform + - uid: 215 + components: + - pos: 1.5,-0.5 + parent: 1 + type: Transform + - uid: 216 + components: + - pos: -0.5,-2.5 + parent: 1 + type: Transform - proto: GasPassiveVent entities: - uid: 196 @@ -564,28 +667,13 @@ entities: type: AtmosPipeColor - proto: GasPipeBend entities: - - uid: 60 + - uid: 200 components: - rot: 3.141592653589793 rad - pos: -1.5,2.5 - parent: 1 - type: Transform - - color: '#0055CCFF' - type: AtmosPipeColor - - uid: 64 - components: - - rot: 1.5707963267948966 rad - pos: -1.5,3.5 - parent: 1 - type: Transform - - color: '#0055CCFF' - type: AtmosPipeColor - - uid: 201 - components: - - pos: -0.5,2.5 + pos: -1.5,1.5 parent: 1 type: Transform - - color: '#0055CCFF' + - color: '#03FCD3FF' type: AtmosPipeColor - proto: GasPipeFourway entities: @@ -594,7 +682,7 @@ entities: - pos: -0.5,-0.5 parent: 1 type: Transform - - color: '#0055CCFF' + - color: '#03FCD3FF' type: AtmosPipeColor - uid: 185 components: @@ -605,19 +693,12 @@ entities: type: AtmosPipeColor - proto: GasPipeStraight entities: - - uid: 59 - components: - - pos: -0.5,1.5 - parent: 1 - type: Transform - - color: '#0055CCFF' - type: AtmosPipeColor - uid: 65 components: - pos: -0.5,0.5 parent: 1 type: Transform - - color: '#0055CCFF' + - color: '#03FCD3FF' type: AtmosPipeColor - uid: 96 components: @@ -625,7 +706,7 @@ entities: pos: 0.5,-0.5 parent: 1 type: Transform - - color: '#0055CCFF' + - color: '#03FCD3FF' type: AtmosPipeColor - uid: 110 components: @@ -633,7 +714,7 @@ entities: pos: 1.5,-0.5 parent: 1 type: Transform - - color: '#0055CCFF' + - color: '#03FCD3FF' type: AtmosPipeColor - uid: 139 components: @@ -641,7 +722,7 @@ entities: pos: -0.5,-1.5 parent: 1 type: Transform - - color: '#0055CCFF' + - color: '#03FCD3FF' type: AtmosPipeColor - uid: 140 components: @@ -649,7 +730,7 @@ entities: pos: -0.5,-2.5 parent: 1 type: Transform - - color: '#0055CCFF' + - color: '#03FCD3FF' type: AtmosPipeColor - uid: 186 components: @@ -724,38 +805,38 @@ entities: type: Transform - color: '#990000FF' type: AtmosPipeColor -- proto: GasPort - entities: - - uid: 57 + - uid: 201 components: - rot: -1.5707963267948966 rad - pos: 0.5,3.5 + pos: -0.5,1.5 parent: 1 type: Transform - - color: '#0055CCFF' + - color: '#03FCD3FF' type: AtmosPipeColor +- proto: GasPort + entities: + - uid: 60 + components: + - pos: -0.5,3.5 + parent: 1 + type: Transform - proto: GasPressurePump entities: - - uid: 58 + - uid: 54 components: - - rot: -1.5707963267948966 rad - pos: -0.5,3.5 + - pos: -0.5,2.5 parent: 1 type: Transform - - color: '#0055CCFF' + - color: '#03FCD3FF' type: AtmosPipeColor - proto: GasVentPump entities: - - uid: 54 + - uid: 71 components: - - rot: 3.141592653589793 rad - pos: -1.5,2.5 + - pos: -1.5,2.5 parent: 1 type: Transform - - ShutdownSubscribers: - - 62 - type: DeviceNetwork - - color: '#0055CCFF' + - color: '#03FCD3FF' type: AtmosPipeColor - uid: 149 components: @@ -766,7 +847,7 @@ entities: - ShutdownSubscribers: - 62 type: DeviceNetwork - - color: '#0055CCFF' + - color: '#03FCD3FF' type: AtmosPipeColor - uid: 180 components: @@ -777,7 +858,7 @@ entities: - ShutdownSubscribers: - 62 type: DeviceNetwork - - color: '#0055CCFF' + - color: '#03FCD3FF' type: AtmosPipeColor - uid: 181 components: @@ -788,7 +869,7 @@ entities: - ShutdownSubscribers: - 62 type: DeviceNetwork - - color: '#0055CCFF' + - color: '#03FCD3FF' type: AtmosPipeColor - proto: GasVentScrubber entities: @@ -808,9 +889,6 @@ entities: - pos: 0.5,2.5 parent: 1 type: Transform - - ShutdownSubscribers: - - 62 - type: DeviceNetwork - color: '#990000FF' type: AtmosPipeColor - uid: 184 @@ -835,18 +913,6 @@ entities: type: DeviceNetwork - color: '#990000FF' type: AtmosPipeColor -- proto: GeneratorWallmountAPU - entities: - - uid: 70 - components: - - pos: -1.5,1.5 - parent: 1 - type: Transform - - uid: 71 - components: - - pos: 1.5,1.5 - parent: 1 - type: Transform - proto: GravityGeneratorMini entities: - uid: 72 @@ -1086,6 +1152,20 @@ entities: - canCollide: False type: Physics - type: InsideEntityStorage +- proto: PortableGeneratorPacman + entities: + - uid: 57 + components: + - anchored: True + pos: 0.5,3.5 + parent: 1 + type: Transform + - storage: + Plasma: 1500 + type: MaterialStorage + - bodyType: Static + type: Physics + - type: InsertingMaterialStorage - proto: PowerCellRecharger entities: - uid: 63 @@ -1159,6 +1239,17 @@ entities: - pos: -1.5,-4.5 parent: 1 type: Transform +- proto: SheetPlasma + entities: + - uid: 70 + components: + - pos: 0.5180994,2.6407764 + parent: 1 + type: Transform + - count: 15 + type: Stack + - size: 15 + type: Item - proto: ShuttleWindow entities: - uid: 113 @@ -1527,9 +1618,9 @@ entities: type: Transform - proto: Wrench entities: - - uid: 202 + - uid: 64 components: - - pos: 0.5390229,3.4032404 + - pos: 0.36184943,2.8187637 parent: 1 type: Transform ... From 7e8f3b40703607fa61f76096f54392f5e071a73a Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Mon, 1 Jan 2024 03:05:46 +0000 Subject: [PATCH 14/66] Automatic Changelog (#775) --- Resources/Changelog/Changelog.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index f7bfd3188b1..3e8dd52ca0b 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -2611,3 +2611,9 @@ Entries: P.A.C.M.A.N. id: 4717 time: '2024-01-01T03:02:00.0000000+00:00' +- author: erhardsteinhauer + changes: + - type: Tweak + message: Tweaked Pulse - replaced APUs with P.A.C.M.A.N. + id: 4718 + time: '2024-01-01T03:05:22.0000000+00:00' From b891dd2a59e3117d4f7db4832daf1934591a7b1f Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Mon, 1 Jan 2024 12:29:26 +0200 Subject: [PATCH 15/66] New files locations of maps & grids (#797) * Starting new format for save locations of maps & grids * Fix * Moving POI and Bluespace * Fix --- .../_NF/GameRule/NfAdventureRuleSystem.cs | 24 +++++++++---------- Resources/Maps/{ => _NF}/Admin/gallery.yml | 0 .../{ => _NF}/Bluespace/asteroidbunker.yml | 4 ++-- .../{ => _NF}/Bluespace/asteroidvault.yml | 4 ++-- Resources/Maps/{ => _NF}/Bluespace/cache.yml | 4 ++-- .../Maps/{ => _NF}/Bluespace/cargoniaship.yml | 4 ++-- Resources/Maps/{ => _NF}/Bluespace/vault.yml | 4 ++-- .../Maps/{ => _NF}/Bluespace/vaultsmall.yml | 4 ++-- Resources/Maps/{ => _NF/POI}/anomalouslab.yml | 4 ++-- Resources/Maps/{ => _NF/POI}/arena.yml | 4 ++-- Resources/Maps/{ => _NF/POI}/beacon.yml | 4 ++-- Resources/Maps/{ => _NF/POI}/cargodepot.yml | 8 +++---- Resources/Maps/{ => _NF/POI}/caseyscasino.yml | 4 ++-- Resources/Maps/{ => _NF/POI}/courthouse.yml | 4 ++-- Resources/Maps/{ => _NF/POI}/cove.yml | 4 ++-- Resources/Maps/{ => _NF/POI}/grifty.yml | 4 ++-- Resources/Maps/{ => _NF/POI}/lodge.yml | 4 ++-- Resources/Maps/{ => _NF/POI}/lpbravo.yml | 0 Resources/Maps/{ => _NF/POI}/northpole.yml | 4 ++-- Resources/Maps/{ => _NF/POI}/tinnia.yml | 4 ++-- Resources/Maps/{ => _NF}/Shuttles/mccargo.yml | 0 Resources/Maps/{ => _NF}/frontier.yml | 0 Resources/Prototypes/Maps/frontier.yml | 2 +- Resources/Prototypes/_NF/Events/events.yml | 12 +++++----- .../Prototypes/_NF/Shipyard/anomalouslab.yml | 2 +- Resources/Prototypes/_NF/Shipyard/cove.yml | 2 +- Resources/Prototypes/_NF/Shipyard/lodge.yml | 2 +- Resources/Prototypes/_NF/Shipyard/mccargo.yml | 4 ++-- 28 files changed, 60 insertions(+), 60 deletions(-) rename Resources/Maps/{ => _NF}/Admin/gallery.yml (100%) rename Resources/Maps/{ => _NF}/Bluespace/asteroidbunker.yml (99%) rename Resources/Maps/{ => _NF}/Bluespace/asteroidvault.yml (99%) rename Resources/Maps/{ => _NF}/Bluespace/cache.yml (99%) rename Resources/Maps/{ => _NF}/Bluespace/cargoniaship.yml (99%) rename Resources/Maps/{ => _NF}/Bluespace/vault.yml (99%) rename Resources/Maps/{ => _NF}/Bluespace/vaultsmall.yml (99%) rename Resources/Maps/{ => _NF/POI}/anomalouslab.yml (99%) rename Resources/Maps/{ => _NF/POI}/arena.yml (99%) rename Resources/Maps/{ => _NF/POI}/beacon.yml (99%) rename Resources/Maps/{ => _NF/POI}/cargodepot.yml (99%) rename Resources/Maps/{ => _NF/POI}/caseyscasino.yml (99%) rename Resources/Maps/{ => _NF/POI}/courthouse.yml (99%) rename Resources/Maps/{ => _NF/POI}/cove.yml (99%) rename Resources/Maps/{ => _NF/POI}/grifty.yml (99%) rename Resources/Maps/{ => _NF/POI}/lodge.yml (99%) rename Resources/Maps/{ => _NF/POI}/lpbravo.yml (100%) rename Resources/Maps/{ => _NF/POI}/northpole.yml (99%) rename Resources/Maps/{ => _NF/POI}/tinnia.yml (99%) rename Resources/Maps/{ => _NF}/Shuttles/mccargo.yml (100%) rename Resources/Maps/{ => _NF}/frontier.yml (100%) diff --git a/Content.Server/_NF/GameRule/NfAdventureRuleSystem.cs b/Content.Server/_NF/GameRule/NfAdventureRuleSystem.cs index 906357ad7ee..efbd6129737 100644 --- a/Content.Server/_NF/GameRule/NfAdventureRuleSystem.cs +++ b/Content.Server/_NF/GameRule/NfAdventureRuleSystem.cs @@ -110,18 +110,18 @@ private void OnPlayerSpawningEvent(PlayerSpawnCompleteEvent ev) private void OnStartup(RoundStartingEvent ev) { - var depotMap = "/Maps/cargodepot.yml"; - var tinnia = "/Maps/tinnia.yml"; - var caseys = "/Maps/caseyscasino.yml"; - var lpbravo = "/Maps/lpbravo.yml"; - var northpole = "/Maps/northpole.yml"; - var arena = "/Maps/arena.yml"; - var cove = "/Maps/cove.yml"; - var courthouse = "/Maps/courthouse.yml"; - var lodge = "/Maps/lodge.yml"; - var lab = "/Maps/anomalouslab.yml"; - var church = "Maps/beacon.yml"; - var grifty = "Maps/grifty.yml"; + var depotMap = "/Maps/_NF/POI/cargodepot.yml"; + var tinnia = "/Maps/_NF/POI/tinnia.yml"; + var caseys = "/Maps/_NF/POI/caseyscasino.yml"; + var lpbravo = "/Maps/_NF/POI/lpbravo.yml"; + var northpole = "/Maps/_NF/POI/northpole.yml"; + var arena = "/Maps/_NF/POI/arena.yml"; + var cove = "/Maps/_NF/POI/cove.yml"; + var courthouse = "/Maps/_NF/POI/courthouse.yml"; + var lodge = "/Maps/_NF/POI/lodge.yml"; + var lab = "/Maps/_NF/POI/anomalouslab.yml"; + var church = "Maps/_NF/POI/beacon.yml"; + var grifty = "Maps/_NF/POI/grifty.yml"; var depotColor = new Color(55, 200, 55); var civilianColor = new Color(55, 55, 200); var lpbravoColor = new Color(200, 55, 55); diff --git a/Resources/Maps/Admin/gallery.yml b/Resources/Maps/_NF/Admin/gallery.yml similarity index 100% rename from Resources/Maps/Admin/gallery.yml rename to Resources/Maps/_NF/Admin/gallery.yml diff --git a/Resources/Maps/Bluespace/asteroidbunker.yml b/Resources/Maps/_NF/Bluespace/asteroidbunker.yml similarity index 99% rename from Resources/Maps/Bluespace/asteroidbunker.yml rename to Resources/Maps/_NF/Bluespace/asteroidbunker.yml index 325f3abd0d8..3a33b7d53d0 100644 --- a/Resources/Maps/Bluespace/asteroidbunker.yml +++ b/Resources/Maps/_NF/Bluespace/asteroidbunker.yml @@ -111,8 +111,8 @@ entities: type: MapGrid - type: Broadphase - bodyStatus: InAir - angularDamping: 0.05 - linearDamping: 0.05 + angularDamping: 999999 + linearDamping: 999999 fixedRotation: False bodyType: Dynamic type: Physics diff --git a/Resources/Maps/Bluespace/asteroidvault.yml b/Resources/Maps/_NF/Bluespace/asteroidvault.yml similarity index 99% rename from Resources/Maps/Bluespace/asteroidvault.yml rename to Resources/Maps/_NF/Bluespace/asteroidvault.yml index b81cf381de5..a1bf796ba86 100644 --- a/Resources/Maps/Bluespace/asteroidvault.yml +++ b/Resources/Maps/_NF/Bluespace/asteroidvault.yml @@ -92,8 +92,8 @@ entities: type: MapGrid - type: Broadphase - bodyStatus: InAir - angularDamping: 0.05 - linearDamping: 0.05 + angularDamping: 999999 + linearDamping: 999999 fixedRotation: False bodyType: Dynamic type: Physics diff --git a/Resources/Maps/Bluespace/cache.yml b/Resources/Maps/_NF/Bluespace/cache.yml similarity index 99% rename from Resources/Maps/Bluespace/cache.yml rename to Resources/Maps/_NF/Bluespace/cache.yml index a8bc7915575..67822c486dd 100644 --- a/Resources/Maps/Bluespace/cache.yml +++ b/Resources/Maps/_NF/Bluespace/cache.yml @@ -37,8 +37,8 @@ entities: type: MapGrid - type: Broadphase - bodyStatus: InAir - angularDamping: 0.05 - linearDamping: 0.05 + angularDamping: 999999 + linearDamping: 999999 fixedRotation: False bodyType: Dynamic type: Physics diff --git a/Resources/Maps/Bluespace/cargoniaship.yml b/Resources/Maps/_NF/Bluespace/cargoniaship.yml similarity index 99% rename from Resources/Maps/Bluespace/cargoniaship.yml rename to Resources/Maps/_NF/Bluespace/cargoniaship.yml index cc319ac2474..4b3c7000209 100644 --- a/Resources/Maps/Bluespace/cargoniaship.yml +++ b/Resources/Maps/_NF/Bluespace/cargoniaship.yml @@ -49,8 +49,8 @@ entities: type: MapGrid - type: Broadphase - bodyStatus: InAir - angularDamping: 0.05 - linearDamping: 0.05 + angularDamping: 999999 + linearDamping: 999999 fixedRotation: False bodyType: Dynamic type: Physics diff --git a/Resources/Maps/Bluespace/vault.yml b/Resources/Maps/_NF/Bluespace/vault.yml similarity index 99% rename from Resources/Maps/Bluespace/vault.yml rename to Resources/Maps/_NF/Bluespace/vault.yml index b65df3de399..de8b51ba6f0 100644 --- a/Resources/Maps/Bluespace/vault.yml +++ b/Resources/Maps/_NF/Bluespace/vault.yml @@ -55,8 +55,8 @@ entities: tiles: AAAAAAAAAAAAAAAAAAAAAAAAAABeAAAAXgAAAF4AAAAAAAAAAAAAAAAAAAAAAAAAXgAAAF4AAABfAAAAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA== type: MapGrid - type: Broadphase - - angularDamping: 0.05 - linearDamping: 0.05 + - angularDamping: 999999 + linearDamping: 999999 fixedRotation: False bodyType: Dynamic type: Physics diff --git a/Resources/Maps/Bluespace/vaultsmall.yml b/Resources/Maps/_NF/Bluespace/vaultsmall.yml similarity index 99% rename from Resources/Maps/Bluespace/vaultsmall.yml rename to Resources/Maps/_NF/Bluespace/vaultsmall.yml index 911d03de73a..83763b1b22d 100644 --- a/Resources/Maps/Bluespace/vaultsmall.yml +++ b/Resources/Maps/_NF/Bluespace/vaultsmall.yml @@ -34,8 +34,8 @@ entities: tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABeAAAAXgAAAF4AAABeAAAAAAAAAF4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXgAAAAAAAABeAAAAAAAAAF4AAABfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAF4AAABeAAAAXgAAAF8AAABfAAAAXwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABeAAAAAAAAAF8AAABfAAAAXwAAAF8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAF4AAABfAAAAXwAAABwAAAMcAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXgAAAF4AAABfAAAAXwAAAF8AAAAcAAACGgAAAA== type: MapGrid - type: Broadphase - - angularDamping: 0.05 - linearDamping: 0.05 + - angularDamping: 999999 + linearDamping: 999999 fixedRotation: False bodyType: Dynamic type: Physics diff --git a/Resources/Maps/anomalouslab.yml b/Resources/Maps/_NF/POI/anomalouslab.yml similarity index 99% rename from Resources/Maps/anomalouslab.yml rename to Resources/Maps/_NF/POI/anomalouslab.yml index 95aa2edbf3c..3fc6bdd8319 100644 --- a/Resources/Maps/anomalouslab.yml +++ b/Resources/Maps/_NF/POI/anomalouslab.yml @@ -81,8 +81,8 @@ entities: type: MapGrid - type: Broadphase - bodyStatus: InAir - angularDamping: 0.05 - linearDamping: 0.05 + angularDamping: 999999 + linearDamping: 999999 fixedRotation: False bodyType: Dynamic type: Physics diff --git a/Resources/Maps/arena.yml b/Resources/Maps/_NF/POI/arena.yml similarity index 99% rename from Resources/Maps/arena.yml rename to Resources/Maps/_NF/POI/arena.yml index e13f51c4449..04e691f5c86 100644 --- a/Resources/Maps/arena.yml +++ b/Resources/Maps/_NF/POI/arena.yml @@ -125,8 +125,8 @@ entities: type: MapGrid - type: Broadphase - bodyStatus: InAir - angularDamping: 0.05 - linearDamping: 0.05 + angularDamping: 999999 + linearDamping: 999999 fixedRotation: False bodyType: Dynamic type: Physics diff --git a/Resources/Maps/beacon.yml b/Resources/Maps/_NF/POI/beacon.yml similarity index 99% rename from Resources/Maps/beacon.yml rename to Resources/Maps/_NF/POI/beacon.yml index 416b8233806..f653df166c3 100644 --- a/Resources/Maps/beacon.yml +++ b/Resources/Maps/_NF/POI/beacon.yml @@ -74,8 +74,8 @@ entities: type: MapGrid - type: Broadphase - bodyStatus: InAir - angularDamping: 0.05 - linearDamping: 0.05 + angularDamping: 999999 + linearDamping: 999999 fixedRotation: False bodyType: Dynamic type: Physics diff --git a/Resources/Maps/cargodepot.yml b/Resources/Maps/_NF/POI/cargodepot.yml similarity index 99% rename from Resources/Maps/cargodepot.yml rename to Resources/Maps/_NF/POI/cargodepot.yml index d75d6bd906c..9dd7ed768f0 100644 --- a/Resources/Maps/cargodepot.yml +++ b/Resources/Maps/_NF/POI/cargodepot.yml @@ -43,16 +43,16 @@ entities: type: MapGrid - type: Broadphase - bodyStatus: InAir - angularDamping: 10000 - linearDamping: 10000 + angularDamping: 999999 + linearDamping: 999999 fixedRotation: False bodyType: Dynamic type: Physics - fixtures: {} type: Fixtures - type: OccluderTree - - angularDamping: 10000 - linearDamping: 10000 + - angularDamping: 999999 + linearDamping: 999999 type: Shuttle - type: GridPathfinding - gravityShakeSound: !type:SoundPathSpecifier diff --git a/Resources/Maps/caseyscasino.yml b/Resources/Maps/_NF/POI/caseyscasino.yml similarity index 99% rename from Resources/Maps/caseyscasino.yml rename to Resources/Maps/_NF/POI/caseyscasino.yml index 22f914d13d1..673a374513b 100644 --- a/Resources/Maps/caseyscasino.yml +++ b/Resources/Maps/_NF/POI/caseyscasino.yml @@ -46,8 +46,8 @@ entities: type: MapGrid - type: Broadphase - bodyStatus: InAir - angularDamping: 0.05 - linearDamping: 0.05 + angularDamping: 999999 + linearDamping: 999999 fixedRotation: False bodyType: Dynamic type: Physics diff --git a/Resources/Maps/courthouse.yml b/Resources/Maps/_NF/POI/courthouse.yml similarity index 99% rename from Resources/Maps/courthouse.yml rename to Resources/Maps/_NF/POI/courthouse.yml index f0e8ab164b5..40dba324621 100644 --- a/Resources/Maps/courthouse.yml +++ b/Resources/Maps/_NF/POI/courthouse.yml @@ -76,8 +76,8 @@ entities: type: MapGrid - type: Broadphase - bodyStatus: InAir - angularDamping: 0.05 - linearDamping: 0.05 + angularDamping: 999999 + linearDamping: 999999 fixedRotation: False bodyType: Dynamic type: Physics diff --git a/Resources/Maps/cove.yml b/Resources/Maps/_NF/POI/cove.yml similarity index 99% rename from Resources/Maps/cove.yml rename to Resources/Maps/_NF/POI/cove.yml index f23cee7b536..6be40e6476b 100644 --- a/Resources/Maps/cove.yml +++ b/Resources/Maps/_NF/POI/cove.yml @@ -81,8 +81,8 @@ entities: type: MapGrid - type: Broadphase - bodyStatus: InAir - angularDamping: 0.05 - linearDamping: 0.05 + angularDamping: 999999 + linearDamping: 999999 fixedRotation: False bodyType: Dynamic type: Physics diff --git a/Resources/Maps/grifty.yml b/Resources/Maps/_NF/POI/grifty.yml similarity index 99% rename from Resources/Maps/grifty.yml rename to Resources/Maps/_NF/POI/grifty.yml index 84b2969b391..75cd54d8d88 100644 --- a/Resources/Maps/grifty.yml +++ b/Resources/Maps/_NF/POI/grifty.yml @@ -40,8 +40,8 @@ entities: type: MapGrid - type: Broadphase - bodyStatus: InAir - angularDamping: 0.05 - linearDamping: 0.05 + angularDamping: 999999 + linearDamping: 999999 fixedRotation: False bodyType: Dynamic type: Physics diff --git a/Resources/Maps/lodge.yml b/Resources/Maps/_NF/POI/lodge.yml similarity index 99% rename from Resources/Maps/lodge.yml rename to Resources/Maps/_NF/POI/lodge.yml index 248b77d18ef..c8653b849ba 100644 --- a/Resources/Maps/lodge.yml +++ b/Resources/Maps/_NF/POI/lodge.yml @@ -93,8 +93,8 @@ entities: type: MapGrid - type: Broadphase - bodyStatus: InAir - angularDamping: 0.05 - linearDamping: 0.05 + angularDamping: 999999 + linearDamping: 999999 fixedRotation: False bodyType: Dynamic type: Physics diff --git a/Resources/Maps/lpbravo.yml b/Resources/Maps/_NF/POI/lpbravo.yml similarity index 100% rename from Resources/Maps/lpbravo.yml rename to Resources/Maps/_NF/POI/lpbravo.yml diff --git a/Resources/Maps/northpole.yml b/Resources/Maps/_NF/POI/northpole.yml similarity index 99% rename from Resources/Maps/northpole.yml rename to Resources/Maps/_NF/POI/northpole.yml index c33a2eb9557..fe81b5e3dc2 100644 --- a/Resources/Maps/northpole.yml +++ b/Resources/Maps/_NF/POI/northpole.yml @@ -102,8 +102,8 @@ entities: type: MapGrid - type: Broadphase - bodyStatus: InAir - angularDamping: 0.05 - linearDamping: 0.05 + angularDamping: 999999 + linearDamping: 999999 fixedRotation: False bodyType: Dynamic type: Physics diff --git a/Resources/Maps/tinnia.yml b/Resources/Maps/_NF/POI/tinnia.yml similarity index 99% rename from Resources/Maps/tinnia.yml rename to Resources/Maps/_NF/POI/tinnia.yml index dd680839470..9d46013d4e6 100644 --- a/Resources/Maps/tinnia.yml +++ b/Resources/Maps/_NF/POI/tinnia.yml @@ -69,8 +69,8 @@ entities: type: MapGrid - type: Broadphase - bodyStatus: InAir - angularDamping: 0.05 - linearDamping: 0.05 + angularDamping: 999999 + linearDamping: 999999 fixedRotation: False bodyType: Dynamic type: Physics diff --git a/Resources/Maps/Shuttles/mccargo.yml b/Resources/Maps/_NF/Shuttles/mccargo.yml similarity index 100% rename from Resources/Maps/Shuttles/mccargo.yml rename to Resources/Maps/_NF/Shuttles/mccargo.yml diff --git a/Resources/Maps/frontier.yml b/Resources/Maps/_NF/frontier.yml similarity index 100% rename from Resources/Maps/frontier.yml rename to Resources/Maps/_NF/frontier.yml diff --git a/Resources/Prototypes/Maps/frontier.yml b/Resources/Prototypes/Maps/frontier.yml index a4e5ecdacfa..ceac0a04327 100644 --- a/Resources/Prototypes/Maps/frontier.yml +++ b/Resources/Prototypes/Maps/frontier.yml @@ -1,7 +1,7 @@ - type: gameMap id: Frontier mapName: 'Frontier Outpost' - mapPath: /Maps/frontier.yml + mapPath: /Maps/_NF/frontier.yml minPlayers: 0 maxPlayers: 100 stations: diff --git a/Resources/Prototypes/_NF/Events/events.yml b/Resources/Prototypes/_NF/Events/events.yml index 83351e9902f..f493ec18914 100644 --- a/Resources/Prototypes/_NF/Events/events.yml +++ b/Resources/Prototypes/_NF/Events/events.yml @@ -41,7 +41,7 @@ duration: 1350 maxDuration: 1560 - type: BluespaceErrorRule - gridPath: /Maps/Bluespace/cache.yml + gridPath: /Maps/_NF/Bluespace/cache.yml rewardFactor: 3.3 - type: entity @@ -61,7 +61,7 @@ duration: 1020 maxDuration: 1350 - type: BluespaceErrorRule - gridPath: /Maps/Bluespace/vault.yml + gridPath: /Maps/_NF/Bluespace/vault.yml rewardFactor: 0.7 - type: entity @@ -81,7 +81,7 @@ duration: 590 maxDuration: 780 - type: BluespaceErrorRule - gridPath: /Maps/Bluespace/vaultsmall.yml + gridPath: /Maps/_NF/Bluespace/vaultsmall.yml rewardFactor: 1 - type: entity @@ -101,7 +101,7 @@ duration: 1500 maxDuration: 1800 - type: BluespaceErrorRule - gridPath: /Maps/Bluespace/asteroidvault.yml + gridPath: /Maps/_NF/Bluespace/asteroidvault.yml - type: entity id: BluespaceAsteroidBunker @@ -120,7 +120,7 @@ duration: 2100 maxDuration: 2400 - type: BluespaceErrorRule - gridPath: /Maps/Bluespace/asteroidbunker.yml + gridPath: /Maps/_NF/Bluespace/asteroidbunker.yml - type: entity id: BluespaceCargoniaShip @@ -139,4 +139,4 @@ duration: 900 maxDuration: 1200 - type: BluespaceErrorRule - gridPath: /Maps/Bluespace/cargoniaship.yml + gridPath: /Maps/_NF/Bluespace/cargoniaship.yml diff --git a/Resources/Prototypes/_NF/Shipyard/anomalouslab.yml b/Resources/Prototypes/_NF/Shipyard/anomalouslab.yml index f1cd679309c..1dd40c41193 100644 --- a/Resources/Prototypes/_NF/Shipyard/anomalouslab.yml +++ b/Resources/Prototypes/_NF/Shipyard/anomalouslab.yml @@ -1,7 +1,7 @@ - type: gameMap id: anomalouslab mapName: 'Anomalous Lab' - mapPath: /Maps/anomalouslab.yml + mapPath: /Maps/_NF/POI/anomalouslab.yml minPlayers: 0 stations: anomalouslab: diff --git a/Resources/Prototypes/_NF/Shipyard/cove.yml b/Resources/Prototypes/_NF/Shipyard/cove.yml index 95d4a5b6d02..6d3b83ea69a 100644 --- a/Resources/Prototypes/_NF/Shipyard/cove.yml +++ b/Resources/Prototypes/_NF/Shipyard/cove.yml @@ -1,7 +1,7 @@ - type: gameMap id: Cove mapName: 'Pirate Cove' - mapPath: /Maps/cove.yml + mapPath: /Maps/_NF/POI/cove.yml minPlayers: 0 stations: Cove: diff --git a/Resources/Prototypes/_NF/Shipyard/lodge.yml b/Resources/Prototypes/_NF/Shipyard/lodge.yml index 89d2fe33ffa..8bae4a40ffb 100644 --- a/Resources/Prototypes/_NF/Shipyard/lodge.yml +++ b/Resources/Prototypes/_NF/Shipyard/lodge.yml @@ -1,7 +1,7 @@ - type: gameMap id: Lodge mapName: 'Expeditionary Lodge' - mapPath: /Maps/cove.yml + mapPath: /Maps/_NF/POI/cove.yml minPlayers: 0 stations: Lodge: diff --git a/Resources/Prototypes/_NF/Shipyard/mccargo.yml b/Resources/Prototypes/_NF/Shipyard/mccargo.yml index b2d11c3bb3e..a6d3db8ccbd 100644 --- a/Resources/Prototypes/_NF/Shipyard/mccargo.yml +++ b/Resources/Prototypes/_NF/Shipyard/mccargo.yml @@ -12,12 +12,12 @@ price: 77000 category: Medium group: Civilian - shuttlePath: /Maps/Shuttles/mccargo.yml + shuttlePath: /Maps/_NF/Shuttles/mccargo.yml - type: gameMap id: mccargo mapName: 'DC McCargo' - mapPath: /Maps/Shuttles/mccargo.yml + mapPath: /Maps/_NF/Shuttles/mccargo.yml minPlayers: 0 stations: mccargo: From 80904129e45d8136ca8a219cb5bccfc43b67ff9e Mon Sep 17 00:00:00 2001 From: Maxtone <124747282+MagnusCrowe@users.noreply.github.com> Date: Mon, 1 Jan 2024 11:00:12 -0600 Subject: [PATCH 16/66] Adds station guard uniform jumpsuit and skirt (#803) * Adds station guard uniform jumpsuit and skirt * Updated comments * Moving to _NF --------- Co-authored-by: Dvir --- .../Entities/Structures/Machines/lathe.yml | 2 ++ .../Entities/Clothing/Uniforms/jumpskirts.yml | 10 ++++++ .../Entities/Clothing/Uniforms/jumpsuits.yml | 11 +++++++ .../_NF/Recipes/Construction/clothing.yml | 14 ++++++++ .../equipped-INNERCLOTHING-monkey.png | Bin 0 -> 3997 bytes .../equipped-INNERCLOTHING.png | Bin 0 -> 4077 bytes .../security_stationguard.rsi/icon.png | Bin 0 -> 3370 bytes .../security_stationguard.rsi/inhand-left.png | Bin 0 -> 3319 bytes .../inhand-right.png | Bin 0 -> 3572 bytes .../security_stationguard.rsi/meta.json | 30 ++++++++++++++++++ .../equipped-INNERCLOTHING-monkey.png | Bin 0 -> 4328 bytes .../equipped-INNERCLOTHING.png | Bin 0 -> 4221 bytes .../security_stationguard.rsi/icon.png | Bin 0 -> 3213 bytes .../security_stationguard.rsi/inhand-left.png | Bin 0 -> 3319 bytes .../inhand-right.png | Bin 0 -> 3572 bytes .../security_stationguard.rsi/meta.json | 30 ++++++++++++++++++ 16 files changed, 97 insertions(+) create mode 100644 Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/security_stationguard.rsi/equipped-INNERCLOTHING-monkey.png create mode 100644 Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/security_stationguard.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/security_stationguard.rsi/icon.png create mode 100644 Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/security_stationguard.rsi/inhand-left.png create mode 100644 Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/security_stationguard.rsi/inhand-right.png create mode 100644 Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/security_stationguard.rsi/meta.json create mode 100644 Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/security_stationguard.rsi/equipped-INNERCLOTHING-monkey.png create mode 100644 Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/security_stationguard.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/security_stationguard.rsi/icon.png create mode 100644 Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/security_stationguard.rsi/inhand-left.png create mode 100644 Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/security_stationguard.rsi/inhand-right.png create mode 100644 Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/security_stationguard.rsi/meta.json diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index cf8849fd6bf..5f86857f882 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -795,6 +795,8 @@ - ClothingUniformJumpskirtBrigmedic - ClothingUniformJumpsuitWarden - ClothingUniformJumpskirtWarden + - ClothingUniformJumpsuitSecStationGuard #Frontier + - ClothingUniformJumpskirtSecStationGuard #Frontier - ClothingOuterWinterCap - ClothingOuterWinterCE - ClothingOuterWinterCMO diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpskirts.yml index c7ed9db151b..33eef9f62f4 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpskirts.yml @@ -37,3 +37,13 @@ - type: Clothing sprite: _NF/Clothing/Uniforms/Jumpskirt/mercenary.rsi +- type: entity + parent: ClothingUniformSkirtBase + id: ClothingUniformJumpskirtSecStationGuard + name: station guard jumpskirt + description: A specialized uniform for a Frontier Outpost guard. Crisp and official to let dock loiterers know you mean business. + components: + - type: Sprite + sprite: _NF/Clothing/Uniforms/Jumpskirt/security_stationguard.rsi + - type: Clothing + sprite: _NF/Clothing/Uniforms/Jumpskirt/security_stationguard.rsi diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpsuits.yml index 25aefa42b6d..4cd882060e9 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpsuits.yml @@ -36,3 +36,14 @@ sprite: _NF/Clothing/Uniforms/Jumpsuit/chaplain-pilgrim.rsi - type: Clothing sprite: _NF/Clothing/Uniforms/Jumpsuit/chaplain-pilgrim.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitSecStationGuard + name: station guard jumpsuit + description: A specialized uniform for a Frontier Outpost guard. Crisp and official to let dock loiterers know you mean business. + components: + - type: Sprite + sprite: _NF/Clothing/Uniforms/Jumpsuit/security_stationguard.rsi + - type: Clothing + sprite: _NF/Clothing/Uniforms/Jumpsuit/security_stationguard.rsi diff --git a/Resources/Prototypes/_NF/Recipes/Construction/clothing.yml b/Resources/Prototypes/_NF/Recipes/Construction/clothing.yml index 87096359b75..d0b1ad095d6 100644 --- a/Resources/Prototypes/_NF/Recipes/Construction/clothing.yml +++ b/Resources/Prototypes/_NF/Recipes/Construction/clothing.yml @@ -8,3 +8,17 @@ description: A quiver to hold crossbow bolts. icon: { sprite: _NF/Objects/Clothing/Belt/crossbow_quiver.rsi, state: icon } objectType: Item + +- type: latheRecipe + id: ClothingUniformJumpskirtSecStationGuard + result: ClothingUniformJumpskirtSecStationGuard + completetime: 4 + materials: + Cloth: 300 + +- type: latheRecipe + id: ClothingUniformJumpsuitSecStationGuard + result: ClothingUniformJumpsuitSecStationGuard + completetime: 4 + materials: + Cloth: 300 diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/security_stationguard.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/security_stationguard.rsi/equipped-INNERCLOTHING-monkey.png new file mode 100644 index 0000000000000000000000000000000000000000..b962d5c9626016ca941d425639e4a18b307be061 GIT binary patch literal 3997 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/security_stationguard.rsi/icon.png b/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/security_stationguard.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..5ec4252aa3864ff6484dcae12b9a9cb3c038dd86 GIT binary patch literal 3370 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/security_stationguard.rsi/meta.json b/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/security_stationguard.rsi/meta.json new file mode 100644 index 00000000000..ffecc9fc1bb --- /dev/null +++ b/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/security_stationguard.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "made by @mureixlol, for monkey @hem0mancer, recolored by MagnusCrowe", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-monkey", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/security_stationguard.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/security_stationguard.rsi/equipped-INNERCLOTHING-monkey.png new file mode 100644 index 0000000000000000000000000000000000000000..f5bbb0366e3eaa791bff2363cdd1ff55af9de254 GIT binary patch literal 4328 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/security_stationguard.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/security_stationguard.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..cc83f03e1bb4f3967b302c1afa87edf923006d59 GIT binary patch literal 4221 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 Twm~h$00000NkvXXu0mjfxa;2> literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/security_stationguard.rsi/icon.png b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/security_stationguard.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..fe9aea69e94d0437d64c47767adec5f8adb5c437 GIT binary patch literal 3213 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/security_stationguard.rsi/meta.json b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/security_stationguard.rsi/meta.json new file mode 100644 index 00000000000..f22d6d800a5 --- /dev/null +++ b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/security_stationguard.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14, recolored by MagnusCrowe", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-monkey", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} From 725a1c778459e6a5805039dc7444371408bdeed4 Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Mon, 1 Jan 2024 17:00:35 +0000 Subject: [PATCH 17/66] Automatic Changelog (#803) --- Resources/Changelog/Changelog.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 3e8dd52ca0b..4140cca5369 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -2617,3 +2617,9 @@ Entries: message: Tweaked Pulse - replaced APUs with P.A.C.M.A.N. id: 4718 time: '2024-01-01T03:05:22.0000000+00:00' +- author: MagnusCrowe + changes: + - type: Add + message: Added station guard jumpsuit and jumpskirt. + id: 4719 + time: '2024-01-01T17:00:12.0000000+00:00' From 9367e648dd12502f5c2b8a5556ce753c2f444d37 Mon Sep 17 00:00:00 2001 From: GingerAvalanche <32864080+GingerAvalanche@users.noreply.github.com> Date: Mon, 1 Jan 2024 10:06:11 -0800 Subject: [PATCH 18/66] Add ship designation to shuttle console UI (#795) * Add shuttle designation to console UI * Add "ship name" column * New frontiers loc change Reverted base localization change Added new file with NF localization * Shuttle name length fix Add comments for frontier changes Split name off into header, keep designation in ReadonlyDisplay - Fixes long names causing the UI to extend beyond the parent window * Shrink lines --------- Co-authored-by: Dvir --- .../Shuttles/UI/ShuttleConsoleWindow.xaml | 3 +++ .../Shuttles/UI/ShuttleConsoleWindow.xaml.cs | 18 ++++++++++++++++-- .../Locale/en-US/_NF/shuttles/console.ftl | 1 + 3 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 Resources/Locale/en-US/_NF/shuttles/console.ftl diff --git a/Content.Client/Shuttles/UI/ShuttleConsoleWindow.xaml b/Content.Client/Shuttles/UI/ShuttleConsoleWindow.xaml index 6f30a5ddd51..653813f909f 100644 --- a/Content.Client/Shuttles/UI/ShuttleConsoleWindow.xaml +++ b/Content.Client/Shuttles/UI/ShuttleConsoleWindow.xaml @@ -66,6 +66,9 @@ + public bool CanGib(EntityUid uid, EntityUid victim, MaterialReclaimerComponent component) { - return component.Powered && - component.Enabled && - HasComp(victim) && - HasComp(uid); + return false; // DeltaV - Kinda LRP + // return component.Powered && + // component.Enabled && + // HasComp(victim) && + // HasComp(uid); } /// From 913ef14d0b0a577d171198ec5192d8086384bd13 Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Sun, 7 Jan 2024 21:00:26 +0200 Subject: [PATCH 57/66] Plastitanium Windows (#839) * Update plastitanium.yml * Harder walls * Plastwalls but stronger * Update plastitanium.yml --- .../Structures/Windows/plastitanium.yml | 34 ++++++++---- .../Structures/Windows/plastitanium.yml | 45 ++++++++++++++++ .../Graphs/structures/plastitanium.yml | 52 +++++++++++++++++++ 3 files changed, 120 insertions(+), 11 deletions(-) create mode 100644 Resources/Prototypes/_NF/Entities/Structures/Windows/plastitanium.yml create mode 100644 Resources/Prototypes/_NF/Recipes/Construction/Graphs/structures/plastitanium.yml diff --git a/Resources/Prototypes/Entities/Structures/Windows/plastitanium.yml b/Resources/Prototypes/Entities/Structures/Windows/plastitanium.yml index cae9b55452e..e50606694e3 100644 --- a/Resources/Prototypes/Entities/Structures/Windows/plastitanium.yml +++ b/Resources/Prototypes/Entities/Structures/Windows/plastitanium.yml @@ -1,13 +1,14 @@ - type: entity id: PlastitaniumWindow name: plastitanium window - parent: Window + parent: PlastitaniumWindowIndestructible # Frontier - Change to ReinforcedWindow + suffix: "" # Frontier components: - - type: Sprite - drawdepth: WallTops - sprite: Structures/Windows/plastitanium_window.rsi - - type: Icon - sprite: Structures/Windows/plastitanium_window.rsi + # - type: Sprite + # drawdepth: WallTops + # sprite: Structures/Windows/plastitanium_window.rsi + # - type: Icon + # sprite: Structures/Windows/plastitanium_window.rsi - type: Damageable damageContainer: Inorganic damageModifierSet: RGlass @@ -33,14 +34,25 @@ max: 2 - !type:DoActsBehavior acts: [ "Destruction" ] - - type: IconSmooth - base: plwindow - - type: Appearance + # - type: IconSmooth + # base: plwindow + # - type: Appearance - type: DamageVisuals thresholds: [4, 8, 12] damageDivisor: 36 trackAllDamage: true damageOverlay: sprite: Structures/Windows/cracks.rsi - - type: StaticPrice - price: 65 + # - type: StaticPrice + # price: 65 + - type: Construction # Frontier + graph: Plastitanium + node: plastitaniumWindow + - type: Repairable + - type: ExaminableDamage + messages: WindowMessages + - type: MeleeSound + soundGroups: + Brute: + path: + "/Audio/Effects/glass_hit.ogg" diff --git a/Resources/Prototypes/_NF/Entities/Structures/Windows/plastitanium.yml b/Resources/Prototypes/_NF/Entities/Structures/Windows/plastitanium.yml new file mode 100644 index 00000000000..c7b6f38cb7c --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Structures/Windows/plastitanium.yml @@ -0,0 +1,45 @@ +- type: entity + id: PlastitaniumWindowIndestructible + name: plastitanium window + parent: BaseStructure + suffix: Indestructible + placement: + mode: SnapgridCenter + snap: + - Window + components: + - type: WallMount + arc: 360 # interact despite grilles + - type: Tag + tags: + - ForceFixRotations + - Window + - type: Sprite + drawdepth: WallTops + sprite: Structures/Windows/plastitanium_window.rsi + - type: Icon + sprite: Structures/Windows/plastitanium_window.rsi + state: full + - type: Physics + bodyType: Static + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeAabb {} + mask: + - FullTileMask + layer: + - GlassLayer + - type: Airtight + - type: IconSmooth + key: walls + base: plwindow + - type: InteractionPopup + interactSuccessString: comp-window-knock + messagePerceivedByOthers: comp-window-knock + interactSuccessSound: + path: /Audio/Effects/glass_knock.ogg + - type: Appearance + - type: StaticPrice + price: 65 diff --git a/Resources/Prototypes/_NF/Recipes/Construction/Graphs/structures/plastitanium.yml b/Resources/Prototypes/_NF/Recipes/Construction/Graphs/structures/plastitanium.yml new file mode 100644 index 00000000000..6cc95e71b7f --- /dev/null +++ b/Resources/Prototypes/_NF/Recipes/Construction/Graphs/structures/plastitanium.yml @@ -0,0 +1,52 @@ +- type: constructionGraph + id: Plastitanium + start: start + graph: + - node: start + edges: + - to: plastitaniumWindow + steps: + - material: UraniumGlass + amount: 2 + doAfter: 2 + + - node: plastitaniumWindow + entity: PlastitaniumWindow + edges: + - to: start + completed: + - !type:SpawnPrototype + prototype: SheetRGlass1 + amount: 2 + - !type:DeleteEntity {} + steps: + - tool: Welding + doAfter: 5 + - tool: Screwing + doAfter: 2 + - tool: Prying + doAfter: 3 + - tool: Welding + doAfter: 5 + - tool: Screwing + doAfter: 2 + - tool: Anchoring + doAfter: 3 + - tool: Cutting + doAfter: 1 + - tool: Screwing + doAfter: 1 + - tool: Welding + doAfter: 5 + - tool: Prying + doAfter: 1 + - tool: Anchoring + doAfter: 1 + - tool: Welding + doAfter: 10 + - tool: Prying + doAfter: 1 + - tool: Screwing + doAfter: 1 + - tool: Cutting + doAfter: 1 From d381c3c6ffb4a55b20ffdfc564adc618c7f329ed Mon Sep 17 00:00:00 2001 From: Mnemotechnican <69920617+Mnemotechnician@users.noreply.github.com> Date: Sun, 7 Jan 2024 22:28:56 +0300 Subject: [PATCH 58/66] Custom shipyard listings (#808) * Did the deed * Fix spectre's name tag * Removed the None ui key * Typo * Limit the empress' console to just 3 ships * Cleanup * Remove unused name field --- .../BUI/ShipyardConsoleBoundUserInterface.cs | 6 +- .../Shipyard/UI/ShipyardConsoleMenu.xaml.cs | 51 +++++++---------- .../Systems/ShipyardSystem.Consoles.cs | 56 ++++++++++++++++++- .../BUI/ShipyardConsoleInterfaceState.cs | 9 ++- .../Components/ShipyardListingComponent.cs | 17 ++++++ .../Shipyard/SharedShipyardSystem.cs | 21 +++++-- Resources/Maps/Shuttles/empress.yml | 2 +- .../Machines/Computers/computers.yml | 28 ++++++++-- .../Computers/mothership-computers.yml | 22 ++++++++ Resources/Prototypes/_NF/Shipyard/cleric.yml | 2 +- Resources/Prototypes/_NF/Shipyard/fighter.yml | 2 +- Resources/Prototypes/_NF/Shipyard/rogue.yml | 2 +- Resources/Prototypes/_NF/Shipyard/spectre.yml | 4 +- 13 files changed, 170 insertions(+), 52 deletions(-) create mode 100644 Content.Shared/Shipyard/Components/ShipyardListingComponent.cs create mode 100644 Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/mothership-computers.yml diff --git a/Content.Client/Shipyard/BUI/ShipyardConsoleBoundUserInterface.cs b/Content.Client/Shipyard/BUI/ShipyardConsoleBoundUserInterface.cs index d1703159a70..f1a257045f6 100644 --- a/Content.Client/Shipyard/BUI/ShipyardConsoleBoundUserInterface.cs +++ b/Content.Client/Shipyard/BUI/ShipyardConsoleBoundUserInterface.cs @@ -42,12 +42,12 @@ protected override void Open() _menu.TargetIdButton.OnPressed += _ => SendMessage(new ItemSlotButtonPressedEvent("ShipyardConsole-targetId")); } - private void Populate(byte uiKey) + private void Populate(List prototypes, string name) { if (_menu == null) return; - _menu.PopulateProducts((ShipyardConsoleUiKey) uiKey); + _menu.PopulateProducts(prototypes, name); _menu.PopulateCategories(); } @@ -61,7 +61,7 @@ protected override void UpdateState(BoundUserInterfaceState state) Balance = cState.Balance; ShipSellValue = cState.ShipSellValue; var castState = (ShipyardConsoleInterfaceState) state; - Populate(castState.UiKey); + Populate(castState.ShipyardPrototypes, castState.ShipyardName); _menu?.UpdateState(castState); } diff --git a/Content.Client/Shipyard/UI/ShipyardConsoleMenu.xaml.cs b/Content.Client/Shipyard/UI/ShipyardConsoleMenu.xaml.cs index d6489776385..93ae70fd5ac 100644 --- a/Content.Client/Shipyard/UI/ShipyardConsoleMenu.xaml.cs +++ b/Content.Client/Shipyard/UI/ShipyardConsoleMenu.xaml.cs @@ -23,6 +23,9 @@ public sealed partial class ShipyardConsoleMenu : FancyWindow private readonly List _categoryStrings = new(); private string? _category; + private List _lastProtos = new(); + private string _lastType = ""; + public ShipyardConsoleMenu(ShipyardConsoleBoundUserInterface owner) { RobustXamlLoader.Load(this); @@ -38,12 +41,12 @@ public ShipyardConsoleMenu(ShipyardConsoleBoundUserInterface owner) private void OnCategoryItemSelected(OptionButton.ItemSelectedEventArgs args) { SetCategoryText(args.Id); - PopulateProducts((ShipyardConsoleUiKey) _menu.UiKey); + PopulateProducts(_lastProtos, _lastType); } private void OnSearchBarTextChanged(LineEdit.LineEditEventArgs args) { - PopulateProducts((ShipyardConsoleUiKey) _menu.UiKey); + PopulateProducts(_lastProtos, _lastType); } private void SetCategoryText(int id) @@ -52,52 +55,35 @@ private void SetCategoryText(int id) Categories.SelectId(id); } - private void GetPrototypes(out IEnumerable vessels) - { - vessels = _protoManager.EnumeratePrototypes(); - } - /// /// Populates the list of products that will actually be shown, using the current filters. /// - public void PopulateProducts(ShipyardConsoleUiKey uiKey) + public void PopulateProducts(List prototypes, string type) { Vessels.RemoveAllChildren(); - GetPrototypes(out var vessels); - var vesselList = vessels.ToList(); - vesselList.Sort((x, y) => - string.Compare(x.Name, y.Name, StringComparison.CurrentCultureIgnoreCase)); - var type = uiKey switch - { - ShipyardConsoleUiKey.Shipyard => "Civilian", - ShipyardConsoleUiKey.Security => "Security", - ShipyardConsoleUiKey.BlackMarket => "BlackMarket", - ShipyardConsoleUiKey.Expedition => "Expedition", - ShipyardConsoleUiKey.Scrap => "Scrap", - _ => "Shipyard", - }; + var newVessels = prototypes.Select(it => _protoManager.TryIndex(it, out var proto) ? proto : null) + .Where(it => it != null) + .ToList(); + + newVessels.Sort((x, y) => + string.Compare(x!.Name, y!.Name, StringComparison.CurrentCultureIgnoreCase)); var search = SearchBar.Text.Trim().ToLowerInvariant(); - foreach (var prototype in vesselList) + foreach (var prototype in newVessels) { - // filter by type for ui key - if (prototype.Group != type) - { - continue; - } // if no search or category // else if search // else if category and not search if (search.Length == 0 && _category == null || - search.Length != 0 && prototype.Name.ToLowerInvariant().Contains(search) || - search.Length == 0 && _category != null && prototype.Category.Equals(_category)) + search.Length != 0 && prototype!.Name.ToLowerInvariant().Contains(search) || + search.Length == 0 && _category != null && prototype!.Category.Equals(_category)) { var vesselEntry = new VesselRow { Vessel = prototype, - VesselName = { Text = prototype.Name }, + VesselName = { Text = prototype!.Name }, Purchase = { ToolTip = prototype.Description, TooltipDelay = 0.2f }, Price = { Text = Loc.GetString("cargo-console-menu-points-amount", ("amount", prototype.Price.ToString())) }, }; @@ -105,6 +91,9 @@ public void PopulateProducts(ShipyardConsoleUiKey uiKey) Vessels.AddChild(vesselEntry); } } + + _lastProtos = prototypes; + _lastType = type; } /// @@ -114,7 +103,7 @@ public void PopulateCategories() { _categoryStrings.Clear(); Categories.Clear(); - GetPrototypes(out var vessels); + var vessels = _protoManager.EnumeratePrototypes(); foreach (var prototype in vessels) { if (!_categoryStrings.Contains(prototype.Category)) diff --git a/Content.Server/Shipyard/Systems/ShipyardSystem.Consoles.cs b/Content.Server/Shipyard/Systems/ShipyardSystem.Consoles.cs index 36e90332228..88047b65b39 100644 --- a/Content.Server/Shipyard/Systems/ShipyardSystem.Consoles.cs +++ b/Content.Server/Shipyard/Systems/ShipyardSystem.Consoles.cs @@ -102,6 +102,13 @@ private void OnPurchaseMessage(EntityUid uid, ShipyardConsoleComponent component return; } + if (!GetAvailableShuttles(uid).Contains(vessel.ID)) + { + PlayDenySound(uid, component); + _adminLogger.Add(LogType.Action, LogImpact.Medium, $"{ToPrettyString(player):player} tried to purchase a vessel that was never available."); + return; + } + var name = vessel.Name; if (vessel.Price <= 0) return; @@ -495,15 +502,62 @@ public bool FoundOrganics(EntityUid uid, EntityQuery mobQuery return false; } + /// + /// Returns all shuttle prototype IDs the given shipyard console can offer. + /// + public List GetAvailableShuttles(EntityUid uid, ShipyardConsoleUiKey? key = null, ShipyardListingComponent? listing = null) + { + var availableShuttles = new List(); + + if (key == null && TryComp(uid, out var ui)) + { + // Try to find a ui key that is an instance of the shipyard console ui key + foreach (var (k, v) in ui.Interfaces) + { + if (k is ShipyardConsoleUiKey shipyardKey) + { + key = shipyardKey; + break; + } + } + } + + // Add all prototypes matching the ui key + if (key != null && key != ShipyardConsoleUiKey.Custom && ShipyardGroupMapping.TryGetValue(key.Value, out var group)) + { + var protos = _prototypeManager.EnumeratePrototypes(); + foreach (var proto in protos) + { + if (proto.Group == group) + availableShuttles.Add(proto.ID); + } + } + + // Add all prototypes specified in ShipyardListing + if (listing != null || TryComp(uid, out listing)) + { + foreach (var shuttle in listing.Shuttles) + { + availableShuttles.Add(shuttle); + } + } + + return availableShuttles; + } + private void RefreshState(EntityUid uid, int balance, bool access, string? shipDeed, int shipSellValue, bool isTargetIdPresent, ShipyardConsoleUiKey uiKey) { + var listing = TryComp(uid, out var comp) ? comp : null; + var newState = new ShipyardConsoleInterfaceState( balance, access, shipDeed, shipSellValue, isTargetIdPresent, - ((byte)uiKey)); + ((byte)uiKey), + GetAvailableShuttles(uid, uiKey, listing), + uiKey.ToString()); _ui.TrySetUiState(uid, uiKey, newState); } diff --git a/Content.Shared/Shipyard/BUI/ShipyardConsoleInterfaceState.cs b/Content.Shared/Shipyard/BUI/ShipyardConsoleInterfaceState.cs index 95fcac3f857..b1072735618 100644 --- a/Content.Shared/Shipyard/BUI/ShipyardConsoleInterfaceState.cs +++ b/Content.Shared/Shipyard/BUI/ShipyardConsoleInterfaceState.cs @@ -12,13 +12,18 @@ public sealed class ShipyardConsoleInterfaceState : BoundUserInterfaceState public readonly bool IsTargetIdPresent; public readonly byte UiKey; + public readonly List ShipyardPrototypes; + public readonly string ShipyardName; + public ShipyardConsoleInterfaceState( int balance, bool accessGranted, string? shipDeedTitle, int shipSellValue, bool isTargetIdPresent, - byte uiKey) + byte uiKey, + List shipyardPrototypes, + string shipyardName) { Balance = balance; AccessGranted = accessGranted; @@ -26,5 +31,7 @@ public ShipyardConsoleInterfaceState( ShipSellValue = shipSellValue; IsTargetIdPresent = isTargetIdPresent; UiKey = uiKey; + ShipyardPrototypes = shipyardPrototypes; + ShipyardName = shipyardName; } } diff --git a/Content.Shared/Shipyard/Components/ShipyardListingComponent.cs b/Content.Shared/Shipyard/Components/ShipyardListingComponent.cs new file mode 100644 index 00000000000..2aa1df67534 --- /dev/null +++ b/Content.Shared/Shipyard/Components/ShipyardListingComponent.cs @@ -0,0 +1,17 @@ +using Content.Shared.Shipyard.Prototypes; +using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List; + +namespace Content.Shared.Shipyard.Components; + +/// +/// When applied to a shipyard console, adds all specified shuttles to the list of sold shuttles. +/// +[RegisterComponent] +public sealed partial class ShipyardListingComponent : Component +{ + /// + /// All VesselPrototype IDs that should be listed in this shipyard console. + /// + [ViewVariables, DataField(customTypeSerializer: typeof(PrototypeIdListSerializer))] + public List Shuttles = new(); +} diff --git a/Content.Shared/Shipyard/SharedShipyardSystem.cs b/Content.Shared/Shipyard/SharedShipyardSystem.cs index 222024b2ec4..17a153aae75 100644 --- a/Content.Shared/Shipyard/SharedShipyardSystem.cs +++ b/Content.Shared/Shipyard/SharedShipyardSystem.cs @@ -7,6 +7,7 @@ namespace Content.Shared.Shipyard; +// Note: when adding a new ui key, don't forget to modify the dictionary in SharedShipyardSystem [NetSerializable, Serializable] public enum ShipyardConsoleUiKey : byte { @@ -14,14 +15,26 @@ public enum ShipyardConsoleUiKey : byte Security, BlackMarket, Expedition, - Scrap - // Syndicate - //Not currently implemented. Could be used in the future to give other factions a variety of shuttle options, - //like nukies, syndicate, or for evac purchases. + Scrap, + // Do not add any ship to this key. Shipyards using it are inherently empty and are populated using the ShipyardListingComponent. + Custom } public abstract class SharedShipyardSystem : EntitySystem { + /// + /// Maps entries of the enum to how they're specified in shuttle prototype files + /// + public static readonly Dictionary ShipyardGroupMapping = new() + { + {ShipyardConsoleUiKey.Shipyard, "Civilian"}, + {ShipyardConsoleUiKey.Security, "Security"}, + {ShipyardConsoleUiKey.BlackMarket, "BlackMarket"}, + {ShipyardConsoleUiKey.Expedition, "Expedition"}, + {ShipyardConsoleUiKey.Scrap, "Scrap"}, + {ShipyardConsoleUiKey.Custom, ""} + }; + [Dependency] private readonly ItemSlotsSystem _itemSlotsSystem = default!; public override void Initialize() diff --git a/Resources/Maps/Shuttles/empress.yml b/Resources/Maps/Shuttles/empress.yml index 9abec7d0eab..99cd1722da0 100644 --- a/Resources/Maps/Shuttles/empress.yml +++ b/Resources/Maps/Shuttles/empress.yml @@ -6940,7 +6940,7 @@ entities: - pos: 15.5,-6.5 parent: 1 type: Transform -- proto: ComputerShipyardSecurity +- proto: EmpressMothershipComputer entities: - uid: 118 components: diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/computers.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/computers.yml index 00c75ac18c5..b4ea1018719 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/computers.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/computers.yml @@ -68,7 +68,7 @@ interfaces: - key: enum.ShipyardConsoleUiKey.Shipyard type: ShipyardConsoleBoundUserInterface - - type: ItemSlots + - type: ItemSlots - type: ContainerContainer containers: ShipyardConsole-targetId: !type:ContainerSlot {} @@ -80,6 +80,22 @@ !type:DamageTrigger damage: 0 +# Custom console +- type: entity + id: BaseMothershipComputer + parent: ComputerShipyard + name: mothership console + description: Used on motherships to purchase and sell ships without returning to a station. + components: + - type: ActivatableUI + key: enum.ShipyardConsoleUiKey.Custom + - type: UserInterface + interfaces: + - key: enum.ShipyardConsoleUiKey.Custom + type: ShipyardConsoleBoundUserInterface + - type: ShipyardListing + +# Hardcoded consoles - type: entity id: ComputerShipyardSecurity parent: ComputerShipyard @@ -100,7 +116,7 @@ - map: ["computerLayerKeyboard"] state: generic_keyboard - map: ["computerLayerScreen"] - state: shipyard_security + state: shipyard_security - map: ["computerLayerKeys"] state: telesci_key @@ -124,7 +140,7 @@ - map: ["computerLayerKeyboard"] state: generic_keyboard - map: ["computerLayerScreen"] - state: shipyard_blackmarket + state: shipyard_blackmarket - map: ["computerLayerKeys"] state: blackmarket_key - type: Destructible @@ -156,7 +172,7 @@ - map: ["computerLayerKeyboard"] state: generic_keyboard - map: ["computerLayerScreen"] - state: shipyard_blackmarket + state: shipyard_blackmarket - map: ["computerLayerKeys"] state: blackmarket_key @@ -180,7 +196,7 @@ - map: ["computerLayerKeyboard"] state: generic_keyboard - map: ["computerLayerScreen"] - state: shipyard_blackmarket + state: shipyard_blackmarket - map: ["computerLayerKeys"] state: blackmarket_key @@ -281,4 +297,4 @@ description: Used to sell goods loaded onto cargo pallets components: - type: MarketModifier - mod: 0.40 \ No newline at end of file + mod: 0.40 diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/mothership-computers.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/mothership-computers.yml new file mode 100644 index 00000000000..07a1a5a83b2 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/mothership-computers.yml @@ -0,0 +1,22 @@ +# The empress console +- type: entity + id: EmpressMothershipComputer + name: Empress mothership console + parent: BaseMothershipComputer + components: + - type: Sprite + sprite: _NF/Structures/Machines/computers.rsi + layers: + - map: ["computerLayerBody"] + state: computer + - map: ["computerLayerKeyboard"] + state: generic_keyboard + - map: ["computerLayerScreen"] + state: shipyard_security + - map: ["computerLayerKeys"] + state: telesci_key + - type: ShipyardListing + shuttles: + - Fighter + - Cleric + - Rogue diff --git a/Resources/Prototypes/_NF/Shipyard/cleric.yml b/Resources/Prototypes/_NF/Shipyard/cleric.yml index fd0f9b7f2ae..f4f706fd8db 100644 --- a/Resources/Prototypes/_NF/Shipyard/cleric.yml +++ b/Resources/Prototypes/_NF/Shipyard/cleric.yml @@ -4,7 +4,7 @@ description: Small support vessel used for emergency rescues and first aid. price: 10800 #Appraisal is 10500 category: Small - group: Security #Should be only available at a cruiser custom shipyard TODO + group: None shuttlePath: /Maps/Shuttles/cleric.yml - type: gameMap diff --git a/Resources/Prototypes/_NF/Shipyard/fighter.yml b/Resources/Prototypes/_NF/Shipyard/fighter.yml index a425f334c65..ae8ec1a2610 100644 --- a/Resources/Prototypes/_NF/Shipyard/fighter.yml +++ b/Resources/Prototypes/_NF/Shipyard/fighter.yml @@ -4,7 +4,7 @@ description: Small attack vessel used for boarding and transport of prisoners. price: 9000 #not sure how much mark up % to add but the appraisal is 8491$ category: Small - group: Security #Should be only available at a cruiser custom shipyard TODO + group: None shuttlePath: /Maps/Shuttles/fighter.yml - type: gameMap diff --git a/Resources/Prototypes/_NF/Shipyard/rogue.yml b/Resources/Prototypes/_NF/Shipyard/rogue.yml index 9cb24143192..de155d51d9f 100644 --- a/Resources/Prototypes/_NF/Shipyard/rogue.yml +++ b/Resources/Prototypes/_NF/Shipyard/rogue.yml @@ -4,7 +4,7 @@ description: Small assault vessel with a toggle for going dark in deep space. price: 8200 #the appraisal is 7941$ category: Small - group: Security #Should be only available at a cruiser custom shipyard TODO + group: None shuttlePath: /Maps/Shuttles/rogue.yml - type: gameMap diff --git a/Resources/Prototypes/_NF/Shipyard/spectre.yml b/Resources/Prototypes/_NF/Shipyard/spectre.yml index 30103fecf95..fa6d628638e 100644 --- a/Resources/Prototypes/_NF/Shipyard/spectre.yml +++ b/Resources/Prototypes/_NF/Shipyard/spectre.yml @@ -1,6 +1,6 @@ - type: vessel id: Spectre - name: Spectre + name: NSS Spectre description: A large research mothership designed to be flown nexto a small fleet of other ships including salvage and food services. price: 195000 category: Large @@ -17,7 +17,7 @@ stationProto: StandardFrontierVessel components: - type: StationNameSetup - mapNameTemplate: 'Spectre {1}' + mapNameTemplate: 'Spectre {1}' nameGenerator: !type:NanotrasenNameGenerator prefixCreator: '14' From 8ebe330dc2284838c331ba5cc027f3060c765422 Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Sun, 7 Jan 2024 19:29:20 +0000 Subject: [PATCH 59/66] Automatic Changelog (#808) --- Resources/Changelog/Changelog.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 3b75cd501c7..bc399d82b2e 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -2705,3 +2705,15 @@ Entries: message: Tweaked Barge - added waste loop to atmos. id: 4731 time: '2024-01-07T16:12:03.0000000+00:00' +- author: Mnemotechnician + changes: + - type: Tweak + message: >- + The shipyard console on the Empress was changed to only sell small + security ships + - type: Tweak + message: >- + The Cleric, the Rogue and the Fighter are now only available from the + Empresses shipyard console. + id: 4732 + time: '2024-01-07T19:28:57.0000000+00:00' From 51a926d385a0c47ce72bdbf0b61d17ba11daf8fe Mon Sep 17 00:00:00 2001 From: TsjipTsjip <19798667+TsjipTsjip@users.noreply.github.com> Date: Sun, 7 Jan 2024 20:48:49 +0100 Subject: [PATCH 60/66] Praeda rework (#833) * Create pr-labeler.yml * Update labeler.yml * Telecoms * Rework praeda * Un hail cargonia. * Turn on AME and wrench canisters --------- Co-authored-by: Dvir Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> --- Resources/Maps/{ => _NF}/Shuttles/praeda.yml | 803 +++---------------- Resources/Prototypes/_NF/Shipyard/praeda.yml | 4 +- 2 files changed, 99 insertions(+), 708 deletions(-) rename Resources/Maps/{ => _NF}/Shuttles/praeda.yml (92%) diff --git a/Resources/Maps/Shuttles/praeda.yml b/Resources/Maps/_NF/Shuttles/praeda.yml similarity index 92% rename from Resources/Maps/Shuttles/praeda.yml rename to Resources/Maps/_NF/Shuttles/praeda.yml index df637d1ee56..ccb16a03b4a 100644 --- a/Resources/Maps/Shuttles/praeda.yml +++ b/Resources/Maps/_NF/Shuttles/praeda.yml @@ -3,17 +3,17 @@ meta: postmapinit: false tilemap: 0: Space - 15: FloorBlueCircuit - 71: FloorRGlass - 72: FloorReinforced - 84: FloorSteel - 91: FloorSteelMini - 100: FloorWhite - 104: FloorWhiteMini - 109: FloorWhitePlastic - 110: FloorWood - 112: Lattice - 113: Plating + 16: FloorBlueCircuit + 72: FloorRGlass + 73: FloorReinforced + 85: FloorSteel + 92: FloorSteelMini + 101: FloorWhite + 105: FloorWhiteMini + 110: FloorWhitePlastic + 111: FloorWood + 113: Lattice + 114: Plating entities: - proto: "" entities: @@ -26,35 +26,35 @@ entities: - chunks: 0,0: ind: 0,0 - tiles: bgAAAAACbgAAAAABbgAAAAADcQAAAAAAVAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbgAAAAADbgAAAAACbgAAAAACcQAAAAAAVAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAVAAAAAACcQAAAAAAcQAAAAAAVAAAAAADcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAVAAAAAADVAAAAAABVAAAAAACVAAAAAAAcQAAAAAAcQAAAAAAVAAAAAADcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAACVAAAAAACcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAVAAAAAADcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAVAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAADwAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAACVAAAAAACcQAAAAAAcQAAAAAAVAAAAAACcQAAAAAAcQAAAAAAcQAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAADVAAAAAACcQAAAAAAcQAAAAAAVAAAAAABcQAAAAAAcQAAAAAAcQAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAADVAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcAAAAAAAcQAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: bwAAAAACbwAAAAABbwAAAAADcgAAAAAAVQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbwAAAAADbwAAAAACbwAAAAACcgAAAAAAVQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAVQAAAAACcgAAAAAAcgAAAAAAVQAAAAADcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVQAAAAAAVQAAAAADVQAAAAABVQAAAAACVQAAAAAAcgAAAAAAcgAAAAAAVQAAAAADcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVQAAAAACVQAAAAACcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAVQAAAAADcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVQAAAAAAVQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAEAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVQAAAAACVQAAAAACcgAAAAAAcgAAAAAAVQAAAAACcgAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVQAAAAADVQAAAAACcgAAAAAAcgAAAAAAVQAAAAABcgAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVQAAAAADVQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 -1,0: ind: -1,0 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAVAAAAAAAVAAAAAAAcQAAAAAAVAAAAAAAcQAAAAAAbgAAAAABbgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAVAAAAAACcQAAAAAADwAAAAAAbgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAVAAAAAADcQAAAAAAcQAAAAAAVAAAAAADcQAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAVAAAAAACcQAAAAAAcQAAAAAAVAAAAAABVAAAAAABVAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAVAAAAAADcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAADwAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAVAAAAAADcQAAAAAAcQAAAAAAVAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAVAAAAAADcQAAAAAAcQAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAVAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcQAAAAAAcAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAVQAAAAAAVQAAAAAAcgAAAAAAVQAAAAAAcgAAAAAAbwAAAAABbwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAVQAAAAACcgAAAAAAEAAAAAAAbwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAVQAAAAADcgAAAAAAcgAAAAAAVQAAAAADcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAVQAAAAACcgAAAAAAcgAAAAAAVQAAAAABVQAAAAABVQAAAAAAVQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAVQAAAAADcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAVQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAVQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAEAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAVQAAAAADcgAAAAAAcgAAAAAAVQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAVQAAAAADcgAAAAAAcgAAAAAAVQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAVQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAcQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 0,-1: ind: 0,-1 - tiles: bgAAAAABbgAAAAADbgAAAAABbgAAAAADbgAAAAACcQAAAAAAbQAAAAABbQAAAAABcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbgAAAAACbgAAAAADbgAAAAACcQAAAAAAbgAAAAACcQAAAAAAbQAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbgAAAAACbgAAAAABbgAAAAADbgAAAAADbgAAAAABbQAAAAABbQAAAAAAbQAAAAADcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbgAAAAADbgAAAAACbgAAAAADcQAAAAAAbgAAAAABcQAAAAAAbQAAAAADbQAAAAABcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAbQAAAAACcQAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAABVAAAAAACVAAAAAABVAAAAAAAVAAAAAADcQAAAAAAcQAAAAAAcQAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAACVAAAAAADVAAAAAAAVAAAAAAAVAAAAAADcQAAAAAAVAAAAAABcQAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAADVAAAAAABVAAAAAADVAAAAAAAVAAAAAAAcQAAAAAAVAAAAAAAcQAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAABVAAAAAAAVAAAAAABVAAAAAADVAAAAAACcQAAAAAAcQAAAAAAcQAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAADVAAAAAADVAAAAAAAVAAAAAACVAAAAAAAVAAAAAACVAAAAAACcQAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAACVAAAAAACVAAAAAAAVAAAAAACVAAAAAACcQAAAAAAVAAAAAAAcQAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAADVAAAAAADVAAAAAAAVAAAAAAAVAAAAAAAcQAAAAAAVAAAAAADcQAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAVAAAAAAAVAAAAAABVAAAAAACVAAAAAACcQAAAAAAVAAAAAACcQAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAABcQAAAAAAVAAAAAACcQAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAVAAAAAABcQAAAAAAcQAAAAAAcQAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbgAAAAABbgAAAAABbgAAAAABcQAAAAAAVAAAAAABcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: bwAAAAABbwAAAAADbwAAAAABbwAAAAADbwAAAAACcgAAAAAAbgAAAAABbgAAAAABcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbwAAAAACbwAAAAADbwAAAAACcgAAAAAAbwAAAAACcgAAAAAAbgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbwAAAAACbwAAAAABbwAAAAADbwAAAAADbwAAAAABbgAAAAABbgAAAAAAbgAAAAADcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbwAAAAADbwAAAAACbwAAAAADcgAAAAAAbwAAAAABcgAAAAAAbgAAAAADbgAAAAABcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAbgAAAAACcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVQAAAAABVQAAAAACVQAAAAABVQAAAAAAVQAAAAADcgAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVQAAAAACVQAAAAADVQAAAAAAVQAAAAAAVQAAAAADcgAAAAAAVQAAAAABcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVQAAAAADVQAAAAABVQAAAAADVQAAAAAAVQAAAAAAcgAAAAAAVQAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVQAAAAABVQAAAAAAVQAAAAABVQAAAAADVQAAAAACcgAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVQAAAAADVQAAAAADVQAAAAAAVQAAAAACVQAAAAAAVQAAAAACVQAAAAACcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVQAAAAACVQAAAAACVQAAAAAAVQAAAAACVQAAAAACcgAAAAAAVQAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVQAAAAADVQAAAAADVQAAAAAAVQAAAAAAVQAAAAAAcgAAAAAAVQAAAAADcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVQAAAAAAVQAAAAAAVQAAAAABVQAAAAACVQAAAAACcgAAAAAAVQAAAAACcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAABcgAAAAAAVQAAAAACcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAVQAAAAABcgAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbwAAAAABbwAAAAABbwAAAAABcgAAAAAAVQAAAAABcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 0,-2: ind: 0,-2 - tiles: VAAAAAAAcQAAAAAAVAAAAAAAVAAAAAAAVAAAAAABVAAAAAADVAAAAAABVAAAAAADDwAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAcQAAAAAAVAAAAAACVAAAAAADVAAAAAAADwAAAAAAVAAAAAAAVAAAAAACcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAVAAAAAAAVAAAAAABcQAAAAAAVAAAAAAAVAAAAAAAcQAAAAAAcQAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAVAAAAAAAVAAAAAABcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcAAAAAAAAAAAAAAAAAAAAAAASAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAVAAAAAAAVAAAAAABcQAAAAAAVAAAAAADcQAAAAAAcQAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAADwAAAAAAcQAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAVAAAAAACVAAAAAABcQAAAAAAcQAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADwAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAVAAAAAABcQAAAAAAVAAAAAABVAAAAAADcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAVAAAAAADcQAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADwAAAAAADwAAAAAAcQAAAAAAcQAAAAAAcAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcAAAAAAAcAAAAAAAcQAAAAAAVAAAAAABcQAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcQAAAAAAVAAAAAADVAAAAAABcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAVAAAAAADVAAAAAABVAAAAAADDwAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbgAAAAABbgAAAAADbgAAAAABbgAAAAADcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbgAAAAAAbgAAAAAARwAAAAAAbgAAAAABbgAAAAAAcQAAAAAAbQAAAAADbQAAAAACcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: VQAAAAAAcgAAAAAAVQAAAAAAVQAAAAAAVQAAAAABVQAAAAADVQAAAAABVQAAAAADEAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAVQAAAAAAcgAAAAAAVQAAAAACVQAAAAADVQAAAAAAEAAAAAAAVQAAAAAAVQAAAAACcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAVQAAAAAAVQAAAAABcgAAAAAAVQAAAAAAVQAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAVQAAAAAAVQAAAAABcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAASQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAVQAAAAAAVQAAAAABcgAAAAAAVQAAAAADcgAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAEAAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAVQAAAAACVQAAAAABcgAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAVQAAAAABcgAAAAAAVQAAAAABVQAAAAADcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAVQAAAAADcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAEAAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAcQAAAAAAcgAAAAAAVQAAAAABcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcgAAAAAAVQAAAAADVQAAAAABcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAVQAAAAADVQAAAAABVQAAAAADEAAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbwAAAAABbwAAAAADbwAAAAABbwAAAAADcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbwAAAAAAbwAAAAAASAAAAAAAbwAAAAABbwAAAAAAcgAAAAAAbgAAAAADbgAAAAACcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 0,-3: ind: 0,-3 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAVAAAAAABVAAAAAADVAAAAAABVAAAAAAAVAAAAAACVAAAAAAAVAAAAAABcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAACcQAAAAAAVAAAAAADVAAAAAADVAAAAAADVAAAAAABVAAAAAADVAAAAAADDwAAAAAAcQAAAAAAcQAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAVAAAAAAAWwAAAAAAWwAAAAACWwAAAAABVAAAAAACVAAAAAACDwAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAVQAAAAABVQAAAAADVQAAAAABVQAAAAAAVQAAAAACVQAAAAAAVQAAAAABcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVQAAAAACcgAAAAAAVQAAAAADVQAAAAADVQAAAAADVQAAAAABVQAAAAADVQAAAAADEAAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAVQAAAAAAXAAAAAAAXAAAAAACXAAAAAABVQAAAAACVQAAAAACEAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAA version: 6 -1,-1: ind: -1,-1 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAaAAAAAABaAAAAAAAcQAAAAAAbgAAAAABbgAAAAACbgAAAAADbgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAaAAAAAAAcQAAAAAAbgAAAAACcQAAAAAAbgAAAAADbgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAZAAAAAABZAAAAAAAbQAAAAACbgAAAAABbgAAAAABbgAAAAACbgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAZAAAAAACZAAAAAAAcQAAAAAAbgAAAAAAbgAAAAAAbgAAAAABbgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcQAAAAAADwAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAVAAAAAABVAAAAAABVAAAAAABVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAVAAAAAADVAAAAAADVAAAAAABVAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAVAAAAAADVAAAAAADVAAAAAADVAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAVAAAAAAAVAAAAAACVAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcQAAAAAAVAAAAAAAVAAAAAADVAAAAAAAVAAAAAADVAAAAAAAVAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcQAAAAAAVAAAAAAAcQAAAAAAVAAAAAADVAAAAAADVAAAAAADVAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcQAAAAAAVAAAAAADcQAAAAAAVAAAAAACVAAAAAADVAAAAAAAVAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcQAAAAAAVAAAAAADcQAAAAAAVAAAAAABVAAAAAACVAAAAAACVAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcQAAAAAAVAAAAAADcQAAAAAAVAAAAAACVAAAAAAAVAAAAAABVAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAVAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAVAAAAAAAcQAAAAAAcQAAAAAAVAAAAAABcQAAAAAAbgAAAAACbgAAAAAB + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAaQAAAAABaQAAAAAAcgAAAAAAbwAAAAABbwAAAAACbwAAAAADbwAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAaQAAAAAAcgAAAAAAbwAAAAACcgAAAAAAbwAAAAADbwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAZQAAAAABZQAAAAAAbgAAAAACbwAAAAABbwAAAAABbwAAAAACbwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAZQAAAAACZQAAAAAAcgAAAAAAbwAAAAAAbwAAAAAAbwAAAAABbwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAEAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAVQAAAAABVQAAAAABVQAAAAABVQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAVQAAAAADVQAAAAADVQAAAAABVQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAVQAAAAADVQAAAAADVQAAAAADVQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAVQAAAAAAVQAAAAACVQAAAAAAVQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAVQAAAAAAVQAAAAADVQAAAAAAVQAAAAADVQAAAAAAVQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAVQAAAAAAcgAAAAAAVQAAAAADVQAAAAADVQAAAAADVQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAVQAAAAADcgAAAAAAVQAAAAACVQAAAAADVQAAAAAAVQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAVQAAAAADcgAAAAAAVQAAAAABVQAAAAACVQAAAAACVQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAVQAAAAADcgAAAAAAVQAAAAACVQAAAAAAVQAAAAABVQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAVQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAVQAAAAAAcgAAAAAAcgAAAAAAVQAAAAABcgAAAAAAbwAAAAACbwAAAAAB version: 6 -1,-2: ind: -1,-2 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcQAAAAAAcQAAAAAAbgAAAAACbgAAAAABcQAAAAAAbgAAAAAAbgAAAAAAcQAAAAAAbgAAAAAAcQAAAAAAVAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAbgAAAAABbgAAAAAAcQAAAAAAbgAAAAAAcQAAAAAAVAAAAAACVAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcQAAAAAAcQAAAAAAVAAAAAAAVAAAAAAAcQAAAAAAbgAAAAADbgAAAAABcQAAAAAAcQAAAAAAcQAAAAAADwAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAbgAAAAACbgAAAAAAcQAAAAAAbgAAAAADcQAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcQAAAAAAcQAAAAAAVAAAAAAAcQAAAAAAbgAAAAABbgAAAAADcQAAAAAAbgAAAAACcQAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcQAAAAAADwAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcQAAAAAAcQAAAAAAVAAAAAADVAAAAAACcQAAAAAADwAAAAAAbgAAAAACbgAAAAACbgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAVAAAAAABVAAAAAACcQAAAAAADwAAAAAAbgAAAAACbgAAAAACbgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcQAAAAAAVAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcAAAAAAAcQAAAAAAcQAAAAAADwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcQAAAAAAVAAAAAACcQAAAAAAcAAAAAAAcAAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcQAAAAAAVAAAAAAAVAAAAAADcQAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAADwAAAAAAVAAAAAACVAAAAAACVAAAAAACcQAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAbgAAAAACbgAAAAADbgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAaAAAAAADaAAAAAACcQAAAAAAbgAAAAADbgAAAAADRwAAAAAAbgAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAcgAAAAAAbwAAAAACbwAAAAABcgAAAAAAbwAAAAAAbwAAAAAAcgAAAAAAbwAAAAAAcgAAAAAAVQAAAAAAVQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAbwAAAAABbwAAAAAAcgAAAAAAbwAAAAAAcgAAAAAAVQAAAAACVQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAcgAAAAAAVQAAAAAAVQAAAAAAcgAAAAAAbwAAAAADbwAAAAABcgAAAAAAcgAAAAAAcgAAAAAAEAAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAbwAAAAACbwAAAAAAcgAAAAAAbwAAAAADcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAcgAAAAAAVQAAAAAAcgAAAAAAbwAAAAABbwAAAAADcgAAAAAAbwAAAAACcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAEAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAcgAAAAAAVQAAAAADVQAAAAACcgAAAAAAEAAAAAAAbwAAAAACbwAAAAACbwAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAVQAAAAABVQAAAAACcgAAAAAAEAAAAAAAbwAAAAACbwAAAAACbwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAVQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAcgAAAAAAcgAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAVQAAAAACcgAAAAAAcQAAAAAAcQAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAVQAAAAAAVQAAAAADcgAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAEAAAAAAAVQAAAAACVQAAAAACVQAAAAACcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAbwAAAAACbwAAAAADbwAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAaQAAAAADaQAAAAACcgAAAAAAbwAAAAADbwAAAAADSAAAAAAAbwAAAAAA version: 6 -1,-3: ind: -1,-3 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAADwAAAAAAVAAAAAADVAAAAAAAVAAAAAACVAAAAAACVAAAAAABVAAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcQAAAAAAcQAAAAAADwAAAAAAVAAAAAADVAAAAAACVAAAAAACVAAAAAADVAAAAAABVAAAAAACcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcAAAAAAAcQAAAAAAbgAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAEAAAAAAAVQAAAAADVQAAAAAAVQAAAAACVQAAAAACVQAAAAABVQAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAcgAAAAAAEAAAAAAAVQAAAAADVQAAAAACVQAAAAACVQAAAAADVQAAAAABVQAAAAACcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAcgAAAAAAbwAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAA version: 6 type: MapGrid - type: Broadphase @@ -444,8 +444,8 @@ entities: 0,-4: 0: 65535 0,-3: - 0: 65407 - 1: 128 + 0: 65311 + 1: 224 0,-2: 0: 65535 0,-1: @@ -1257,75 +1257,57 @@ entities: - uid: 61 components: - rot: -1.5707963267948966 rad - pos: -7.5,4.5 + pos: -7.5,2.5 parent: 1 type: Transform - - name: 'Side dock #1 (left)' - type: Docking - uid: 62 components: - rot: 1.5707963267948966 rad - pos: 8.5,2.5 + pos: 8.5,4.5 parent: 1 type: Transform - - name: 'Side dock #3 (right)' - type: Docking - uid: 63 components: - rot: 1.5707963267948966 rad pos: 8.5,3.5 parent: 1 type: Transform - - name: 'Side dock #2 (right)' - type: Docking - uid: 64 components: - rot: 1.5707963267948966 rad - pos: 8.5,4.5 + pos: 8.5,2.5 parent: 1 type: Transform - - name: 'Side dock #1 (right)' - type: Docking - uid: 65 components: - rot: -1.5707963267948966 rad - pos: -7.5,2.5 + pos: -7.5,4.5 parent: 1 type: Transform - - name: 'Side dock #3 (left)' - type: Docking - uid: 66 components: - rot: -1.5707963267948966 rad pos: -7.5,3.5 parent: 1 type: Transform - - name: 'Side dock #2 (left)' - type: Docking - uid: 67 components: - rot: 3.141592653589793 rad - pos: -0.5,10.5 + pos: 1.5,10.5 parent: 1 type: Transform - - name: 'Main dock #3 (front)' - type: Docking - uid: 68 components: - rot: 3.141592653589793 rad pos: 0.5,10.5 parent: 1 type: Transform - - name: 'Main dock #2 (front)' - type: Docking - uid: 69 components: - rot: 3.141592653589793 rad - pos: 1.5,10.5 + pos: -0.5,10.5 parent: 1 type: Transform - - name: 'Main dock #1 (front)' - type: Docking - proto: AirlockMedicalGlass entities: - uid: 70 @@ -1349,7 +1331,8 @@ entities: - pos: 5.5,-30.5 parent: 1 type: Transform - - injecting: True + - injectionAmount: 4 + injecting: True type: AmeController - containers: AmeFuel: !type:ContainerSlot @@ -1399,7 +1382,7 @@ entities: - pos: 4.5,-28.5 parent: 1 type: Transform - - radius: 1 + - radius: 2 enabled: True type: PointLight - uid: 80 @@ -1407,7 +1390,7 @@ entities: - pos: 3.5,-28.5 parent: 1 type: Transform - - radius: 1 + - radius: 2 enabled: True type: PointLight - uid: 81 @@ -1508,11 +1491,6 @@ entities: type: Transform - proto: AppraisalTool entities: - - uid: 99 - components: - - pos: -1.7131324,-21.819618 - parent: 1 - type: Transform - uid: 100 components: - pos: 3.298502,-2.4168472 @@ -1763,7 +1741,7 @@ entities: entities: - uid: 160 components: - - desc: A banner displaying the colors of the cargo department. Hail Cargonia! + - desc: A banner displaying the colors of the cargo department. name: Cargo banner type: MetaData - pos: 0.5,-4.5 @@ -1771,7 +1749,7 @@ entities: type: Transform - uid: 161 components: - - desc: A banner displaying the colors of the cargo department. Hail Cargonia! + - desc: A banner displaying the colors of the cargo department. name: Cargo banner type: MetaData - pos: -4.5,-19.5 @@ -1779,7 +1757,7 @@ entities: type: Transform - uid: 162 components: - - desc: A banner displaying the colors of the cargo department. Hail Cargonia! + - desc: A banner displaying the colors of the cargo department. name: Cargo banner type: MetaData - pos: 5.5,-19.5 @@ -2122,26 +2100,6 @@ entities: - pos: -0.5,-12.5 parent: 1 type: Transform -- proto: BoxShotgunIncendiary - entities: - - uid: 218 - components: - - flags: InContainer - type: MetaData - - parent: 217 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage - - uid: 219 - components: - - flags: InContainer - type: MetaData - - parent: 217 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage - proto: Bucket entities: - uid: 248 @@ -6125,7 +6083,7 @@ entities: type: Transform - uid: 1023 components: - - pos: -0.7390743,0.7418492 + - pos: -0.5613496,1.0679312 parent: 1 type: Transform - uid: 1024 @@ -6213,17 +6171,6 @@ entities: - pos: -9.5,-30.5 parent: 1 type: Transform -- proto: ClothingBackpackCaptain - entities: - - uid: 220 - components: - - flags: InContainer - type: MetaData - - parent: 217 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage - proto: ClothingBackpackDuffelSurgeryFilled entities: - uid: 1035 @@ -6231,50 +6178,6 @@ entities: - pos: -6.3591137,-16.300005 parent: 1 type: Transform -- proto: ClothingBeltSheathFilled - entities: - - uid: 221 - components: - - flags: InContainer - type: MetaData - - parent: 217 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage -- proto: ClothingEyesGlassesSecurity - entities: - - uid: 222 - components: - - flags: InContainer - type: MetaData - - parent: 217 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage -- proto: ClothingEyesGlassesSunglasses - entities: - - uid: 223 - components: - - flags: InContainer - type: MetaData - - parent: 217 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage -- proto: ClothingHandsGlovesCaptain - entities: - - uid: 224 - components: - - flags: InContainer - type: MetaData - - parent: 217 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage - proto: ClothingHeadHatBowlerHat entities: - uid: 1044 @@ -6282,17 +6185,6 @@ entities: - pos: 1.3621204,-17.150785 parent: 1 type: Transform -- proto: ClothingHeadHatCaptain - entities: - - uid: 225 - components: - - flags: InContainer - type: MetaData - - parent: 217 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage - proto: ClothingHeadHatCone entities: - uid: 1045 @@ -6300,28 +6192,6 @@ entities: - pos: 4.469919,-30.10354 parent: 1 type: Transform -- proto: ClothingHeadHatFancyCrown - entities: - - uid: 104 - components: - - flags: InContainer - type: MetaData - - parent: 103 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage -- proto: ClothingHeadHatPirate - entities: - - uid: 1047 - components: - - flags: InContainer - type: MetaData - - parent: 1046 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage - proto: ClothingHeadHelmetEVA entities: - uid: 1051 @@ -6329,90 +6199,6 @@ entities: - pos: 10.221624,-32.356922 parent: 1 type: Transform -- proto: ClothingMaskItalianMoustache - entities: - - uid: 226 - components: - - flags: InContainer - type: MetaData - - parent: 217 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage -- proto: ClothingNeckCloakCap - entities: - - uid: 227 - components: - - flags: InContainer - type: MetaData - - parent: 217 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage -- proto: ClothingNeckCloakCapFormal - entities: - - uid: 228 - components: - - flags: InContainer - type: MetaData - - parent: 217 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage -- proto: ClothingNeckCloakPirateCap - entities: - - uid: 1048 - components: - - flags: InContainer - type: MetaData - - parent: 1046 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage -- proto: ClothingOuterArmorCaptainCarapace - entities: - - uid: 229 - components: - - flags: InContainer - type: MetaData - - parent: 217 - type: Transform - - group: - - hoverMessage: "" - contextText: verb-examine-group-other - icon: /Textures/Interface/examine-star.png - components: - - Armor - - ClothingSpeedModifier - entries: - - message: This decreases your speed by [color=yellow]10%[/color]. - priority: 0 - component: ClothingSpeedModifier - - message: >- - It provides the following protection: - - - [color=yellow]Blunt[/color] damage reduced by [color=lightblue]50%[/color]. - - - [color=yellow]Slash[/color] damage reduced by [color=lightblue]50%[/color]. - - - [color=yellow]Piercing[/color] damage reduced by [color=lightblue]40%[/color]. - - - [color=yellow]Heat[/color] damage reduced by [color=lightblue]50%[/color]. - - - [color=yellow]Caustic[/color] damage reduced by [color=lightblue]10%[/color]. - - - [color=orange]Explosion[/color] damage reduced by [color=lightblue]35%[/color]. - priority: 0 - component: Armor - title: null - type: GroupExamine - - canCollide: False - type: Physics - - type: InsideEntityStorage - proto: ClothingOuterHardsuitEVA entities: - uid: 1052 @@ -6420,61 +6206,6 @@ entities: - pos: 10.643499,-32.59146 parent: 1 type: Transform -- proto: ClothingOuterWinterCap - entities: - - uid: 230 - components: - - flags: InContainer - type: MetaData - - parent: 217 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage -- proto: ClothingUniformJumpskirtCapFormalDress - entities: - - uid: 231 - components: - - flags: InContainer - type: MetaData - - parent: 217 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage -- proto: ClothingUniformJumpskirtCaptain - entities: - - uid: 232 - components: - - flags: InContainer - type: MetaData - - parent: 217 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage -- proto: ClothingUniformJumpsuitCapFormal - entities: - - uid: 233 - components: - - flags: InContainer - type: MetaData - - parent: 217 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage -- proto: ClothingUniformJumpsuitCaptain - entities: - - uid: 234 - components: - - flags: InContainer - type: MetaData - - parent: 217 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage - proto: ComfyChair entities: - uid: 1055 @@ -6920,45 +6651,6 @@ entities: - pos: 2.5,-30.5 parent: 1 type: Transform -- proto: CratePirate - entities: - - uid: 1046 - components: - - pos: -0.5,-25.5 - parent: 1 - type: Transform - - air: - volume: 200 - immutable: False - temperature: 293.14957 - moles: - - 1.7459903 - - 6.568249 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - type: EntityStorage - - containers: - entity_storage: !type:Container - showEnts: False - occludes: True - ents: - - 1050 - - 1049 - - 1047 - - 1048 - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - type: ContainerContainer - proto: CrowbarRed entities: - uid: 1109 @@ -7812,7 +7504,7 @@ entities: entities: - uid: 1254 components: - - pos: 4.4121666,-24.277555 + - pos: 4.2452617,-24.44838 parent: 1 type: Transform - proto: DrinkGlass @@ -7836,31 +7528,9 @@ entities: entities: - uid: 1258 components: - - pos: -1.4439895,-21.777922 + - pos: -1.6703883,-21.962532 parent: 1 type: Transform -- proto: DrinkMugDog - entities: - - uid: 235 - components: - - flags: InContainer - type: MetaData - - parent: 217 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage -- proto: DrinkRumBottleFull - entities: - - uid: 236 - components: - - flags: InContainer - type: MetaData - - parent: 217 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage - proto: DrinkRumGlass entities: - uid: 1259 @@ -7974,36 +7644,11 @@ entities: pos: -3.5,-7.5 parent: 1 type: Transform -- proto: EncryptionKeyCommand - entities: - - uid: 1280 - components: - - pos: -1.2307451,-22.015284 - parent: 1 - type: Transform -- proto: EncryptionKeyEngineering - entities: - - uid: 1281 - components: - - pos: -0.97588915,-30.425823 - parent: 1 - type: Transform -- proto: EnergyCutlass - entities: - - uid: 1049 - components: - - flags: InContainer - type: MetaData - - parent: 1046 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage - proto: FaxMachineShip entities: - - uid: 1282 + - uid: 104 components: - - pos: -0.5,1.5 + - pos: -1.5,-21.5 parent: 1 type: Transform - proto: FireAlarm @@ -11711,6 +11356,8 @@ entities: entities: - uid: 1708 components: + - name: uranium safe + type: MetaData - pos: 0.5,-27.5 parent: 1 type: Transform @@ -11739,10 +11386,6 @@ entities: showEnts: False occludes: True ents: - - 1711 - - 1710 - - 1713 - - 1712 - 1709 paper_label: !type:ContainerSlot showEnts: False @@ -11839,10 +11482,10 @@ entities: type: Transform - proto: LampGold entities: - - uid: 1728 + - uid: 211 components: - - rot: 3.141592653589793 rad - pos: 4.7820306,-24.235859 + - rot: -1.5707963267948966 rad + pos: 4.6780534,-24.275356 parent: 1 type: Transform - proto: LockerBoozeFilled @@ -11872,71 +11515,13 @@ entities: type: EntityStorage - locked: False type: Lock -- proto: LockerCaptain +- proto: LockerCaptainFilled entities: - - uid: 217 + - uid: 212 components: - pos: -1.5,-24.5 parent: 1 type: Transform - - air: - volume: 200 - immutable: False - temperature: 293.1496 - moles: - - 1.7459903 - - 6.568249 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - type: EntityStorage - - containers: - entity_storage: !type:Container - showEnts: False - occludes: True - ents: - - 243 - - 244 - - 242 - - 238 - - 226 - - 237 - - 245 - - 235 - - 236 - - 229 - - 224 - - 246 - - 231 - - 233 - - 228 - - 220 - - 247 - - 222 - - 227 - - 232 - - 221 - - 225 - - 241 - - 223 - - 218 - - 230 - - 239 - - 219 - - 234 - - 240 - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - type: ContainerContainer - proto: LockerChiefEngineerFilledHardsuit entities: - uid: 106 @@ -12008,17 +11593,6 @@ entities: - 0 - 0 type: EntityStorage - - containers: - entity_storage: !type:Container - showEnts: False - occludes: True - ents: - - 104 - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - type: ContainerContainer - proto: LockerSalvageSpecialistFilled entities: - uid: 1730 @@ -12026,8 +11600,6 @@ entities: - pos: -2.5,-10.5 parent: 1 type: Transform - - locked: False - type: Lock - air: volume: 200 immutable: False @@ -12046,24 +11618,11 @@ entities: - 0 - 0 type: EntityStorage - - containers: - entity_storage: !type:Container - showEnts: False - occludes: True - ents: - - 1731 - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - type: ContainerContainer - uid: 1732 components: - pos: 3.5,-10.5 parent: 1 type: Transform - - locked: False - type: Lock - air: volume: 200 immutable: False @@ -12082,17 +11641,6 @@ entities: - 0 - 0 type: EntityStorage - - containers: - entity_storage: !type:Container - showEnts: False - occludes: True - ents: - - 1733 - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - type: ContainerContainer - proto: LockerWallMedicalDoctorFilled entities: - uid: 1734 @@ -12183,26 +11731,6 @@ entities: - 0 - 0 type: EntityStorage -- proto: MagazineBoxMagnum - entities: - - uid: 237 - components: - - flags: InContainer - type: MetaData - - parent: 217 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage - - uid: 238 - components: - - flags: InContainer - type: MetaData - - parent: 217 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage - proto: Matchbox entities: - uid: 1743 @@ -12212,7 +11740,7 @@ entities: type: Transform - uid: 1744 components: - - pos: -0.62868136,1.0963256 + - pos: -0.27773947,0.9905455 parent: 1 type: Transform - uid: 1745 @@ -12262,9 +11790,12 @@ entities: entities: - uid: 1752 components: - - pos: 5.5,-32.5 + - anchored: True + pos: 5.5,-32.5 parent: 1 type: Transform + - bodyType: Static + type: Physics - proto: OperatingTable entities: - uid: 1753 @@ -12283,9 +11814,12 @@ entities: entities: - uid: 1755 components: - - pos: 4.5,-32.5 + - anchored: True + pos: 4.5,-32.5 parent: 1 type: Transform + - bodyType: Static + type: Physics - proto: PaintingSkeletonBoof entities: - uid: 1756 @@ -12313,13 +11847,6 @@ entities: - pos: -1.3206933,-22.118023 parent: 1 type: Transform -- proto: PhoneInstrument - entities: - - uid: 1760 - components: - - pos: -1.5209062,-21.368505 - parent: 1 - type: Transform - proto: PillDexalin entities: - uid: 1761 @@ -12554,26 +12081,6 @@ entities: - pos: -6.5,-28.5 parent: 1 type: Transform -- proto: PowerCellHyper - entities: - - uid: 239 - components: - - flags: InContainer - type: MetaData - - parent: 217 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage - - uid: 240 - components: - - flags: InContainer - type: MetaData - - parent: 217 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage - proto: Poweredlight entities: - uid: 112 @@ -13002,20 +12509,9 @@ entities: entities: - uid: 1863 components: - - pos: -0.80478126,0.49763185 + - pos: -0.3421964,1.6612247 parent: 1 type: Transform -- proto: RubberStampCaptain - entities: - - uid: 241 - components: - - flags: InContainer - type: MetaData - - parent: 217 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage - proto: RubberStampCE entities: - uid: 1864 @@ -13027,7 +12523,7 @@ entities: entities: - uid: 1865 components: - - pos: -0.81724185,0.883254 + - pos: -0.600023,1.4806572 parent: 1 type: Transform - proto: SheetUranium @@ -13677,8 +13173,6 @@ entities: - linkedPorts: 1811: - Pressed: Toggle - invalid: - - Pressed: Toggle 1799: - Pressed: Toggle 1812: @@ -14255,60 +13749,6 @@ entities: type: Transform - proto: SpeedLoaderMagnum entities: - - uid: 242 - components: - - flags: InContainer - type: MetaData - - parent: 217 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage - - uid: 243 - components: - - flags: InContainer - type: MetaData - - parent: 217 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage - - uid: 244 - components: - - flags: InContainer - type: MetaData - - parent: 217 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage - - uid: 1710 - components: - - flags: InContainer - type: MetaData - - parent: 1708 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage - - uid: 1711 - components: - - flags: InContainer - type: MetaData - - parent: 1708 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage - - uid: 1712 - components: - - flags: InContainer - type: MetaData - - parent: 1708 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage - uid: 1737 components: - flags: InContainer @@ -14327,11 +13767,6 @@ entities: - canCollide: False type: Physics - type: InsideEntityStorage - - uid: 2043 - components: - - pos: 4.4148893,-24.544632 - parent: 1 - type: Transform - proto: SpeedLoaderMagnumRubber entities: - uid: 1739 @@ -14400,9 +13835,9 @@ entities: type: Transform - proto: SuitStorageCaptain entities: - - uid: 2053 + - uid: 99 components: - - pos: -1.5,-25.5 + - pos: -0.5,-25.5 parent: 1 type: Transform - proto: SuitStorageCE @@ -14502,11 +13937,47 @@ entities: - pos: 1.5,-10.5 parent: 1 type: Transform + - air: + volume: 200 + immutable: False + temperature: 293.1496 + moles: + - 1.7459903 + - 6.568249 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + type: EntityStorage - uid: 2061 components: - pos: 2.5,-10.5 parent: 1 type: Transform + - air: + volume: 200 + immutable: False + temperature: 293.1496 + moles: + - 1.7459903 + - 6.568249 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + type: EntityStorage - proto: SurveillanceCameraCommand entities: - uid: 2062 @@ -14813,9 +14284,9 @@ entities: - pos: -0.5,0.5 parent: 1 type: Transform -- proto: TelecomServerFilled +- proto: TelecomServerFilledShuttle entities: - - uid: 2111 + - uid: 213 components: - pos: -7.5,-33.5 parent: 1 @@ -15006,17 +14477,6 @@ entities: pos: 6.5,-9.5 parent: 1 type: Transform -- proto: ToyFigurineCaptain - entities: - - uid: 245 - components: - - flags: InContainer - type: MetaData - - parent: 217 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage - proto: TwoWayLever entities: - uid: 2143 @@ -16727,77 +16187,8 @@ entities: - pos: 2.5,-22.5 parent: 1 type: Transform -- proto: WeaponDisabler - entities: - - uid: 246 - components: - - flags: InContainer - type: MetaData - - parent: 217 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage -- proto: WeaponLaserGun - entities: - - uid: 247 - components: - - flags: InContainer - type: MetaData - - parent: 217 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage -- proto: WeaponProtoKineticAccelerator - entities: - - uid: 1731 - components: - - flags: InContainer - type: MetaData - - parent: 1730 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage - - uid: 1733 - components: - - flags: InContainer - type: MetaData - - parent: 1732 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage -- proto: WeaponRevolverDeckard - entities: - - uid: 2406 - components: - - pos: 2.4326227,-22.201796 - parent: 1 - type: Transform -- proto: WeaponRevolverPirate - entities: - - uid: 1050 - components: - - flags: InContainer - type: MetaData - - parent: 1046 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage - proto: WeaponRevolverPython entities: - - uid: 1713 - components: - - flags: InContainer - type: MetaData - - parent: 1708 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage - uid: 1740 components: - flags: InContainer diff --git a/Resources/Prototypes/_NF/Shipyard/praeda.yml b/Resources/Prototypes/_NF/Shipyard/praeda.yml index 8b855032d31..b52418e9810 100644 --- a/Resources/Prototypes/_NF/Shipyard/praeda.yml +++ b/Resources/Prototypes/_NF/Shipyard/praeda.yml @@ -5,12 +5,12 @@ price: 160210 category: Large group: Expedition - shuttlePath: /Maps/Shuttles/praeda.yml + shuttlePath: /Maps/_NF/Shuttles/praeda.yml - type: gameMap id: Praeda mapName: 'NT Praeda' - mapPath: /Maps/Shuttles/praeda.yml + mapPath: /Maps/_NF/Shuttles/praeda.yml minPlayers: 0 stations: Praeda: From 615d7645149d5b11135f4bf696f32f3e7e5728bc Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Sun, 7 Jan 2024 19:49:10 +0000 Subject: [PATCH 61/66] Automatic Changelog (#833) --- Resources/Changelog/Changelog.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index bc399d82b2e..38b6b1699de 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -2717,3 +2717,9 @@ Entries: Empresses shipyard console. id: 4732 time: '2024-01-07T19:28:57.0000000+00:00' +- author: TsjipTsjip + changes: + - type: Tweak + message: Praeda was reworked. + id: 4733 + time: '2024-01-07T19:48:50.0000000+00:00' From 98ba725515e543887fd8f23ee6c325af76a6ebf0 Mon Sep 17 00:00:00 2001 From: TsjipTsjip <19798667+TsjipTsjip@users.noreply.github.com> Date: Sun, 7 Jan 2024 20:53:42 +0100 Subject: [PATCH 62/66] Replace Wasp's TComms server with the correct prototype (#841) * Create pr-labeler.yml * Update labeler.yml * Move wasp to new directory, replace telecomms server --- Resources/Maps/{ => _NF}/Shuttles/wasp.yml | 58 +++++++++++----------- Resources/Prototypes/_NF/Shipyard/wasp.yml | 4 +- 2 files changed, 31 insertions(+), 31 deletions(-) rename Resources/Maps/{ => _NF}/Shuttles/wasp.yml (95%) diff --git a/Resources/Maps/Shuttles/wasp.yml b/Resources/Maps/_NF/Shuttles/wasp.yml similarity index 95% rename from Resources/Maps/Shuttles/wasp.yml rename to Resources/Maps/_NF/Shuttles/wasp.yml index f77aad209ed..63f92fe6bc5 100644 --- a/Resources/Maps/Shuttles/wasp.yml +++ b/Resources/Maps/_NF/Shuttles/wasp.yml @@ -3,26 +3,26 @@ meta: postmapinit: false tilemap: 0: Space - 27: FloorDark - 31: FloorDarkMini - 32: FloorDarkMono - 34: FloorDarkPavement - 40: FloorElevatorShaft - 42: FloorFreezer - 43: FloorGlass - 71: FloorRGlass - 72: FloorReinforced - 79: FloorShuttleRed - 84: FloorSteel - 86: FloorSteelCheckerLight - 92: FloorSteelMono - 93: FloorSteelOffset - 94: FloorSteelPavement - 100: FloorWhite - 105: FloorWhiteMono - 110: FloorWood - 112: Lattice - 113: Plating + 28: FloorDark + 32: FloorDarkMini + 33: FloorDarkMono + 35: FloorDarkPavement + 41: FloorElevatorShaft + 43: FloorFreezer + 44: FloorGlass + 72: FloorRGlass + 73: FloorReinforced + 80: FloorShuttleRed + 85: FloorSteel + 87: FloorSteelCheckerLight + 93: FloorSteelMono + 94: FloorSteelOffset + 95: FloorSteelPavement + 101: FloorWhite + 106: FloorWhiteMono + 111: FloorWood + 113: Lattice + 114: Plating entities: - proto: "" entities: @@ -36,35 +36,35 @@ entities: - chunks: 0,0: ind: 0,0 - tiles: SAAAAAAASAAAAAAASAAAAAAAcQAAAAAAcAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAIAAAAAAAcQAAAAAAcAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAASAAAAAAASAAAAAAASAAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAIAAAAAAAcQAAAAAAcAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAASAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAIAAAAAAAcQAAAAAAIAAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAcQAAAAAAcQAAAAAAcAAAAAAAcAAAAAAAcQAAAAAAIAAAAAAAcQAAAAAAIAAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAGwAAAAAAcQAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAcQAAAAAAGwAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAIAAAAAAAcQAAAAAAIAAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAcQAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAcQAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAGwAAAAAAVgAAAAAAVgAAAAAAVgAAAAAAVgAAAAAAVgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAIAAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAGwAAAAAAVgAAAAAAVgAAAAAAVgAAAAAAVgAAAAAAVgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAcQAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAGwAAAAAAVgAAAAAAVgAAAAAAVgAAAAAAVgAAAAAAVgAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAIAAAAAAAcQAAAAAAIAAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAGwAAAAAAVgAAAAAAVgAAAAAAVgAAAAAAVgAAAAAAVgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGwAAAAAAVgAAAAAAVgAAAAAAVgAAAAAAVgAAAAAAVgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKwAAAAAAKwAAAAAAKwAAAAAATwAAAAAAcQAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKwAAAAAAKwAAAAAATwAAAAAAcQAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKwAAAAAAKwAAAAAATwAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: SQAAAAAASQAAAAAASQAAAAAAcgAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAIQAAAAAAcgAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAASQAAAAAASQAAAAAASQAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAIQAAAAAAcgAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAASQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAIQAAAAAAcgAAAAAAIQAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAcQAAAAAAcgAAAAAAIQAAAAAAcgAAAAAAIQAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAcgAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAcgAAAAAAHAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAIQAAAAAAcgAAAAAAIQAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAcgAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAIQAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAcgAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAIQAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAIQAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAcgAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAIQAAAAAAcgAAAAAAIQAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALAAAAAAALAAAAAAALAAAAAAAUAAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALAAAAAAALAAAAAAAUAAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALAAAAAAALAAAAAAAUAAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 0,-1: ind: 0,-1 - tiles: cQAAAAAAXAAAAAAAcQAAAAAAVAAAAAAAVgAAAAAAVgAAAAAAcQAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIgAAAAAAIgAAAAAAcQAAAAAAVgAAAAAAVgAAAAAAcQAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAIAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARwAAAAAARwAAAAAAIgAAAAAAIgAAAAAAIgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIgAAAAAARwAAAAAAIgAAAAAAIgAAAAAAIgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARwAAAAAARwAAAAAAIgAAAAAAIgAAAAAAIgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIgAAAAAAIgAAAAAAIgAAAAAAIgAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIgAAAAAAIgAAAAAAcQAAAAAAIgAAAAAAIAAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAIAAAAAAAcQAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIgAAAAAAIgAAAAAAIgAAAAAAcQAAAAAAcQAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAIAAAAAAAcQAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIgAAAAAAIgAAAAAAIgAAAAAAcQAAAAAAIAAAAAAAGwAAAAAAGwAAAAAAIAAAAAAAGwAAAAAAGwAAAAAAIAAAAAAAcQAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIgAAAAAAIgAAAAAAIgAAAAAAcQAAAAAAIAAAAAAAGwAAAAAAGwAAAAAAIAAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAcQAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAcQAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAASAAAAAAASAAAAAAASAAAAAAAcQAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAcQAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAASAAAAAAASAAAAAAASAAAAAAAcQAAAAAAGwAAAAAAIAAAAAAAIAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAIAAAAAAAcQAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAASAAAAAAASAAAAAAASAAAAAAAcQAAAAAAGwAAAAAAcQAAAAAAcQAAAAAAcAAAAAAAcAAAAAAAcQAAAAAAIAAAAAAAcQAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAASAAAAAAASAAAAAAASAAAAAAAcQAAAAAAcQAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAAAAAAAAAcQAAAAAAIAAAAAAAcQAAAAAAcAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAA + tiles: cgAAAAAAXQAAAAAAcgAAAAAAVQAAAAAAVwAAAAAAVwAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIwAAAAAAIwAAAAAAcgAAAAAAVwAAAAAAVwAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAIQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAASAAAAAAASAAAAAAAIwAAAAAAIwAAAAAAIwAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIwAAAAAASAAAAAAAIwAAAAAAIwAAAAAAIwAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAASAAAAAAASAAAAAAAIwAAAAAAIwAAAAAAIwAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIwAAAAAAIwAAAAAAIwAAAAAAIwAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIwAAAAAAIwAAAAAAcgAAAAAAIwAAAAAAIQAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAIQAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIwAAAAAAIwAAAAAAIwAAAAAAcgAAAAAAcgAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAIQAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIwAAAAAAIwAAAAAAIwAAAAAAcgAAAAAAIQAAAAAAHAAAAAAAHAAAAAAAIQAAAAAAHAAAAAAAHAAAAAAAIQAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIwAAAAAAIwAAAAAAIwAAAAAAcgAAAAAAIQAAAAAAHAAAAAAAHAAAAAAAIQAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAASQAAAAAASQAAAAAASQAAAAAAcgAAAAAAIQAAAAAAIQAAAAAAIQAAAAAAIQAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAASQAAAAAASQAAAAAASQAAAAAAcgAAAAAAHAAAAAAAIQAAAAAAIQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAIQAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAASQAAAAAASQAAAAAASQAAAAAAcgAAAAAAHAAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAcQAAAAAAcgAAAAAAIQAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAASQAAAAAASQAAAAAASQAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAcgAAAAAAIQAAAAAAcgAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAA version: 6 0,-2: ind: 0,-2 - tiles: cAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAcQAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAcQAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAcQAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAcQAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAcQAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAcQAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAcQAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAcQAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAXAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAXAAAAAAAcQAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAcQAAAAAAVAAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAcQAAAAAAcQAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAcQAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: cQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAXwAAAAAAXwAAAAAAXwAAAAAAcgAAAAAAXwAAAAAAXwAAAAAAXwAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAXwAAAAAAXwAAAAAAXwAAAAAAcgAAAAAAXwAAAAAAXwAAAAAAXwAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAXwAAAAAAXwAAAAAAXwAAAAAAcgAAAAAAXwAAAAAAXwAAAAAAXwAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAXwAAAAAAXwAAAAAAXwAAAAAAcgAAAAAAXwAAAAAAXwAAAAAAXwAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAXQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAXQAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAcgAAAAAAVQAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 -1,-1: ind: -1,-1 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcQAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAcQAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcQAAAAAAVAAAAAAAXQAAAAAAcQAAAAAAIgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAIgAAAAAAIgAAAAAAIgAAAAAARwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAIgAAAAAAIgAAAAAAIgAAAAAARwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAIgAAAAAAIgAAAAAAIgAAAAAARwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAIgAAAAAAIgAAAAAAIgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcQAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAIAAAAAAAIgAAAAAAcQAAAAAAIgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcQAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAcQAAAAAAcQAAAAAAIgAAAAAAIgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcQAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAKgAAAAAAKgAAAAAAIgAAAAAAIgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcQAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAIgAAAAAAIgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcQAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAcQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcQAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAcQAAAAAASAAAAAAASAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcQAAAAAAIAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAcQAAAAAASAAAAAAASAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcQAAAAAAIAAAAAAAcQAAAAAAcAAAAAAAcAAAAAAAcQAAAAAAcQAAAAAAaQAAAAAAcQAAAAAASAAAAAAASAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcAAAAAAAcQAAAAAAIAAAAAAAcQAAAAAAAAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcQAAAAAAcQAAAAAASAAAAAAASAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAcgAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAVQAAAAAAXgAAAAAAcgAAAAAAIwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAIQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAIwAAAAAAIwAAAAAAIwAAAAAASAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAIwAAAAAAIwAAAAAAIwAAAAAASAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAIwAAAAAAIwAAAAAAIwAAAAAASAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAIwAAAAAAIwAAAAAAIwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAZQAAAAAAZQAAAAAAZQAAAAAAZQAAAAAAIQAAAAAAIwAAAAAAcgAAAAAAIwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAZQAAAAAAZQAAAAAAZQAAAAAAZQAAAAAAZQAAAAAAcgAAAAAAcgAAAAAAIwAAAAAAIwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAZQAAAAAAZQAAAAAAZQAAAAAAZQAAAAAAZQAAAAAAZQAAAAAAKwAAAAAAKwAAAAAAIwAAAAAAIwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAZQAAAAAAZQAAAAAAZQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAIwAAAAAAIwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAZQAAAAAAZQAAAAAAZQAAAAAAcgAAAAAAagAAAAAAagAAAAAAagAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAZQAAAAAAZQAAAAAAZQAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAAcgAAAAAASQAAAAAASQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAIQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAagAAAAAAagAAAAAAagAAAAAAcgAAAAAASQAAAAAASQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAIQAAAAAAcgAAAAAAcQAAAAAAcQAAAAAAcgAAAAAAcgAAAAAAagAAAAAAcgAAAAAASQAAAAAASQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAcgAAAAAAIQAAAAAAcgAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcgAAAAAAcgAAAAAASQAAAAAASQAAAAAA version: 6 -1,0: ind: -1,0 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcAAAAAAAcQAAAAAAIAAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcAAAAAAAcQAAAAAAKAAAAAAAKAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcAAAAAAAcQAAAAAAIAAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAKAAAAAAAKAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAIAAAAAAAcQAAAAAAIAAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAIAAAAAAAcQAAAAAAIAAAAAAAcQAAAAAAcAAAAAAAcAAAAAAAcQAAAAAAcQAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAIAAAAAAAcQAAAAAAIAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAGwAAAAAAcQAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAcQAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAcQAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAIAAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAcQAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAIAAAAAAAcQAAAAAAIAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAbgAAAAAAbgAAAAAAbgAAAAAAbgAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAbgAAAAAAbgAAAAAAbgAAAAAAbgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcQAAAAAATwAAAAAAKwAAAAAAKwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcQAAAAAATwAAAAAAKwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAATwAAAAAAKwAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAcgAAAAAAIQAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAcgAAAAAAKQAAAAAAKQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAcgAAAAAAIQAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAKQAAAAAAKQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAIQAAAAAAcgAAAAAAIQAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAIQAAAAAAcgAAAAAAIQAAAAAAcgAAAAAAcQAAAAAAcQAAAAAAcgAAAAAAcgAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAIQAAAAAAcgAAAAAAIQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAHAAAAAAAcgAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIQAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAcgAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAcgAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIQAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAIQAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAcgAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAIQAAAAAAcgAAAAAAIQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAIQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAUAAAAAAALAAAAAAALAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAUAAAAAAALAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAUAAAAAAALAAAAAAA version: 6 -1,-2: ind: -1,-2 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcQAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAcQAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcQAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAcQAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcQAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAcQAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcQAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAcQAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcQAAAAAAXAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAXAAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAVAAAAAAAcQAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcQAAAAAAcQAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcQAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAXwAAAAAAXwAAAAAAXwAAAAAAcgAAAAAAXwAAAAAAXwAAAAAAXwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAXwAAAAAAXwAAAAAAXwAAAAAAcgAAAAAAXwAAAAAAXwAAAAAAXwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAXwAAAAAAXwAAAAAAXwAAAAAAcgAAAAAAXwAAAAAAXwAAAAAAXwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAXwAAAAAAXwAAAAAAXwAAAAAAcgAAAAAAXwAAAAAAXwAAAAAAXwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAXQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAXQAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAVQAAAAAAcgAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAcgAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAA version: 6 -1,1: ind: -1,1 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcAAAAAAATwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 0,1: ind: 0,1 - tiles: TwAAAAAATwAAAAAAcAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: UAAAAAAAUAAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 type: MapGrid - type: Broadphase @@ -10218,7 +10218,7 @@ entities: - pos: 5.5,-16.5 parent: 1 type: Transform -- proto: TelecomServerFilled +- proto: TelecomServerFilledSecurity entities: - uid: 982 components: diff --git a/Resources/Prototypes/_NF/Shipyard/wasp.yml b/Resources/Prototypes/_NF/Shipyard/wasp.yml index 3058c20c19d..37109fc254b 100644 --- a/Resources/Prototypes/_NF/Shipyard/wasp.yml +++ b/Resources/Prototypes/_NF/Shipyard/wasp.yml @@ -5,12 +5,12 @@ price: 145700 category: Large group: Security - shuttlePath: /Maps/Shuttles/wasp.yml + shuttlePath: /Maps/_NF/Shuttles/wasp.yml - type: gameMap id: Wasp mapName: 'NSF Wasp' - mapPath: /Maps/Shuttles/wasp.yml + mapPath: /Maps/_NF/Shuttles/wasp.yml minPlayers: 0 stations: Wasp: From 50ba3aa093ed59167f7add7ef1bbd6581c1de218 Mon Sep 17 00:00:00 2001 From: TsjipTsjip <19798667+TsjipTsjip@users.noreply.github.com> Date: Sun, 7 Jan 2024 21:45:57 +0100 Subject: [PATCH 63/66] Sprinter rework (#832) * Create pr-labeler.yml * Update labeler.yml * Sprinter rework * Remove security intercom, tracking implants, reduce price * Make @dvir01 happy * Resolve stairs situation * Sprinter 2.0 * Update sprinter.yml * Thrusters on separate APC's, passive gate, no more dark tiles next to stairs --------- Co-authored-by: Dvir Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> --- .../Maps/{ => _NF}/Shuttles/sprinter.yml | 4063 +++++++---------- .../Prototypes/_NF/Shipyard/sprinter.yml | 12 +- 2 files changed, 1667 insertions(+), 2408 deletions(-) rename Resources/Maps/{ => _NF}/Shuttles/sprinter.yml (71%) diff --git a/Resources/Maps/Shuttles/sprinter.yml b/Resources/Maps/_NF/Shuttles/sprinter.yml similarity index 71% rename from Resources/Maps/Shuttles/sprinter.yml rename to Resources/Maps/_NF/Shuttles/sprinter.yml index 2b3bc8e8d60..3b1d4dced50 100644 --- a/Resources/Maps/Shuttles/sprinter.yml +++ b/Resources/Maps/_NF/Shuttles/sprinter.yml @@ -3,15 +3,16 @@ meta: postmapinit: false tilemap: 0: Space - 27: FloorDark - 40: FloorElevatorShaft - 62: FloorMetalDiamond - 70: FloorPlastic - 89: FloorSteelDirty - 96: FloorTechMaint - 109: FloorWhitePlastic - 112: Lattice - 113: Plating + 28: FloorDark + 41: FloorElevatorShaft + 63: FloorMetalDiamond + 71: FloorPlastic + 85: FloorSteel + 90: FloorSteelDirty + 97: FloorTechMaint + 110: FloorWhitePlastic + 113: Lattice + 114: Plating entities: - proto: "" entities: @@ -24,19 +25,19 @@ entities: - chunks: 0,0: ind: 0,0 - tiles: WQAAAAAAWQAAAAAAGwAAAAABGwAAAAADGwAAAAADcQAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAKAAAAAAAcAAAAAAAKAAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAGwAAAAACGwAAAAABGwAAAAABcAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAKAAAAAAAKAAAAAAAKAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAGwAAAAADGwAAAAADGwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAGwAAAAACGwAAAAAAcQAAAAAAcQAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAGwAAAAAAGwAAAAABGwAAAAADcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAGwAAAAACGwAAAAADGwAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAGwAAAAAAGwAAAAACGwAAAAADcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAGwAAAAADGwAAAAADGwAAAAADcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGwAAAAAAGwAAAAADGwAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGwAAAAADGwAAAAADGwAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGwAAAAADGwAAAAAAcQAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGwAAAAADGwAAAAACcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: WgAAAAAAWgAAAAAAHAAAAAABHAAAAAADHAAAAAADcgAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAKQAAAAAAcQAAAAAAKQAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWgAAAAAAWgAAAAAAHAAAAAACHAAAAAABHAAAAAABcQAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAKQAAAAAAKQAAAAAAKQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWgAAAAAAWgAAAAAAHAAAAAADHAAAAAADHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAAAHAAAAAACHAAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAAAHAAAAAAAHAAAAAABHAAAAAADcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAAAHAAAAAACHAAAAAADHAAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAAAHAAAAAAAHAAAAAACHAAAAAADcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAAAHAAAAAADHAAAAAADHAAAAAADcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAHAAAAAADHAAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAADHAAAAAADHAAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAADHAAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAADHAAAAAACcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 -1,0: ind: -1,0 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAKAAAAAAAcAAAAAAAKAAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAKAAAAAAAKAAAAAAAKAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcQAAAAAAcQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAGwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAGwAAAAADGwAAAAACGwAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAGwAAAAADGwAAAAABGwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAGwAAAAADGwAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAKQAAAAAAcQAAAAAAKQAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAKQAAAAAAKQAAAAAAKQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAcgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAHAAAAAADHAAAAAACHAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAHAAAAAADHAAAAAABHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAHAAAAAADHAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 -1,-1: ind: -1,-1 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAWQAAAAAARgAAAAACRgAAAAACWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAKAAAAAAAKAAAAAAAKAAAAAAAcAAAAAAAAAAAAAAAcAAAAAAAcQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAKAAAAAAAcAAAAAAAKAAAAAAAcQAAAAAAAAAAAAAAcAAAAAAAcQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAKAAAAAAAKAAAAAAAKAAAAAAAcQAAAAAAcAAAAAAAcAAAAAAAcQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAKAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPgAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAcQAAAAAAWQAAAAAAWQAAAAAAGwAAAAAAGwAAAAADGwAAAAACGwAAAAADGwAAAAABWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAACGwAAAAACGwAAAAABGwAAAAACGwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAPgAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAGwAAAAAAGwAAAAABGwAAAAADGwAAAAABGwAAAAACGwAAAAAAGwAAAAABGwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAcQAAAAAAWQAAAAAAWQAAAAAAcQAAAAAAcQAAAAAAWQAAAAAAcQAAAAAAcQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAKAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAcQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAKAAAAAAAKAAAAAAAKAAAAAAAcQAAAAAAcAAAAAAAcAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAcQAAAAAAWQAAAAAAWQAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAWgAAAAAARwAAAAACRwAAAAACWgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAKQAAAAAAKQAAAAAAKQAAAAAAcQAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAKQAAAAAAcQAAAAAAKQAAAAAAcgAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAKQAAAAAAKQAAAAAAKQAAAAAAcgAAAAAAcQAAAAAAcQAAAAAAcgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAKQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPwAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAcgAAAAAAWgAAAAAAWgAAAAAAHAAAAAAAHAAAAAADHAAAAAACHAAAAAADHAAAAAABWgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPwAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAcgAAAAAAWgAAAAAAWgAAAAAAcgAAAAAAcgAAAAAAWgAAAAAAcgAAAAAAcgAAAAAAWgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAKQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAcgAAAAAAWgAAAAAAWgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAKQAAAAAAKQAAAAAAKQAAAAAAcgAAAAAAcQAAAAAAcQAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAcgAAAAAAWgAAAAAAWgAAAAAA version: 6 0,-1: ind: 0,-1 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAARgAAAAABWQAAAAAAWQAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAcQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAcQAAAAAAWQAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAARgAAAAAAcQAAAAAAcQAAAAAAWQAAAAAAWQAAAAAAcAAAAAAAAAAAAAAAcAAAAAAAKAAAAAAAKAAAAAAAKAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAGwAAAAADWQAAAAAAWQAAAAAAWQAAAAAAcQAAAAAAcAAAAAAAAAAAAAAAcQAAAAAAKAAAAAAAcAAAAAAAKAAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAbQAAAAABWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAcAAAAAAAcAAAAAAAcQAAAAAAKAAAAAAAKAAAAAAAKAAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAGwAAAAACWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAKAAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAcQAAAAAAcQAAAAAAGwAAAAABGwAAAAACcQAAAAAAWQAAAAAAWQAAAAAAcQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAPgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGwAAAAADGwAAAAABGwAAAAACGwAAAAADGwAAAAABGwAAAAABGwAAAAADGwAAAAACWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGwAAAAADGwAAAAADGwAAAAADGwAAAAADGwAAAAAAGwAAAAACGwAAAAACGwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAPgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAGwAAAAADcQAAAAAAcQAAAAAAGwAAAAAAcQAAAAAAWQAAAAAAWQAAAAAAcQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAGwAAAAABGwAAAAADGwAAAAACGwAAAAADcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAKAAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAGwAAAAADGwAAAAABGwAAAAAAGwAAAAADcAAAAAAAcAAAAAAAcQAAAAAAKAAAAAAAKAAAAAAAKAAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWgAAAAAARwAAAAABWgAAAAAAWgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAcgAAAAAAWgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAcgAAAAAAWgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWgAAAAAARwAAAAAAcgAAAAAAcgAAAAAAWgAAAAAAWgAAAAAAcQAAAAAAAAAAAAAAcQAAAAAAKQAAAAAAKQAAAAAAKQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWgAAAAAAHAAAAAADWgAAAAAAWgAAAAAAWgAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAcgAAAAAAKQAAAAAAcQAAAAAAKQAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWgAAAAAAbgAAAAABWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAcQAAAAAAcQAAAAAAcgAAAAAAKQAAAAAAKQAAAAAAKQAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWgAAAAAAHAAAAAACWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAKQAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWgAAAAAAcgAAAAAAcgAAAAAAHAAAAAABHAAAAAACcgAAAAAAWgAAAAAAWgAAAAAAcgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAPwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAPwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAHAAAAAADcgAAAAAAcgAAAAAAHAAAAAAAcgAAAAAAWgAAAAAAWgAAAAAAcgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWgAAAAAAWgAAAAAAHAAAAAABHAAAAAADHAAAAAACHAAAAAADcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAKQAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWgAAAAAAWgAAAAAAHAAAAAADHAAAAAABHAAAAAAAHAAAAAADcQAAAAAAcQAAAAAAcgAAAAAAKQAAAAAAKQAAAAAAKQAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 type: MapGrid - type: Broadphase @@ -62,732 +63,646 @@ entities: color: '#FFFFFFFF' id: Bot decals: - 474: -12,-3 - 475: -11,-3 - 476: -10,-3 - 477: 9,-3 - 478: 10,-3 - 479: 11,-3 + 429: -12,-3 + 430: -11,-3 + 431: -10,-3 + 432: 9,-3 + 433: 10,-3 + 434: 11,-3 - node: angle: 4.71238898038469 rad color: '#FFFFFFFF' id: Bot decals: - 26: -5,-7 - 27: -4,-7 - 28: -3,-7 - 29: -3,-8 - 30: -4,-8 - 31: -5,-8 - 32: -5,-9 - 33: -4,-9 - 34: -3,-9 - - node: - color: '#787878FF' - id: BrickTileSteelLineE - decals: - 12: 5.7666655,-3.9822545 - 13: 5.7666655,-4.9822545 - - node: - color: '#8C8C8CFF' - id: BrickTileSteelLineE - decals: - 10: 6.0010405,-3.9978795 - 11: 6.0166655,-4.9822545 - - node: - color: '#A0A0A0FF' - id: BrickTileSteelLineE - decals: - 8: 6.2510405,-3.9978795 - 9: 6.2666655,-4.9822545 - - node: - color: '#B4B4B4FF' - id: BrickTileSteelLineE - decals: - 6: 6.5010405,-3.9978795 - 7: 6.5010405,-4.9822545 - - node: - color: '#C8C8C8FF' - id: BrickTileSteelLineE - decals: - 4: 6.7510405,-3.9978795 - 5: 6.7510405,-4.9822545 - - node: - color: '#FFFFFFFF' - id: BrickTileSteelLineE - decals: - 2: 7,-4 - 3: 7,-5 - - node: - color: '#8C8C8CFF' - id: BrickTileSteelLineW - decals: - 22: -6.795757,-4.0040007 - 23: -6.795757,-4.9883757 - - node: - color: '#A0A0A0FF' - id: BrickTileSteelLineW - decals: - 20: -7.043778,-4.981266 - 21: -7.045757,-3.9883757 - - node: - color: '#B4B4B4FF' - id: BrickTileSteelLineW - decals: - 18: -7.2781525,-4.012516 - 19: -7.2781525,-4.981266 - - node: - color: '#C8C8C8FF' - id: BrickTileSteelLineW - decals: - 16: -7.5125275,-3.9968908 - 17: -7.5125275,-4.981266 - - node: - color: '#DCDCDCFF' - id: BrickTileSteelLineW - decals: - 14: -7.7625275,-3.9968908 - 15: -7.7625275,-4.981266 - - node: - color: '#FFFFFFFF' - id: BrickTileSteelLineW - decals: - 0: -8,-4 - 1: -8,-5 + 2: -5,-7 + 3: -4,-7 + 4: -3,-7 + 5: -3,-8 + 6: -4,-8 + 7: -5,-8 + 8: -5,-9 + 9: -4,-9 + 10: -3,-9 - node: angle: -1.5707963267948966 rad color: '#FFFFFFFF' id: Caution decals: - 520: 11,-6 + 475: 11,-6 - node: cleanable: True color: '#FFFFFFFF' id: Caution decals: - 209: -4,-4 + 184: -4,-4 - node: angle: 1.5707963267948966 rad color: '#FFFFFFFF' id: Caution decals: - 24: -12,-4 - 521: -12,-6 + 0: -12,-4 + 476: -12,-6 - node: angle: 4.71238898038469 rad color: '#FFFFFFFF' id: Caution decals: - 25: 11,-4 + 1: 11,-4 - node: cleanable: True color: '#C7621F47' id: Dirt decals: - 210: -5,-2 - 211: -5,-2 - 212: -5,-2 - 213: -5,-2 - 214: -5,-2 - 215: -6,-2 - 216: -6,-2 - 217: -5,-2 - 218: -6,-2 - 219: -6,-2 - 220: -4,-2 - 221: 7,-4 - 222: 7,-5 - 223: 7,-4 - 224: 6,-5 - 225: -8,-5 - 226: -8,-4 - 227: -8,-4 - 228: -8,-4 - 229: -8,-5 - 230: -7,-4 - 231: -7,-5 - 232: -8,-5 - 233: -8,-5 - 234: 1,-1 - 235: 1,0 - 236: 1,-2 - 237: -2,9 - 238: -3,10 - 239: -2,10 - 240: -1,9 - 241: 0,9 - 242: 0,9 - 243: 0,10 - 244: -1,10 - 245: -2,9 - 246: -2,9 - 247: -1,9 - 248: 0,9 - 249: 1,9 - 250: 0,10 - 251: -1,10 - 252: -2,10 - 253: -2,11 - 254: 0,11 - 255: 0,11 + 185: -5,-2 + 186: -5,-2 + 187: -5,-2 + 188: -5,-2 + 189: -5,-2 + 190: -6,-2 + 191: -6,-2 + 192: -5,-2 + 193: -6,-2 + 194: -6,-2 + 195: -4,-2 + 196: 1,-1 + 197: 1,0 + 198: 1,-2 + 199: -2,9 + 200: -3,10 + 201: -2,10 + 202: -1,9 + 203: 0,9 + 204: 0,9 + 205: 0,10 + 206: -1,10 + 207: -2,9 + 208: -2,9 + 209: -1,9 + 210: 0,9 + 211: 1,9 + 212: 0,10 + 213: -1,10 + 214: -2,10 + 215: -2,11 + 216: 0,11 + 217: 0,11 - node: cleanable: True color: '#FF0000FF' id: Dirt decals: - 68: -4,-1 - 69: -5,-1 - 70: -4,-1 - 71: -4,-1 - 72: -5,0 - 73: -4,0 - 74: -4,0 + 44: -4,-1 + 45: -5,-1 + 46: -4,-1 + 47: -4,-1 + 48: -5,0 + 49: -4,0 + 50: -4,0 - node: cleanable: True angle: 4.71238898038469 rad color: '#FF9F4DFF' id: Dirt decals: - 35: -3,-11 - 36: -3,-11 - 37: -2,-11 - 38: -2,-11 - 39: -3,-11 - 40: -3,-10 - 41: -3,-10 - 42: -2.5055575,-10.488877 - 47: -5,-8 - 48: -3,-7 + 11: -3,-11 + 12: -3,-11 + 13: -2,-11 + 14: -2,-11 + 15: -3,-11 + 16: -3,-10 + 17: -3,-10 + 18: -2.5055575,-10.488877 + 23: -5,-8 + 24: -3,-7 - node: cleanable: True color: '#FFFFFFFF' id: Dirt decals: - 133: 10,-5 - 134: 11,-5 - 135: 11,-4 - 489: -11,-6 - 490: -11,-6 - 491: -11,-6 - 492: -11,-3 - 493: -11,-3 - 494: -11,-3 - 495: 10,-6 - 496: 10,-6 - 497: 10,-6 - 498: 10,-3 - 499: 10,-3 - 500: 10,-3 - 501: -12,-8 - 502: -11,-8 - 503: -11,-8 - 504: -10,-8 - 505: -10,-8 - 506: -12,-1 - 507: -12,-1 - 508: -11,-1 - 509: -10,-1 - 510: 9,-8 - 511: 9,-8 - 512: 10,-8 - 513: 11,-8 - 514: 11,-8 - 515: 11,-1 - 516: 10,-1 - 517: 10,-1 - 518: 9,-1 - 519: 9,-1 + 109: 10,-5 + 110: 11,-5 + 111: 11,-4 + 444: -11,-6 + 445: -11,-6 + 446: -11,-6 + 447: -11,-3 + 448: -11,-3 + 449: -11,-3 + 450: 10,-6 + 451: 10,-6 + 452: 10,-6 + 453: 10,-3 + 454: 10,-3 + 455: 10,-3 + 456: -12,-8 + 457: -11,-8 + 458: -11,-8 + 459: -10,-8 + 460: -10,-8 + 461: -12,-1 + 462: -12,-1 + 463: -11,-1 + 464: -10,-1 + 465: 9,-8 + 466: 9,-8 + 467: 10,-8 + 468: 11,-8 + 469: 11,-8 + 470: 11,-1 + 471: 10,-1 + 472: 10,-1 + 473: 9,-1 + 474: 9,-1 + 487: 6,-5 - node: cleanable: True color: '#FF0000FF' id: DirtHeavy decals: - 75: -4,-2 - 76: -4,-2 - 77: -4,-1 - 78: -4,-1 + 51: -4,-2 + 52: -4,-2 + 53: -4,-1 + 54: -4,-1 - node: color: '#FFFFFFCA' id: DirtHeavy decals: - 325: 3,4 - 326: 3,5 - 327: 3,6 - 328: 3,6 - 329: 3,6 - 330: 3,7 - 331: 2,6 - 332: 3,5 - 333: 3,4 - 334: 3,4 - 335: 3,1 - 336: 2,1 - 337: 2,1 - 338: 3,2 - 339: 3,2 - 340: 3,2 - 341: 2,1 - 342: 2,2 - 343: 3,2 - 344: 0,2 - 345: 0,1 - 346: 0,2 - 347: -1,1 - 348: -1,1 - 349: -1,10 - 350: -1,9 - 351: 0,9 - 352: 0,10 - 353: -2,10 - 354: -3,9 - 355: -2,10 - 356: 1,10 - 357: 1,9 + 287: 3,4 + 288: 3,5 + 289: 3,6 + 290: 3,6 + 291: 3,6 + 292: 3,7 + 293: 2,6 + 294: 3,5 + 295: 3,4 + 296: 3,4 + 297: 3,1 + 298: 2,1 + 299: 2,1 + 300: 3,2 + 301: 3,2 + 302: 3,2 + 303: 2,1 + 304: 2,2 + 305: 3,2 + 306: 0,2 + 307: 0,1 + 308: 0,2 + 309: -1,1 + 310: -1,1 + 311: -1,10 + 312: -1,9 + 313: 0,9 + 314: 0,10 + 315: -2,10 + 316: -3,9 + 317: -2,10 + 318: 1,10 + 319: 1,9 - node: cleanable: True color: '#FFFFFFCA' id: DirtHeavy decals: - 364: -4,7 - 365: -4,7 + 326: -4,7 + 327: -4,7 + 328: -4,6 + 329: -4,5 + 330: -3,4 + 331: -3,4 + 332: -2,5 + 333: -4,6 + 334: -4,4 + 335: -2,4 + 336: -2,6 + 337: -4,6 + 338: -5,5 + 339: -5,5 + 340: -4,4 + 341: -3,5 + 342: -3,6 + 343: -2,7 + 344: -2,7 + 345: -2,7 + 346: -2,7 + 347: -2,7 + 348: 0,6 + 349: 0,7 + 350: 0,7 + 351: 0,7 + 352: -2,6 + 353: -1,6 + 354: -1,7 + 355: -1,7 + 356: 0,6 + 357: -1,5 + 358: -1,4 + 359: -1,4 + 360: -3,4 + 361: -4,4 + 362: -4,4 + 363: -4,4 + 364: -4,6 + 365: -4,6 366: -4,6 367: -4,5 - 368: -3,4 - 369: -3,4 - 370: -2,5 - 371: -4,6 - 372: -4,4 - 373: -2,4 - 374: -2,6 - 375: -4,6 - 376: -5,5 - 377: -5,5 - 378: -4,4 - 379: -3,5 - 380: -3,6 - 381: -2,7 - 382: -2,7 - 383: -2,7 - 384: -2,7 - 385: -2,7 - 386: 0,6 - 387: 0,7 - 388: 0,7 - 389: 0,7 - 390: -2,6 - 391: -1,6 - 392: -1,7 - 393: -1,7 - 394: 0,6 - 395: -1,5 - 396: -1,4 - 397: -1,4 - 398: -3,4 - 399: -4,4 - 400: -4,4 - 401: -4,4 - 402: -4,6 - 403: -4,6 - 404: -4,6 - 405: -4,5 - 406: -4,5 - 407: -4,5 - 408: 2,7 - 409: 2,7 - 410: 1,9 - 411: 1,9 - 412: 2,9 - 413: 2,9 - 414: 2,9 - 415: 2,9 - 416: 1,9 - 417: -3,0 - 418: -3,0 - 419: -3,1 - 420: -3,1 - 421: -2,2 - 422: -2,2 - 423: -3,1 - 424: -3,1 - 425: -3,1 - 426: -2,2 - 427: -2,0 - 428: -1,0 - 429: -1,-1 - 430: 3,-8 - 431: 3,-8 - 432: 3,-7 - 433: 3,-7 - 434: 5,-7 - 435: 2,-7 - 436: 2,-7 - 437: -4,-8 - 438: -4,-9 - 439: -5,-9 - 440: -5,-9 - 441: -5,-8 - 442: -4,-7 - 443: -3,-8 - 444: -3,-8 - 445: -4,-7 - 446: -5,-7 - 447: -5,-7 - 448: -4,-10 - 449: -4,-10 - 463: 1,-5 - 464: 1,-5 - 465: 0,-5 - 466: 0,-5 - 467: 4,-5 - 468: 2,-5 - 469: 5,-4 - 470: 7,-5 - 471: 6,-4 - 472: 6,-4 - 473: 7,-4 + 368: -4,5 + 369: -4,5 + 370: 2,7 + 371: 2,7 + 372: 1,9 + 373: 1,9 + 374: 2,9 + 375: 2,9 + 376: 2,9 + 377: 2,9 + 378: 1,9 + 379: -3,0 + 380: -3,0 + 381: -3,1 + 382: -3,1 + 383: -2,2 + 384: -2,2 + 385: -3,1 + 386: -3,1 + 387: -3,1 + 388: -2,2 + 389: -2,0 + 390: -1,0 + 391: -1,-1 + 392: 3,-8 + 393: 3,-8 + 394: 3,-7 + 395: 3,-7 + 396: 5,-7 + 397: 2,-7 + 398: 2,-7 + 399: -4,-8 + 400: -4,-9 + 401: -5,-9 + 402: -5,-9 + 403: -5,-8 + 404: -4,-7 + 405: -3,-8 + 406: -3,-8 + 407: -4,-7 + 408: -5,-7 + 409: -5,-7 + 410: -4,-10 + 411: -4,-10 + 422: 1,-5 + 423: 1,-5 + 424: 0,-5 + 425: 0,-5 + 426: 4,-5 + 427: 2,-5 + 428: 5,-4 - node: cleanable: True color: '#FFFFFFFF' id: DirtHeavy decals: - 97: -2,-9 - 98: -1,-1 - 99: -1,0 - 100: -3,1 - 101: -2,-1 - 102: -2,-2 - 103: 0,-1 - 104: 0,0 - 105: -2,1 - 106: -3,2 - 107: 1,5 - 108: 2,5 - 109: 2,6 - 110: 1,7 - 111: 1,6 - 112: 2,7 - 113: -1,4 - 114: -2,4 - 115: -3,5 - 116: -2,6 - 117: -2,6 - 118: -3,7 - 119: -3,7 - 120: -1,5 - 121: -2,4 - 122: -3,4 - 123: -1,5 - 124: -1,7 - 125: -1,7 - 126: 10,-5 - 127: 10,-4 - 128: 9,-4 - 129: 9,-5 - 130: 11,-3 - 131: 10,-4 - 132: 11,-5 - 153: -12,-5 - 154: -11,-3 - 155: -12,-3 - 156: -12,-3 - 157: -12,-4 - 158: -11,-4 - 159: -7,-5 - 160: -3,-5 - 161: -4,-4 - 162: -6,-4 - 163: -5,-5 - 164: -1,-5 - 165: -1,-4 - 166: 1,-4 - 167: 2,-5 - 168: 5,-5 - 169: 4,-4 - 170: 3,-4 - 171: -1,-5 - 172: -2,-4 - 173: 2,-2 - 174: 2,-1 - 175: 3,-1 - 176: 3,-2 - 177: 4,-2 - 178: 3,-2 - 179: 2,-1 - 180: 2,-2 - 303: -1,-9 - 304: -1,-9 - 305: -1,-8 - 306: -1,-7 - 307: 0,-7 - 308: 0,-7 - 309: 0,-9 - 310: 0,-10 - 311: -2,-11 - 312: -2,-11 - 313: 0,-12 - 314: -1,-11 - 315: -1,-10 - 316: 0,-11 + 73: -2,-9 + 74: -1,-1 + 75: -1,0 + 76: -3,1 + 77: -2,-1 + 78: -2,-2 + 79: 0,-1 + 80: 0,0 + 81: -2,1 + 82: -3,2 + 83: 1,5 + 84: 2,5 + 85: 2,6 + 86: 1,7 + 87: 1,6 + 88: 2,7 + 89: -1,4 + 90: -2,4 + 91: -3,5 + 92: -2,6 + 93: -2,6 + 94: -3,7 + 95: -3,7 + 96: -1,5 + 97: -2,4 + 98: -3,4 + 99: -1,5 + 100: -1,7 + 101: -1,7 + 102: 10,-5 + 103: 10,-4 + 104: 9,-4 + 105: 9,-5 + 106: 11,-3 + 107: 10,-4 + 108: 11,-5 + 129: -12,-5 + 130: -11,-3 + 131: -12,-3 + 132: -12,-3 + 133: -12,-4 + 134: -11,-4 + 135: -3,-5 + 136: -4,-4 + 137: -6,-4 + 138: -5,-5 + 139: -1,-5 + 140: -1,-4 + 141: 1,-4 + 142: 2,-5 + 143: 5,-5 + 144: 4,-4 + 145: 3,-4 + 146: -1,-5 + 147: -2,-4 + 148: 2,-2 + 149: 2,-1 + 150: 3,-1 + 151: 3,-2 + 152: 4,-2 + 153: 3,-2 + 154: 2,-1 + 155: 2,-2 + 265: -1,-9 + 266: -1,-9 + 267: -1,-8 + 268: -1,-7 + 269: 0,-7 + 270: 0,-7 + 271: 0,-9 + 272: 0,-10 + 273: -2,-11 + 274: -2,-11 + 275: 0,-12 + 276: -1,-11 + 277: -1,-10 + 278: 0,-11 + 485: -7,-4 + 486: -8,-5 + 488: 6,-4 + 489: 7,-4 - node: cleanable: True color: '#FF0000FF' id: DirtLight decals: - 79: -6,-1 - 80: -6,-1 - 81: -6,-1 - 82: -6,-2 - 83: -5,-1 - 84: -5,-1 - 85: -5,-1 - 86: -4,0 - 87: -4,0 - 88: -4,0 - 89: -4,-1 - 90: -4,-1 - 91: -4,-2 - 92: -4,-2 - 93: -6,-2 - 94: -6,-2 - 95: -6,-2 - 96: -6,-2 + 55: -6,-1 + 56: -6,-1 + 57: -6,-1 + 58: -6,-2 + 59: -5,-1 + 60: -5,-1 + 61: -5,-1 + 62: -4,0 + 63: -4,0 + 64: -4,0 + 65: -4,-1 + 66: -4,-1 + 67: -4,-2 + 68: -4,-2 + 69: -6,-2 + 70: -6,-2 + 71: -6,-2 + 72: -6,-2 - node: cleanable: True angle: 4.71238898038469 rad color: '#FF0000FF' id: DirtLight decals: - 49: 4,-7 - 50: 4,-8 - 51: 4,-7 - 52: 4,-7 - 53: 4,-7 - 54: 4,-8 - 55: 4,-8 - 56: 4,-8 - 57: 4,-8 - 58: 3,-8 - 59: 3,-8 - 60: 5,-7 - 61: 5,-7 - 62: 5,-7 - 63: 5,-7 - 64: 5,-7 - 65: 5,-7 - 66: 5,-7 - 67: 5,-7 + 25: 4,-7 + 26: 4,-8 + 27: 4,-7 + 28: 4,-7 + 29: 4,-7 + 30: 4,-8 + 31: 4,-8 + 32: 4,-8 + 33: 4,-8 + 34: 3,-8 + 35: 3,-8 + 36: 5,-7 + 37: 5,-7 + 38: 5,-7 + 39: 5,-7 + 40: 5,-7 + 41: 5,-7 + 42: 5,-7 + 43: 5,-7 - node: cleanable: True angle: 4.71238898038469 rad color: '#FF9F4DFF' id: DirtLight decals: - 43: -2,-10 - 44: -4,-8 - 45: -3,-9 + 19: -2,-10 + 20: -4,-8 + 21: -3,-9 - node: cleanable: True color: '#FFFFFF98' id: DirtLight decals: - 277: 2.956286,4.7591314 + 239: 2.956286,4.7591314 - node: cleanable: True color: '#FFFFFFCA' id: DirtLight decals: - 358: -4,7 - 359: -4,7 - 360: -4,7 - 361: -3,7 - 362: -3,7 - 363: -4,7 + 320: -4,7 + 321: -4,7 + 322: -4,7 + 323: -3,7 + 324: -3,7 + 325: -4,7 - node: cleanable: True color: '#FFFFFFFF' id: DirtLight decals: - 136: 9,-3 - 137: 10,-4 - 138: 10,-5 - 139: -11,-5 - 140: -11,-3 - 141: -10,-4 - 142: -11,-5 - 143: -12,-4 - 144: -12,-3 - 145: -11,-3 - 146: -10,-4 - 147: -10,-5 - 181: 3,-1 - 182: 4,-1 - 183: 4,-1 - 184: 2,0 - 185: 3,0 - 186: 2,0 - 278: 3,5 - 279: 3,5 - 280: 3,6 - 281: 3,6 - 282: 3,7 - 283: 3,7 - 284: 3,6 - 285: 3,6 - 286: 3,5 - 287: -1,-12 - 288: -1,-11 - 289: -1,-11 - 290: -1,-11 - 291: 0,-11 - 292: -1,-11 - 293: -1,-11 - 294: -1,-10 - 295: -1,-9 - 296: 0,-9 - 297: 0,-8 - 298: 0,-8 - 299: 0,-7 - 300: -1,-7 - 301: -1,-7 - 302: -1,-8 - 480: -11,-6 - 481: -11,-6 - 482: -10,-6 - 483: -11,-6 - 484: 10,-6 - 485: 10,-6 - 486: 10,-6 - 487: 9,-6 - 488: 10,-6 + 112: 9,-3 + 113: 10,-4 + 114: 10,-5 + 115: -11,-5 + 116: -11,-3 + 117: -10,-4 + 118: -11,-5 + 119: -12,-4 + 120: -12,-3 + 121: -11,-3 + 122: -10,-4 + 123: -10,-5 + 156: 3,-1 + 157: 4,-1 + 158: 4,-1 + 159: 2,0 + 160: 3,0 + 161: 2,0 + 240: 3,5 + 241: 3,5 + 242: 3,6 + 243: 3,6 + 244: 3,7 + 245: 3,7 + 246: 3,6 + 247: 3,6 + 248: 3,5 + 249: -1,-12 + 250: -1,-11 + 251: -1,-11 + 252: -1,-11 + 253: 0,-11 + 254: -1,-11 + 255: -1,-11 + 256: -1,-10 + 257: -1,-9 + 258: 0,-9 + 259: 0,-8 + 260: 0,-8 + 261: 0,-7 + 262: -1,-7 + 263: -1,-7 + 264: -1,-8 + 435: -11,-6 + 436: -11,-6 + 437: -10,-6 + 438: -11,-6 + 439: 10,-6 + 440: 10,-6 + 441: 10,-6 + 442: 9,-6 + 443: 10,-6 - node: cleanable: True angle: 4.71238898038469 rad color: '#FF9F4DFF' id: DirtMedium decals: - 46: -4,-9 + 22: -4,-9 - node: cleanable: True color: '#FFFFFFCA' id: DirtMedium decals: - 450: -1,-2 - 451: -1,-2 - 452: 0,-2 - 453: 0,-1 - 454: 3,7 - 455: 2,7 - 456: 2,7 - 457: 7,-5 - 458: 6,-4 - 459: 6,-5 - 460: 10,-3 - 461: 9,-3 - 462: 9,-4 + 412: -1,-2 + 413: -1,-2 + 414: 0,-2 + 415: 0,-1 + 416: 3,7 + 417: 2,7 + 418: 2,7 + 419: 10,-3 + 420: 9,-3 + 421: 9,-4 - node: cleanable: True color: '#FFFFFFFF' id: DirtMedium decals: - 148: -12,-5 - 149: -11,-5 - 150: -10,-5 - 151: -10,-4 - 152: -10,-3 - 187: 3,-2 - 188: 4,-1 - 189: 4,-1 - 190: 4,-5 - 191: 3,-5 - 192: 2,-5 - 193: 5,-4 - 194: 5,-4 - 195: -1,-4 - 196: 0,-4 - 197: 0,-4 - 198: -1,-3 - 199: -1,-3 - 200: -1,-3 - 201: -1,-6 - 202: -1,-6 - 203: -1,-6 - 204: -1,-6 - 205: 0,-6 - 206: 0,-6 - 207: 0,-6 - 208: 0,-6 - 522: -12,-6 - 523: -12,-6 - 524: 11,-6 - 525: 11,-6 - 526: 3,-9 - 527: 3,-9 - 528: 3,-9 - 529: 4,-9 + 124: -12,-5 + 125: -11,-5 + 126: -10,-5 + 127: -10,-4 + 128: -10,-3 + 162: 3,-2 + 163: 4,-1 + 164: 4,-1 + 165: 4,-5 + 166: 3,-5 + 167: 2,-5 + 168: 5,-4 + 169: 5,-4 + 170: -1,-4 + 171: 0,-4 + 172: 0,-4 + 173: -1,-3 + 174: -1,-3 + 175: -1,-3 + 176: -1,-6 + 177: -1,-6 + 178: -1,-6 + 179: -1,-6 + 180: 0,-6 + 181: 0,-6 + 182: 0,-6 + 183: 0,-6 + 477: -12,-6 + 478: -12,-6 + 479: 11,-6 + 480: 11,-6 + 481: 3,-9 + 482: 3,-9 + 483: 3,-9 + 484: 4,-9 - node: cleanable: True angle: 1.5707963267948966 rad color: '#FFFFFFFF' id: LoadingArea decals: - 275: -2,-9 - 276: -2,-8 + 237: -2,-9 + 238: -2,-8 - node: cleanable: True color: '#FFFFFFDB' id: Rust decals: - 256: -3,-8 - 257: -4,-7 - 258: -3,-7 - 259: -2,-7 - 260: -2,-8 - 261: -2,-7 + 218: -3,-8 + 219: -4,-7 + 220: -3,-7 + 221: -2,-7 + 222: -2,-8 + 223: -2,-7 - node: color: '#FFFFFFCA' id: WarnLineE decals: - 323: 0,-12 - 324: 0,-11 + 285: 0,-12 + 286: 0,-11 - node: color: '#FFFFFFCA' id: WarnLineS decals: - 317: -1,-7 - 318: -1,-8 - 319: -1,-9 - 320: -1,-10 - 321: -1,-11 - 322: -1,-12 + 279: -1,-7 + 280: -1,-8 + 281: -1,-9 + 282: -1,-10 + 283: -1,-11 + 284: -1,-12 - node: cleanable: True color: '#92000050' id: largebrush decals: - 262: 4.6452923,-7.4165974 - 263: 5.0359173,-6.9478474 - 264: 4.7702923,-7.0415974 - 265: 4.6452923,-7.7134724 - 266: 4.6609173,-7.0884724 - 267: 5.3784537,-7.2633767 - 268: 5.4253287,-6.9040017 - 269: 5.1440787,-6.9665017 - 270: -3.3899674,-1.5190489 - 271: -3.6087174,-1.3315489 - 272: -3.8587174,-1.0502989 - 273: -3.5149674,-0.8159237 - 274: -3.1868424,-0.9096737 + 224: 4.6452923,-7.4165974 + 225: 5.0359173,-6.9478474 + 226: 4.7702923,-7.0415974 + 227: 4.6452923,-7.7134724 + 228: 4.6609173,-7.0884724 + 229: 5.3784537,-7.2633767 + 230: 5.4253287,-6.9040017 + 231: 5.1440787,-6.9665017 + 232: -3.3899674,-1.5190489 + 233: -3.6087174,-1.3315489 + 234: -3.8587174,-1.0502989 + 235: -3.5149674,-0.8159237 + 236: -3.1868424,-0.9096737 type: DecalGrid - version: 2 data: tiles: 0,0: - 0: 65535 + 0: 65407 + 1: 128 -1,0: 0: 65535 0,1: 0: 63359 - 1: 2176 + 2: 128 + 3: 2048 0,2: 0: 32767 0,3: @@ -827,37 +742,40 @@ entities: -3,-1: 0: 65535 -2,-2: - 0: 65535 + 0: 65279 + 1: 256 -2,-1: 0: 64511 - 2: 1024 + 4: 1024 -2,-3: 0: 61120 - 3: 8 + 5: 8 -1,-4: 0: 65216 -1,-3: 0: 65535 -1,-2: 0: 65519 - 4: 16 + 1: 16 -1,-1: 0: 49151 - 4: 16384 + 1: 16384 0,-4: 0: 63280 0,-3: 0: 65535 0,-2: - 0: 65531 - 4: 4 + 0: 65467 + 1: 68 0,-1: - 0: 65535 + 0: 63487 + 1: 2048 1,-3: 0: 30512 - 3: 1 + 5: 1 1,-2: - 0: 65535 + 0: 63487 + 1: 2048 1,-1: 0: 65535 2,-3: @@ -873,9 +791,9 @@ entities: 3,-1: 0: 4369 -2,-4: - 3: 32768 + 5: 32768 1,-4: - 3: 4096 + 5: 4096 uniqueMixes: - volume: 2500 temperature: 293.15 @@ -892,6 +810,21 @@ entities: - 0 - 0 - 0 + - volume: 2500 + temperature: 293.14996 + moles: + - 20.078888 + - 75.53487 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 - volume: 2500 temperature: 293.15 moles: @@ -910,8 +843,8 @@ entities: - volume: 2500 temperature: 293.15 moles: - - 21.6852 - - 81.57766 + - 23.710548 + - 89.19683 - 0 - 0 - 0 @@ -925,8 +858,8 @@ entities: - volume: 2500 temperature: 293.15 moles: - - 0 - - 0 + - 21.6852 + - 81.57766 - 0 - 0 - 0 @@ -938,10 +871,10 @@ entities: - 0 - 0 - volume: 2500 - temperature: 293.14996 + temperature: 293.15 moles: - - 20.078888 - - 75.53487 + - 0 + - 0 - 0 - 0 - 0 @@ -958,13 +891,16 @@ entities: - type: RadiationGridResistance - id: Sprinter type: BecomesStation -- proto: AirlockCaptainGlassLocked +- proto: AirCanister entities: - - uid: 2 + - uid: 446 components: - - pos: -3.5,-2.5 + - anchored: True + pos: -2.5,7.5 parent: 1 type: Transform + - bodyType: Static + type: Physics - proto: AirlockCargoGlass entities: - uid: 3 @@ -1075,18 +1011,28 @@ entities: pos: -12.5,-5.5 parent: 1 type: Transform -- proto: AirlockMaintCaptainLocked +- proto: AirlockMaintGlass entities: - - uid: 21 + - uid: 22 components: - - pos: 1.5,5.5 + - pos: 3.5,-5.5 parent: 1 type: Transform -- proto: AirlockMaintGlass +- proto: AirlockMercenaryGlassLocked entities: - - uid: 22 + - uid: 2 components: - - pos: 3.5,-5.5 + - pos: -3.5,-2.5 + parent: 1 + type: Transform + - links: + - 412 + type: DeviceLinkSink +- proto: AirlockMercenaryLocked + entities: + - uid: 21 + components: + - pos: 1.5,5.5 parent: 1 type: Transform - proto: AmeController @@ -1116,7 +1062,7 @@ entities: type: Physics - uid: 25 components: - - pos: 0.54973245,7.5791607 + - pos: 0.71468806,7.6303167 parent: 1 type: Transform - proto: AmeShielding @@ -1171,32 +1117,37 @@ entities: type: Transform - proto: APCBasic entities: - - uid: 35 + - uid: 178 components: - - rot: 3.141592653589793 rad - pos: 2.5,8.5 + - pos: 7.5,-1.5 parent: 1 type: Transform - - uid: 36 + - uid: 200 components: - - pos: 1.5,-9.5 + - pos: -7.5,-1.5 parent: 1 type: Transform -- proto: APCHighCapacity - entities: - - uid: 37 + - uid: 337 components: - - pos: -7.5,-1.5 + - rot: 1.5707963267948966 rad + pos: -2.5,-0.5 parent: 1 type: Transform - - uid: 38 + - uid: 338 components: - - pos: 7.5,-1.5 + - pos: -2.5,-5.5 parent: 1 type: Transform - - uid: 39 + - uid: 461 components: - - pos: 0.5,-2.5 + - rot: 3.141592653589793 rad + pos: 0.5,8.5 + parent: 1 + type: Transform + - uid: 462 + components: + - rot: -1.5707963267948966 rad + pos: 1.5,6.5 parent: 1 type: Transform - proto: AtmosDeviceFanTiny @@ -1375,83 +1326,33 @@ entities: - pos: 2.5,2.5 parent: 1 type: Transform -- proto: BoxShellTranquilizer - entities: - - uid: 578 - components: - - flags: InContainer - type: MetaData - - parent: 576 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage - - uid: 579 - components: - - flags: InContainer - type: MetaData - - parent: 576 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage -- proto: BoxZiptie +- proto: BoxMedicalTrackingImplants entities: - - uid: 68 + - uid: 399 components: - - pos: 2.3657243,7.608989 + - pos: 3.3875737,4.814908 parent: 1 type: Transform - - uid: 69 + - uid: 414 components: - - pos: 2.7719743,7.452739 + - pos: 3.6584072,4.616992 parent: 1 type: Transform - proto: CableApcExtension entities: - - uid: 70 + - uid: 36 components: - - pos: 1.5,-7.5 + - pos: 4.5,-3.5 parent: 1 type: Transform - uid: 71 components: - - pos: 2.5,-7.5 + - pos: 3.5,-4.5 parent: 1 type: Transform - uid: 72 components: - - pos: -0.5,-3.5 - parent: 1 - type: Transform - - uid: 73 - components: - - pos: 1.5,-3.5 - parent: 1 - type: Transform - - uid: 74 - components: - - pos: -7.5,-2.5 - parent: 1 - type: Transform - - uid: 75 - components: - - pos: -7.5,-1.5 - parent: 1 - type: Transform - - uid: 76 - components: - - pos: -7.5,-3.5 - parent: 1 - type: Transform - - uid: 77 - components: - - pos: -8.5,-3.5 - parent: 1 - type: Transform - - uid: 78 - components: - - pos: -9.5,-3.5 + - pos: -2.5,-3.5 parent: 1 type: Transform - uid: 79 @@ -1554,31 +1455,6 @@ entities: - pos: -9.5,1.5 parent: 1 type: Transform - - uid: 99 - components: - - pos: 7.5,-1.5 - parent: 1 - type: Transform - - uid: 100 - components: - - pos: 7.5,-2.5 - parent: 1 - type: Transform - - uid: 101 - components: - - pos: 7.5,-3.5 - parent: 1 - type: Transform - - uid: 102 - components: - - pos: 8.5,-3.5 - parent: 1 - type: Transform - - uid: 103 - components: - - pos: 9.5,-3.5 - parent: 1 - type: Transform - uid: 104 components: - pos: 10.5,-3.5 @@ -1679,1519 +1555,1198 @@ entities: - pos: 11.5,-9.5 parent: 1 type: Transform - - uid: 124 + - uid: 129 components: - - pos: 0.5,-2.5 + - pos: 2.5,-0.5 parent: 1 type: Transform - - uid: 125 + - uid: 130 components: - - pos: 0.5,-3.5 + - pos: 0.5,-0.5 parent: 1 type: Transform - - uid: 126 + - uid: 131 components: - - pos: 4.5,-3.5 + - pos: -1.5,-0.5 parent: 1 type: Transform - - uid: 127 + - uid: 132 components: - - pos: -0.5,-4.5 + - pos: -0.5,-0.5 parent: 1 type: Transform - - uid: 128 + - uid: 133 components: - - pos: -1.5,-4.5 + - pos: 5.5,-3.5 parent: 1 type: Transform - - uid: 129 + - uid: 134 components: - - pos: -2.5,-4.5 + - pos: -0.5,-3.5 parent: 1 type: Transform - - uid: 130 + - uid: 145 components: - - pos: -2.5,-3.5 + - pos: 3.5,-3.5 parent: 1 type: Transform - - uid: 131 + - uid: 146 components: - - pos: -4.5,-4.5 + - pos: 8.5,-3.5 parent: 1 type: Transform - - uid: 132 + - uid: 160 components: - - pos: -5.5,-4.5 + - pos: -2.5,-7.5 parent: 1 type: Transform - - uid: 133 + - uid: 161 components: - - pos: -3.5,-10.5 + - pos: -0.5,-10.5 parent: 1 type: Transform - - uid: 134 + - uid: 162 components: - - pos: -3.5,-9.5 + - pos: -1.5,-7.5 parent: 1 type: Transform - - uid: 135 + - uid: 163 components: - - pos: 2.5,-3.5 + - pos: 7.5,-1.5 parent: 1 type: Transform - - uid: 136 + - uid: 164 components: - - pos: 4.5,-4.5 + - pos: -0.5,-6.5 parent: 1 type: Transform - - uid: 137 + - uid: 165 components: - - pos: 5.5,-4.5 + - pos: -0.5,-7.5 parent: 1 type: Transform - - uid: 138 + - uid: 166 components: - - pos: 6.5,-4.5 + - pos: -2.5,-6.5 parent: 1 type: Transform - - uid: 139 + - uid: 167 components: - pos: -4.5,-3.5 parent: 1 type: Transform - - uid: 140 + - uid: 177 components: - - pos: -3.5,-5.5 + - pos: 7.5,-3.5 parent: 1 type: Transform - - uid: 141 + - uid: 179 components: - - pos: -3.5,-6.5 + - pos: -3.5,-1.5 parent: 1 type: Transform - - uid: 142 + - uid: 181 components: - - pos: -3.5,-7.5 + - pos: 0.5,8.5 parent: 1 type: Transform - - uid: 143 + - uid: 184 components: - - pos: -3.5,-8.5 + - pos: 0.5,9.5 parent: 1 type: Transform - - uid: 144 - components: - - pos: -3.5,-3.5 - parent: 1 - type: Transform - - uid: 145 - components: - - pos: -3.5,-2.5 - parent: 1 - type: Transform - - uid: 146 - components: - - pos: -3.5,-1.5 - parent: 1 - type: Transform - - uid: 147 + - uid: 185 components: - - pos: -3.5,-0.5 + - pos: 0.5,10.5 parent: 1 type: Transform - - uid: 148 + - uid: 186 components: - - pos: -3.5,0.5 + - pos: -0.5,9.5 parent: 1 type: Transform - - uid: 149 + - uid: 187 components: - - pos: 3.5,-3.5 + - pos: 2.5,5.5 parent: 1 type: Transform - - uid: 150 + - uid: 188 components: - - pos: 3.5,-2.5 + - pos: 1.5,-0.5 parent: 1 type: Transform - - uid: 151 + - uid: 189 components: - - pos: 3.5,-1.5 + - pos: 3.5,-0.5 parent: 1 type: Transform - - uid: 152 + - uid: 201 components: - - pos: 3.5,-0.5 + - pos: -0.5,-5.5 parent: 1 type: Transform - - uid: 153 + - uid: 202 components: - - pos: 3.5,0.5 + - pos: 9.5,-3.5 parent: 1 type: Transform - - uid: 154 + - uid: 203 components: - - pos: 3.5,-5.5 + - pos: 0.5,-3.5 parent: 1 type: Transform - - uid: 155 + - uid: 204 components: - - pos: 3.5,-6.5 + - pos: -0.5,-8.5 parent: 1 type: Transform - - uid: 156 + - uid: 205 components: - - pos: 3.5,-7.5 + - pos: -0.5,-9.5 parent: 1 type: Transform - - uid: 157 + - uid: 206 components: - - pos: 3.5,-8.5 + - pos: -3.5,-3.5 parent: 1 type: Transform - - uid: 158 + - uid: 207 components: - - pos: 0.5,-5.5 + - pos: -3.5,-2.5 parent: 1 type: Transform - - uid: 159 + - uid: 208 components: - - pos: 0.5,-6.5 + - pos: -1.5,-3.5 parent: 1 type: Transform - - uid: 160 + - uid: 209 components: - - pos: 0.5,-7.5 + - pos: -0.5,-4.5 parent: 1 type: Transform - - uid: 161 + - uid: 210 components: - - pos: 0.5,-8.5 + - pos: -7.5,-3.5 parent: 1 type: Transform - - uid: 162 + - uid: 211 components: - - pos: 0.5,-9.5 + - pos: -8.5,-3.5 parent: 1 type: Transform - - uid: 163 + - uid: 212 components: - - pos: 0.5,-10.5 + - pos: -9.5,-3.5 parent: 1 type: Transform - - uid: 164 + - uid: 219 components: - - pos: 0.5,-11.5 + - pos: -3.5,-10.5 parent: 1 type: Transform - - uid: 165 + - uid: 220 components: - - pos: -0.5,-10.5 + - pos: -2.5,-10.5 parent: 1 type: Transform - - uid: 166 + - uid: 221 components: - pos: -1.5,-10.5 parent: 1 type: Transform - - uid: 167 + - uid: 222 components: - - pos: -2.5,-10.5 + - pos: 0.5,-10.5 parent: 1 type: Transform - - uid: 168 + - uid: 223 components: - pos: 1.5,-10.5 parent: 1 type: Transform - - uid: 169 + - uid: 224 components: - - pos: 2.5,-10.5 + - pos: -3.5,-7.5 parent: 1 type: Transform - - uid: 170 + - uid: 225 components: - - pos: 1.5,-9.5 + - pos: -4.5,-7.5 parent: 1 type: Transform - - uid: 171 + - uid: 227 components: - - pos: 0.5,-1.5 + - pos: 1.5,-3.5 parent: 1 type: Transform - - uid: 172 + - uid: 228 components: - - pos: 0.5,-0.5 + - pos: 2.5,-3.5 parent: 1 type: Transform - - uid: 173 + - uid: 229 components: - - pos: 0.5,0.5 + - pos: 3.5,-7.5 parent: 1 type: Transform - - uid: 174 + - uid: 230 components: - - pos: 0.5,1.5 + - pos: 3.5,-6.5 parent: 1 type: Transform - - uid: 175 + - uid: 231 components: - - pos: 0.5,2.5 + - pos: 4.5,-0.5 parent: 1 type: Transform - - uid: 176 + - uid: 232 components: - - pos: -0.5,2.5 + - pos: -0.5,1.5 parent: 1 type: Transform - - uid: 177 + - uid: 233 components: - - pos: -1.5,2.5 + - pos: -0.5,0.5 parent: 1 type: Transform - - uid: 178 + - uid: 234 components: - - pos: -1.5,3.5 + - pos: 3.5,1.5 parent: 1 type: Transform - - uid: 179 + - uid: 235 components: - - pos: -1.5,4.5 + - pos: 3.5,0.5 parent: 1 type: Transform - - uid: 180 + - uid: 240 components: - - pos: -1.5,5.5 + - pos: -2.5,-5.5 parent: 1 type: Transform - - uid: 181 + - uid: 322 components: - - pos: -1.5,6.5 + - pos: 0.5,5.5 parent: 1 type: Transform - - uid: 182 + - uid: 328 components: - - pos: -0.5,6.5 + - pos: 7.5,-2.5 parent: 1 type: Transform - - uid: 183 + - uid: 331 components: - pos: 0.5,6.5 parent: 1 type: Transform - - uid: 184 + - uid: 352 components: - pos: 1.5,6.5 parent: 1 type: Transform - - uid: 185 - components: - - pos: 2.5,6.5 - parent: 1 - type: Transform - - uid: 186 + - uid: 353 components: - - pos: -0.5,8.5 + - pos: 1.5,10.5 parent: 1 type: Transform - - uid: 187 + - uid: 435 components: - - pos: -0.5,9.5 + - pos: 2.5,6.5 parent: 1 type: Transform - - uid: 188 + - uid: 441 components: - - pos: 0.5,9.5 + - pos: -2.5,-0.5 parent: 1 type: Transform - - uid: 189 + - uid: 450 components: - - pos: 1.5,9.5 + - pos: -0.5,5.5 parent: 1 type: Transform - - uid: 190 + - uid: 452 components: - - pos: -0.5,10.5 + - pos: -1.5,9.5 parent: 1 type: Transform - - uid: 191 + - uid: 469 components: - - pos: 1.5,8.5 + - pos: 3.5,-5.5 parent: 1 type: Transform - - uid: 192 + - uid: 496 components: - - pos: 2.5,8.5 + - pos: -7.5,-2.5 parent: 1 type: Transform - - uid: 193 + - uid: 497 components: - - pos: -0.5,11.5 + - pos: -7.5,-1.5 parent: 1 type: Transform - proto: CableHV entities: - - uid: 194 + - uid: 37 components: - - pos: 3.5,-10.5 + - pos: -5.5,0.5 parent: 1 type: Transform - - uid: 195 + - uid: 73 components: - - pos: -2.5,4.5 + - pos: -4.5,-0.5 parent: 1 type: Transform - - uid: 196 + - uid: 74 components: - - pos: -2.5,5.5 + - pos: -5.5,-0.5 parent: 1 type: Transform - - uid: 197 + - uid: 75 components: - - pos: -5.5,-7.5 + - pos: -3.5,-0.5 parent: 1 type: Transform - - uid: 198 + - uid: 76 components: - - pos: -3.5,5.5 + - pos: 5.5,0.5 parent: 1 type: Transform - - uid: 199 + - uid: 77 components: - - pos: -3.5,-11.5 + - pos: 4.5,-0.5 parent: 1 type: Transform - - uid: 200 + - uid: 101 components: - - pos: -3.5,-9.5 + - pos: 2.5,4.5 parent: 1 type: Transform - - uid: 201 + - uid: 102 components: - - pos: -3.5,-10.5 + - pos: 2.5,3.5 parent: 1 type: Transform - - uid: 202 + - uid: 103 components: - - pos: -3.5,4.5 + - pos: -0.5,-5.5 parent: 1 type: Transform - - uid: 203 + - uid: 124 components: - - pos: 3.5,-11.5 + - pos: -0.5,-4.5 parent: 1 type: Transform - - uid: 204 + - uid: 125 components: - - pos: 3.5,-9.5 + - pos: 8.5,-3.5 parent: 1 type: Transform - - uid: 205 + - uid: 126 components: - - pos: -3.5,6.5 + - pos: 9.5,-3.5 parent: 1 type: Transform - - uid: 206 + - uid: 127 components: - - pos: -2.5,6.5 + - pos: 10.5,-3.5 parent: 1 type: Transform - - uid: 207 + - uid: 128 components: - - pos: -1.5,6.5 + - pos: 11.5,-3.5 parent: 1 type: Transform - - uid: 208 + - uid: 135 components: - - pos: -1.5,5.5 + - pos: 5.5,-9.5 parent: 1 type: Transform - - uid: 209 + - uid: 136 components: - - pos: -1.5,4.5 + - pos: 5.5,-8.5 parent: 1 type: Transform - - uid: 210 + - uid: 137 components: - - pos: -1.5,7.5 + - pos: 4.5,-8.5 parent: 1 type: Transform - - uid: 211 + - uid: 138 components: - - pos: -1.5,8.5 + - pos: 4.5,-7.5 parent: 1 type: Transform - - uid: 212 + - uid: 139 components: - - pos: -1.5,3.5 + - pos: 3.5,-7.5 parent: 1 type: Transform - - uid: 213 + - uid: 140 components: - - pos: -1.5,2.5 + - pos: 0.5,-7.5 parent: 1 type: Transform - - uid: 214 + - uid: 141 components: - - pos: -1.5,1.5 + - pos: -0.5,-7.5 parent: 1 type: Transform - - uid: 215 + - uid: 142 components: - - pos: -1.5,0.5 + - pos: -0.5,-6.5 parent: 1 type: Transform - - uid: 216 + - uid: 143 components: - - pos: -1.5,-0.5 + - pos: 2.5,-7.5 parent: 1 type: Transform - - uid: 217 + - uid: 144 components: - - pos: -1.5,-1.5 + - pos: 1.5,-7.5 parent: 1 type: Transform - - uid: 218 + - uid: 182 components: - - pos: -1.5,-2.5 + - pos: 7.5,-3.5 parent: 1 type: Transform - - uid: 219 + - uid: 183 components: - - pos: -1.5,-3.5 + - pos: 6.5,-3.5 parent: 1 type: Transform - - uid: 220 + - uid: 213 components: - - pos: -1.5,-4.5 + - pos: 0.5,9.5 parent: 1 type: Transform - - uid: 221 + - uid: 214 components: - - pos: -1.5,-5.5 + - pos: -0.5,5.5 parent: 1 type: Transform - - uid: 222 + - uid: 215 components: - - pos: -1.5,-6.5 + - pos: -0.5,6.5 parent: 1 type: Transform - - uid: 223 + - uid: 216 components: - - pos: -1.5,-7.5 + - pos: -0.5,7.5 parent: 1 type: Transform - - uid: 224 + - uid: 217 components: - - pos: 1.5,-7.5 + - pos: -0.5,8.5 parent: 1 type: Transform - - uid: 225 + - uid: 218 components: - - pos: -2.5,-2.5 + - pos: -0.5,9.5 parent: 1 type: Transform - uid: 226 components: - - pos: -3.5,-2.5 + - pos: 3.5,-0.5 parent: 1 type: Transform - - uid: 227 + - uid: 236 components: - - pos: -4.5,-2.5 + - pos: 2.5,10.5 parent: 1 type: Transform - - uid: 228 + - uid: 239 components: - - pos: -5.5,-2.5 + - pos: -0.5,4.5 parent: 1 type: Transform - - uid: 229 + - uid: 241 components: - - pos: -0.5,-2.5 + - pos: 2.5,1.5 parent: 1 type: Transform - - uid: 230 + - uid: 278 components: - - pos: 0.5,-2.5 + - pos: 3.5,-3.5 parent: 1 type: Transform - - uid: 231 + - uid: 281 components: - - pos: 1.5,-2.5 + - pos: -12.5,-5.5 parent: 1 type: Transform - - uid: 232 + - uid: 282 components: - - pos: 2.5,-2.5 + - pos: -12.5,-4.5 parent: 1 type: Transform - - uid: 233 + - uid: 283 components: - - pos: 3.5,-2.5 + - pos: -12.5,-3.5 parent: 1 type: Transform - - uid: 234 + - uid: 284 components: - - pos: 4.5,-2.5 + - pos: -12.5,-2.5 parent: 1 type: Transform - - uid: 235 + - uid: 294 components: - - pos: -2.5,-5.5 + - pos: 12.5,-5.5 parent: 1 type: Transform - - uid: 236 + - uid: 295 components: - - pos: -3.5,-5.5 + - pos: 12.5,-4.5 parent: 1 type: Transform - - uid: 237 + - uid: 296 components: - - pos: -4.5,-5.5 + - pos: 12.5,-3.5 parent: 1 type: Transform - - uid: 238 + - uid: 297 components: - - pos: -0.5,-5.5 + - pos: 12.5,-2.5 parent: 1 type: Transform - - uid: 239 + - uid: 298 components: - - pos: 0.5,-5.5 + - pos: 1.5,9.5 parent: 1 type: Transform - - uid: 240 + - uid: 300 components: - - pos: 1.5,-5.5 + - pos: 1.5,11.5 parent: 1 type: Transform - - uid: 241 + - uid: 303 components: - - pos: 2.5,-5.5 + - pos: -1.5,11.5 parent: 1 type: Transform - - uid: 242 + - uid: 304 components: - - pos: 3.5,-5.5 + - pos: -2.5,11.5 parent: 1 type: Transform - - uid: 243 + - uid: 305 components: - - pos: 4.5,-5.5 + - pos: 2.5,11.5 parent: 1 type: Transform - - uid: 244 + - uid: 306 components: - - pos: -2.5,0.5 + - pos: 1.5,12.5 parent: 1 type: Transform - - uid: 245 + - uid: 307 components: - - pos: -3.5,0.5 + - pos: 0.5,12.5 parent: 1 type: Transform - - uid: 246 + - uid: 308 components: - - pos: -4.5,0.5 + - pos: -0.5,12.5 parent: 1 type: Transform - - uid: 247 + - uid: 309 components: - - pos: -5.5,0.5 + - pos: -1.5,12.5 parent: 1 type: Transform - - uid: 248 + - uid: 311 components: - - pos: -0.5,0.5 + - pos: 2.5,9.5 parent: 1 type: Transform - - uid: 249 + - uid: 312 components: - - pos: 0.5,0.5 + - pos: 2.5,8.5 parent: 1 type: Transform - - uid: 250 + - uid: 313 components: - - pos: 1.5,0.5 + - pos: 5.5,-3.5 parent: 1 type: Transform - - uid: 251 + - uid: 319 components: - - pos: 2.5,0.5 + - pos: -11.5,-3.5 parent: 1 type: Transform - - uid: 252 + - uid: 320 components: - - pos: 3.5,0.5 + - pos: -10.5,-3.5 parent: 1 type: Transform - - uid: 253 + - uid: 321 components: - - pos: 4.5,0.5 + - pos: -0.5,-0.5 parent: 1 type: Transform - - uid: 254 + - uid: 323 components: - - pos: 5.5,0.5 + - pos: -4.5,-3.5 parent: 1 type: Transform - - uid: 255 + - uid: 324 components: - - pos: -1.5,-8.5 + - pos: -5.5,-3.5 parent: 1 type: Transform - - uid: 256 + - uid: 329 components: - - pos: -2.5,-8.5 + - pos: -2.5,-3.5 parent: 1 type: Transform - - uid: 257 + - uid: 350 components: - - pos: -3.5,-8.5 + - pos: 2.5,-3.5 parent: 1 type: Transform - - uid: 258 + - uid: 351 components: - - pos: -4.5,-8.5 + - pos: 1.5,-3.5 parent: 1 type: Transform - - uid: 259 + - uid: 357 components: - - pos: -5.5,-8.5 + - pos: -2.5,-0.5 parent: 1 type: Transform - - uid: 260 + - uid: 358 components: - - pos: -0.5,-8.5 + - pos: -1.5,-0.5 parent: 1 type: Transform - - uid: 261 + - uid: 359 components: - - pos: 0.5,-8.5 + - pos: 2.5,0.5 parent: 1 type: Transform - - uid: 262 + - uid: 360 components: - - pos: 1.5,-8.5 + - pos: 2.5,7.5 parent: 1 type: Transform - - uid: 263 + - uid: 361 components: - - pos: 2.5,-8.5 + - pos: 2.5,6.5 parent: 1 type: Transform - - uid: 264 + - uid: 362 components: - - pos: 3.5,-8.5 + - pos: 2.5,5.5 parent: 1 type: Transform - - uid: 265 + - uid: 363 components: - - pos: 4.5,-8.5 + - pos: -9.5,-3.5 parent: 1 type: Transform - - uid: 266 + - uid: 378 components: - - pos: 5.5,-8.5 + - pos: -0.5,-3.5 parent: 1 type: Transform - - uid: 267 + - uid: 379 components: - - pos: 0.5,8.5 + - pos: -1.5,-3.5 parent: 1 type: Transform - - uid: 268 + - uid: 380 components: - - pos: -0.5,6.5 + - pos: 0.5,-0.5 parent: 1 type: Transform - - uid: 269 + - uid: 381 components: - - pos: 0.5,6.5 + - pos: 2.5,-0.5 parent: 1 type: Transform - - uid: 270 + - uid: 382 components: - - pos: 1.5,6.5 + - pos: -3.5,-3.5 parent: 1 type: Transform - - uid: 271 + - uid: 383 components: - - pos: 1.5,7.5 + - pos: -0.5,-2.5 parent: 1 type: Transform - - uid: 272 + - uid: 384 components: - - pos: 1.5,8.5 + - pos: -0.5,-1.5 parent: 1 type: Transform - - uid: 273 + - uid: 392 components: - - pos: -7.5,-6.5 + - pos: -7.5,-3.5 parent: 1 type: Transform - - uid: 274 + - uid: 405 components: - - pos: -6.5,-6.5 + - pos: -6.5,-3.5 parent: 1 type: Transform - - uid: 275 + - uid: 416 components: - - pos: -5.5,-6.5 + - pos: -8.5,-3.5 parent: 1 type: Transform - - uid: 276 + - uid: 436 components: - - pos: -8.5,-6.5 + - pos: 0.5,-3.5 parent: 1 type: Transform - - uid: 277 + - uid: 443 components: - - pos: -9.5,-6.5 + - pos: 5.5,-0.5 parent: 1 type: Transform - - uid: 278 + - uid: 444 components: - - pos: -10.5,-6.5 + - pos: 2.5,2.5 parent: 1 type: Transform - - uid: 279 + - uid: 445 components: - - pos: -11.5,-6.5 + - pos: 1.5,-0.5 parent: 1 type: Transform - - uid: 280 + - uid: 453 components: - - pos: -12.5,-6.5 + - pos: 4.5,-3.5 parent: 1 type: Transform - - uid: 281 + - uid: 466 components: - - pos: -12.5,-5.5 + - pos: 1.5,4.5 parent: 1 type: Transform - - uid: 282 +- proto: CableMV + entities: + - uid: 35 components: - - pos: -12.5,-4.5 + - pos: -2.5,-7.5 parent: 1 type: Transform - - uid: 283 + - uid: 38 components: - - pos: -12.5,-3.5 + - pos: 1.5,4.5 parent: 1 type: Transform - - uid: 284 + - uid: 153 components: - - pos: -12.5,-2.5 + - pos: -5.5,-3.5 parent: 1 type: Transform - - uid: 285 + - uid: 154 components: - - pos: 5.5,-7.5 + - pos: -3.5,-3.5 parent: 1 type: Transform - - uid: 286 + - uid: 155 components: - - pos: 5.5,-6.5 + - pos: -0.5,-3.5 parent: 1 type: Transform - - uid: 287 + - uid: 156 components: - - pos: 6.5,-6.5 + - pos: 1.5,-3.5 parent: 1 type: Transform - - uid: 288 + - uid: 157 components: - - pos: 7.5,-6.5 + - pos: -0.5,-6.5 parent: 1 type: Transform - - uid: 289 + - uid: 158 components: - - pos: 8.5,-6.5 + - pos: -2.5,-6.5 parent: 1 type: Transform - - uid: 290 + - uid: 159 components: - - pos: 9.5,-6.5 + - pos: 2.5,-3.5 parent: 1 type: Transform - - uid: 291 + - uid: 168 components: - - pos: 10.5,-6.5 + - pos: -0.5,-0.5 parent: 1 type: Transform - - uid: 292 + - uid: 169 components: - - pos: 11.5,-6.5 + - pos: 0.5,-0.5 parent: 1 type: Transform - - uid: 293 + - uid: 170 components: - - pos: 12.5,-6.5 + - pos: -1.5,-0.5 parent: 1 type: Transform - - uid: 294 + - uid: 171 components: - - pos: 12.5,-5.5 + - pos: -2.5,-0.5 parent: 1 type: Transform - - uid: 295 + - uid: 172 components: - - pos: 12.5,-4.5 + - pos: 1.5,6.5 parent: 1 type: Transform - - uid: 296 + - uid: 190 components: - - pos: 12.5,-3.5 + - pos: 0.5,0.5 parent: 1 type: Transform - - uid: 297 + - uid: 191 components: - - pos: 12.5,-2.5 + - pos: 0.5,1.5 parent: 1 type: Transform - - uid: 298 + - uid: 192 components: - - pos: 1.5,9.5 + - pos: 0.5,2.5 parent: 1 type: Transform - - uid: 299 + - uid: 193 components: - - pos: 1.5,10.5 + - pos: 5.5,-3.5 parent: 1 type: Transform - - uid: 300 + - uid: 194 components: - - pos: 1.5,11.5 + - pos: 0.5,3.5 parent: 1 type: Transform - - uid: 301 + - uid: 195 components: - - pos: 0.5,11.5 + - pos: 0.5,4.5 parent: 1 type: Transform - - uid: 302 + - uid: 196 components: - - pos: -0.5,11.5 + - pos: 0.5,5.5 parent: 1 type: Transform - - uid: 303 + - uid: 197 components: - - pos: -1.5,11.5 + - pos: 0.5,6.5 parent: 1 type: Transform - - uid: 304 + - uid: 198 components: - - pos: -2.5,11.5 + - pos: 0.5,7.5 parent: 1 type: Transform - - uid: 305 + - uid: 199 components: - - pos: 2.5,11.5 + - pos: 0.5,8.5 parent: 1 type: Transform - - uid: 306 + - uid: 237 components: - - pos: 1.5,12.5 + - pos: 4.5,-3.5 parent: 1 type: Transform - - uid: 307 + - uid: 238 components: - - pos: 0.5,12.5 + - pos: 3.5,-3.5 parent: 1 type: Transform - - uid: 308 + - uid: 272 components: - - pos: -0.5,12.5 + - pos: -4.5,-3.5 parent: 1 type: Transform - - uid: 309 + - uid: 273 components: - - pos: -1.5,12.5 + - pos: -2.5,-3.5 parent: 1 type: Transform - - uid: 310 + - uid: 274 components: - - pos: -0.5,4.5 + - pos: -0.5,-5.5 parent: 1 type: Transform - - uid: 311 + - uid: 275 components: - - pos: 2.5,9.5 + - pos: -2.5,-5.5 parent: 1 type: Transform - - uid: 312 + - uid: 339 components: - - pos: 2.5,8.5 + - pos: 1.5,-7.5 parent: 1 type: Transform - - uid: 313 + - uid: 340 components: - - pos: 5.5,-9.5 + - pos: -1.5,-7.5 parent: 1 type: Transform -- proto: CableMV - entities: - - uid: 314 + - uid: 389 components: - - pos: 2.5,8.5 + - pos: 0.5,-7.5 parent: 1 type: Transform - - uid: 315 + - uid: 390 components: - - pos: 1.5,-7.5 + - pos: -0.5,-7.5 parent: 1 type: Transform - - uid: 316 + - uid: 442 components: - - pos: 0.5,-7.5 + - pos: -0.5,-4.5 parent: 1 type: Transform - - uid: 317 + - uid: 454 components: - - pos: -0.5,-7.5 + - pos: -1.5,-3.5 parent: 1 type: Transform - - uid: 318 + - uid: 459 components: - - pos: -1.5,-7.5 + - pos: 0.5,-3.5 parent: 1 type: Transform - - uid: 319 + - uid: 498 components: - - pos: -1.5,-6.5 + - pos: -6.5,-3.5 parent: 1 type: Transform - - uid: 320 + - uid: 499 components: - - pos: -1.5,-5.5 + - pos: -7.5,-3.5 parent: 1 type: Transform - - uid: 321 + - uid: 500 components: - - pos: -1.5,-4.5 + - pos: -7.5,-2.5 parent: 1 type: Transform - - uid: 322 + - uid: 501 components: - - pos: -1.5,8.5 + - pos: -7.5,-1.5 parent: 1 type: Transform - - uid: 323 + - uid: 502 components: - - pos: -1.5,7.5 + - pos: 7.5,-1.5 parent: 1 type: Transform - - uid: 324 + - uid: 503 components: - - pos: -1.5,6.5 + - pos: 7.5,-2.5 parent: 1 type: Transform - - uid: 325 + - uid: 504 components: - - pos: -1.5,5.5 + - pos: 7.5,-3.5 parent: 1 type: Transform - - uid: 326 + - uid: 505 components: - - pos: -1.5,4.5 + - pos: 6.5,-3.5 parent: 1 type: Transform - - uid: 327 +- proto: CableTerminal + entities: + - uid: 364 components: - - pos: -1.5,3.5 + - rot: 1.5707963267948966 rad + pos: 1.5,9.5 parent: 1 type: Transform - - uid: 328 +- proto: CargoPallet + entities: + - uid: 365 components: - - pos: -1.5,2.5 + - pos: -9.5,-2.5 parent: 1 type: Transform - - uid: 329 + - uid: 366 components: - - pos: -1.5,1.5 + - pos: 9.5,-5.5 parent: 1 type: Transform - - uid: 330 + - uid: 367 components: - - pos: -1.5,0.5 + - pos: -9.5,-5.5 parent: 1 type: Transform - - uid: 331 + - uid: 368 components: - - pos: -1.5,-0.5 + - pos: 9.5,-2.5 parent: 1 type: Transform - - uid: 332 +- proto: Catwalk + entities: + - uid: 369 components: - - pos: -1.5,-1.5 + - pos: -0.5,7.5 parent: 1 type: Transform - - uid: 333 + - uid: 370 components: - - pos: -1.5,-2.5 + - pos: 0.5,5.5 parent: 1 type: Transform - - uid: 334 + - uid: 371 components: - - pos: -1.5,-3.5 + - pos: 0.5,4.5 parent: 1 type: Transform - - uid: 335 + - uid: 372 components: - - pos: -2.5,-3.5 + - pos: -0.5,5.5 parent: 1 type: Transform - - uid: 336 + - uid: 373 components: - - pos: -3.5,-3.5 + - pos: -0.5,6.5 parent: 1 type: Transform - - uid: 337 +- proto: ChairOfficeDark + entities: + - uid: 374 components: - - pos: -4.5,-3.5 + - pos: 3.5,-7.5 parent: 1 type: Transform - - uid: 338 +- proto: ChairPilotSeat + entities: + - uid: 375 components: - - pos: -5.5,-3.5 + - rot: 3.141592653589793 rad + pos: 0.5,10.5 parent: 1 type: Transform - - uid: 339 + - uid: 376 components: - - pos: -6.5,-3.5 + - rot: 3.141592653589793 rad + pos: -1.5,10.5 parent: 1 type: Transform - - uid: 340 +- proto: CheckerBoard + entities: + - uid: 377 components: - - pos: -7.5,-3.5 + - pos: -1.9841328,2.5913696 parent: 1 type: Transform - - uid: 341 +- proto: ClothingOuterWinterPara + entities: + - uid: 395 components: - - pos: -7.5,-2.5 + - pos: 2.53125,-6.401108 parent: 1 type: Transform - - uid: 342 - components: - - pos: -7.5,-1.5 - parent: 1 - type: Transform - - uid: 343 - components: - - pos: -0.5,-3.5 - parent: 1 - type: Transform - - uid: 344 - components: - - pos: 0.5,-3.5 - parent: 1 - type: Transform - - uid: 345 - components: - - pos: 1.5,-3.5 - parent: 1 - type: Transform - - uid: 346 - components: - - pos: 2.5,-3.5 - parent: 1 - type: Transform - - uid: 347 - components: - - pos: 3.5,-3.5 - parent: 1 - type: Transform - - uid: 348 - components: - - pos: 4.5,-3.5 - parent: 1 - type: Transform - - uid: 349 - components: - - pos: 5.5,-3.5 - parent: 1 - type: Transform - - uid: 350 - components: - - pos: 6.5,-3.5 - parent: 1 - type: Transform - - uid: 351 - components: - - pos: 7.5,-3.5 - parent: 1 - type: Transform - - uid: 352 - components: - - pos: 7.5,-2.5 - parent: 1 - type: Transform - - uid: 353 - components: - - pos: 7.5,-1.5 - parent: 1 - type: Transform - - uid: 354 - components: - - pos: 0.5,-2.5 - parent: 1 - type: Transform - - uid: 355 - components: - - pos: -0.5,-8.5 - parent: 1 - type: Transform - - uid: 356 - components: - - pos: -0.5,-9.5 - parent: 1 - type: Transform - - uid: 357 - components: - - pos: 0.5,-9.5 - parent: 1 - type: Transform - - uid: 358 - components: - - pos: 1.5,-9.5 - parent: 1 - type: Transform - - uid: 359 - components: - - pos: -1.5,9.5 - parent: 1 - type: Transform - - uid: 360 - components: - - pos: -0.5,9.5 - parent: 1 - type: Transform - - uid: 361 - components: - - pos: 0.5,9.5 - parent: 1 - type: Transform - - uid: 362 - components: - - pos: 1.5,9.5 - parent: 1 - type: Transform - - uid: 363 - components: - - pos: 1.5,8.5 - parent: 1 - type: Transform -- proto: CableTerminal +- proto: ComputerSalvageExpedition entities: - - uid: 364 + - uid: 402 components: - rot: 1.5707963267948966 rad - pos: 1.5,9.5 + pos: -2.5,9.5 parent: 1 type: Transform -- proto: CargoPallet +- proto: ComputerShuttle entities: - - uid: 365 - components: - - pos: -9.5,-2.5 - parent: 1 - type: Transform - - uid: 366 - components: - - pos: 9.5,-5.5 - parent: 1 - type: Transform - - uid: 367 - components: - - pos: -9.5,-5.5 - parent: 1 - type: Transform - - uid: 368 + - uid: 403 components: - - pos: 9.5,-2.5 + - pos: 0.5,11.5 parent: 1 type: Transform -- proto: Catwalk +- proto: ComputerStationRecords entities: - - uid: 369 - components: - - pos: -0.5,7.5 - parent: 1 - type: Transform - - uid: 370 - components: - - pos: 0.5,5.5 - parent: 1 - type: Transform - - uid: 371 - components: - - pos: 0.5,4.5 - parent: 1 - type: Transform - - uid: 372 - components: - - pos: -0.5,5.5 - parent: 1 - type: Transform - - uid: 373 + - uid: 401 components: - - pos: -0.5,6.5 + - pos: -1.5,11.5 parent: 1 type: Transform -- proto: ChairOfficeDark +- proto: DefibrillatorCabinetFilled entities: - - uid: 374 + - uid: 487 components: - - pos: 3.5,-7.5 + - rot: -1.5707963267948966 rad + pos: 5.5,-7.5 parent: 1 type: Transform -- proto: ChairPilotSeat +- proto: DiceBag entities: - - uid: 375 + - uid: 407 components: - - rot: 3.141592653589793 rad - pos: 0.5,10.5 + - pos: -1.3747578,2.6226196 parent: 1 type: Transform - - uid: 376 +- proto: EmergencyLight + entities: + - uid: 68 components: - rot: 3.141592653589793 rad - pos: -1.5,10.5 + pos: 1.5,-4.5 parent: 1 type: Transform -- proto: CheckerBoard - entities: - - uid: 377 + - uid: 406 components: - - pos: -1.9841328,2.5913696 + - rot: -1.5707963267948966 rad + pos: 3.5,6.5 parent: 1 type: Transform -- proto: ClothingBeltMilitaryWebbing - entities: - - uid: 379 - components: - - flags: InContainer - type: MetaData - - parent: 378 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage -- proto: ClothingEyesGlassesSunglasses - entities: - - uid: 380 - components: - - flags: InContainer - type: MetaData - - parent: 378 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage -- proto: ClothingHandsGlovesCombat - entities: - - uid: 381 - components: - - flags: InContainer - type: MetaData - - parent: 378 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage -- proto: ClothingHeadHatHoshat - entities: - - uid: 382 - components: - - flags: InContainer - desc: There's a new bounty hunter in the sector. - name: bounty hunter's hat - type: MetaData - - parent: 378 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage -- proto: ClothingOuterArmorBulletproof - entities: - - uid: 383 - components: - - flags: InContainer - type: MetaData - - parent: 378 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage -- proto: ClothingOuterCoatHoSTrench - entities: - - uid: 384 - components: - - flags: InContainer - desc: A greatcoat enhanced with a special alloy for some extra protection and style for those with a charismatic presence. - name: bounty hunter's flak trenchcoat - type: MetaData - - parent: 378 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage -- proto: ClothingOuterHardsuitBasic - entities: - - uid: 385 - components: - - flags: InContainer - type: MetaData - - parent: 378 - type: Transform - - group: - - hoverMessage: "" - contextText: verb-examine-group-other - icon: /Textures/Interface/examine-star.png - components: - - Armor - - ClothingSpeedModifier - entries: - - message: >- - It provides the following protection: - - - [color=yellow]Blunt[/color] damage reduced by [color=lightblue]10%[/color]. - - - [color=yellow]Slash[/color] damage reduced by [color=lightblue]10%[/color]. - - - [color=yellow]Piercing[/color] damage reduced by [color=lightblue]10%[/color]. - - - [color=yellow]Heat[/color] damage reduced by [color=lightblue]10%[/color]. - - - [color=yellow]Radiation[/color] damage reduced by [color=lightblue]10%[/color]. - - - [color=yellow]Caustic[/color] damage reduced by [color=lightblue]15%[/color]. - - - [color=orange]Explosion[/color] damage reduced by [color=lightblue]10%[/color]. - priority: 0 - component: Armor - - message: This decreases your speed by [color=yellow]20%[/color]. - priority: 0 - component: ClothingSpeedModifier - title: null - type: GroupExamine - - canCollide: False - type: Physics - - type: InsideEntityStorage -- proto: ClothingOuterWinterPara - entities: - - uid: 395 + - uid: 409 components: - - pos: 2.6429324,-6.3159156 + - rot: -1.5707963267948966 rad + pos: 0.5,6.5 parent: 1 type: Transform -- proto: ClothingShoesBootsCombatFilled - entities: - - uid: 386 - components: - - flags: InContainer - type: MetaData - - parent: 378 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage -- proto: ClothingUniformJumpskirtDetective - entities: - - uid: 387 - components: - - flags: InContainer - type: MetaData - - parent: 378 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage -- proto: ClothingUniformJumpsuitDetective - entities: - - uid: 388 - components: - - flags: InContainer - type: MetaData - - parent: 378 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage -- proto: ComputerBroken - entities: - - uid: 401 + - uid: 471 components: - - pos: -1.5,11.5 + - rot: 3.141592653589793 rad + pos: 0.5,9.5 parent: 1 type: Transform -- proto: ComputerSalvageExpedition - entities: - - uid: 402 + - uid: 479 components: - rot: 1.5707963267948966 rad - pos: -2.5,9.5 + pos: -1.5,-0.5 parent: 1 type: Transform -- proto: ComputerShuttle - entities: - - uid: 403 + - uid: 484 components: - - pos: 0.5,11.5 + - rot: 3.141592653589793 rad + pos: 11.5,-5.5 parent: 1 type: Transform -- proto: ComputerStationRecords - entities: - - uid: 404 + - uid: 485 components: - rot: 3.141592653589793 rad - pos: 3.5,-8.5 + pos: -11.5,-5.5 parent: 1 type: Transform -- proto: CrateFoodCooking - entities: - - uid: 394 + - uid: 486 components: - - pos: 3.5,1.5 + - rot: -1.5707963267948966 rad + pos: -3.5,-1.5 parent: 1 type: Transform -- proto: DefibrillatorCabinetFilled - entities: - - uid: 406 + - uid: 488 components: - rot: 3.141592653589793 rad - pos: 2.5,-9.5 + pos: 2.5,-8.5 parent: 1 type: Transform -- proto: DiceBag +- proto: ExtinguisherCabinetFilled entities: - - uid: 407 + - uid: 408 components: - - pos: -1.3747578,2.6226196 + - rot: 3.141592653589793 rad + pos: -1.5,8.5 parent: 1 type: Transform -- proto: DrinkNuclearColaGlass - entities: - - uid: 409 - components: - - flags: InContainer - type: MetaData - - parent: 408 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage - - uid: 410 - components: - - flags: InContainer - type: MetaData - - parent: 408 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage - proto: FaxMachineShip entities: - uid: 417 @@ -3206,6 +2761,20 @@ entities: - pos: -1.5,-6.5 parent: 1 type: Transform +- proto: Firelock + entities: + - uid: 493 + components: + - rot: -1.5707963267948966 rad + pos: 0.5,3.5 + parent: 1 + type: Transform + - uid: 495 + components: + - rot: -1.5707963267948966 rad + pos: 1.5,5.5 + parent: 1 + type: Transform - proto: FirelockEdge entities: - uid: 419 @@ -3224,1079 +2793,951 @@ entities: components: - rot: 1.5707963267948966 rad pos: 2.5,-4.5 - parent: 1 - type: Transform - - uid: 422 - components: - - rot: 1.5707963267948966 rad - pos: 2.5,-3.5 - parent: 1 - type: Transform - - uid: 423 - components: - - pos: -3.5,-1.5 - parent: 1 - type: Transform -- proto: FirelockGlass - entities: - - uid: 424 - components: - - pos: 1.5,0.5 - parent: 1 - type: Transform - - uid: 425 - components: - - rot: 1.5707963267948966 rad - pos: 4.5,-2.5 - parent: 1 - type: Transform - - uid: 426 - components: - - pos: 1.5,-0.5 - parent: 1 - type: Transform - - uid: 427 - components: - - pos: 1.5,-1.5 - parent: 1 - type: Transform -- proto: FloorDrain - entities: - - uid: 428 - components: - - pos: 2.5,-10.5 - parent: 1 - type: Transform - - fixtures: {} - type: Fixtures - - uid: 429 - components: - - pos: -4.5,0.5 - parent: 1 - type: Transform - - fixtures: {} - type: Fixtures -- proto: FoodBreadMoldy - entities: - - uid: 430 - components: - - pos: -0.5628208,11.671696 - parent: 1 - type: Transform -- proto: FoodBreadMoldySlice - entities: - - uid: 411 - components: - - flags: InContainer - type: MetaData - - parent: 408 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage - - uid: 412 - components: - - flags: InContainer - type: MetaData - - parent: 408 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage -- proto: FoodPizzaMoldySlice - entities: - - uid: 413 - components: - - flags: InContainer - type: MetaData - - parent: 408 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage - - uid: 414 - components: - - flags: InContainer - type: MetaData - - parent: 408 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage - - uid: 415 - components: - - flags: InContainer - type: MetaData - - parent: 408 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage -- proto: GasDualPortVentPump - entities: - - uid: 431 - components: - - pos: -0.5,1.5 - parent: 1 - type: Transform - - color: '#0055CCFF' - type: AtmosPipeColor - - uid: 432 - components: - - rot: 3.141592653589793 rad - pos: -0.5,-4.5 - parent: 1 - type: Transform - - color: '#0055CCFF' - type: AtmosPipeColor - - uid: 433 + parent: 1 + type: Transform + - uid: 422 components: - rot: 1.5707963267948966 rad - pos: -4.5,-3.5 + pos: 2.5,-3.5 parent: 1 type: Transform - - color: '#0055CCFF' - type: AtmosPipeColor - - uid: 434 + - uid: 423 components: - - rot: 1.5707963267948966 rad - pos: 4.5,-3.5 + - pos: -3.5,-1.5 parent: 1 type: Transform - - color: '#0055CCFF' - type: AtmosPipeColor -- proto: GasMixerFlipped +- proto: FirelockGlass entities: - - uid: 435 + - uid: 69 components: - - rot: 3.141592653589793 rad - pos: -0.5,6.5 + - rot: -1.5707963267948966 rad + pos: 0.5,-5.5 parent: 1 type: Transform - - color: '#0055CCFF' - type: AtmosPipeColor -- proto: GasPassiveVent - entities: - - uid: 436 + - uid: 424 + components: + - pos: 1.5,0.5 + parent: 1 + type: Transform + - uid: 425 components: - rot: 1.5707963267948966 rad - pos: -5.5,3.5 + pos: 4.5,-2.5 parent: 1 type: Transform - - uid: 437 + - uid: 426 components: - - rot: -1.5707963267948966 rad - pos: 5.5,3.5 + - pos: 1.5,-0.5 parent: 1 type: Transform -- proto: GasPipeBend - entities: - - uid: 438 + - uid: 427 components: - - rot: 1.5707963267948966 rad - pos: 2.5,-1.5 + - pos: 1.5,-1.5 parent: 1 type: Transform - - color: '#0055CCFF' - type: AtmosPipeColor - - uid: 439 + - uid: 481 components: - - pos: -2.5,-1.5 + - rot: -1.5707963267948966 rad + pos: -0.5,-5.5 parent: 1 type: Transform - - color: '#990000FF' - type: AtmosPipeColor - - uid: 440 + - uid: 489 components: - rot: -1.5707963267948966 rad - pos: 1.5,2.5 + pos: -0.5,-2.5 parent: 1 type: Transform - - color: '#0055CCFF' - type: AtmosPipeColor - - uid: 441 + - uid: 490 components: - - pos: -3.5,3.5 + - rot: -1.5707963267948966 rad + pos: -3.5,-2.5 parent: 1 type: Transform - - color: '#990000FF' - type: AtmosPipeColor - - uid: 442 + - uid: 491 components: - - rot: 3.141592653589793 rad - pos: -3.5,2.5 + - rot: -1.5707963267948966 rad + pos: 4.5,-2.5 parent: 1 type: Transform - - color: '#990000FF' - type: AtmosPipeColor - - uid: 443 + - uid: 492 components: - - rot: 1.5707963267948966 rad - pos: 3.5,3.5 + - rot: -1.5707963267948966 rad + pos: 3.5,-5.5 parent: 1 type: Transform - - color: '#990000FF' - type: AtmosPipeColor - - uid: 444 + - uid: 494 components: - rot: -1.5707963267948966 rad - pos: 3.5,2.5 + pos: -0.5,8.5 parent: 1 type: Transform - - color: '#990000FF' - type: AtmosPipeColor - - uid: 445 +- proto: FloorDrain + entities: + - uid: 428 components: - - pos: -1.5,2.5 + - pos: 2.5,-10.5 parent: 1 type: Transform - - color: '#990000FF' - type: AtmosPipeColor - - uid: 446 + - fixtures: {} + type: Fixtures + - uid: 429 components: - - rot: 1.5707963267948966 rad - pos: 1.5,2.5 + - pos: -4.5,0.5 parent: 1 type: Transform - - color: '#990000FF' - type: AtmosPipeColor - - uid: 447 + - fixtures: {} + type: Fixtures +- proto: FoodBreadMoldy + entities: + - uid: 430 + components: + - pos: -0.5628208,11.671696 + parent: 1 + type: Transform +- proto: GasMixer + entities: + - uid: 175 components: - rot: 3.141592653589793 rad - pos: -1.5,1.5 + pos: -0.5,-10.5 parent: 1 type: Transform - - color: '#990000FF' + - color: '#0055CCFF' type: AtmosPipeColor - - uid: 448 +- proto: GasPassiveGate + entities: + - uid: 388 components: - rot: 1.5707963267948966 rad - pos: 0.5,-3.5 + pos: -6.5,-7.5 parent: 1 type: Transform - color: '#990000FF' type: AtmosPipeColor - - uid: 449 +- proto: GasPassiveVent + entities: + - uid: 349 components: - - rot: -1.5707963267948966 rad - pos: 0.5,-4.5 + - rot: 1.5707963267948966 rad + pos: -7.5,-7.5 parent: 1 type: Transform - color: '#990000FF' type: AtmosPipeColor - - uid: 450 +- proto: GasPipeBend + entities: + - uid: 173 components: - - pos: 2.5,-3.5 + - pos: 0.5,-10.5 parent: 1 type: Transform - - color: '#990000FF' + - color: '#0055CCFF' type: AtmosPipeColor - - uid: 451 + - uid: 345 components: - rot: -1.5707963267948966 rad - pos: 0.5,-3.5 + pos: 7.5,-3.5 parent: 1 type: Transform - - color: '#0055CCFF' + - color: '#990000FF' type: AtmosPipeColor - - uid: 452 + - uid: 347 components: - - rot: 1.5707963267948966 rad - pos: 0.5,-2.5 + - rot: 3.141592653589793 rad + pos: -7.5,-3.5 parent: 1 type: Transform - - color: '#0055CCFF' + - color: '#990000FF' type: AtmosPipeColor - - uid: 453 +- proto: GasPipeFourway + entities: + - uid: 268 components: - - pos: 2.5,-2.5 + - pos: -0.5,-4.5 parent: 1 type: Transform - color: '#0055CCFF' type: AtmosPipeColor - - uid: 454 + - uid: 269 components: - - rot: 3.141592653589793 rad - pos: 2.5,-3.5 + - pos: 0.5,-3.5 parent: 1 type: Transform - - color: '#0055CCFF' + - color: '#990000FF' type: AtmosPipeColor - - uid: 455 +- proto: GasPipeStraight + entities: + - uid: 39 components: - - rot: -1.5707963267948966 rad - pos: 1.5,-5.5 + - rot: 1.5707963267948966 rad + pos: 4.5,-3.5 parent: 1 type: Transform - color: '#990000FF' type: AtmosPipeColor - - uid: 456 + - uid: 78 components: - rot: 1.5707963267948966 rad - pos: 0.5,-5.5 + pos: 1.5,5.5 parent: 1 type: Transform - color: '#990000FF' type: AtmosPipeColor - - uid: 457 + - uid: 100 components: - - rot: -1.5707963267948966 rad - pos: 0.5,-10.5 + - pos: -0.5,6.5 parent: 1 type: Transform - - color: '#990000FF' + - color: '#0055CCFF' type: AtmosPipeColor - - uid: 458 + - uid: 148 components: - rot: 3.141592653589793 rad - pos: 2.5,-6.5 + pos: 0.5,8.5 parent: 1 type: Transform - color: '#990000FF' type: AtmosPipeColor - - uid: 459 + - uid: 149 components: - rot: 3.141592653589793 rad - pos: 1.5,-7.5 + pos: 0.5,7.5 parent: 1 type: Transform - - color: '#0055CCFF' + - color: '#990000FF' type: AtmosPipeColor - - uid: 460 + - uid: 150 components: - - pos: 1.5,-6.5 + - rot: 3.141592653589793 rad + pos: 0.5,6.5 parent: 1 type: Transform - - color: '#0055CCFF' + - color: '#990000FF' type: AtmosPipeColor - - uid: 461 + - uid: 151 components: - - pos: -0.5,7.5 + - rot: 1.5707963267948966 rad + pos: 1.5,5.5 parent: 1 type: Transform - - color: '#0055CCFF' + - color: '#990000FF' type: AtmosPipeColor -- proto: GasPipeFourway - entities: - - uid: 462 + - uid: 152 components: - - pos: -0.5,-3.5 + - pos: 0.5,4.5 parent: 1 type: Transform - - color: '#0055CCFF' + - color: '#990000FF' type: AtmosPipeColor - - uid: 463 + - uid: 242 components: - - pos: 1.5,-3.5 + - pos: 0.5,-6.5 parent: 1 type: Transform - color: '#990000FF' type: AtmosPipeColor - - uid: 464 + - uid: 243 components: - - pos: 0.5,5.5 + - pos: 0.5,-5.5 parent: 1 type: Transform - color: '#990000FF' type: AtmosPipeColor -- proto: GasPipeStraight - entities: - - uid: 465 + - uid: 244 components: - - rot: 3.141592653589793 rad - pos: -0.5,-7.5 + - pos: 0.5,-4.5 parent: 1 type: Transform - - color: '#0055CCFF' + - color: '#990000FF' type: AtmosPipeColor - - uid: 466 + - uid: 245 components: - - rot: 1.5707963267948966 rad - pos: 1.5,-6.5 + - rot: -1.5707963267948966 rad + pos: 0.5,-4.5 parent: 1 type: Transform - color: '#0055CCFF' type: AtmosPipeColor - - uid: 467 + - uid: 247 components: - - pos: 2.5,-2.5 + - rot: -1.5707963267948966 rad + pos: 2.5,-4.5 parent: 1 type: Transform - color: '#0055CCFF' type: AtmosPipeColor - - uid: 468 + - uid: 248 components: - - rot: 3.141592653589793 rad - pos: 2.5,-5.5 + - rot: -1.5707963267948966 rad + pos: 1.5,-3.5 parent: 1 type: Transform - color: '#990000FF' type: AtmosPipeColor - - uid: 469 + - uid: 249 components: - - pos: -2.5,-2.5 + - rot: -1.5707963267948966 rad + pos: 2.5,-3.5 parent: 1 type: Transform - color: '#990000FF' type: AtmosPipeColor - - uid: 470 + - uid: 250 components: - - rot: 3.141592653589793 rad - pos: 0.5,2.5 + - rot: -1.5707963267948966 rad + pos: -0.5,-3.5 parent: 1 type: Transform - color: '#990000FF' type: AtmosPipeColor - - uid: 471 - components: - - pos: -0.5,5.5 - parent: 1 - type: Transform - - color: '#0055CCFF' - type: AtmosPipeColor - - uid: 472 + - uid: 252 components: - rot: -1.5707963267948966 rad - pos: 0.5,2.5 + pos: -2.5,-3.5 parent: 1 type: Transform - - color: '#0055CCFF' + - color: '#990000FF' type: AtmosPipeColor - - uid: 473 + - uid: 253 components: - - rot: 3.141592653589793 rad - pos: 1.5,3.5 + - rot: -1.5707963267948966 rad + pos: -1.5,-4.5 parent: 1 type: Transform - color: '#0055CCFF' type: AtmosPipeColor - - uid: 474 + - uid: 254 components: - - rot: 3.141592653589793 rad - pos: 1.5,4.5 + - rot: -1.5707963267948966 rad + pos: -2.5,-4.5 parent: 1 type: Transform - color: '#0055CCFF' type: AtmosPipeColor - - uid: 475 + - uid: 257 components: - - rot: 3.141592653589793 rad - pos: 1.5,5.5 + - rot: 1.5707963267948966 rad + pos: -4.5,-3.5 parent: 1 type: Transform - - color: '#0055CCFF' + - color: '#990000FF' type: AtmosPipeColor - - uid: 476 + - uid: 258 components: - - rot: 3.141592653589793 rad - pos: 1.5,6.5 + - pos: -4.5,-3.5 parent: 1 type: Transform - color: '#0055CCFF' type: AtmosPipeColor - - uid: 477 + - uid: 259 components: - - rot: 3.141592653589793 rad - pos: 1.5,7.5 + - pos: -0.5,-3.5 parent: 1 type: Transform - color: '#0055CCFF' type: AtmosPipeColor - - uid: 478 + - uid: 260 components: - - rot: 3.141592653589793 rad - pos: 1.5,8.5 + - pos: -0.5,-1.5 parent: 1 type: Transform - color: '#0055CCFF' type: AtmosPipeColor - - uid: 479 + - uid: 261 components: - - rot: -1.5707963267948966 rad - pos: 2.5,2.5 + - pos: -0.5,1.5 parent: 1 type: Transform - - color: '#990000FF' + - color: '#0055CCFF' type: AtmosPipeColor - - uid: 480 + - uid: 262 components: - - rot: 1.5707963267948966 rad - pos: -0.5,1.5 + - pos: -0.5,2.5 parent: 1 type: Transform - - color: '#990000FF' + - color: '#0055CCFF' type: AtmosPipeColor - - uid: 481 + - uid: 263 components: - - pos: -0.5,0.5 + - pos: -0.5,3.5 parent: 1 type: Transform - color: '#0055CCFF' type: AtmosPipeColor - - uid: 482 + - uid: 264 components: - - pos: -0.5,-0.5 + - pos: -0.5,4.5 parent: 1 type: Transform - color: '#0055CCFF' type: AtmosPipeColor - - uid: 483 + - uid: 265 components: - - pos: -0.5,-1.5 + - pos: -0.5,5.5 parent: 1 type: Transform - color: '#0055CCFF' type: AtmosPipeColor - - uid: 484 + - uid: 266 components: - - pos: -0.5,-2.5 + - pos: -0.5,8.5 parent: 1 type: Transform - color: '#0055CCFF' type: AtmosPipeColor - - uid: 485 + - uid: 267 components: - - rot: 3.141592653589793 rad - pos: 1.5,-0.5 + - pos: -0.5,0.5 parent: 1 type: Transform - - color: '#990000FF' + - color: '#0055CCFF' type: AtmosPipeColor - - uid: 486 + - uid: 270 components: - - rot: 3.141592653589793 rad - pos: 1.5,-1.5 + - pos: 0.5,-2.5 parent: 1 type: Transform - color: '#990000FF' type: AtmosPipeColor - - uid: 487 + - uid: 271 components: - - rot: 3.141592653589793 rad - pos: 1.5,-2.5 + - pos: 0.5,-1.5 parent: 1 type: Transform - color: '#990000FF' type: AtmosPipeColor - - uid: 488 + - uid: 277 components: - - rot: 1.5707963267948966 rad - pos: -0.5,-4.5 + - rot: -1.5707963267948966 rad + pos: 6.5,-3.5 parent: 1 type: Transform - color: '#990000FF' type: AtmosPipeColor - - uid: 489 + - uid: 279 components: - rot: -1.5707963267948966 rad - pos: -1.5,-4.5 + pos: -0.5,-7.5 parent: 1 type: Transform - color: '#990000FF' type: AtmosPipeColor - - uid: 490 + - uid: 280 components: - - rot: -1.5707963267948966 rad - pos: -3.5,-4.5 + - pos: 0.5,2.5 parent: 1 type: Transform - color: '#990000FF' type: AtmosPipeColor - - uid: 491 + - uid: 287 components: - rot: -1.5707963267948966 rad - pos: -4.5,-4.5 + pos: -4.5,-7.5 parent: 1 type: Transform - color: '#990000FF' type: AtmosPipeColor - - uid: 492 + - uid: 293 components: - rot: 1.5707963267948966 rad - pos: 3.5,-4.5 + pos: -8.5,-4.5 parent: 1 type: Transform - - color: '#990000FF' + - color: '#0055CCFF' type: AtmosPipeColor - - uid: 493 + - uid: 301 components: - rot: 1.5707963267948966 rad - pos: 4.5,-4.5 + pos: 8.5,-4.5 parent: 1 type: Transform - - color: '#990000FF' + - color: '#0055CCFF' type: AtmosPipeColor - - uid: 494 + - uid: 302 components: - - rot: 1.5707963267948966 rad - pos: 1.5,-2.5 + - rot: -1.5707963267948966 rad + pos: 5.5,-3.5 parent: 1 type: Transform - - color: '#0055CCFF' + - color: '#990000FF' type: AtmosPipeColor - - uid: 495 + - uid: 310 components: - - rot: 1.5707963267948966 rad - pos: 3.5,-3.5 + - pos: -4.5,-2.5 parent: 1 type: Transform - color: '#0055CCFF' type: AtmosPipeColor - - uid: 496 + - uid: 314 components: - - rot: 1.5707963267948966 rad - pos: -1.5,-3.5 + - rot: -1.5707963267948966 rad + pos: -1.5,-7.5 parent: 1 type: Transform - - color: '#0055CCFF' + - color: '#990000FF' type: AtmosPipeColor - - uid: 497 + - uid: 315 components: - rot: 1.5707963267948966 rad - pos: -2.5,-3.5 + pos: 3.5,-4.5 parent: 1 type: Transform - color: '#0055CCFF' type: AtmosPipeColor - - uid: 498 + - uid: 316 components: - rot: 1.5707963267948966 rad - pos: -3.5,-3.5 + pos: 4.5,-4.5 parent: 1 type: Transform - color: '#0055CCFF' type: AtmosPipeColor - - uid: 499 + - uid: 318 components: - - rot: 1.5707963267948966 rad - pos: -5.5,-3.5 + - rot: -1.5707963267948966 rad + pos: -2.5,-7.5 parent: 1 type: Transform - - uid: 500 + - color: '#990000FF' + type: AtmosPipeColor + - uid: 325 components: - - rot: 1.5707963267948966 rad - pos: -6.5,-3.5 + - pos: 0.5,3.5 parent: 1 type: Transform - - uid: 501 + - color: '#990000FF' + type: AtmosPipeColor + - uid: 326 components: - rot: 1.5707963267948966 rad - pos: -7.5,-3.5 + pos: -3.5,-4.5 parent: 1 type: Transform - - uid: 502 + - color: '#0055CCFF' + type: AtmosPipeColor + - uid: 327 components: - - rot: 1.5707963267948966 rad - pos: -8.5,-3.5 + - pos: -3.5,-2.5 parent: 1 type: Transform - - uid: 503 + - color: '#990000FF' + type: AtmosPipeColor + - uid: 330 components: - - rot: 1.5707963267948966 rad - pos: 5.5,-3.5 + - rot: -1.5707963267948966 rad + pos: -5.5,-7.5 parent: 1 type: Transform - - uid: 504 + - color: '#990000FF' + type: AtmosPipeColor + - uid: 333 components: - - rot: 1.5707963267948966 rad - pos: 6.5,-3.5 + - rot: 3.141592653589793 rad + pos: -0.5,-2.5 parent: 1 type: Transform - - uid: 505 + - color: '#0055CCFF' + type: AtmosPipeColor + - uid: 336 components: - rot: 1.5707963267948966 rad - pos: 7.5,-3.5 + pos: 9.5,-4.5 parent: 1 type: Transform - - uid: 506 + - color: '#0055CCFF' + type: AtmosPipeColor + - uid: 341 components: - rot: 1.5707963267948966 rad - pos: 8.5,-3.5 + pos: -9.5,-4.5 parent: 1 type: Transform - - uid: 507 + - color: '#0055CCFF' + type: AtmosPipeColor + - uid: 342 components: - - pos: -0.5,-5.5 + - rot: -1.5707963267948966 rad + pos: 6.5,-4.5 parent: 1 type: Transform - color: '#0055CCFF' type: AtmosPipeColor - - uid: 508 + - uid: 343 components: - - pos: -0.5,-8.5 + - rot: -1.5707963267948966 rad + pos: -5.5,-3.5 parent: 1 type: Transform - - color: '#0055CCFF' + - color: '#990000FF' type: AtmosPipeColor - - uid: 509 + - uid: 346 components: - - pos: -0.5,-9.5 + - rot: 1.5707963267948966 rad + pos: 3.5,-3.5 parent: 1 type: Transform - - color: '#0055CCFF' + - color: '#990000FF' type: AtmosPipeColor - - uid: 510 + - uid: 354 components: - - pos: -0.5,-10.5 + - rot: 3.141592653589793 rad + pos: -0.5,-7.5 parent: 1 type: Transform - color: '#0055CCFF' type: AtmosPipeColor - - uid: 511 + - uid: 355 components: - - rot: 1.5707963267948966 rad - pos: -0.5,-10.5 + - pos: -0.5,-6.5 parent: 1 type: Transform - - color: '#990000FF' + - color: '#0055CCFF' type: AtmosPipeColor - - uid: 512 + - uid: 432 components: - - pos: 0.5,-7.5 + - rot: -1.5707963267948966 rad + pos: 5.5,-4.5 parent: 1 type: Transform - - color: '#990000FF' + - color: '#0055CCFF' type: AtmosPipeColor - - uid: 513 + - uid: 433 components: - - pos: 0.5,-8.5 + - rot: -1.5707963267948966 rad + pos: -6.5,-4.5 parent: 1 type: Transform - - color: '#990000FF' + - color: '#0055CCFF' type: AtmosPipeColor - - uid: 514 + - uid: 434 components: - - pos: 0.5,-9.5 + - rot: -1.5707963267948966 rad + pos: -5.5,-4.5 parent: 1 type: Transform - - color: '#990000FF' + - color: '#0055CCFF' type: AtmosPipeColor - - uid: 515 + - uid: 447 components: - rot: -1.5707963267948966 rad - pos: -2.5,2.5 + pos: -6.5,-3.5 parent: 1 type: Transform - color: '#990000FF' type: AtmosPipeColor - - uid: 516 + - uid: 448 components: - - rot: 3.141592653589793 rad - pos: 0.5,3.5 + - pos: 0.5,-0.5 parent: 1 type: Transform - color: '#990000FF' type: AtmosPipeColor - - uid: 517 + - uid: 449 components: - - rot: 3.141592653589793 rad - pos: 0.5,4.5 + - rot: -1.5707963267948966 rad + pos: -3.5,-7.5 parent: 1 type: Transform - color: '#990000FF' type: AtmosPipeColor - - uid: 518 + - uid: 455 components: - rot: 3.141592653589793 rad - pos: 0.5,6.5 + pos: -0.5,-5.5 parent: 1 type: Transform - - color: '#990000FF' + - color: '#0055CCFF' type: AtmosPipeColor - - uid: 519 + - uid: 457 components: - - rot: 3.141592653589793 rad - pos: 0.5,7.5 + - pos: 0.5,1.5 parent: 1 type: Transform - color: '#990000FF' type: AtmosPipeColor - - uid: 520 + - uid: 460 components: - rot: 3.141592653589793 rad - pos: 0.5,8.5 + pos: -0.5,-9.5 parent: 1 type: Transform - - color: '#990000FF' + - color: '#0055CCFF' type: AtmosPipeColor - - uid: 521 +- proto: GasPipeTJunction + entities: + - uid: 99 components: - - rot: 3.141592653589793 rad - pos: -2.5,-3.5 + - rot: 1.5707963267948966 rad + pos: 0.5,5.5 parent: 1 type: Transform - color: '#990000FF' type: AtmosPipeColor - - uid: 522 + - uid: 147 components: - rot: -1.5707963267948966 rad - pos: 1.5,5.5 + pos: -0.5,7.5 parent: 1 type: Transform - - color: '#990000FF' + - color: '#0055CCFF' type: AtmosPipeColor - - uid: 523 + - uid: 246 components: - - pos: 0.5,-6.5 + - pos: -1.5,-3.5 parent: 1 type: Transform - color: '#990000FF' type: AtmosPipeColor - - uid: 524 + - uid: 251 components: - - pos: -0.5,4.5 + - rot: 3.141592653589793 rad + pos: 1.5,-4.5 parent: 1 type: Transform - color: '#0055CCFF' type: AtmosPipeColor - - uid: 525 + - uid: 255 components: - - pos: -0.5,3.5 + - rot: 3.141592653589793 rad + pos: -3.5,-3.5 parent: 1 type: Transform - - color: '#0055CCFF' + - color: '#990000FF' type: AtmosPipeColor - - uid: 526 + - uid: 288 components: - rot: 1.5707963267948966 rad - pos: 0.5,-6.5 + pos: -0.5,-0.5 parent: 1 type: Transform - color: '#0055CCFF' type: AtmosPipeColor -- proto: GasPipeTJunction - entities: - - uid: 527 + - uid: 317 components: - - rot: 3.141592653589793 rad - pos: -2.5,-4.5 + - rot: -1.5707963267948966 rad + pos: 0.5,-7.5 parent: 1 type: Transform - color: '#990000FF' type: AtmosPipeColor - - uid: 528 + - uid: 344 components: - - rot: 1.5707963267948966 rad - pos: -0.5,-6.5 + - pos: 7.5,-4.5 parent: 1 type: Transform - color: '#0055CCFF' type: AtmosPipeColor - - uid: 529 + - uid: 348 components: - - rot: 1.5707963267948966 rad - pos: -0.5,2.5 + - pos: -7.5,-4.5 parent: 1 type: Transform - color: '#0055CCFF' type: AtmosPipeColor - - uid: 530 + - uid: 356 components: - rot: 3.141592653589793 rad - pos: 0.5,1.5 + pos: -4.5,-4.5 parent: 1 type: Transform - - color: '#990000FF' + - color: '#0055CCFF' type: AtmosPipeColor - - uid: 531 + - uid: 400 components: - rot: -1.5707963267948966 rad - pos: 1.5,1.5 + pos: -0.5,-8.5 parent: 1 type: Transform - - color: '#990000FF' + - color: '#0055CCFF' type: AtmosPipeColor - - uid: 532 + - uid: 438 components: - rot: -1.5707963267948966 rad - pos: 1.5,0.5 + pos: 0.5,0.5 parent: 1 type: Transform - color: '#990000FF' type: AtmosPipeColor - - uid: 533 +- proto: GasPort + entities: + - uid: 174 components: - - rot: 1.5707963267948966 rad - pos: 2.5,-4.5 + - rot: 3.141592653589793 rad + pos: 0.5,-11.5 parent: 1 type: Transform - - color: '#990000FF' + - color: '#0055CCFF' type: AtmosPipeColor - - uid: 534 + - uid: 180 components: - - rot: -1.5707963267948966 rad - pos: 1.5,-4.5 + - rot: 3.141592653589793 rad + pos: -0.5,-11.5 parent: 1 type: Transform - - color: '#990000FF' + - color: '#0055CCFF' type: AtmosPipeColor -- proto: GasPort - entities: - - uid: 535 + - uid: 456 components: - rot: 1.5707963267948966 rad - pos: -1.5,7.5 + pos: -2.5,7.5 parent: 1 type: Transform - color: '#0055CCFF' type: AtmosPipeColor - - uid: 536 +- proto: GasPressurePump + entities: + - uid: 458 components: - - rot: -1.5707963267948966 rad - pos: 0.5,6.5 + - rot: 1.5707963267948966 rad + pos: -1.5,7.5 parent: 1 type: Transform -- proto: GasPressurePump + - color: '#0055CCFF' + type: AtmosPipeColor +- proto: GasVentPump entities: - - uid: 537 + - uid: 176 components: - rot: 1.5707963267948966 rad - pos: 4.5,3.5 + pos: -1.5,-8.5 parent: 1 type: Transform - - targetPressure: 4500 - type: GasPressurePump - - color: '#990000FF' + - color: '#0055CCFF' type: AtmosPipeColor - - uid: 538 + - uid: 289 components: - - rot: -1.5707963267948966 rad - pos: -4.5,3.5 + - rot: 1.5707963267948966 rad + pos: -10.5,-4.5 parent: 1 type: Transform - - targetPressure: 4500 - type: GasPressurePump - - color: '#990000FF' + - color: '#0055CCFF' type: AtmosPipeColor -- proto: GasVentPump - entities: - - uid: 539 + - uid: 292 components: - - rot: -1.5707963267948966 rad - pos: 2.5,-7.5 + - pos: 1.5,-3.5 parent: 1 type: Transform - color: '#0055CCFF' type: AtmosPipeColor - - uid: 540 + - uid: 332 components: - - pos: 1.5,9.5 + - rot: 3.141592653589793 rad + pos: 7.5,-5.5 parent: 1 type: Transform - color: '#0055CCFF' type: AtmosPipeColor - - uid: 541 + - uid: 334 components: - - rot: 1.5707963267948966 rad - pos: -9.5,-3.5 + - rot: 3.141592653589793 rad + pos: -7.5,-5.5 parent: 1 type: Transform - - uid: 542 + - color: '#0055CCFF' + type: AtmosPipeColor + - uid: 335 components: - rot: -1.5707963267948966 rad - pos: 9.5,-3.5 + pos: 10.5,-4.5 parent: 1 type: Transform - - uid: 543 + - color: '#0055CCFF' + type: AtmosPipeColor + - uid: 386 components: - - rot: 3.141592653589793 rad - pos: -0.5,-11.5 + - rot: -1.5707963267948966 rad + pos: 0.5,-0.5 parent: 1 type: Transform - color: '#0055CCFF' type: AtmosPipeColor -- proto: GasVentScrubber - entities: - - uid: 544 + - uid: 387 components: - - rot: -1.5707963267948966 rad - pos: 2.5,5.5 + - pos: -0.5,9.5 parent: 1 type: Transform - - color: '#990000FF' + - color: '#0055CCFF' type: AtmosPipeColor - - uid: 545 + - uid: 431 components: - - rot: 3.141592653589793 rad - pos: 0.5,0.5 + - pos: -4.5,-1.5 parent: 1 type: Transform - - uid: 546 + - color: '#0055CCFF' + type: AtmosPipeColor +- proto: GasVentScrubber + entities: + - uid: 285 components: - - rot: 1.5707963267948966 rad - pos: -3.5,-1.5 + - rot: 3.141592653589793 rad + pos: -1.5,-4.5 parent: 1 type: Transform - color: '#990000FF' type: AtmosPipeColor - - uid: 547 + - uid: 286 components: - rot: -1.5707963267948966 rad - pos: 3.5,-1.5 + pos: 2.5,-7.5 parent: 1 type: Transform - - color: '#0055CCFF' - type: AtmosPipeColor - - uid: 548 + - uid: 290 components: - rot: -1.5707963267948966 rad - pos: 3.5,-6.5 + pos: 2.5,5.5 parent: 1 type: Transform - color: '#990000FF' type: AtmosPipeColor - - uid: 549 + - uid: 291 components: - rot: 1.5707963267948966 rad - pos: -1.5,-10.5 + pos: -0.5,0.5 parent: 1 type: Transform - color: '#990000FF' type: AtmosPipeColor - - uid: 550 + - uid: 299 components: - - rot: -1.5707963267948966 rad - pos: 5.5,-4.5 + - pos: -7.5,-2.5 parent: 1 type: Transform - color: '#990000FF' type: AtmosPipeColor - - uid: 551 + - uid: 385 components: - - rot: 1.5707963267948966 rad - pos: 0.5,-4.5 + - pos: 7.5,-2.5 parent: 1 type: Transform - color: '#990000FF' type: AtmosPipeColor - - uid: 552 + - uid: 393 components: - - rot: 1.5707963267948966 rad - pos: -5.5,-4.5 + - rot: 3.141592653589793 rad + pos: 0.5,-8.5 parent: 1 type: Transform - color: '#990000FF' type: AtmosPipeColor - - uid: 553 + - uid: 439 components: - - pos: 0.5,9.5 + - pos: -3.5,-1.5 parent: 1 type: Transform - color: '#990000FF' type: AtmosPipeColor - - uid: 554 + - uid: 440 components: - - rot: 1.5707963267948966 rad - pos: -0.5,5.5 + - pos: 0.5,9.5 parent: 1 type: Transform - color: '#990000FF' type: AtmosPipeColor - proto: GravityGeneratorMini entities: - - uid: 555 + - uid: 437 components: - - pos: -2.5,7.5 + - pos: 0.5,6.5 parent: 1 type: Transform - proto: Grille @@ -4412,51 +3853,13 @@ entities: pos: 5.5,-9.5 parent: 1 type: Transform -- proto: GunSafe +- proto: GunSafeShuttleT1Spawner entities: - - uid: 576 + - uid: 70 components: - pos: 3.5,6.5 parent: 1 type: Transform - - locked: False - type: Lock - - air: - volume: 200 - immutable: False - temperature: 293.14975 - moles: - - 1.8968438 - - 7.1357465 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - type: EntityStorage - - containers: - entity_storage: !type:Container - showEnts: False - occludes: True - ents: - - 392 - - 390 - - 389 - - 393 - - 579 - - 391 - - 578 - - 577 - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - type: ContainerContainer - proto: Gyroscope entities: - uid: 580 @@ -4523,18 +3926,21 @@ entities: - pos: 1.501635,10.979151 parent: 1 type: Transform -- proto: IntercomCommand +- proto: IngotGold1 entities: - - uid: 591 + - uid: 463 components: - - pos: -2.5,10.5 + - pos: -2.6976614,2.3970013 parent: 1 type: Transform -- proto: IntercomSecurity - entities: - - uid: 592 + - uid: 464 components: - - pos: 1.5,10.5 + - pos: -2.4656172,2.5517735 + parent: 1 + type: Transform + - uid: 468 + components: + - pos: -2.6460953,2.7065454 parent: 1 type: Transform - proto: KitchenMicrowave @@ -4551,15 +3957,6 @@ entities: - pos: 3.5,-1.5 parent: 1 type: Transform -- proto: LockerFreezerBase - entities: - - uid: 408 - components: - - pos: -1.5,-0.5 - parent: 1 - type: Transform - - locked: False - type: Lock - air: volume: 200 immutable: False @@ -4578,55 +3975,41 @@ entities: - 0 - 0 type: EntityStorage - - containers: - entity_storage: !type:Container - showEnts: False - occludes: True - ents: - - 415 - - 414 - - 412 - - 410 - - 411 - - 413 - - 409 - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - type: ContainerContainer +- proto: LockerFreezerBase + entities: + - uid: 472 + components: + - pos: -1.5,-1.5 + parent: 1 + type: Transform +- proto: LockerMercenaryFilled + entities: + - uid: 276 + components: + - pos: 2.5,4.5 + parent: 1 + type: Transform - proto: LockerParamedicFilled entities: - - uid: 595 + - uid: 410 components: - pos: 2.5,-7.5 parent: 1 type: Transform - - air: - volume: 200 - immutable: False - temperature: 293.1496 - moles: - - 1.7459903 - - 6.568249 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - type: EntityStorage -- proto: LockerSalvageSpecialistFilledHardsuit +- proto: LockerSalvageSpecialistFilled entities: - - uid: 596 + - uid: 411 components: - pos: -3.5,-6.5 parent: 1 type: Transform +- proto: LockerWallMedicalFilled + entities: + - uid: 597 + components: + - pos: 2.5,-5.5 + parent: 1 + type: Transform - air: volume: 200 immutable: False @@ -4637,56 +4020,19 @@ entities: - 0 - 0 - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - type: EntityStorage -- proto: LockerWallMedicalFilled - entities: - - uid: 597 - components: - - pos: 2.5,-5.5 - parent: 1 - type: Transform -- proto: MagazineBoxMagnum - entities: - - uid: 389 - components: - - flags: InContainer - type: MetaData - - parent: 576 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage -- proto: MedicalBed - entities: - - uid: 598 - components: - - pos: 5.5,-6.5 - parent: 1 - type: Transform -- proto: MedicalTrackingImplanter - entities: - - uid: 398 - components: - - pos: 2.646165,4.387697 - parent: 1 - type: Transform - - uid: 399 - components: - - pos: 2.3362565,4.5056906 - parent: 1 - type: Transform -- proto: MedkitCombatFilled + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + type: EntityStorage +- proto: MedicalBed entities: - - uid: 599 + - uid: 598 components: - - pos: 2.490187,-6.4109445 + - pos: 5.5,-6.5 parent: 1 type: Transform - proto: Mirror @@ -4705,20 +4051,6 @@ entities: pos: 4.5,-9.5 parent: 1 type: Transform -- proto: NitrogenCanister - entities: - - uid: 602 - components: - - pos: 0.5,6.5 - parent: 1 - type: Transform -- proto: OxygenCanister - entities: - - uid: 603 - components: - - pos: -1.5,7.5 - parent: 1 - type: Transform - proto: PaperBin10 entities: - uid: 604 @@ -4847,22 +4179,9 @@ entities: type: Transform - proto: Rack entities: - - uid: 624 - components: - - rot: -1.5707963267948966 rad - pos: 2.5,7.5 - parent: 1 - type: Transform - - uid: 625 - components: - - rot: -1.5707963267948966 rad - pos: 3.5,4.5 - parent: 1 - type: Transform - - uid: 626 + - uid: 394 components: - - rot: -1.5707963267948966 rad - pos: 2.5,4.5 + - pos: 3.5,4.5 parent: 1 type: Transform - uid: 627 @@ -4945,6 +4264,28 @@ entities: type: Transform - proto: RandomSpawner entities: + - uid: 256 + components: + - pos: 0.5,-11.5 + parent: 1 + type: Transform + - uid: 451 + components: + - pos: -1.5,9.5 + parent: 1 + type: Transform + - uid: 477 + components: + - rot: 1.5707963267948966 rad + pos: -6.5,-4.5 + parent: 1 + type: Transform + - uid: 478 + components: + - rot: 1.5707963267948966 rad + pos: 6.5,-4.5 + parent: 1 + type: Transform - uid: 641 components: - pos: -4.5,-1.5 @@ -4995,11 +4336,6 @@ entities: - pos: -2.5,-8.5 parent: 1 type: Transform - - uid: 651 - components: - - pos: -1.5,9.5 - parent: 1 - type: Transform - uid: 652 components: - pos: 11.5,-2.5 @@ -5020,31 +4356,16 @@ entities: - pos: -11.5,-2.5 parent: 1 type: Transform - - uid: 656 - components: - - pos: -5.5,-4.5 - parent: 1 - type: Transform - uid: 657 components: - pos: 1.5,-3.5 parent: 1 type: Transform - - uid: 658 - components: - - pos: 5.5,-4.5 - parent: 1 - type: Transform - uid: 659 components: - pos: -1.5,-10.5 parent: 1 type: Transform - - uid: 660 - components: - - pos: 0.5,-11.5 - parent: 1 - type: Transform - uid: 661 components: - pos: 0.5,-8.5 @@ -5060,20 +4381,6 @@ entities: - pos: -0.5,11.5 parent: 1 type: Transform -- proto: RandomVendingDrinks - entities: - - uid: 664 - components: - - pos: 0.5,-9.5 - parent: 1 - type: Transform -- proto: RandomVendingSnacks - entities: - - uid: 665 - components: - - pos: -1.5,-1.5 - parent: 1 - type: Transform - proto: ReinforcedWindow entities: - uid: 666 @@ -5243,6 +4550,15 @@ entities: type: DeviceLinkSink - proto: SignalButton entities: + - uid: 412 + components: + - pos: -2.5,-2.5 + parent: 1 + type: Transform + - linkedPorts: + 2: + - Pressed: DoorBolt + type: DeviceLinkSource - uid: 693 components: - pos: 1.5,11.5 @@ -5325,19 +4641,18 @@ entities: - pos: -4.5,0.5 parent: 1 type: Transform -- proto: SinkStemlessWater +- proto: SinkStemless entities: - - uid: 703 + - uid: 480 components: - - pos: 2.5,-10.5 + - pos: 3.5,2.5 parent: 1 type: Transform -- proto: SinkWide +- proto: SinkStemlessWater entities: - - uid: 704 + - uid: 703 components: - - rot: 1.5707963267948966 rad - pos: 2.5,1.5 + - pos: 2.5,-10.5 parent: 1 type: Transform - proto: SMESBasic @@ -5354,55 +4669,6 @@ entities: - pos: 2.6583714,-10.571913 parent: 1 type: Transform -- proto: soda_dispenser - entities: - - uid: 707 - components: - - pos: 3.5,2.5 - parent: 1 - type: Transform -- proto: SpaceCash - entities: - - uid: 708 - components: - - pos: -2.6022344,2.537315 - parent: 1 - type: Transform - - uid: 709 - components: - - pos: -2.4616094,2.6545024 - parent: 1 - type: Transform - - uid: 710 - components: - - pos: -2.6256719,2.77169 - parent: 1 - type: Transform - - uid: 711 - components: - - pos: -2.6959844,2.7951274 - parent: 1 - type: Transform - - uid: 712 - components: - - pos: -2.3912969,2.7013774 - parent: 1 - type: Transform - - uid: 713 - components: - - pos: -2.4616094,2.67794 - parent: 1 - type: Transform - - uid: 714 - components: - - pos: -2.5553594,2.67794 - parent: 1 - type: Transform - - uid: 715 - components: - - pos: -2.5787969,2.818565 - parent: 1 - type: Transform - proto: SpawnPointBartender entities: - uid: 716 @@ -5424,9 +4690,9 @@ entities: type: Transform - proto: SpawnPointMercenary entities: - - uid: 719 + - uid: 398 components: - - pos: 4.5,-1.5 + - pos: 2.5,6.5 parent: 1 type: Transform - proto: SpawnPointParamedic @@ -5438,40 +4704,37 @@ entities: type: Transform - proto: SpawnPointSalvageSpecialist entities: - - uid: 721 + - uid: 415 components: - - pos: -2.5,-6.5 + - pos: -2.5,-7.5 parent: 1 type: Transform -- proto: SpeedLoaderMagnum +- proto: Stairs entities: - - uid: 390 + - uid: 473 components: - - flags: InContainer - type: MetaData - - parent: 576 + - rot: -1.5707963267948966 rad + pos: -5.5,-3.5 + parent: 1 type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage - - uid: 391 + - uid: 474 components: - - flags: InContainer - type: MetaData - - parent: 576 + - rot: -1.5707963267948966 rad + pos: -5.5,-4.5 + parent: 1 type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage - - uid: 392 + - uid: 475 components: - - flags: InContainer - type: MetaData - - parent: 576 + - rot: 1.5707963267948966 rad + pos: 5.5,-3.5 + parent: 1 + type: Transform + - uid: 476 + components: + - rot: 1.5707963267948966 rad + pos: 5.5,-4.5 + parent: 1 type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage - proto: StoolBar entities: - uid: 722 @@ -5494,30 +4757,32 @@ entities: type: Transform - proto: SubstationWallBasic entities: - - uid: 725 + - uid: 465 components: - - pos: -1.5,8.5 + - rot: -1.5707963267948966 rad + pos: 1.5,-7.5 parent: 1 type: Transform - - uid: 726 + - uid: 467 components: - - pos: 1.5,-7.5 + - rot: -1.5707963267948966 rad + pos: 1.5,4.5 parent: 1 type: Transform -- proto: SuitStorageBase +- proto: SuitStorageEVA entities: - - uid: 378 + - uid: 727 components: - - pos: 3.5,5.5 + - pos: -7.5,-5.5 parent: 1 type: Transform - air: volume: 200 immutable: False - temperature: 293.14966 + temperature: 293.1496 moles: - - 1.8968438 - - 7.1357465 + - 1.7459903 + - 6.568249 - 0 - 0 - 0 @@ -5529,34 +4794,29 @@ entities: - 0 - 0 type: EntityStorage - - containers: - entity_storage: !type:Container - showEnts: False - occludes: True - ents: - - 387 - - 384 - - 385 - - 382 - - 388 - - 381 - - 383 - - 379 - - 386 - - 380 - type: ContainerContainer -- proto: SuitStorageEVA - entities: - - uid: 727 - components: - - pos: -7.5,-5.5 - parent: 1 - type: Transform - uid: 728 components: - pos: 7.5,-5.5 parent: 1 type: Transform + - air: + volume: 200 + immutable: False + temperature: 293.1496 + moles: + - 1.7459903 + - 6.568249 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + type: EntityStorage - proto: SuitStorageEVAPrisoner entities: - uid: 396 @@ -5582,6 +4842,27 @@ entities: - 0 - 0 type: EntityStorage +- proto: SuitStorageMercenary + entities: + - uid: 483 + components: + - pos: 3.5,5.5 + parent: 1 + type: Transform +- proto: SuitStorageParamedic + entities: + - uid: 404 + components: + - pos: 3.5,-8.5 + parent: 1 + type: Transform +- proto: SuitStorageSalv + entities: + - uid: 482 + components: + - pos: -2.5,-6.5 + parent: 1 + type: Transform - proto: TableCarpet entities: - uid: 729 @@ -5776,18 +5057,6 @@ entities: pos: 2.5,-11.5 parent: 1 type: Transform -- proto: TrackingImplanter - entities: - - uid: 762 - components: - - pos: 3.4641175,4.4740067 - parent: 1 - type: Transform - - uid: 763 - components: - - pos: 3.7141175,4.3958817 - parent: 1 - type: Transform - proto: VendingBarDrobe entities: - uid: 397 @@ -5804,6 +5073,13 @@ entities: - pos: 5.5,-1.5 parent: 1 type: Transform +- proto: VendingMachineBountyVend + entities: + - uid: 413 + components: + - pos: 2.5,7.5 + parent: 1 + type: Transform - proto: VendingMachineTankDispenserEVA entities: - uid: 765 @@ -5836,15 +5112,13 @@ entities: - pos: -1.5,3.5 parent: 1 type: Transform -- proto: WallPlastitanium +- proto: WallReinforced entities: - - uid: 769 + - uid: 470 components: - pos: 1.5,-7.5 parent: 1 type: Transform -- proto: WallReinforced - entities: - uid: 770 components: - pos: 1.5,3.5 @@ -6665,28 +5939,6 @@ entities: - pos: 0.5,1.5 parent: 1 type: Transform -- proto: WeaponRevolverMateba - entities: - - uid: 393 - components: - - flags: InContainer - type: MetaData - - parent: 576 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage -- proto: WeaponShotgunSawnEmpty - entities: - - uid: 577 - components: - - flags: InContainer - type: MetaData - - parent: 576 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage - proto: Windoor entities: - uid: 924 @@ -6703,4 +5955,11 @@ entities: pos: 1.5,-11.5 parent: 1 type: Transform +- proto: Wrench + entities: + - uid: 391 + components: + - pos: 0.4459281,7.562047 + parent: 1 + type: Transform ... diff --git a/Resources/Prototypes/_NF/Shipyard/sprinter.yml b/Resources/Prototypes/_NF/Shipyard/sprinter.yml index 8d23eb4b11d..1231c1cb700 100644 --- a/Resources/Prototypes/_NF/Shipyard/sprinter.yml +++ b/Resources/Prototypes/_NF/Shipyard/sprinter.yml @@ -2,17 +2,17 @@ id: Sprinter name: KC Sprinter description: A light freighter often picked by bounty hunters due to its quick acceleration, expedition capable. - price: 75020 + price: 61500 # 15% tax category: Medium group: Expedition - shuttlePath: /Maps/Shuttles/sprinter.yml - + shuttlePath: /Maps/_NF/Shuttles/sprinter.yml + - type: gameMap id: Sprinter mapName: 'KC Sprinter' - mapPath: /Maps/Shuttles/sprinter.yml + mapPath: /Maps/_NF/Shuttles/sprinter.yml minPlayers: 0 - stations: + stations: Sprinter: stationProto: StandardFrontierExpeditionVessel components: @@ -27,4 +27,4 @@ Bartender: [ 0, 0 ] Paramedic: [ 0, 0 ] Mercenary: [ 0, 0 ] - SalvageSpecialist: [ 0, 0 ] + SalvageSpecialist: [ 0, 0 ] From f9c813f4bc00aec42fda3a2219f46e497704e98c Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Sun, 7 Jan 2024 20:46:21 +0000 Subject: [PATCH 64/66] Automatic Changelog (#832) --- Resources/Changelog/Changelog.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 38b6b1699de..74b5d11171f 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -2723,3 +2723,9 @@ Entries: message: Praeda was reworked. id: 4733 time: '2024-01-07T19:48:50.0000000+00:00' +- author: TsjipTsjip + changes: + - type: Tweak + message: Sprinter was reworked. + id: 4734 + time: '2024-01-07T20:45:57.0000000+00:00' From 2d6c9d4b523ad74ae7784d8fa90c5dbec897242d Mon Sep 17 00:00:00 2001 From: Mnemosyne <153693227+mnemosynium@users.noreply.github.com> Date: Mon, 8 Jan 2024 02:58:09 -0500 Subject: [PATCH 65/66] Remove shitcurity and cargonia references (#836) * Remove description references to shitcurity and cargonia * Update comments * Update banners.yml * Undo removal from Praeda --------- Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> --- Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml | 2 +- Resources/Prototypes/Entities/Clothing/Eyes/specific.yml | 3 +-- .../Entities/Objects/Consumable/Drinks/drinks_bottles.yml | 2 +- .../Prototypes/Entities/Structures/Decoration/banners.yml | 6 ++---- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml index 5b704878b35..4c35147b71a 100644 --- a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml +++ b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml @@ -115,7 +115,7 @@ parent: ClothingEyesBase id: ClothingEyesGlassesSunglasses name: sun glasses - description: Useful both for security and cargonia. + description: Useful for security. # Frontier - description change components: - type: Sprite sprite: Clothing/Eyes/Glasses/sunglasses.rsi diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/specific.yml b/Resources/Prototypes/Entities/Clothing/Eyes/specific.yml index c04f3482870..b67614f1333 100644 --- a/Resources/Prototypes/Entities/Clothing/Eyes/specific.yml +++ b/Resources/Prototypes/Entities/Clothing/Eyes/specific.yml @@ -2,7 +2,7 @@ parent: ClothingEyesBase id: ClothingEyesChameleon # no flash immunity, sorry name: sun glasses - description: Useful both for security and cargonia. + description: Useful for security. # Frontier - description change suffix: Chameleon components: - type: Tag @@ -18,4 +18,3 @@ interfaces: - key: enum.ChameleonUiKey.Key type: ChameleonBoundUserInterface - diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml index a253bae40a4..2c9b2b2df31 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml @@ -97,7 +97,7 @@ parent: DrinkBottleBaseFull id: DrinkCognacBottleFull name: cognac bottle - description: A sweet and strongly alchoholic drink, made after numerous distillations and years of maturing. You might as well not scream 'SHITCURITY' this time. + description: A sweet and strongly alchoholic drink, made after numerous distillations and years of maturing. # Frontier - description change components: - type: SolutionContainerManager solutions: diff --git a/Resources/Prototypes/Entities/Structures/Decoration/banners.yml b/Resources/Prototypes/Entities/Structures/Decoration/banners.yml index cc0c90503d0..bb020fd9f60 100644 --- a/Resources/Prototypes/Entities/Structures/Decoration/banners.yml +++ b/Resources/Prototypes/Entities/Structures/Decoration/banners.yml @@ -41,7 +41,7 @@ id: BannerCargo parent: BannerBase name: cargo banner - description: A banner displaying the colors of the cargo department. Not. Cargonia. + description: A banner displaying the colors of the cargo department. # Frontier - description change components: - type: Sprite sprite: Structures/Decoration/banner.rsi @@ -101,7 +101,7 @@ id: BannerSecurity parent: BannerBase name: security banner - description: A banner displaying the colors of the shitcurity department. Security, my bad. + description: A banner displaying the colors of the security department. # Frontier - description change components: - type: Sprite sprite: Structures/Decoration/banner.rsi @@ -146,5 +146,3 @@ - type: Sprite sprite: Structures/Decoration/banner.rsi state: banner-green - - From f53ea0e891bddfae9b63998e4e3a73c2e17f723b Mon Sep 17 00:00:00 2001 From: TsjipTsjip <19798667+TsjipTsjip@users.noreply.github.com> Date: Mon, 8 Jan 2024 11:48:40 +0100 Subject: [PATCH 66/66] Xeno noghostrole (#845) * Create pr-labeler.yml * Update labeler.yml * Move proto components around * Update xeno.yml --------- Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> --- .../Prototypes/Entities/Mobs/NPCs/xeno.yml | 17 +++++++++-------- .../Prototypes/_NF/Entities/Mobs/NPCs/xeno.yml | 9 +++++++++ 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml index 8bf82afd674..2e064d7d4aa 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml @@ -94,14 +94,15 @@ spawned: - id: FoodMeatXeno amount: 5 - - type: GhostRole - allowMovement: true - allowSpeech: true - makeSentient: true - name: ghost-role-information-xeno-name - description: ghost-role-information-xeno-description - rules: ghost-role-information-xeno-rules - - type: GhostTakeoverAvailable + # Frontier - Remove GhostRole from all xenos + # - type: GhostRole + # allowMovement: true + # allowSpeech: true + # makeSentient: true + # name: ghost-role-information-xeno-name + # description: ghost-role-information-xeno-description + # rules: ghost-role-information-xeno-rules + # - type: GhostTakeoverAvailable - type: TypingIndicator proto: alien - type: Temperature diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/xeno.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/xeno.yml index 89a1482b633..8d9ecad383c 100644 --- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/xeno.yml +++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/xeno.yml @@ -2,6 +2,7 @@ name: Queen parent: MobXenoQueen id: MobXenoQueenDungeon + suffix: Ghost components: - type: Tag tags: @@ -9,3 +10,11 @@ - type: SalvageMobRestrictions - type: ReplacementAccent accent: xeno + - type: GhostRole + allowMovement: true + allowSpeech: true + makeSentient: true + name: ghost-role-information-xeno-name + description: ghost-role-information-xeno-description + rules: ghost-role-information-xeno-rules + - type: GhostTakeoverAvailable