From 2138b8ac18f004b7364a5c54903963115b6b9cd7 Mon Sep 17 00:00:00 2001 From: SimpleStation14 <130339894+SimpleStation14@users.noreply.github.com> Date: Thu, 13 Jun 2024 15:30:31 -0400 Subject: [PATCH 01/27] Mirror 26441: Fix atmos NaN error (#449) ## Mirror of PR #26441: [Fix atmos NaN error](https://github.com/space-wizards/space-station-14/pull/26441) from space-wizards [space-wizards](https://github.com/space-wizards)/[space-station-14](https://github.com/space-wizards/space-station-14) ###### `fdb4a61487db9fc67714c913832427063abdea42` PR opened by ElectroJr at 2024-03-26 04:27:08 UTC - merged at 2024-03-26 04:44:56 UTC --- PR changed 16 files with 43 additions and 25 deletions. The PR had the following labels: - Status: Needs Review ---

Original Body

 > - Fixes a bug I introduced in #22521 that caused the temperature to be set to `NaN`. I don't know for sure, but I assume this is causing the current atmos issues > - Fixes `FixVacuum` not working after #22521 > - Removes some redundant yaml that was setting FixVacuum to its default value > > :cl: > - fix: Fixed an atmos bug, which was (probably) causing atmospherics on the station to behave incorrectly.
Co-authored-by: SimpleStation14 --- .../Atmos/Components/AirtightComponent.cs | 32 ++- .../Atmos/EntitySystems/AirtightSystem.cs | 2 - .../AtmosphereSystem.GridAtmosphere.cs | 8 +- .../AtmosphereSystem.Processing.cs | 2 +- .../EntitySystems/AtmosphereSystem.Utils.cs | 3 +- Content.Server/Atmos/GasMixture.cs | 7 +- Content.Server/Atmos/TileAtmosphere.cs | 3 + .../Doors/Airlocks/base_structureairlocks.yml | 1 - .../Structures/Doors/Airlocks/highsec.yml | 209 +++++++++--------- .../Structures/Doors/Airlocks/shuttle.yml | 1 - .../Structures/Doors/Firelocks/firelock.yml | 2 - .../Doors/MaterialDoors/material_doors.yml | 1 - .../Doors/SecretDoor/secret_door.yml | 1 - .../Structures/Doors/Shutter/shutters.yml | 1 - .../Doors/Windoors/base_structurewindoors.yml | 1 - .../Entities/Structures/plastic_flaps.yml | 2 - 16 files changed, 147 insertions(+), 129 deletions(-) diff --git a/Content.Server/Atmos/Components/AirtightComponent.cs b/Content.Server/Atmos/Components/AirtightComponent.cs index ca107eafbe8..69488a71307 100644 --- a/Content.Server/Atmos/Components/AirtightComponent.cs +++ b/Content.Server/Atmos/Components/AirtightComponent.cs @@ -9,27 +9,53 @@ public sealed partial class AirtightComponent : Component { public (EntityUid Grid, Vector2i Tile) LastPosition { get; set; } + /// + /// The directions in which this entity should block airflow, relative to its own reference frame. + /// [DataField("airBlockedDirection", customTypeSerializer: typeof(FlagSerializer))] public int InitialAirBlockedDirection { get; set; } = (int) AtmosDirection.All; + /// + /// The directions in which the entity is currently blocking airflow, relative to the grid that the entity is on. + /// I.e., this is a variant of that takes into account the entity's + /// current rotation. + /// [ViewVariables] public int CurrentAirBlockedDirection; - [DataField("airBlocked")] + /// + /// Whether the airtight entity is currently blocking airflow. + /// + [DataField] public bool AirBlocked { get; set; } = true; - [DataField("fixVacuum")] + /// + /// If true, entities on this tile will attempt to draw air from surrounding tiles when they become unblocked + /// and currently have no air. This is generally only required when is + /// true, or if the entity is likely to occupy the same tile as another no-air airtight entity. + /// + [DataField] public bool FixVacuum { get; set; } = true; + // I think fixvacuum exists to ensure that repeatedly closing/opening air-blocking doors doesn't end up + // depressurizing a room. However it can also effectively be used as a means of generating gasses for free + // TODO ATMOS Mass conservation. Make it actually push/pull air from adjacent tiles instead of destroying & creating, + + // TODO ATMOS Do we need these two fields? [DataField("rotateAirBlocked")] public bool RotateAirBlocked { get; set; } = true; + // TODO ATMOS remove this? What is this even for?? [DataField("fixAirBlockedDirectionInitialize")] public bool FixAirBlockedDirectionInitialize { get; set; } = true; - [DataField("noAirWhenFullyAirBlocked")] + /// + /// If true, then the tile that this entity is on will have no air at all if all directions are blocked. + /// + [DataField] public bool NoAirWhenFullyAirBlocked { get; set; } = true; + /// [Access(Other = AccessPermissions.ReadWriteExecute)] public AtmosDirection AirBlockedDirection => (AtmosDirection)CurrentAirBlockedDirection; } diff --git a/Content.Server/Atmos/EntitySystems/AirtightSystem.cs b/Content.Server/Atmos/EntitySystems/AirtightSystem.cs index 548d6a36926..152fba8fc4d 100644 --- a/Content.Server/Atmos/EntitySystems/AirtightSystem.cs +++ b/Content.Server/Atmos/EntitySystems/AirtightSystem.cs @@ -85,8 +85,6 @@ private void OnAirtightMoved(Entity airtight, ref MoveEvent e private bool AirtightMove(Entity ent, ref MoveEvent ev) { var (owner, airtight) = ent; - if (!airtight.RotateAirBlocked || airtight.InitialAirBlockedDirection == (int)AtmosDirection.Invalid) - return false; airtight.CurrentAirBlockedDirection = (int) Rotate((AtmosDirection)airtight.InitialAirBlockedDirection, ev.NewRotation); var pos = airtight.LastPosition; diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.GridAtmosphere.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.GridAtmosphere.cs index d43cc81b0f8..beddef4be7e 100644 --- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.GridAtmosphere.cs +++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.GridAtmosphere.cs @@ -399,10 +399,7 @@ private void GridIsHotspotActive(EntityUid uid, GridAtmosphereComponent componen args.Handled = true; } - private void GridFixTileVacuum( - Entity ent, - TileAtmosphere tile, - float volume) + private void GridFixTileVacuum(TileAtmosphere tile) { DebugTools.AssertNotNull(tile.Air); DebugTools.Assert(tile.Air?.Immutable == false ); @@ -416,6 +413,9 @@ private void GridFixTileVacuum( count++; } + if (count == 0) + return; + var ratio = 1f / count; var totalTemperature = 0f; diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Processing.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Processing.cs index 1f3ca2145b9..eba398c1821 100644 --- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Processing.cs +++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Processing.cs @@ -272,7 +272,7 @@ private void UpdateTileAir( tile.Air = new GasMixture(volume){Temperature = Atmospherics.T20C}; if (data.FixVacuum) - GridFixTileVacuum(ent, tile, volume); + GridFixTileVacuum(tile); } private void QueueRunTiles( diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Utils.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Utils.cs index 9b0d0d9670d..67c6d5998dd 100644 --- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Utils.cs +++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Utils.cs @@ -78,12 +78,13 @@ private AirtightData GetAirtightData(EntityUid uid, MapGridComponent grid, Vecto if (!_airtightQuery.TryGetComponent(ent, out var airtight)) continue; + fixVacuum |= airtight.FixVacuum; + if(!airtight.AirBlocked) continue; blockedDirs |= airtight.AirBlockedDirection; noAirWhenBlocked |= airtight.NoAirWhenFullyAirBlocked; - fixVacuum |= airtight.FixVacuum; if (blockedDirs == AtmosDirection.All && noAirWhenBlocked && fixVacuum) break; diff --git a/Content.Server/Atmos/GasMixture.cs b/Content.Server/Atmos/GasMixture.cs index 77fd7018333..3d73a4d0b16 100644 --- a/Content.Server/Atmos/GasMixture.cs +++ b/Content.Server/Atmos/GasMixture.cs @@ -62,9 +62,9 @@ public float Temperature get => _temperature; set { - DebugTools.Assert(!float.IsNaN(_temperature)); - if (Immutable) return; - _temperature = MathF.Min(MathF.Max(value, Atmospherics.TCMB), Atmospherics.Tmax); + DebugTools.Assert(!float.IsNaN(value)); + if (!Immutable) + _temperature = MathF.Min(MathF.Max(value, Atmospherics.TCMB), Atmospherics.Tmax); } } @@ -91,6 +91,7 @@ public GasMixture(float[] moles, float temp, float volume = Atmospherics.CellVol if (volume < 0) volume = 0; + DebugTools.Assert(!float.IsNaN(temp)); _temperature = temp; Moles = moles; Volume = volume; diff --git a/Content.Server/Atmos/TileAtmosphere.cs b/Content.Server/Atmos/TileAtmosphere.cs index 0dd35a29e76..0026dbbf4f0 100644 --- a/Content.Server/Atmos/TileAtmosphere.cs +++ b/Content.Server/Atmos/TileAtmosphere.cs @@ -28,6 +28,9 @@ public sealed class TileAtmosphere : IGasMixtureHolder [ViewVariables] public TileAtmosphere? PressureSpecificTarget { get; set; } + /// + /// This is either the pressure difference, or the quantity of moles transferred if monstermos is enabled. + /// [ViewVariables] public float PressureDifference { get; set; } diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml index 4bc43b5559e..476e715175e 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml @@ -104,7 +104,6 @@ - key: enum.WiresUiKey.Key type: WiresBoundUserInterface - type: Airtight - fixVacuum: true noAirWhenFullyAirBlocked: false - type: RadiationBlocker resistance: 3 diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/highsec.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/highsec.yml index d799558df75..a26226c9578 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/highsec.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/highsec.yml @@ -1,105 +1,104 @@ -- type: entity - id: HighSecDoor - parent: BaseStructure - name: high security door - description: Keeps the bad out and keeps the good in. - placement: - mode: SnapgridCenter - components: - - type: InteractionOutline - - type: Sprite - sprite: Structures/Doors/Airlocks/highsec/highsec.rsi - layers: - - state: closed - map: ["enum.DoorVisualLayers.Base"] - - state: closed_unlit - shader: unshaded - map: ["enum.DoorVisualLayers.BaseUnlit"] - - state: welded - map: ["enum.WeldableLayers.BaseWelded"] - - state: bolted_unlit - shader: unshaded - map: ["enum.DoorVisualLayers.BaseBolted"] - - state: emergency_unlit - map: ["enum.DoorVisualLayers.BaseEmergencyAccess"] - shader: unshaded - - state: panel_open - map: ["enum.WiresVisualLayers.MaintenancePanel"] - - type: AnimationPlayer - - type: Physics - - type: Fixtures - fixtures: - fix1: - shape: - !type:PhysShapeAabb - bounds: "-0.49,-0.49,0.49,0.49" # don't want this colliding with walls or they won't close - density: 100 - mask: - - FullTileMask - layer: - - WallLayer - - type: ContainerFill - containers: - board: [ DoorElectronics ] - - type: ContainerContainer - containers: - board: !type:Container - - type: Door - crushDamage: - types: - Blunt: 50 - openSound: - path: /Audio/Machines/airlock_open.ogg - closeSound: - path: /Audio/Machines/airlock_close.ogg - denySound: - path: /Audio/Machines/airlock_deny.ogg - - type: Weldable - time: 10 - - type: Airlock - - type: NavMapDoor - - type: DoorBolt - - type: AccessReader - - type: Appearance - - type: WiresVisuals - - type: ApcPowerReceiver - powerLoad: 20 - - type: ExtensionCableReceiver - - type: Electrified - enabled: false - usesApcPower: true - - type: WiresPanel - - type: WiresPanelSecurity - securityLevel: maxSecurity - - type: Wires - boardName: wires-board-name-highsec - layoutId: HighSec - alwaysRandomize: true - - type: UserInterface - interfaces: - - key: enum.WiresUiKey.Key - type: WiresBoundUserInterface - - type: Airtight - fixVacuum: true - - type: Occluder - - type: Damageable - damageContainer: StructuralInorganic - damageModifierSet: StrongMetallic - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 1500 - behaviors: - - !type:DoActsBehavior - acts: ["Destruction"] - - type: IconSmooth - key: walls - mode: NoSprite - - type: Construction - graph: Airlock - node: highSecDoor - - type: Tag - tags: - - HighSecDoor - # This tag is used to nagivate the Airlock construction graph. It's needed because this construction graph is shared between Airlock, AirlockGlass, and HighSecDoor +- type: entity + id: HighSecDoor + parent: BaseStructure + name: high security door + description: Keeps the bad out and keeps the good in. + placement: + mode: SnapgridCenter + components: + - type: InteractionOutline + - type: Sprite + sprite: Structures/Doors/Airlocks/highsec/highsec.rsi + layers: + - state: closed + map: ["enum.DoorVisualLayers.Base"] + - state: closed_unlit + shader: unshaded + map: ["enum.DoorVisualLayers.BaseUnlit"] + - state: welded + map: ["enum.WeldableLayers.BaseWelded"] + - state: bolted_unlit + shader: unshaded + map: ["enum.DoorVisualLayers.BaseBolted"] + - state: emergency_unlit + map: ["enum.DoorVisualLayers.BaseEmergencyAccess"] + shader: unshaded + - state: panel_open + map: ["enum.WiresVisualLayers.MaintenancePanel"] + - type: AnimationPlayer + - type: Physics + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeAabb + bounds: "-0.49,-0.49,0.49,0.49" # don't want this colliding with walls or they won't close + density: 100 + mask: + - FullTileMask + layer: + - WallLayer + - type: ContainerFill + containers: + board: [ DoorElectronics ] + - type: ContainerContainer + containers: + board: !type:Container + - type: Door + crushDamage: + types: + Blunt: 50 + openSound: + path: /Audio/Machines/airlock_open.ogg + closeSound: + path: /Audio/Machines/airlock_close.ogg + denySound: + path: /Audio/Machines/airlock_deny.ogg + - type: Weldable + time: 10 + - type: Airlock + - type: NavMapDoor + - type: DoorBolt + - type: AccessReader + - type: Appearance + - type: WiresVisuals + - type: ApcPowerReceiver + powerLoad: 20 + - type: ExtensionCableReceiver + - type: Electrified + enabled: false + usesApcPower: true + - type: WiresPanel + - type: WiresPanelSecurity + securityLevel: maxSecurity + - type: Wires + boardName: wires-board-name-highsec + layoutId: HighSec + alwaysRandomize: true + - type: UserInterface + interfaces: + - key: enum.WiresUiKey.Key + type: WiresBoundUserInterface + - type: Airtight + - type: Occluder + - type: Damageable + damageContainer: StructuralInorganic + damageModifierSet: StrongMetallic + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 1500 + behaviors: + - !type:DoActsBehavior + acts: ["Destruction"] + - type: IconSmooth + key: walls + mode: NoSprite + - type: Construction + graph: Airlock + node: highSecDoor + - type: Tag + tags: + - HighSecDoor + # This tag is used to nagivate the Airlock construction graph. It's needed because this construction graph is shared between Airlock, AirlockGlass, and HighSecDoor diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml index 21d485be0c8..9771f633888 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml @@ -57,7 +57,6 @@ denySound: path: /Audio/Machines/airlock_deny.ogg - type: Airtight - fixVacuum: true noAirWhenFullyAirBlocked: false - type: Tag tags: diff --git a/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml b/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml index dccc76e96c1..e677ef185be 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml @@ -93,7 +93,6 @@ - type: Physics canCollide: false - type: Airtight - fixVacuum: true airBlocked: false noAirWhenFullyAirBlocked: true - type: RadiationBlocker @@ -158,7 +157,6 @@ sprite: Structures/Doors/edge_door_hazard.rsi snapCardinals: false - type: Airtight - fixVacuum: true airBlocked: false noAirWhenFullyAirBlocked: false airBlockedDirection: diff --git a/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml b/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml index 644976eb9c4..3709b739a3e 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml @@ -40,7 +40,6 @@ path: /Audio/Effects/stonedoor_openclose.ogg - type: Appearance - type: Airtight - fixVacuum: true - type: Damageable damageContainer: Inorganic damageModifierSet: Metallic diff --git a/Resources/Prototypes/Entities/Structures/Doors/SecretDoor/secret_door.yml b/Resources/Prototypes/Entities/Structures/Doors/SecretDoor/secret_door.yml index 2c54d3cd418..d6c087af0a5 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/SecretDoor/secret_door.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/SecretDoor/secret_door.yml @@ -38,7 +38,6 @@ - type: Weldable time: 2 - type: Airtight - fixVacuum: true - type: Damageable damageContainer: Inorganic damageModifierSet: Metallic diff --git a/Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml b/Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml index 7d3af93a64d..55010eea512 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml @@ -59,7 +59,6 @@ - key: enum.WiresUiKey.Key type: WiresBoundUserInterface - type: Airtight - fixVacuum: true - type: RadiationBlocker resistance: 2 - type: Damageable diff --git a/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml b/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml index 56167c178e2..d03765d4fc9 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml @@ -130,7 +130,6 @@ - type: Appearance - type: WiresVisuals - type: Airtight - fixVacuum: true noAirWhenFullyAirBlocked: false airBlockedDirection: - South diff --git a/Resources/Prototypes/Entities/Structures/plastic_flaps.yml b/Resources/Prototypes/Entities/Structures/plastic_flaps.yml index 8c53daf3b60..bf49eb1be35 100644 --- a/Resources/Prototypes/Entities/Structures/plastic_flaps.yml +++ b/Resources/Prototypes/Entities/Structures/plastic_flaps.yml @@ -83,7 +83,6 @@ - !type:DoActsBehavior acts: ["Destruction"] - type: Airtight - fixVacuum: true - type: entity id: PlasticFlapsAirtightOpaque @@ -101,4 +100,3 @@ - !type:DoActsBehavior acts: ["Destruction"] - type: Airtight - fixVacuum: true From 8594381ae76d9ffeb4859e3c355247ed18de65b3 Mon Sep 17 00:00:00 2001 From: SimpleStation14 <130339894+SimpleStation14@users.noreply.github.com> Date: Fri, 14 Jun 2024 06:36:39 -0700 Subject: [PATCH 02/27] Mirror 26447: Curtains fix (#450) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Mirror of PR #26447: [Curtains fix](https://github.com/space-wizards/space-station-14/pull/26447) from space-wizards [space-wizards](https://github.com/space-wizards)/[space-station-14](https://github.com/space-wizards/space-station-14) ###### `55b146a16c74d9b1ef4991f3ad3e22b15267f56f` PR opened by Futuristic-OK at 2024-03-26 13:45:20 UTC - merged at 2024-03-26 16:03:54 UTC --- PR changed 2 files with 13 additions and 31 deletions. The PR had the following labels: - No C# ---

Original Body

 > > > > ## About the PR > > Now curtains can be built and opened inside walls and windows, etc. > (There is a mistake that if the curtain is opened outside the 180 degree range, the sound of the curtains opening will not be played by the player himself. All the surrounding players and ghosts will still hear the sound. > ## Why / Balance > > Why not? > ## Technical details > > A few lines of code > ## Media > > > - [X] I have added screenshots/videos to this PR showcasing its changes ingame, **or** this PR does not require an ingame showcase > > ## Breaking changes > > Erm... Nothing? > > **Changelog** > > - tweak: Сurtains can be built and opened inside full tiles > > >
Co-authored-by: SimpleStation14 --- .../Structures/Decoration/curtains.yml | 4 +- .../Recipes/Construction/furniture.yml | 40 +++++-------------- 2 files changed, 13 insertions(+), 31 deletions(-) diff --git a/Resources/Prototypes/Entities/Structures/Decoration/curtains.yml b/Resources/Prototypes/Entities/Structures/Decoration/curtains.yml index 85c9bdae3df..77b03d36f5d 100644 --- a/Resources/Prototypes/Entities/Structures/Decoration/curtains.yml +++ b/Resources/Prototypes/Entities/Structures/Decoration/curtains.yml @@ -50,6 +50,8 @@ MaterialCloth1: min: 1 max: 2 + - type: WallMount + arc: 360 - type: entity id: HospitalCurtains @@ -350,4 +352,4 @@ graph: Curtains node: CurtainsWhiteOpen - type: Physics - canCollide: false \ No newline at end of file + canCollide: false diff --git a/Resources/Prototypes/Recipes/Construction/furniture.yml b/Resources/Prototypes/Recipes/Construction/furniture.yml index 1a17b2f856d..25978771872 100644 --- a/Resources/Prototypes/Recipes/Construction/furniture.yml +++ b/Resources/Prototypes/Recipes/Construction/furniture.yml @@ -731,9 +731,7 @@ state: closed objectType: Structure placementMode: SnapgridCenter - canBuildInImpassable: false - conditions: - - !type:TileNotBlocked + canBuildInImpassable: true - type: construction id: CurtainsBlack @@ -748,9 +746,7 @@ state: closed objectType: Structure placementMode: SnapgridCenter - canBuildInImpassable: false - conditions: - - !type:TileNotBlocked + canBuildInImpassable: true - type: construction id: CurtainsBlue @@ -765,9 +761,7 @@ state: closed objectType: Structure placementMode: SnapgridCenter - canBuildInImpassable: false - conditions: - - !type:TileNotBlocked + canBuildInImpassable: true - type: construction id: CurtainsCyan @@ -782,9 +776,7 @@ state: closed objectType: Structure placementMode: SnapgridCenter - canBuildInImpassable: false - conditions: - - !type:TileNotBlocked + canBuildInImpassable: true - type: construction id: CurtainsGreen @@ -799,9 +791,7 @@ state: closed objectType: Structure placementMode: SnapgridCenter - canBuildInImpassable: false - conditions: - - !type:TileNotBlocked + canBuildInImpassable: true - type: construction id: CurtainsOrange @@ -816,9 +806,7 @@ state: closed objectType: Structure placementMode: SnapgridCenter - canBuildInImpassable: false - conditions: - - !type:TileNotBlocked + canBuildInImpassable: true - type: construction id: CurtainsPink @@ -833,9 +821,7 @@ state: closed objectType: Structure placementMode: SnapgridCenter - canBuildInImpassable: false - conditions: - - !type:TileNotBlocked + canBuildInImpassable: true - type: construction id: CurtainsPurple @@ -850,9 +836,7 @@ state: closed objectType: Structure placementMode: SnapgridCenter - canBuildInImpassable: false - conditions: - - !type:TileNotBlocked + canBuildInImpassable: true - type: construction id: CurtainsRed @@ -867,9 +851,7 @@ state: closed objectType: Structure placementMode: SnapgridCenter - canBuildInImpassable: false - conditions: - - !type:TileNotBlocked + canBuildInImpassable: true - type: construction id: CurtainsWhite @@ -884,9 +866,7 @@ state: closed objectType: Structure placementMode: SnapgridCenter - canBuildInImpassable: false - conditions: - - !type:TileNotBlocked + canBuildInImpassable: true - type: construction id: Bookshelf From 12ee94c4ef7eb2a5798978c233c54bdc5b998167 Mon Sep 17 00:00:00 2001 From: SimpleStation14 <130339894+SimpleStation14@users.noreply.github.com> Date: Fri, 14 Jun 2024 06:51:46 -0700 Subject: [PATCH 03/27] Mirror 26430: Reduces size of smaller cartons and fix size discrepancies with empty containers (#447) ## Mirror of PR #26430: [Reduces size of smaller cartons and fix size discrepancies with empty containers](https://github.com/space-wizards/space-station-14/pull/26430) from space-wizards [space-wizards](https://github.com/space-wizards)/[space-station-14](https://github.com/space-wizards/space-station-14) ###### `47fe7d3cc664d59bacc2036e5678adad47622e3d` PR opened by IamVelcroboy at 2024-03-25 16:06:33 UTC - merged at 2024-03-26 04:04:42 UTC --- PR changed 2 files with 49 additions and 33 deletions. The PR had the following labels: - No C# ---

Original Body

 > ## About the PR > - Reduces the item size of drink cartons with `maxVol: 50` to `small` > - Fixes discrepancies between full alcohol bottles and empty > - Makes empty cartons consistent with full as well > > ## Why / Balance > Keeps it consistent with other drink containers. > > ## Technical details > n/a > > ## Media > Before: > ![image](https://github.com/space-wizards/space-station-14/assets/107660393/f232b56c-c4d1-480f-ae29-a11dc2f2c47c) > > - [X] I have added screenshots/videos to this PR showcasing its changes in-game, **or** this PR does not require an in-game showcase > > ## Breaking changes > n/a > > **Changelog** > n/a
Co-authored-by: SimpleStation14 --- .../Consumable/Drinks/drinks-cartons.yml | 23 +++++--- .../Consumable/Drinks/trash_drinks.yml | 59 +++++++++++-------- 2 files changed, 49 insertions(+), 33 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml index f232bf1d34d..67d79540382 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml @@ -17,7 +17,7 @@ - type: Sprite state: icon - type: Item - size: Normal + size: Small - type: MeleeWeapon soundNoDamage: path: "/Audio/Effects/Fluids/splat.ogg" @@ -39,6 +39,18 @@ - type: TrashOnSolutionEmpty solution: drink +- type: entity + parent: DrinkCartonBaseFull + id: DrinkCartonBaseLargeFull + abstract: true + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 100 + - type: Item + size: Normal + - type: entity id: DrinkCartonVisualsOpenable abstract: true @@ -116,7 +128,7 @@ sprite: Objects/Consumable/Drinks/cream.rsi - type: entity - parent: [DrinkCartonVisualsOpenable, DrinkCartonBaseFull] + parent: [DrinkCartonVisualsOpenable, DrinkCartonBaseLargeFull] id: DrinkMilkCarton name: milk description: An opaque white liquid produced by the mammary glands of mammals. @@ -124,7 +136,6 @@ - type: SolutionContainerManager solutions: drink: - maxVol: 100 reagents: - ReagentId: Milk Quantity: 100 @@ -132,7 +143,7 @@ sprite: Objects/Consumable/Drinks/milk.rsi - type: entity - parent: [DrinkCartonVisualsOpenable, DrinkCartonBaseFull] + parent: [DrinkCartonVisualsOpenable, DrinkCartonBaseLargeFull] id: DrinkSoyMilkCarton name: soy milk description: White and nutritious soy goodness! @@ -140,7 +151,6 @@ - type: SolutionContainerManager solutions: drink: - maxVol: 100 reagents: - ReagentId: MilkSoy Quantity: 100 @@ -148,7 +158,7 @@ sprite: Objects/Consumable/Drinks/soymilk.rsi - type: entity - parent: [DrinkCartonVisualsOpenable, DrinkCartonBaseFull] + parent: [DrinkCartonVisualsOpenable, DrinkCartonBaseLargeFull] id: DrinkOatMilkCarton name: oat milk description: It's oat milk. Tan and nutritious goodness! @@ -156,7 +166,6 @@ - type: SolutionContainerManager solutions: drink: - maxVol: 100 reagents: - ReagentId: MilkOat Quantity: 100 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/trash_drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/trash_drinks.yml index f6dd7222611..86bc34f3c8b 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/trash_drinks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/trash_drinks.yml @@ -8,6 +8,8 @@ components: - type: Sprite state: icon + - type: Item + size: Normal - type: SolutionContainerManager solutions: drink: @@ -72,6 +74,19 @@ Glass: 100 - type: SpaceGarbage +- type: entity + name: base empty bottle + id: DrinkBottleBaseSmallEmpty + parent: DrinkBottleBaseEmpty + abstract: true + components: + - type: Item + size: Small + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + - type: entity name: base empty carton id: DrinkCartonBaseEmpty @@ -122,6 +137,19 @@ Cardboard: 20 - type: SpaceGarbage +- type: entity + name: base empty bottle + id: DrinkCartonBaseLargeEmpty + parent: DrinkCartonBaseEmpty + abstract: true + components: + - type: Item + size: Normal + - type: SolutionContainerManager + solutions: + drink: + maxVol: 100 + # Containers - type: entity name: Jailbreaker Verte bottle @@ -143,28 +171,20 @@ - type: entity name: ale bottle - parent: DrinkBottleBaseEmpty + parent: DrinkBottleBaseSmallEmpty id: DrinkBottleAle components: - type: Sprite sprite: Objects/Consumable/TrashDrinks/alebottle_empty.rsi - - type: SolutionContainerManager - solutions: - drink: - maxVol: 50 - type: entity name: beer bottle - parent: DrinkBottleBaseEmpty + parent: DrinkBottleBaseSmallEmpty id: DrinkBottleBeer components: - type: Sprite sprite: Objects/Consumable/TrashDrinks/beer_empty.rsi - - type: SolutionContainerManager - solutions: - drink: - maxVol: 50 - type: entity @@ -322,37 +342,24 @@ - type: entity name: milk carton - parent: DrinkCartonBaseEmpty + parent: DrinkCartonBaseLargeEmpty id: DrinkCartonMilk components: - type: Sprite sprite: Objects/Consumable/Drinks/milk.rsi - - type: SolutionContainerManager - solutions: - drink: - maxVol: 100 - - type: entity name: soy milk carton - parent: DrinkCartonBaseEmpty + parent: DrinkCartonBaseLargeEmpty id: DrinkCartonSoyMilk components: - type: Sprite sprite: Objects/Consumable/Drinks/soymilk.rsi - - type: SolutionContainerManager - solutions: - drink: - maxVol: 100 - type: entity name: oat milk carton - parent: DrinkCartonBaseEmpty + parent: DrinkCartonBaseLargeEmpty id: DrinkCartonOatMilk components: - type: Sprite sprite: Objects/Consumable/Drinks/oatmilk.rsi - - type: SolutionContainerManager - solutions: - drink: - maxVol: 100 From 825ca8772ddac4c0e2852572913128221aee566b Mon Sep 17 00:00:00 2001 From: SimpleStation14 <130339894+SimpleStation14@users.noreply.github.com> Date: Sun, 16 Jun 2024 08:39:17 -0700 Subject: [PATCH 04/27] Mirror: Trading Outpost now has half buy-only and half sell-only pallets (#191) ## Mirror of PR #25955: [Trading Outpost now has half buy-only and half sell-only pallets](https://github.com/space-wizards/space-station-14/pull/25955) from space-wizards [space-wizards](https://github.com/space-wizards)/[space-station-14](https://github.com/space-wizards/space-station-14) ###### `c0bbbc33c19eafcc8defaa7f1ec2df42e485b435` PR opened by wafehling at 2024-03-10 02:47:02 UTC --- PR changed 8 files with 226 additions and 123 deletions. The PR had the following labels: - Changes: Sprites - Status: Needs Review ---

Original Body

 > ## About the PR > I added two new entity types, a buy and sell only cargo pallet, and added them to the trading outpost in place of the old pallets. > > ## Why / Balance > Since the day this was added, every single shift, at some point I'll hear someone in cargo yelling about how **"You sold stuff I just bought!"** > > This seemed like the easiest way to fix the problem. > > ## Technical details > Added a variable to the cargo pallet component for labeling which type it is, added two new varieties of the cargo pallet to the yml, and adjusted all the calls for GetCargoPallets() to have boolean variables for buyOnly and sellOnly to tell the function what kind of call you're looking for. > > If you don't give it any specifics it'll still treat any pallet as a two-way one, but this function is only called 2 or 3 times and I've adjusted them all and commented the function itself for anyone looking to change/add it in the future. > > The old pallet is still in the game and is set to "both" by default, so it should work just fine for backwards compatibility. > > ## Media > ![image](https://github.com/space-wizards/space-station-14/assets/1471082/38cdf849-3e05-4f98-957f-65a719c2280d) > ![image](https://github.com/space-wizards/space-station-14/assets/1471082/56e471e9-b45e-4332-bd55-7220566542ab) > ![image](https://github.com/space-wizards/space-station-14/assets/1471082/a5e8e651-d301-420a-b2d7-cc4cf07a50af) > ![image](https://github.com/space-wizards/space-station-14/assets/1471082/fdf2cf4c-fba8-46c9-9a30-7313a2204b5e) > ![image](https://github.com/space-wizards/space-station-14/assets/1471082/3811edd0-bb32-44cf-b884-e0a9f4bf16fa) > > > - [X] I have added screenshots/videos to this PR showcasing its changes ingame, **or** this PR does not require an ingame showcase > > ## Breaking changes > > Shouldn't break anything, I've left the old pallets fully in, and updated them to work with the new GetCargoPallets() function just like they used to. Not sure if/where you'd still need them, but better safe than sorry. > > **Changelog** > :cl: > - tweak: The trading outpost now has dedicated buy-only and sell-only pallets. No more accidentally selling orders you just bought. Cargonians rejoice! >
Co-authored-by: SimpleStation14 --- .../Cargo/Components/CargoPalletComponent.cs | 21 +- .../Cargo/Systems/CargoSystem.Orders.cs | 2 +- .../Cargo/Systems/CargoSystem.Shuttle.cs | 15 +- Resources/Maps/Shuttles/trading_outpost.yml | 263 ++++++++++-------- .../Objects/Specific/Cargo/cargo_pallet.yml | 31 +++ .../cargo_pallets.rsi/cargo_pallet_buy.png | Bin 0 -> 551 bytes .../cargo_pallets.rsi/cargo_pallet_sell.png | Bin 0 -> 535 bytes .../Structures/cargo_pallets.rsi/meta.json | 17 ++ 8 files changed, 226 insertions(+), 123 deletions(-) create mode 100644 Resources/Textures/Structures/cargo_pallets.rsi/cargo_pallet_buy.png create mode 100644 Resources/Textures/Structures/cargo_pallets.rsi/cargo_pallet_sell.png create mode 100644 Resources/Textures/Structures/cargo_pallets.rsi/meta.json diff --git a/Content.Server/Cargo/Components/CargoPalletComponent.cs b/Content.Server/Cargo/Components/CargoPalletComponent.cs index ebf0be93e0c..cdfd0a3874f 100644 --- a/Content.Server/Cargo/Components/CargoPalletComponent.cs +++ b/Content.Server/Cargo/Components/CargoPalletComponent.cs @@ -1,7 +1,26 @@ namespace Content.Server.Cargo.Components; +using Content.Shared.Actions; +using Robust.Shared.Serialization.TypeSerializers.Implementations; /// /// Any entities intersecting when a shuttle is recalled will be sold. /// + +[Flags] +public enum BuySellType : byte +{ + Buy = 1 << 0, + Sell = 1 << 1, + All = Buy | Sell +} + + [RegisterComponent] -public sealed partial class CargoPalletComponent : Component {} +public sealed partial class CargoPalletComponent : Component +{ + /// + /// Whether the pad is a buy pad, a sell pad, or all. + /// + [DataField] + public BuySellType PalletType; +} diff --git a/Content.Server/Cargo/Systems/CargoSystem.Orders.cs b/Content.Server/Cargo/Systems/CargoSystem.Orders.cs index ebe66ff029e..d8b55a7237f 100644 --- a/Content.Server/Cargo/Systems/CargoSystem.Orders.cs +++ b/Content.Server/Cargo/Systems/CargoSystem.Orders.cs @@ -205,7 +205,7 @@ private void OnApproveOrderMessage(EntityUid uid, CargoOrderConsoleComponent com // Try to fulfill from any station where possible, if the pad is not occupied. foreach (var trade in _listEnts) { - var tradePads = GetCargoPallets(trade); + var tradePads = GetCargoPallets(trade, BuySellType.Buy); _random.Shuffle(tradePads); var freePads = GetFreeCargoPallets(trade, tradePads); diff --git a/Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs b/Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs index 3e39440da56..b8a491f4e89 100644 --- a/Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs +++ b/Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs @@ -198,13 +198,16 @@ private List GetProjectedOrders( /// private int GetCargoSpace(EntityUid gridUid) { - var space = GetCargoPallets(gridUid).Count; + var space = GetCargoPallets(gridUid, BuySellType.Buy).Count; return space; } - private List<(EntityUid Entity, CargoPalletComponent Component, TransformComponent PalletXform)> GetCargoPallets(EntityUid gridUid) + /// GetCargoPallets(gridUid, BuySellType.Sell) to return only Sell pads + /// GetCargoPallets(gridUid, BuySellType.Buy) to return only Buy pads + private List<(EntityUid Entity, CargoPalletComponent Component, TransformComponent PalletXform)> GetCargoPallets(EntityUid gridUid, BuySellType requestType = BuySellType.All) { _pads.Clear(); + var query = AllEntityQuery(); while (query.MoveNext(out var uid, out var comp, out var compXform)) @@ -215,7 +218,13 @@ private int GetCargoSpace(EntityUid gridUid) continue; } + if ((requestType & comp.PalletType) == 0) + { + continue; + } + _pads.Add((uid, comp, compXform)); + } return _pads; @@ -275,7 +284,7 @@ private void GetPalletGoods(EntityUid gridUid, out HashSet toSell, ou amount = 0; toSell = new HashSet(); - foreach (var (palletUid, _, _) in GetCargoPallets(gridUid)) + foreach (var (palletUid, _, _) in GetCargoPallets(gridUid, BuySellType.Sell)) { // Containers should already get the sell price of their children so can skip those. _setEnts.Clear(); diff --git a/Resources/Maps/Shuttles/trading_outpost.yml b/Resources/Maps/Shuttles/trading_outpost.yml index a10f070bd25..f040d58253d 100644 --- a/Resources/Maps/Shuttles/trading_outpost.yml +++ b/Resources/Maps/Shuttles/trading_outpost.yml @@ -3,20 +3,20 @@ meta: postmapinit: false tilemap: 0: Space - 29: FloorDark - 34: FloorDarkMono - 37: FloorDarkPavementVertical - 49: FloorGrassJungle - 64: FloorMetalDiamond - 77: FloorReinforced - 89: FloorSteel - 100: FloorSteelMono - 104: FloorTechMaint - 105: FloorTechMaint2 - 118: FloorWood - 119: FloorWoodTile - 120: Lattice - 121: Plating + 31: FloorDark + 36: FloorDarkMono + 39: FloorDarkPavementVertical + 51: FloorGrassJungle + 66: FloorMetalDiamond + 79: FloorReinforced + 93: FloorSteel + 104: FloorSteelMono + 108: FloorTechMaint + 109: FloorTechMaint2 + 122: FloorWood + 124: FloorWoodTile + 125: Lattice + 126: Plating entities: - proto: "" entities: @@ -31,27 +31,27 @@ entities: chunks: 0,0: ind: 0,0 - tiles: WQAAAAABWQAAAAABTQAAAAAATQAAAAAATQAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAWQAAAAABWQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAWQAAAAADWQAAAAADWQAAAAACWQAAAAADWQAAAAAAWQAAAAAAWQAAAAADWQAAAAAAWQAAAAABWQAAAAADWQAAAAAAIgAAAAABJQAAAAADeQAAAAAAAAAAAAAAAAAAAAAAIgAAAAAAIgAAAAAAIgAAAAABIgAAAAAAIgAAAAAAIgAAAAACIgAAAAABIgAAAAAAIgAAAAAAIgAAAAABIgAAAAACeQAAAAAATQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAATQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAdgAAAAAAdwAAAAABdwAAAAADdwAAAAACMQAAAAAAMQAAAAAAMQAAAAAAdwAAAAADdwAAAAABdwAAAAABdgAAAAACeQAAAAAATQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAdgAAAAADdwAAAAABdwAAAAADdwAAAAADdgAAAAADdgAAAAACdgAAAAADdwAAAAAAdwAAAAABdwAAAAAAdgAAAAACIgAAAAADJQAAAAACeQAAAAAAAAAAAAAAAAAAAAAAdgAAAAAAdgAAAAABdgAAAAACdgAAAAABdgAAAAAAdgAAAAACdgAAAAAAdgAAAAAAdgAAAAABdgAAAAADdgAAAAACeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: XQAAAAABXQAAAAABTwAAAAAATwAAAAAATwAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAAXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAXQAAAAADXQAAAAADXQAAAAACXQAAAAADXQAAAAAAXQAAAAAAXQAAAAADXQAAAAAAXQAAAAABXQAAAAADXQAAAAAAJAAAAAABJwAAAAADfgAAAAAAAAAAAAAAAAAAAAAAJAAAAAAAJAAAAAAAJAAAAAABJAAAAAAAJAAAAAAAJAAAAAACJAAAAAABJAAAAAAAJAAAAAAAJAAAAAABJAAAAAACfgAAAAAATwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAegAAAAAAfAAAAAABfAAAAAADfAAAAAACMwAAAAAAMwAAAAAAMwAAAAAAfAAAAAADfAAAAAABfAAAAAABegAAAAACfgAAAAAATwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAegAAAAADfAAAAAABfAAAAAADfAAAAAADegAAAAADegAAAAACegAAAAADfAAAAAAAfAAAAAABfAAAAAAAegAAAAACJAAAAAADJwAAAAACfgAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAABegAAAAACegAAAAABegAAAAAAegAAAAACegAAAAAAegAAAAAAegAAAAABegAAAAADegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 0,-1: ind: 0,-1 - tiles: eQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAIgAAAAAAeQAAAAAAeQAAAAAAIgAAAAABIgAAAAABHQAAAAACeQAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAIgAAAAABIgAAAAACIgAAAAAAIgAAAAAAIgAAAAABIgAAAAABIgAAAAACIgAAAAAAIgAAAAACeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAWQAAAAADWQAAAAADWQAAAAAAWQAAAAACWQAAAAADWQAAAAACWQAAAAADWQAAAAAAWQAAAAACWQAAAAABWQAAAAABeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAWQAAAAACWQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAWQAAAAAAWQAAAAABeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZAAAAAADWQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAWQAAAAACZAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAWQAAAAADWQAAAAABTQAAAAAATQAAAAAATQAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAWQAAAAAAWQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAWQAAAAACWQAAAAABTQAAAAAATQAAAAAATQAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAWQAAAAADWQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAZAAAAAAAWQAAAAABaQAAAAAAaQAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAaQAAAAAAaQAAAAAAWQAAAAAAZAAAAAACeQAAAAAAIgAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAWQAAAAACWQAAAAAAaQAAAAAAaQAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAaQAAAAAAaQAAAAAAWQAAAAADWQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAZAAAAAAAWQAAAAAAaQAAAAAAaQAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAaQAAAAAAaQAAAAAAWQAAAAABZAAAAAACeQAAAAAAIgAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAADTQAAAAAATQAAAAAATQAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAWQAAAAADWQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAWQAAAAABWQAAAAACTQAAAAAATQAAAAAATQAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAWQAAAAABWQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAZAAAAAACWQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAWQAAAAADZAAAAAADeQAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAA + tiles: fgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAJAAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAABHwAAAAACfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAABJAAAAAACJAAAAAAAJAAAAAAAJAAAAAABJAAAAAABJAAAAAACJAAAAAAAJAAAAAACfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAXQAAAAADXQAAAAADXQAAAAAAXQAAAAACXQAAAAADXQAAAAACXQAAAAADXQAAAAAAXQAAAAACXQAAAAABXQAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAXQAAAAACXQAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAAXQAAAAAAXQAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaAAAAAADXQAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAAXQAAAAACaAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAXQAAAAADXQAAAAABTwAAAAAATwAAAAAATwAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAAXQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAXQAAAAACXQAAAAABTwAAAAAATwAAAAAATwAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAAXQAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAaAAAAAAAXQAAAAABbQAAAAAAbQAAAAAAbAAAAAAAfgAAAAAAbAAAAAAAbQAAAAAAbQAAAAAAXQAAAAAAaAAAAAACfgAAAAAAJAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAXQAAAAACXQAAAAAAbQAAAAAAbQAAAAAAbAAAAAAAfgAAAAAAbAAAAAAAbQAAAAAAbQAAAAAAXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAaAAAAAAAXQAAAAAAbQAAAAAAbQAAAAAAbAAAAAAAfgAAAAAAbAAAAAAAbQAAAAAAbQAAAAAAXQAAAAABaAAAAAACfgAAAAAAJAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAXQAAAAADTwAAAAAATwAAAAAATwAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAAXQAAAAADXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAXQAAAAABXQAAAAACTwAAAAAATwAAAAAATwAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAAXQAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAaAAAAAACXQAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAAXQAAAAADaAAAAAADfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAA version: 6 -1,0: ind: -1,0 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAJQAAAAACIgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAATQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAATQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAATQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAJQAAAAADIgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJwAAAAACJAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAATwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAATwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAATwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJwAAAAADJAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 -1,-1: ind: -1,-1 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAIgAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAIgAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAA version: 6 0,-2: ind: 0,-2 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAIgAAAAABIgAAAAACHQAAAAACHQAAAAADHQAAAAABHQAAAAABeQAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAHQAAAAABHQAAAAACHQAAAAABIgAAAAADIgAAAAADHQAAAAACeQAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAJAAAAAABJAAAAAACHwAAAAACHwAAAAADHwAAAAABHwAAAAABfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAHwAAAAABHwAAAAACHwAAAAABJAAAAAADJAAAAAADHwAAAAACfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAA version: 6 -1,-2: ind: -1,-2 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAA version: 6 - type: Broadphase - type: Physics @@ -1889,276 +1889,303 @@ entities: rot: 1.5707963267948966 rad pos: 2.5,-17.5 parent: 2 -- proto: CargoPallet +- proto: CargoPalletBuy entities: - - uid: 20 - components: - - type: Transform - pos: 7.5,0.5 - parent: 2 - uid: 21 components: - type: Transform - pos: 8.5,0.5 + rot: -1.5707963267948966 rad + pos: 3.5,-9.5 parent: 2 - uid: 24 components: - type: Transform - pos: 8.5,-0.5 + rot: -1.5707963267948966 rad + pos: 2.5,-9.5 parent: 2 - uid: 25 components: - type: Transform - pos: 7.5,-0.5 + rot: -1.5707963267948966 rad + pos: 2.5,-8.5 parent: 2 - uid: 26 components: - type: Transform - pos: 7.5,-1.5 + rot: -1.5707963267948966 rad + pos: 3.5,-8.5 parent: 2 - uid: 27 components: - type: Transform - pos: 8.5,-1.5 + rot: -1.5707963267948966 rad + pos: 3.5,-7.5 parent: 2 - uid: 30 components: - type: Transform rot: -1.5707963267948966 rad - pos: 6.5,0.5 - parent: 2 - - uid: 32 - components: - - type: Transform pos: 2.5,-7.5 parent: 2 - - uid: 34 + - uid: 32 components: - type: Transform rot: -1.5707963267948966 rad - pos: 7.5,-7.5 + pos: 4.5,-9.5 parent: 2 - uid: 35 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 8.5,-7.5 + rot: 1.5707963267948966 rad + pos: 7.5,-0.5 parent: 2 - uid: 36 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 6.5,-1.5 + rot: 1.5707963267948966 rad + pos: 6.5,-0.5 parent: 2 - uid: 37 components: - type: Transform rot: -1.5707963267948966 rad - pos: 8.5,-9.5 + pos: 4.5,-7.5 parent: 2 - uid: 39 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 8.5,-8.5 + rot: 1.5707963267948966 rad + pos: 6.5,-2.5 parent: 2 - uid: 41 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 7.5,-8.5 + rot: 1.5707963267948966 rad + pos: 6.5,-1.5 parent: 2 - uid: 42 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 6.5,-8.5 + rot: 1.5707963267948966 rad + pos: 7.5,-1.5 parent: 2 - uid: 43 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 6.5,-9.5 + rot: 1.5707963267948966 rad + pos: 8.5,-2.5 parent: 2 - uid: 44 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 4.5,-0.5 + rot: 1.5707963267948966 rad + pos: 8.5,-1.5 parent: 2 - - uid: 45 + - uid: 47 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 4.5,-8.5 + rot: 1.5707963267948966 rad + pos: 8.5,0.5 parent: 2 - - uid: 46 + - uid: 49 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 6.5,-6.5 + rot: 1.5707963267948966 rad + pos: 8.5,-0.5 parent: 2 - - uid: 47 + - uid: 50 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 4.5,-9.5 + rot: 1.5707963267948966 rad + pos: 7.5,-2.5 parent: 2 - - uid: 48 + - uid: 56 components: - type: Transform rot: -1.5707963267948966 rad - pos: 6.5,-7.5 + pos: 4.5,-6.5 parent: 2 - - uid: 49 + - uid: 61 components: - type: Transform - pos: 7.5,-9.5 + rot: -1.5707963267948966 rad + pos: 4.5,-8.5 parent: 2 - - uid: 50 + - uid: 67 components: - type: Transform - pos: 3.5,-7.5 + rot: -1.5707963267948966 rad + pos: 3.5,-6.5 parent: 2 - - uid: 51 + - uid: 71 components: - type: Transform - pos: 3.5,-9.5 + rot: -1.5707963267948966 rad + pos: 2.5,-6.5 parent: 2 - - uid: 52 + - uid: 183 components: - type: Transform - pos: 3.5,-8.5 + rot: 1.5707963267948966 rad + pos: 6.5,0.5 parent: 2 - - uid: 54 + - uid: 900 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 4.5,-7.5 + rot: 1.5707963267948966 rad + pos: 7.5,0.5 parent: 2 - - uid: 55 +- proto: CargoPalletSell + entities: + - uid: 34 components: - type: Transform rot: -1.5707963267948966 rad - pos: 6.5,-2.5 + pos: 4.5,-0.5 parent: 2 - - uid: 56 + - uid: 45 components: - type: Transform - pos: 3.5,-1.5 + rot: 1.5707963267948966 rad + pos: 8.5,-7.5 parent: 2 - - uid: 57 + - uid: 46 components: - type: Transform - pos: 2.5,-8.5 + rot: -1.5707963267948966 rad + pos: 4.5,-2.5 parent: 2 - - uid: 58 + - uid: 48 components: - type: Transform - pos: 3.5,-0.5 + rot: -1.5707963267948966 rad + pos: 3.5,-2.5 parent: 2 - - uid: 59 + - uid: 51 components: - type: Transform - pos: 3.5,0.5 + rot: -1.5707963267948966 rad + pos: 3.5,-1.5 parent: 2 - - uid: 60 + - uid: 52 components: - type: Transform rot: -1.5707963267948966 rad - pos: 6.5,-0.5 + pos: 2.5,-2.5 parent: 2 - - uid: 61 + - uid: 54 components: - type: Transform - pos: 2.5,-9.5 + rot: 1.5707963267948966 rad + pos: 6.5,-9.5 parent: 2 - - uid: 66 + - uid: 55 components: - type: Transform rot: -1.5707963267948966 rad - pos: 7.5,-2.5 + pos: 2.5,-1.5 parent: 2 - - uid: 67 + - uid: 57 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 8.5,-9.5 + parent: 2 + - uid: 58 components: - type: Transform rot: -1.5707963267948966 rad - pos: 2.5,-2.5 + pos: 4.5,0.5 parent: 2 - - uid: 68 + - uid: 59 components: - type: Transform - pos: 2.5,-1.5 + rot: 1.5707963267948966 rad + pos: 8.5,-6.5 parent: 2 - - uid: 69 + - uid: 60 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 3.5,-2.5 + rot: 1.5707963267948966 rad + pos: 7.5,-7.5 parent: 2 - - uid: 70 + - uid: 66 components: - type: Transform rot: -1.5707963267948966 rad - pos: 8.5,-2.5 + pos: 3.5,0.5 parent: 2 - - uid: 71 + - uid: 68 components: - type: Transform - pos: 2.5,-0.5 + rot: 1.5707963267948966 rad + pos: 7.5,-8.5 parent: 2 - - uid: 72 + - uid: 69 components: - type: Transform - pos: 2.5,0.5 + rot: 1.5707963267948966 rad + pos: 8.5,-8.5 parent: 2 - - uid: 73 + - uid: 70 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 8.5,-6.5 + rot: 1.5707963267948966 rad + pos: 7.5,-9.5 parent: 2 - - uid: 183 + - uid: 72 components: - type: Transform - rot: -1.5707963267948966 rad + rot: 1.5707963267948966 rad pos: 7.5,-6.5 parent: 2 - - uid: 900 + - uid: 73 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 3.5,-6.5 + rot: 1.5707963267948966 rad + pos: 6.5,-6.5 parent: 2 - uid: 901 components: - type: Transform rot: -1.5707963267948966 rad - pos: 2.5,-6.5 + pos: 2.5,-0.5 parent: 2 - uid: 903 components: - type: Transform rot: -1.5707963267948966 rad - pos: 4.5,0.5 + pos: 3.5,-0.5 parent: 2 - uid: 907 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 4.5,-6.5 + rot: 1.5707963267948966 rad + pos: 7.5,-7.5 parent: 2 - uid: 908 components: - type: Transform rot: -1.5707963267948966 rad - pos: 4.5,-2.5 + pos: 4.5,-1.5 parent: 2 - uid: 909 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 6.5,-8.5 + parent: 2 + - uid: 960 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 6.5,-7.5 + parent: 2 + - uid: 961 components: - type: Transform rot: -1.5707963267948966 rad - pos: 4.5,-1.5 + pos: 2.5,0.5 parent: 2 - proto: CarpetBlack entities: diff --git a/Resources/Prototypes/Entities/Objects/Specific/Cargo/cargo_pallet.yml b/Resources/Prototypes/Entities/Objects/Specific/Cargo/cargo_pallet.yml index 925e036e09e..c628d199a90 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Cargo/cargo_pallet.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Cargo/cargo_pallet.yml @@ -21,6 +21,7 @@ mask: - MachineMask - type: CargoPallet + palletType: All - type: StaticPrice price: 100 - type: Sprite @@ -53,3 +54,33 @@ - type: GuideHelp guides: - Cargo + +- type: entity + id: CargoPalletSell + name: cargo selling pallet + description: Designates valid items to sell with a selling computer, or to CentCom when a shuttle is recalled. + parent: CargoPallet + components: + - type: CargoPallet + palletType: sell + - type: Sprite + drawdepth: FloorTiles + layers: + - sprite: Structures/cargo_pallets.rsi + state: cargo_pallet_sell + + +- type: entity + id: CargoPalletBuy + name: cargo buying pallet + description: Designates where orders will appear when purchased. + parent: CargoPallet + components: + - type: CargoPallet + palletType: buy + - type: Sprite + drawdepth: FloorTiles + layers: + - sprite: Structures/cargo_pallets.rsi + state: cargo_pallet_buy + diff --git a/Resources/Textures/Structures/cargo_pallets.rsi/cargo_pallet_buy.png b/Resources/Textures/Structures/cargo_pallets.rsi/cargo_pallet_buy.png new file mode 100644 index 0000000000000000000000000000000000000000..024678fc209363462f2b44b707900f56c749dc56 GIT binary patch literal 551 zcmV+?0@(eDP)Px$;Ymb6R9J=WSHEk*Kp1_7xCN|8$yAPl!~GpuL`rsNagYuY2t}NVlS2_CgLIJM z{~-P^5d;UPLnMkW0jV9##r(8Y(<;JIv$xX^ff)P)a}fJf#!> zKE1Wa`bIr6|gFG#WvYB*?N1#uzB2yC!0EK`Di4nvuDvyrGNkT6~Z7 zdJRIzj)H(%1pxd50f69~&K(D8zs+}tdEeTh%`S}YTH9SQ;tbvEbU*lh%X}*Q z5AYZ_AK1sh%?JLK4>)(YM0~(|$2_QkUSk7QGd*`W)4SNon&^VU(8s8?O$<6YsM-M^ z;I~%?iTOaSy@8>J-x{Hr$A=8wsxwqtGT{6|%d)t7Pab<8J+TdVUo1&O)uQL!27Px$(Md!>R9J=Wm$7c*KoEvMTUa{DM#2>?9JcivTyI4J9w4>5Ywj7Y;u+GUbDcIt zULkK_+B*tw#Y$jBRw8_b*_>^1;2b82bo|w<|Iy4W|L7NMOsCT#&vQNkmSxe)^Bi?) z03ffETEg&qP&;?c3n4JVFf7!iK^8CGeuX1oM?PQf9_i`H9LK?qe4P8IlQv#YtlDMG zD(T!mv7T7Cu8Z-_KuT#!DNWaPky8Hid0UJ1#M-%FuQ}nxgTt?{Yx+PC1RMQ52m*jj zHMcFVP}q^r#e>6=<^BQGm7>3mlO$=<)n=`E50C!n88uRHQ|8F)1R+EzL3LZxS!xb$ z2c)wUN{LKeP@gNkTJgGGI!kMk(@6dh>`0(>J4W+;{Bn6<2VT?lt(x!Shr=PTmHqCq zl%U~IM{9n7ui^9Vz$-CyuoJCzpi9l0&^z!~AE0~9n|uwQcL&ZspkvNH@F#||5BwKC z;QjD63WbNq;C9f752&lM9>5raYG(2`EJUmuEdt~wAun*{euUmBH z16jPlj{KeBj4%v~`F#HF50l! Date: Sun, 16 Jun 2024 15:06:45 -0700 Subject: [PATCH 05/27] Update Credits (#437) This is an automated Pull Request. This PR updates the GitHub contributors in the credits section. Co-authored-by: SimpleStation Changelogs Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> --- Resources/Credits/GitHub.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Credits/GitHub.txt b/Resources/Credits/GitHub.txt index 8c54ecb084d..03d5059e95b 100644 --- a/Resources/Credits/GitHub.txt +++ b/Resources/Credits/GitHub.txt @@ -1 +1 @@ -0x6273, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 4dplanner, 612git, 778b, Ablankmann, Acruid, actioninja, adamsong, Admiral-Obvious-001, Adrian16199, Aerocrux, Aexxie, africalimedrop, Agoichi, Ahion, AJCM-git, AjexRose, Alekshhh, AlexMorgan3817, AlmondFlour, AlphaQwerty, Altoids1, amylizzle, ancientpower, ArchPigeon, Arendian, arimah, Arteben, AruMoon, as334, AsikKEsel, asperger-sind, aspiringLich, avghdev, AzzyIsNotHere, BananaFlambe, BasedUser, BGare, BingoJohnson-zz, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, Boaz1111, BobdaBiscuit, brainfood1183, Brandon-Huu, Bribrooo, Bright0, brndd, BubblegumBlue, BYONDFuckery, c4llv07e, CakeQ, CaptainSqrBeard, Carbonhell, Carolyn3114, casperr04, CatTheSystem, Centronias, chairbender, Charlese2, Cheackraze, cheesePizza2, Chief-Engineer, chromiumboy, Chronophylos, clement-or, Clyybber, ColdAutumnRain, Colin-Tel, collinlunn, ComicIronic, coolmankid12345, corentt, crazybrain23, creadth, CrigCrag, Crotalus, CrudeWax, CrzyPotato, Cyberboss, d34d10cc, Daemon, daerSeebaer, dahnte, dakamakat, dakimasu, DamianX, DangerRevolution, daniel-cr, Darkenson, DawBla, dch-GH, Deahaka, DEATHB4DEFEAT, DeathCamel58, deathride58, DebugOk, Decappi, deepdarkdepths, Delete69, deltanedas, DeltaV-Bot, DerbyX, DoctorBeard, DogZeroX, dontbetank, Doru991, DoubleRiceEddiedd, DrMelon, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, Duddino, Dutch-VanDerLinde, Easypoller, eclips_e, EdenTheLiznerd, EEASAS, Efruit, ElectroSR, elthundercloud, Emisse, EmoGarbage404, Endecc, enumerate0, eoineoineoin, ERORR404V1, Errant-4, estacaoespacialpirata, exincore, exp111, Fahasor, FairlySadPanda, ficcialfaint, Fildrance, FillerVK, Fishfish458, Flareguy, FluffiestFloof, FluidRock, FoLoKe, fooberticus, Fortune117, FoxxoTrystan, freeman2651, Fromoriss, FungiFellow, GalacticChimp, gbasood, Geekyhobo, Genkail, Git-Nivrak, github-actions[bot], gituhabu, GNF54, Golinth, GoodWheatley, Gotimanga, graevy, GreyMario, Guess-My-Name, gusxyz, h3half, Hanzdegloker, Hardly3D, harikattar, Hebiman, Henry12116, HerCoyote23, Hmeister-real, HoofedEar, hord-brayden, hubismal, Hugal31, Hyenh, iacore, IamVelcroboy, icekot8, igorsaux, ike709, Illiux, Ilya246, IlyaElDunaev, Injazz, Insineer, IntegerTempest, Interrobang01, IProduceWidgets, ItsMeThom, j-giebel, Jackal298, Jackrost, jamessimo, janekvap, JerryImMouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JoeHammad1844, joelhed, JohnGinnane, johnku1, joshepvodka, jproads, Jrpl, juliangiebel, JustArt1m, JustCone14, JustinTether, JustinTrotter, KaiShibaa, kalane15, kalanosh, KEEYNy, Keikiru, Kelrak, kerisargit, keronshb, KIBORG04, Killerqu00, KingFroozy, kira-er, Kit0vras, KittenColony, Kmc2000, Ko4ergaPunk, komunre, koteq, Krunklehorn, Kukutis96513, kxvvv, Lamrr, LankLTE, lapatison, Leander-0, leonardo-dabepis, LetterN, Level10Cybermancer, lever1209, LightVillet, liltenhead, LittleBuilderJane, Lomcastar, LordCarve, LordEclipse, LovelyLophi, LudwigVonChesterfield, Lukasz825700516, lunarcomets, luringens, lvvova1, lzimann, lzk228, M3739, MACMAN2003, Macoron, MagnusCrowe, ManelNavola, matthst, Matz05, MehimoNemo, MeltedPixel, MemeProof, Menshin, Mervill, metalgearsloth, mhamsterr, MilenVolf, Minty642, Mirino97, mirrorcult, misandrie, MishaUnity, MisterMecky, Mith-randalf, Moneyl, Moomoobeef, moony, Morb0, Mr0maks, musicmanvr, Myakot, Myctai, N3X15, Nairodian, Naive817, namespace-Memory, NickPowers43, nikthechampiongr, Nimfar11, Nirnael, nmajask, nok-ko, Nopey, notafet, notquitehadouken, noudoit, noverd, nuke-haus, NULL882, OCOtheOmega, OctoRocket, OldDanceJacket, onoira, Owai-Seek, pali6, Pangogie, patrikturi, PaulRitter, Peptide90, peptron1, Phantom-Lily, PHCodes, PixelTheKermit, PJB3005, Plykiya, pofitlo, pointer-to-null, PolterTzi, PoorMansDreams, potato1234x, ProfanedBane, PrPleGoo, ps3moira, Psychpsyo, psykzz, PuroSlavKing, quatre, QuietlyWhisper, qwerltaz, Radosvik, Radrark, Rainbeon, Rainfey, Rane, ravage123321, rbertoche, Redict, RedlineTriad, RednoWCirabrab, RemberBM, RemieRichards, RemTim, rene-descartes2021, RiceMar1244, RieBi, Rinkashikachi, Rockdtben, rolfero, rosieposieeee, Saakra, Samsterious, SaphireLattice, ScalyChimp, scrato, Scribbles0, Serkket, SethLafuente, ShadowCommander, Shadowtheprotogen546, SignalWalker, SimpleStation14, Simyon264, SirDragooon, Sirionaut, siyengar04, Skarletto, Skrauz, Skyedra, SlamBamActionman, Slava0135, Snowni, snowsignal, SonicHDC, SoulSloth, SpaceManiac, SpeltIncorrectyl, spoogemonster, ssdaniel24, Stealthbomber16, stellar-novas, StrawberryMoses, SweptWasTaken, Szunti, TadJohnson00, takemysoult, TaralGit, Tayrtahn, tday93, TekuNut, TemporalOroboros, tentekal, tgrkzus, thatrandomcanadianguy, TheArturZh, theashtronaut, thedraccx, themias, theomund, theOperand, TheShuEd, TimrodDX, Titian3, tkdrg, tmtmtl30, tom-leys, tomasalves8, Tomeno, tosatur, Tryded, TsjipTsjip, Tunguso4ka, TurboTrackerss14, Tyler-IN, Tyzemol, UbaserB, UKNOWH, UnicornOnLSD, Uriende, UristMcDorf, Vaaankas, Varen, VasilisThePikachu, veliebm, Veritius, Verslebas, VigersRay, Visne, VMSolidus, volundr-, Voomra, Vordenburg, vulppine, waylon531, weaversam8, Willhelm53, wixoaGit, WlarusFromDaSpace, wrexbe, xRiriq, yathxyz, Ygg01, YotaXP, YuriyKiss, zach-hill, Zandario, Zap527, ZelteHonor, zerorulez, zionnBE, zlodo, ZNixian, ZoldorfTheWizard, Zumorica, Zymem +0x6273, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 4dplanner, 612git, 778b, Ablankmann, Acruid, actioninja, adamsong, Admiral-Obvious-001, Adrian16199, Aerocrux, Aexxie, africalimedrop, Agoichi, Ahion, AJCM-git, AjexRose, Alekshhh, AlexMorgan3817, AlmondFlour, AlphaQwerty, Altoids1, amylizzle, ancientpower, ArchPigeon, Arendian, arimah, Arteben, AruMoon, as334, AsikKEsel, asperger-sind, aspiringLich, avghdev, AzzyIsNotHere, BananaFlambe, BasedUser, BGare, BingoJohnson-zz, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, Boaz1111, BobdaBiscuit, brainfood1183, Brandon-Huu, Bribrooo, Bright0, brndd, BubblegumBlue, BYONDFuckery, c4llv07e, CakeQ, CaptainSqrBeard, Carbonhell, Carolyn3114, casperr04, CatTheSystem, Centronias, chairbender, Charlese2, Cheackraze, cheesePizza2, Chief-Engineer, chromiumboy, Chronophylos, clement-or, Clyybber, ColdAutumnRain, Colin-Tel, collinlunn, ComicIronic, coolmankid12345, corentt, crazybrain23, creadth, CrigCrag, Crotalus, CrudeWax, CrzyPotato, Cyberboss, d34d10cc, Daemon, daerSeebaer, dahnte, dakamakat, dakimasu, DamianX, DangerRevolution, daniel-cr, Darkenson, DawBla, dch-GH, Deahaka, DEATHB4DEFEAT, DeathCamel58, deathride58, DebugOk, Decappi, deepdarkdepths, Delete69, deltanedas, DeltaV-Bot, DerbyX, DoctorBeard, DogZeroX, dontbetank, Doru991, DoubleRiceEddiedd, DrMelon, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, Duddino, Dutch-VanDerLinde, Easypoller, eclips_e, EdenTheLiznerd, EEASAS, Efruit, ElectroSR, elthundercloud, Emisse, EmoGarbage404, Endecc, enumerate0, eoineoineoin, ERORR404V1, Errant-4, estacaoespacialpirata, exincore, exp111, Fahasor, FairlySadPanda, ficcialfaint, Fildrance, FillerVK, Fishfish458, Flareguy, FluffiestFloof, FluidRock, FoLoKe, fooberticus, Fortune117, FoxxoTrystan, freeman2651, Fromoriss, FungiFellow, GalacticChimp, gbasood, Geekyhobo, Genkail, Git-Nivrak, github-actions[bot], gituhabu, GNF54, Golinth, GoodWheatley, Gotimanga, graevy, GreyMario, Guess-My-Name, gusxyz, h3half, Hanzdegloker, Hardly3D, harikattar, Hebiman, Henry12116, HerCoyote23, Hmeister-real, HoofedEar, hord-brayden, hubismal, Hugal31, Hyenh, iacore, IamVelcroboy, icekot8, igorsaux, ike709, Illiux, Ilya246, IlyaElDunaev, Injazz, Insineer, IntegerTempest, Interrobang01, IProduceWidgets, ItsMeThom, j-giebel, Jackal298, Jackrost, jamessimo, janekvap, JerryImMouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JoeHammad1844, joelhed, JohnGinnane, johnku1, joshepvodka, jproads, Jrpl, juliangiebel, JustArt1m, JustCone14, JustinTether, JustinTrotter, KaiShibaa, kalane15, kalanosh, KEEYNy, Keikiru, Kelrak, kerisargit, keronshb, KIBORG04, Killerqu00, KingFroozy, kira-er, Kit0vras, KittenColony, Kmc2000, Ko4ergaPunk, komunre, koteq, Krunklehorn, Kukutis96513, kxvvv, Lamrr, LankLTE, lapatison, Leander-0, leonardo-dabepis, LetterN, Level10Cybermancer, lever1209, LightVillet, liltenhead, LittleBuilderJane, Lomcastar, LordCarve, LordEclipse, LovelyLophi, LudwigVonChesterfield, Lukasz825700516, lunarcomets, luringens, lvvova1, lzimann, lzk228, M3739, MACMAN2003, Macoron, MagnusCrowe, ManelNavola, matthst, Matz05, MehimoNemo, MeltedPixel, MemeProof, Menshin, Mervill, metalgearsloth, mhamsterr, MilenVolf, Minty642, Mirino97, mirrorcult, misandrie, MishaUnity, MisterMecky, Mith-randalf, Moneyl, Moomoobeef, moony, Morb0, Mr0maks, musicmanvr, Myakot, Myctai, N3X15, Nairodian, Naive817, namespace-Memory, NickPowers43, nikthechampiongr, Nimfar11, Nirnael, nmajask, nok-ko, Nopey, notafet, notquitehadouken, noudoit, noverd, nuke-haus, NULL882, OCOtheOmega, OctoRocket, OldDanceJacket, onoira, Owai-Seek, pali6, Pangogie, patrikturi, PaulRitter, Peptide90, peptron1, Phantom-Lily, PHCodes, PixelTheKermit, PJB3005, Plykiya, pofitlo, pointer-to-null, PolterTzi, PoorMansDreams, potato1234x, ProfanedBane, PrPleGoo, ps3moira, Psychpsyo, psykzz, PuroSlavKing, quatre, QuietlyWhisper, qwerltaz, Radosvik, Radrark, Rainbeon, Rainfey, Rane, ravage123321, rbertoche, Redict, RedlineTriad, RednoWCirabrab, RemberBM, RemieRichards, RemTim, rene-descartes2021, RiceMar1244, RieBi, Rinkashikachi, Rockdtben, rolfero, rosieposieeee, Saakra, Samsterious, SaphireLattice, ScalyChimp, scrato, Scribbles0, Serkket, SethLafuente, ShadowCommander, Shadowtheprotogen546, SignalWalker, SimpleStation14, Simyon264, SirDragooon, Sirionaut, siyengar04, Skarletto, Skrauz, Skyedra, SlamBamActionman, Slava0135, Snowni, snowsignal, SonicHDC, SoulSloth, SpaceManiac, SpeltIncorrectyl, spoogemonster, ssdaniel24, Stealthbomber16, stellar-novas, StrawberryMoses, SweptWasTaken, Szunti, TadJohnson00, takemysoult, TaralGit, Tayrtahn, tday93, TekuNut, TemporalOroboros, tentekal, tgrkzus, thatrandomcanadianguy, TheArturZh, theashtronaut, thedraccx, themias, theomund, theOperand, TheShuEd, TimrodDX, Titian3, tkdrg, tmtmtl30, tom-leys, tomasalves8, Tomeno, Tornado-Technology, tosatur, Tryded, TsjipTsjip, Tunguso4ka, TurboTrackerss14, Tyler-IN, Tyzemol, UbaserB, UKNOWH, UnicornOnLSD, Uriende, UristMcDorf, Vaaankas, Varen, VasilisThePikachu, veliebm, Veritius, Verslebas, VigersRay, Visne, VMSolidus, volundr-, Voomra, Vordenburg, vulppine, waylon531, weaversam8, Willhelm53, wixoaGit, WlarusFromDaSpace, wrexbe, xRiriq, yathxyz, Ygg01, YotaXP, YuriyKiss, zach-hill, Zandario, Zap527, ZelteHonor, zerorulez, zionnBE, zlodo, ZNixian, ZoldorfTheWizard, Zumorica, Zymem From b032f9f347e53605d55bef3ad893efc4ecefb15a Mon Sep 17 00:00:00 2001 From: Pspritechologist <81725545+Pspritechologist@users.noreply.github.com> Date: Sun, 16 Jun 2024 18:14:33 -0400 Subject: [PATCH 06/27] Corpo Jacket Fixes (#462) # Description Adds hand-holes for corpo jackets pending the game being any good. Renames corpo jacket sprites for clarity and organization. ---

Media

See the bot :)

--- .../Clothing/OuterClothing/wintercoats.yml | 40 +++++++++--------- .../equipped-OUTERCLOTHING.png | Bin 9460 -> 0 bytes .../equipped-OUTERCLOTHING.png | Bin 0 -> 10509 bytes .../icon.png | Bin .../meta.json | 0 .../equipped-OUTERCLOTHING.png | Bin 0 -> 9875 bytes .../icon.png | Bin .../meta.json | 0 .../equipped-OUTERCLOTHING.png | Bin 0 -> 10492 bytes .../icon.png | Bin .../meta.json | 0 .../equipped-OUTERCLOTHING.png | Bin 0 -> 9782 bytes .../icon.png | Bin .../meta.json | 0 .../equipped-OUTERCLOTHING.png | Bin 0 -> 10959 bytes .../icon.png | Bin .../meta.json | 0 .../equipped-OUTERCLOTHING.png | Bin 0 -> 9936 bytes .../icon.png | Bin .../meta.json | 0 .../equipped-OUTERCLOTHING.png | Bin 0 -> 10546 bytes .../icon.png | Bin .../meta.json | 0 .../equipped-OUTERCLOTHING.png | Bin 0 -> 9675 bytes .../icon.png | Bin .../meta.json | 0 .../equipped-OUTERCLOTHING.png | Bin 0 -> 10494 bytes .../icon.png | Bin .../meta.json | 0 .../equipped-OUTERCLOTHING.png | Bin 0 -> 10740 bytes .../icon.png | Bin .../meta.json | 0 .../equipped-OUTERCLOTHING.png | Bin 8727 -> 0 bytes .../equipped-OUTERCLOTHING.png | Bin 9455 -> 0 bytes .../equipped-OUTERCLOTHING.png | Bin 8689 -> 0 bytes .../equipped-OUTERCLOTHING.png | Bin 9750 -> 0 bytes .../equipped-OUTERCLOTHING.png | Bin 8865 -> 0 bytes .../equipped-OUTERCLOTHING.png | Bin 8433 -> 0 bytes .../equipped-OUTERCLOTHING.png | Bin 9422 -> 0 bytes .../equipped-OUTERCLOTHING.png | Bin 9418 -> 0 bytes .../equipped-OUTERCLOTHING.png | Bin 9578 -> 0 bytes 41 files changed, 20 insertions(+), 20 deletions(-) delete mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/bc_corpo_jacket.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_bishop_cybernetics.rsi/equipped-OUTERCLOTHING.png rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{bc_corpo_jacket.rsi => corpo_jacket_bishop_cybernetics.rsi}/icon.png (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{bc_corpo_jacket.rsi => corpo_jacket_bishop_cybernetics.rsi}/meta.json (100%) create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_cybersun.rsi/equipped-OUTERCLOTHING.png rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{cs_corpo_jacket.rsi => corpo_jacket_cybersun.rsi}/icon.png (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{cs_corpo_jacket.rsi => corpo_jacket_cybersun.rsi}/meta.json (100%) create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_discount_dans.rsi/equipped-OUTERCLOTHING.png rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{dd_corpo_jacket.rsi => corpo_jacket_discount_dans.rsi}/icon.png (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{dd_corpo_jacket.rsi => corpo_jacket_discount_dans.rsi}/meta.json (100%) create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_einstein_engines.rsi/equipped-OUTERCLOTHING.png rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{ee_corpo_jacket.rsi => corpo_jacket_einstein_engines.rsi}/icon.png (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{ee_corpo_jacket.rsi => corpo_jacket_einstein_engines.rsi}/meta.json (100%) create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_five_points_armory.rsi/equipped-OUTERCLOTHING.png rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{fa_corpo_jacket.rsi => corpo_jacket_five_points_armory.rsi}/icon.png (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{fa_corpo_jacket.rsi => corpo_jacket_five_points_armory.rsi}/meta.json (100%) create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_gilthari_exports.rsi/equipped-OUTERCLOTHING.png rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{ge_corpo_jacket.rsi => corpo_jacket_gilthari_exports.rsi}/icon.png (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{ge_corpo_jacket.rsi => corpo_jacket_gilthari_exports.rsi}/meta.json (100%) create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_hawkmoon_aquisitions.rsi/equipped-OUTERCLOTHING.png rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{hm_corpo_jacket.rsi => corpo_jacket_hawkmoon_aquisitions.rsi}/icon.png (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{hi_corpo_jacket.rsi => corpo_jacket_hawkmoon_aquisitions.rsi}/meta.json (100%) create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_hephestus_industries.rsi/equipped-OUTERCLOTHING.png rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{hi_corpo_jacket.rsi => corpo_jacket_hephestus_industries.rsi}/icon.png (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{hm_corpo_jacket.rsi => corpo_jacket_hephestus_industries.rsi}/meta.json (100%) create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_interdyne.rsi/equipped-OUTERCLOTHING.png rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{id_corpo_jacket.rsi => corpo_jacket_interdyne.rsi}/icon.png (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{id_corpo_jacket.rsi => corpo_jacket_interdyne.rsi}/meta.json (100%) create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_zeng_hu_pharma.rsi/equipped-OUTERCLOTHING.png rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{zh_corpo_jacket.rsi => corpo_jacket_zeng_hu_pharma.rsi}/icon.png (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{zh_corpo_jacket.rsi => corpo_jacket_zeng_hu_pharma.rsi}/meta.json (100%) delete mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/cs_corpo_jacket.rsi/equipped-OUTERCLOTHING.png delete mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/dd_corpo_jacket.rsi/equipped-OUTERCLOTHING.png delete mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/ee_corpo_jacket.rsi/equipped-OUTERCLOTHING.png delete mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/fa_corpo_jacket.rsi/equipped-OUTERCLOTHING.png delete mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/ge_corpo_jacket.rsi/equipped-OUTERCLOTHING.png delete mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/hi_corpo_jacket.rsi/equipped-OUTERCLOTHING.png delete mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/hm_corpo_jacket.rsi/equipped-OUTERCLOTHING.png delete mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/id_corpo_jacket.rsi/equipped-OUTERCLOTHING.png delete mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/zh_corpo_jacket.rsi/equipped-OUTERCLOTHING.png diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml index f3610178b9e..aa4a7b50e65 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml @@ -549,9 +549,9 @@ description: A cozy jacket with the Cybersun logo printed on the back. Merchandise rewarded to stations with a safety factor of uhh... seven. components: - type: Sprite - sprite: Clothing/OuterClothing/WinterCoats/cs_corpo_jacket.rsi + sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_cybersun.rsi - type: Clothing - sprite: Clothing/OuterClothing/WinterCoats/cs_corpo_jacket.rsi + sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_cybersun.rsi - type: entity parent: ClothingOuterWinterCoat @@ -560,9 +560,9 @@ description: A cozy jacket with the Einstein Engines logo printed on the back. Merchandise rewarded to stations with a safety factor of uhh... seven. components: - type: Sprite - sprite: Clothing/OuterClothing/WinterCoats/ee_corpo_jacket.rsi + sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_einstein_engines.rsi - type: Clothing - sprite: Clothing/OuterClothing/WinterCoats/ee_corpo_jacket.rsi + sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_einstein_engines.rsi - type: entity parent: ClothingOuterWinterCoat @@ -571,9 +571,9 @@ description: A cozy jacket with the Hephaestus Industries logo printed on the back. Merchandise rewarded to stations with a safety factor of uhh... seven. components: - type: Sprite - sprite: Clothing/OuterClothing/WinterCoats/hi_corpo_jacket.rsi + sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_hephestus_industries.rsi - type: Clothing - sprite: Clothing/OuterClothing/WinterCoats/hi_corpo_jacket.rsi + sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_hephestus_industries.rsi - type: entity parent: ClothingOuterWinterCoat @@ -582,9 +582,9 @@ description: A cozy jacket with the Hawkmoon Acquisitions logo printed on the back. Merchandise rewarded to stations with a safety factor of uhh... seven. components: - type: Sprite - sprite: Clothing/OuterClothing/WinterCoats/hm_corpo_jacket.rsi + sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_hawkmoon_aquisitions.rsi - type: Clothing - sprite: Clothing/OuterClothing/WinterCoats/hm_corpo_jacket.rsi + sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_hawkmoon_aquisitions.rsi - type: entity parent: ClothingOuterWinterCoat @@ -593,9 +593,9 @@ description: A cozy jacket with the Interdyne logo printed on the back. Merchandise rewarded to stations with a safety factor of uhh... seven. components: - type: Sprite - sprite: Clothing/OuterClothing/WinterCoats/id_corpo_jacket.rsi + sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_interdyne.rsi - type: Clothing - sprite: Clothing/OuterClothing/WinterCoats/id_corpo_jacket.rsi + sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_interdyne.rsi - type: entity parent: ClothingOuterWinterCoat @@ -604,9 +604,9 @@ description: A cozy jacket with the Bishop Cybernetics logo printed on the back. Merchandise rewarded to stations with a safety factor of uhh... seven. components: - type: Sprite - sprite: Clothing/OuterClothing/WinterCoats/bc_corpo_jacket.rsi + sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_bishop_cybernetics.rsi - type: Clothing - sprite: Clothing/OuterClothing/WinterCoats/bc_corpo_jacket.rsi + sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_bishop_cybernetics.rsi - type: entity parent: ClothingOuterWinterCoat @@ -615,9 +615,9 @@ description: A cozy jacket with the Discount Dan's logo printed on the back. Merchandise rewarded to stations with a safety factor of uhh... seven. components: - type: Sprite - sprite: Clothing/OuterClothing/WinterCoats/dd_corpo_jacket.rsi + sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_discount_dans.rsi - type: Clothing - sprite: Clothing/OuterClothing/WinterCoats/dd_corpo_jacket.rsi + sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_discount_dans.rsi - type: entity parent: ClothingOuterWinterCoat @@ -626,9 +626,9 @@ description: A cozy jacket with the Five Points Armory logo printed on the back. Merchandise rewarded to stations with a safety factor of uhh... seven. components: - type: Sprite - sprite: Clothing/OuterClothing/WinterCoats/fa_corpo_jacket.rsi + sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_five_points_armory.rsi - type: Clothing - sprite: Clothing/OuterClothing/WinterCoats/fa_corpo_jacket.rsi + sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_five_points_armory.rsi - type: entity parent: ClothingOuterWinterCoat @@ -637,9 +637,9 @@ description: A cozy jacket with the Gilthari Exports logo printed on the back. Merchandise rewarded to stations with a safety factor of uhh... seven. components: - type: Sprite - sprite: Clothing/OuterClothing/WinterCoats/ge_corpo_jacket.rsi + sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_gilthari_exports.rsi - type: Clothing - sprite: Clothing/OuterClothing/WinterCoats/ge_corpo_jacket.rsi + sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_gilthari_exports.rsi - type: entity parent: ClothingOuterWinterCoat @@ -648,6 +648,6 @@ description: A cozy jacket with the Zeng-Hu Pharmaceuticals logo printed on the back. Merchandise rewarded to stations with a safety factor of uhh... seven. components: - type: Sprite - sprite: Clothing/OuterClothing/WinterCoats/zh_corpo_jacket.rsi + sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_zeng_hu_pharma.rsi - type: Clothing - sprite: Clothing/OuterClothing/WinterCoats/zh_corpo_jacket.rsi + sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_zeng_hu_pharma.rsi diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/bc_corpo_jacket.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/bc_corpo_jacket.rsi/equipped-OUTERCLOTHING.png deleted file mode 100644 index 5eadcdc1c1ab3fbd2bf67c5055286b407e2e4a60..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9460 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 diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_bishop_cybernetics.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_bishop_cybernetics.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..35003686d555624fcac17b387f726605cd147bd7 GIT binary patch literal 10509 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/bc_corpo_jacket.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_bishop_cybernetics.rsi/icon.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/bc_corpo_jacket.rsi/icon.png rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_bishop_cybernetics.rsi/icon.png diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/bc_corpo_jacket.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_bishop_cybernetics.rsi/meta.json similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/bc_corpo_jacket.rsi/meta.json rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_bishop_cybernetics.rsi/meta.json diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_cybersun.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_cybersun.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..fe470b0074272a504eac30798883e5e2c6c5e027 GIT binary patch literal 9875 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/cs_corpo_jacket.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_cybersun.rsi/icon.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/cs_corpo_jacket.rsi/icon.png rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_cybersun.rsi/icon.png diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/cs_corpo_jacket.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_cybersun.rsi/meta.json similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/cs_corpo_jacket.rsi/meta.json rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_cybersun.rsi/meta.json diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_discount_dans.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_discount_dans.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..06932fff6fa7370f5410813dea7991e4cf15cae8 GIT binary patch literal 10492 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/dd_corpo_jacket.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_discount_dans.rsi/icon.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/dd_corpo_jacket.rsi/icon.png rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_discount_dans.rsi/icon.png diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/dd_corpo_jacket.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_discount_dans.rsi/meta.json similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/dd_corpo_jacket.rsi/meta.json rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_discount_dans.rsi/meta.json diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_einstein_engines.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_einstein_engines.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..553d9e2f64723d236c10d8feeb56c23836529b00 GIT binary patch literal 9782 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 LZBvHT-ot+bfr+RI literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/ee_corpo_jacket.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_einstein_engines.rsi/icon.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/ee_corpo_jacket.rsi/icon.png rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_einstein_engines.rsi/icon.png diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/ee_corpo_jacket.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_einstein_engines.rsi/meta.json similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/ee_corpo_jacket.rsi/meta.json rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_einstein_engines.rsi/meta.json diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_five_points_armory.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_five_points_armory.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..19b5dc75afffdae7d345415572ef0d33fb92b869 GIT binary patch literal 10959 zcmeHNcU)7+_P_LE0TmS$0Z|tO11Xdw0#OkaT|ns~$c7XQEkHtz5WB0QtOc7E8!XUZX*M$>;i6P}liPBOZg2kc4J|Ydk1uP*(xhbWmtVrsgUF z_1B=tPktv>LC{Wc_vO0D%6gk7S|5ef$6&#DB-#*syve9ZIm`JQ3@B=qM7LdHGtemWjyquhzf`Yu_OqE$PXUv$nXzn~Em8FX{)R!(+ zQ`20budS)IdbygKj>)RkNR*+Wp@ufj42w3^#~7l;Oe7Q(6lTttsXA+xDtejPGW4JR zzz?B0@?x2!B(xyOITBKHB;coz29Q%mV)8Qu1>8$YNz2H}$tx(%00cS8Voga&N=wPe zNK1p>NYD>S&yktC47E;n-gcs#R-g)c->D?|-kX4N9>R}z06KSbM_GUg%_F+?RW zv@7K|!bi@8+;~mnp(A|G1p!a*Wl3L8Iitr+x7{vyW$FA7>n+D-T->?*WQB&HXqF5jrS)~G@1EB0(gJPaLj$V#?+ZT?#u45f58-`Gm$I_K)$VAidt3$dl^mRb8V4f&}(9abWx{B!X&o zJlj*(>4Y95-|gM?43m&VO5I>jW5S#C>Q_t|mF;W46{q4uNo>E!WTEzpfqO6{+tp^? zQjv8T=WsgODa9r*Rh{M=!8us45{Be+8wizAmHf+z1Eti){KE36k#@Jkrvg8O^YpvA zdt+QXh7IQW4sd?M09BOQrsf2U2N(C6d>rZ>&YD=Mcs6hj|5z>O1EVFQB6D53K7Y6; z|5C)Sal&gKqXeY`gA=&&z}{}R;Ab5ENnRpoXuyFbPcKxw&r@NSrcNlq5GAW1YO%h4 zI&ZK}4Xd`{eynz`Euzlm@e_f^D`9W!N787h7j8s7w#v;dd`Xmh9e0mIbxj8h&BJ_v zp{L0L9x!{L#CwOd51&XYxlq{H{fUCV^>iyQPIsrCN7aW3DHuX23A|wFj+#T@3fhxY*?9(ROQ{CK!M^a~7al#`KoGn$HQN*uCH2+r8ZjT0!-N3d7_GEG% z<>R<{Lm8ta%+A)-|&HH#^AuFqGhim8q z9^afh#9mXz?e8uoNOkUrWec{7F0fm8LhqiEZLwDCt`DwcWxQ!A?N`3GDAnAl+skKU z)>hGuC_=^UEPc}x9R04gBHivXZoTourI5BFA8otH1m{KN>}!4pQgt1cFZxtF7C+i? zD&yy~?fI$n7mL*;VCei2;T;&N%Q)CiKgelbAkY}6*GE-yL_2(ef8Xae3H9ht9&q0j zRSHfB_%Ni7iWabHQjhy`npX)ldd!g9hp z521HcpLv?_5|HujSb|sFgiEmri&eWRH`_HO-2FqgUv!Iw(iVfuu4bWQ>T$q8&L>D z3UWd`41KT_vvo|+SVBUKsq$~8nWtP+N%Ry_lTK&YxTm|y`T zbq|YXWvV;e;AAh4o3-EJ+N;L8Pv^h}>f=om zvL6yMf2!h-Xm~Xa_&1&$&Ajf&cT^E9a!T#~shQK2r)xhQeUYEUq_}4ZV+)>fVzBE=K`O5cXs#HWBoA> zU$pu6b;_!A8&AYEm~xwZ>tdSA8Hs)Av1WxObt8K&<&uh4Wg{uTx&9#8$>4zw`cOuM z|0!Wos|e%@busV2aJF~-Wo*p8c7v~7N@zN5FX)g ziWBfm%D8>q#i*W0p9@8|1R8OIGQr>kwiqQcG6JdLeM(+?RrLF73zO`Q>D)N+hxu&g zn>WHcuY|2-=Rs5lJAvZr-=%WQngts5BCp;(*?JmJCb#8Gnq90_PzeJcyIlUh)hEwy z>D#w#%(ugJ6Q3O`fFVp2`+#b(nXn_Zj@=;CO}7J?9O9YcvB1{juZw>tv|Vamo?s*I zjQ`t_vUM(;}oWW*!KAz!|TFtJ}tbNHgMJ-W%BNb|REBD@W-jn