From bf46fbaddb7640b622387ed29498119fe8beaf62 Mon Sep 17 00:00:00 2001 From: PJBot Date: Tue, 12 Dec 2023 02:57:48 -0500 Subject: [PATCH 01/47] Automatic changelog update --- Resources/Changelog/Changelog.yml | 33 ++++++++++++++----------------- 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index e0d32e82d73..13f99e1c004 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,22 +1,4 @@ Entries: -- author: deltanedas - changes: - - {message: Fixed objectives not being given in some cases., type: Fix} - id: 4840 - time: '2023-09-16T12:10:06.0000000+00:00' -- author: Flareguy - changes: - - {message: 'Added several new types of barricades for mappers to use, all using - sprites from /vg/station. The regular, full-tile barricade has also received - a new sprite from /vg/station.', type: Add} - - {message: Barricades are now slightly stronger & cheaper to make., type: Tweak} - id: 4841 - time: '2023-09-16T12:50:48.0000000+00:00' -- author: DrSmugleaf - changes: - - {message: Resized the non-admin Ahelp window to be taller and less wide., type: Tweak} - id: 4842 - time: '2023-09-17T09:04:20.0000000+00:00' - author: ElectroJr changes: - {message: Fixed light animations not working., type: Fix} @@ -2903,3 +2885,18 @@ Entries: - {message: Jar now fills., type: Tweak} id: 5340 time: '2023-12-12T07:54:15.0000000+00:00' +- author: IProduceWidgets + changes: + - {message: Cig Cartons are slightly smaller., type: Tweak} + id: 5341 + time: '2023-12-12T07:55:56.0000000+00:00' +- author: IProduceWidgets + changes: + - {message: Cigar cases can now hold Small items., type: Tweak} + id: 5342 + time: '2023-12-12T07:56:19.0000000+00:00' +- author: IProduceWidgets + changes: + - {message: Pipes now have slightly bigger bowls! (30u), type: Tweak} + id: 5343 + time: '2023-12-12T07:56:44.0000000+00:00' From cbfd3624c4f5b299a6f88741104390b97a570b88 Mon Sep 17 00:00:00 2001 From: IProduceWidgets <107586145+IProduceWidgets@users.noreply.github.com> Date: Tue, 12 Dec 2023 02:58:30 -0500 Subject: [PATCH 02/47] Cash and Ash presents (#22391) --- .../Entities/Objects/Decoration/flora.yml | 7 ++- .../Entities/Objects/Decoration/present.yml | 50 +++++++++++++++++++ 2 files changed, 55 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Decoration/flora.yml b/Resources/Prototypes/Entities/Objects/Decoration/flora.yml index 0ede50f53e5..2a448274db9 100644 --- a/Resources/Prototypes/Entities/Objects/Decoration/flora.yml +++ b/Resources/Prototypes/Entities/Objects/Decoration/flora.yml @@ -423,10 +423,13 @@ - id: PresentRandom orGroup: present - id: PresentRandomUnsafe - prob: 0.25 + prob: 0.35 orGroup: present - id: PresentRandomInsane - prob: 0.10 + prob: 0.20 + orGroup: present + - id: PresentRandomCash + prob: 0.20 orGroup: present receivedPopup: christmas-tree-got-gift deniedPopup: christmas-tree-no-gift diff --git a/Resources/Prototypes/Entities/Objects/Decoration/present.yml b/Resources/Prototypes/Entities/Objects/Decoration/present.yml index a7fd1cd1dee..e7dfdc234f4 100644 --- a/Resources/Prototypes/Entities/Objects/Decoration/present.yml +++ b/Resources/Prototypes/Entities/Objects/Decoration/present.yml @@ -360,6 +360,56 @@ sound: path: /Audio/Effects/unwrap.ogg +- type: entity + id: PresentRandomAsh + parent: [PresentBase, BaseItem] + suffix: Filled Ash + components: + - type: SpawnItemsOnUse + items: + - id: PresentTrash + - id: Ash # No coal yet! + orGroup: GiftPool + sound: + path: /Audio/Effects/unwrap.ogg + +- type: entity + id: PresentRandomCash + parent: [PresentBase, BaseItem] + suffix: Filled Cash + components: + - type: SpawnItemsOnUse + items: + - id: PresentTrash + - id: SpaceCash + prob: .01 + orGroup: GiftPool + - id: SpaceCash10 + prob: .1 + orGroup: GiftPool + - id: SpaceCash100 + prob: .5 + orGroup: GiftPool + - id: SpaceCash500 + orGroup: GiftPool + - id: SpaceCash1000 + prob: .01 + orGroup: GiftPool + - id: SpaceCash2500 + prob: .004 + orGroup: GiftPool + - id: SpaceCash5000 + prob: .002 + orGroup: GiftPool + - id: SpaceCash10000 + prob: .001 + orGroup: GiftPool + - id: SpaceCash1000000 + prob: .000001 + orGroup: GiftPool + sound: + path: /Audio/Effects/unwrap.ogg + - type: entity id: PresentTrash noSpawn: true From 7b1f12cf08b4148324273e597763004e23b0da4b Mon Sep 17 00:00:00 2001 From: IProduceWidgets <107586145+IProduceWidgets@users.noreply.github.com> Date: Tue, 12 Dec 2023 02:59:08 -0500 Subject: [PATCH 03/47] makes a non lethal (rubbers) lecter. (#22393) --- .../Objects/Weapons/Guns/Rifles/rifles.yml | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml index bc3b65ff3a0..5bc8125ebaa 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml @@ -186,3 +186,28 @@ steps: 1 zeroVisible: true - type: Appearance + +- type: entity + name: Lecter + parent: WeaponRifleLecter + id: WeaponRifleLecterRubber + suffix: Non-lethal + components: + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: MagazineRifleRubber + insertSound: /Audio/Weapons/Guns/MagIn/ltrifle_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg + priority: 2 + whitelist: + tags: + - MagazineRifle + gun_chamber: + name: Chamber + startingItem: CartridgeRifleRubber + priority: 1 + whitelist: + tags: + - CartridgeRifle From 87c110e6f365abfa15dea73979aac35e31a61b84 Mon Sep 17 00:00:00 2001 From: IProduceWidgets <107586145+IProduceWidgets@users.noreply.github.com> Date: Tue, 12 Dec 2023 02:59:43 -0500 Subject: [PATCH 04/47] Gun size balance changes (#22394) --- .../Objects/Weapons/Guns/SMGs/smgs.yml | 2 +- .../Weapons/Guns/Shotguns/shotguns.yml | 21 +++++++++++++++++-- .../Objects/Weapons/Guns/Snipers/snipers.yml | 5 +++++ 3 files changed, 25 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml index fbf56ec9e7a..b693bdba370 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml @@ -7,7 +7,7 @@ components: - type: Sprite - type: Item - size: Huge + size: Large - type: Clothing sprite: Objects/Weapons/Guns/SMGs/atreides.rsi quickEquip: false diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml index cdcc7d77296..3c4fa053274 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml @@ -105,6 +105,10 @@ id: WeaponShotgunDoubleBarreled description: An immortal classic. Uses .50 shotgun shells. components: + - type: Item + size: Normal + shape: + - 0,0,4,0 - type: Sprite sprite: Objects/Weapons/Guns/Shotguns/db_shotgun.rsi - type: Gun @@ -158,12 +162,14 @@ id: WeaponShotgunKammerer description: When an old Remington design meets modern materials, this is the result. A favourite weapon of militia forces throughout many worlds. Uses .50 shotgun shells. components: + - type: Item + size: Normal + shape: + - 0,0,4,0 - type: Sprite sprite: Objects/Weapons/Guns/Shotguns/pump.rsi - type: Clothing sprite: Objects/Weapons/Guns/Shotguns/pump.rsi - - type: Item - size: Normal - type: BallisticAmmoProvider capacity: 4 - type: Tag @@ -211,6 +217,9 @@ id: WeaponShotgunHandmade description: Looks unreliable. Uses .50 shotgun shells. components: + - type: Item + size: Small + storedRotation: 90 - type: Sprite sprite: Objects/Weapons/Guns/Shotguns/hm_pistol.rsi - type: Clothing @@ -233,6 +242,10 @@ suffix: Pirate description: Deadly at close range. components: + - type: Item + size: Normal + shape: + - 0,0,4,0 - type: Sprite sprite: Objects/Weapons/Guns/Shotguns/blunderbuss.rsi - type: Gun @@ -248,6 +261,10 @@ id: WeaponShotgunImprovised description: A shitty, hand-made shotgun that uses .50 shotgun shells. It can only hold one round in the chamber. components: + - type: Item + size: Normal + shape: + - 0,0,4,0 - type: Sprite sprite: Objects/Weapons/Guns/Shotguns/improvised_shotgun.rsi - type: Clothing diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml index 9c6dfa8a8ab..be1ca7b2728 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml @@ -69,6 +69,8 @@ id: Musket description: This should've been in a museum long before you were born. Uses .60 anti-materiel ammo. components: + - type: Item + size: Large - type: Sprite sprite: Objects/Weapons/Guns/Snipers/musket.rsi - type: Clothing @@ -90,6 +92,9 @@ id: WeaponPistolFlintlock description: A pirate's companion. Yarrr! Uses .60 anti-materiel ammo. components: + - type: Item + size: Small + storedRotation: 90 - type: Sprite sprite: Objects/Weapons/Guns/Snipers/flintlock.rsi - type: Clothing From 5f954917fe6d42e932b50feed46c4264e4eabc84 Mon Sep 17 00:00:00 2001 From: PJBot Date: Tue, 12 Dec 2023 03:00:47 -0500 Subject: [PATCH 05/47] Automatic changelog update --- Resources/Changelog/Changelog.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 13f99e1c004..4c7decace49 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,9 +1,4 @@ Entries: -- author: ElectroJr - changes: - - {message: Fixed light animations not working., type: Fix} - id: 4843 - time: '2023-09-17T17:57:50.0000000+00:00' - author: Henry12116 changes: - {message: You can now eat most organs. Bon appetit!, type: Add} @@ -2900,3 +2895,8 @@ Entries: - {message: Pipes now have slightly bigger bowls! (30u), type: Tweak} id: 5343 time: '2023-12-12T07:56:44.0000000+00:00' +- author: IProduceWidgets + changes: + - {message: Long guns are now actually long., type: Tweak} + id: 5344 + time: '2023-12-12T07:59:43.0000000+00:00' From 5e5ad464ce21e2fce4fcd2e9081e30bd53cfde26 Mon Sep 17 00:00:00 2001 From: IProduceWidgets <107586145+IProduceWidgets@users.noreply.github.com> Date: Tue, 12 Dec 2023 03:01:33 -0500 Subject: [PATCH 06/47] Make syndicate discarding boxes tiny like their contents. (#22396) * fix hypopenbox size bug * fix pen bomb box size bug * fix edagger box size bug. --- .../Prototypes/Entities/Objects/Specific/Medical/hypospray.yml | 2 ++ Resources/Prototypes/Entities/Objects/Weapons/Bombs/pen.yml | 2 ++ Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml | 2 ++ 3 files changed, 6 insertions(+) diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml index 41a5472b575..4d111c01a08 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml @@ -390,6 +390,8 @@ name: hypopen box description: A small box containing a hypopen. Packaging disintegrates when opened, leaving no evidence behind. components: + - type: Item + size: Tiny - type: Sprite sprite: Objects/Storage/penbox.rsi state: hypopen diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/pen.yml b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/pen.yml index 312955f297c..029649ab370 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/pen.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/pen.yml @@ -27,6 +27,8 @@ name: exploding pen box description: A small box containing an exploding pen. Packaging disintegrates when opened, leaving no evidence behind. components: + - type: Item + size: Tiny - type: Sprite sprite: Objects/Storage/penbox.rsi state: exploding_pen diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml index c00fd1ab860..50e7b86d0d9 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml @@ -128,6 +128,8 @@ suffix: E-Dagger description: A small box containing an e-dagger. Packaging disintegrates when opened, leaving no evidence behind. components: + - type: Item + size: Tiny - type: Sprite sprite: Objects/Storage/penbox.rsi state: e_dagger From 73fafe0e84d5734be6b97016485ef2708983c802 Mon Sep 17 00:00:00 2001 From: PJBot Date: Tue, 12 Dec 2023 03:02:38 -0500 Subject: [PATCH 07/47] Automatic changelog update --- Resources/Changelog/Changelog.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 4c7decace49..e800bc98728 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,9 +1,4 @@ Entries: -- author: Henry12116 - changes: - - {message: You can now eat most organs. Bon appetit!, type: Add} - id: 4844 - time: '2023-09-18T00:20:11.0000000+00:00' - author: DrSmugleaf changes: - {message: Fixed fultons losing their beacon when the stack is split., type: Fix} @@ -2900,3 +2895,8 @@ Entries: - {message: Long guns are now actually long., type: Tweak} id: 5344 time: '2023-12-12T07:59:43.0000000+00:00' +- author: IProduceWidgets + changes: + - {message: syndicate pens now come in suitably sized discarding boxes., type: Tweak} + id: 5345 + time: '2023-12-12T08:01:33.0000000+00:00' From 39fb2639c98edfaace14e64fc79cbe86130ce132 Mon Sep 17 00:00:00 2001 From: IProduceWidgets <107586145+IProduceWidgets@users.noreply.github.com> Date: Tue, 12 Dec 2023 03:02:44 -0500 Subject: [PATCH 08/47] Mops and Defibs larger, Pinpointers desc, Monkeycube fix, appraisal sidearm, chemistry documents. (#22397) * Pinpointer desc * The game breaking ability to put documents in chem bags * mops bigger * Defib Large * fix monkey cube size bug. * appraisal gun pew pew --- .../Entities/Objects/Devices/pinpointer.yml | 4 +- .../Objects/Specific/Chemistry/chem_bag.yml | 1 + .../Objects/Specific/Janitorial/janitor.yml | 4 +- .../Objects/Specific/Medical/defib.yml | 2 +- .../Objects/Specific/rehydrateable.yml | 4 ++ .../Entities/Objects/Tools/appraisal.yml | 39 ++++++++++--------- 6 files changed, 30 insertions(+), 24 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Devices/pinpointer.yml b/Resources/Prototypes/Entities/Objects/Devices/pinpointer.yml index 92e882571b8..2bd0c31faf2 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pinpointer.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/pinpointer.yml @@ -1,6 +1,6 @@ - type: entity name: pinpointer - description: A handheld tracking device. While typically far more capable, this one has been configured to lock onto certain signals. + description: A handheld tracking device. While typically far more capable, this one has been configured to lock onto certain signals. Keep upright to retain accuracy. parent: BaseItem id: PinpointerBase abstract: true @@ -47,7 +47,7 @@ - type: entity name: universal pinpointer - description: A handheld tracking device that locks onto any physical entity while off. + description: A handheld tracking device that locks onto any physical entity while off. Keep upright to retain accuracy. id: PinpointerUniversal parent: PinpointerBase components: diff --git a/Resources/Prototypes/Entities/Objects/Specific/Chemistry/chem_bag.yml b/Resources/Prototypes/Entities/Objects/Specific/Chemistry/chem_bag.yml index 4d35b51ffe4..a4692db9b5f 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Chemistry/chem_bag.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Chemistry/chem_bag.yml @@ -25,6 +25,7 @@ - FitsInDispenser - Pill tags: + - Document - PillCanister - Bottle - Syringe diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml index 7b0d992f135..c7deba07328 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml @@ -20,7 +20,7 @@ types: Blunt: 5 - type: Item - size: Normal + size: Large sprite: Objects/Specific/Janitorial/mop.rsi - type: Absorbent - type: SolutionContainerManager @@ -59,7 +59,7 @@ types: Blunt: 5 - type: Item - size: Normal + size: Large sprite: Objects/Specific/Janitorial/advmop.rsi - type: Absorbent pickupAmount: 100 diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/defib.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/defib.yml index 74b0cbb0d91..2d1af8f2465 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/defib.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/defib.yml @@ -28,7 +28,7 @@ True: { visible: true } False: { visible: false } - type: Item - size: Normal + size: Large - type: ItemCooldown - type: Speech speechVerb: Robotic diff --git a/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml b/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml index 8a2e4a29ce9..1888c4c4a96 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml @@ -4,6 +4,8 @@ name: monkey cube description: Just add water! components: + - type: Item + size: Tiny - type: SolutionContainerManager solutions: cube: @@ -109,6 +111,8 @@ suffix: Syndicate description: Just add water! components: + - type: Item + size: Tiny - type: SolutionContainerManager solutions: cube: diff --git a/Resources/Prototypes/Entities/Objects/Tools/appraisal.yml b/Resources/Prototypes/Entities/Objects/Tools/appraisal.yml index 72369ce44b4..539e5a3dc5f 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/appraisal.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/appraisal.yml @@ -4,22 +4,23 @@ name: appraisal tool description: A beancounter's best friend, with a quantum connection to the galactic market and the ability to appraise even the toughest items. components: - - type: Sprite - sprite: Objects/Tools/appraisal-tool.rsi - state: icon - - type: Item - sprite: Objects/Tools/appraisal-tool.rsi - - type: PriceGun - - type: UseDelay - delay: 3 - - type: Clothing - sprite: Objects/Tools/appraisal-tool.rsi - quickEquip: false - slots: - - Belt - - type: Tag - tags: - - AppraisalTool - - type: GuideHelp - guides: - - Cargo + - type: Sprite + sprite: Objects/Tools/appraisal-tool.rsi + state: icon + - type: Item + sprite: Objects/Tools/appraisal-tool.rsi + - type: PriceGun + - type: UseDelay + delay: 3 + - type: Clothing + sprite: Objects/Tools/appraisal-tool.rsi + quickEquip: false + slots: + - Belt + - type: Tag + tags: + - AppraisalTool + - Sidearm + - type: GuideHelp + guides: + - Cargo From 6ab7ecdd5318e8f35ca5425e2ef55d0ce9e0cabd Mon Sep 17 00:00:00 2001 From: IProduceWidgets <107586145+IProduceWidgets@users.noreply.github.com> Date: Tue, 12 Dec 2023 03:03:47 -0500 Subject: [PATCH 09/47] Instruments, plushies, gunpet, and bibles. (#22398) * Some instrument sizes and gunpet sidearm * Cello * bagpipe * Crippling balance PR made bananium horn Small not Tiny * plushie and toy sizes. * Scroll bigger * Make bible same size as other books. * size rgb staff to other staffs. * add sprite update json --- .../Fun/Instruments/instruments_misc.yml | 8 ++++-- .../Fun/Instruments/instruments_string.yml | 4 ++- .../Fun/Instruments/instruments_wind.yml | 2 +- .../Entities/Objects/Fun/bike_horn.yml | 2 +- .../Prototypes/Entities/Objects/Fun/toys.yml | 26 ++++++++++++++++-- .../Entities/Objects/Magic/books.yml | 2 ++ .../Objects/Specific/Chapel/bibles.yml | 2 +- Resources/Prototypes/Magic/staves.yml | 1 + .../Textures/Objects/Fun/toys.rsi/meta.json | 3 ++ .../Fun/toys.rsi/plushie_lizard_mirrored.png | Bin 0 -> 262 bytes 10 files changed, 41 insertions(+), 9 deletions(-) create mode 100644 Resources/Textures/Objects/Fun/toys.rsi/plushie_lizard_mirrored.png diff --git a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_misc.yml b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_misc.yml index 47ea5ab2f60..207af9ffcf9 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_misc.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_misc.yml @@ -24,7 +24,7 @@ - type: Instrument program: 122 - type: Item - size: Small + size: Normal - type: entity parent: BaseHandheldInstrument @@ -38,7 +38,8 @@ - type: Instrument program: 123 - type: Item - size: Tiny + size: Small + storedRotation: 90 - type: entity parent: BaseHandheldInstrument @@ -102,10 +103,11 @@ sprite: Objects/Fun/Instruments/gunpet.rsi state: icon - type: Item - size: Normal + size: Small sprite: Objects/Fun/Instruments/gunpet.rsi - type: Tag tags: + - Sidearm - BrassInstrument - type: entity diff --git a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_string.yml b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_string.yml index 70d1444bc4f..7224efa9e02 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_string.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_string.yml @@ -236,7 +236,9 @@ sprite: Objects/Fun/Instruments/cello.rsi state: icon - type: Item - size: Normal + size: Large + shape: + - 0,0,1,3 sprite: Objects/Fun/Instruments/cello.rsi - type: Tag tags: diff --git a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_wind.yml b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_wind.yml index afba6c27740..c8a098b586e 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_wind.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_wind.yml @@ -171,7 +171,7 @@ sprite: Objects/Fun/Instruments/bagpipes.rsi state: icon - type: Item - size: Normal + size: Large sprite: Objects/Fun/Instruments/bagpipes.rsi - type: Tag tags: diff --git a/Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml b/Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml index 58b168e8824..caf2b909c60 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml @@ -119,7 +119,7 @@ state: icon - type: Item sprite: Objects/Fun/bananiumhorn.rsi - size: Tiny + size: Small - type: Clothing sprite: Objects/Fun/bananiumhorn.rsi slots: [Belt] diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml index 71c5444dc30..789ba04e96a 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml @@ -79,6 +79,8 @@ suffix: DO NOT MAP description: So soft it almost makes you want to take a nap... components: + - type: Item + size: Normal - type: Sprite sprite: Mobs/Ghosts/revenant.rsi state: icon @@ -97,6 +99,7 @@ sprite: Objects/Fun/toys.rsi state: plushie_h - type: Item + size: Normal sprite: Objects/Fun/toys.rsi heldPrefix: bee - type: Extractable @@ -201,6 +204,15 @@ soundHit: path: /Audio/Items/Toys/weh.ogg +- type: entity + parent: PlushieLizard + id: PlushieLizardMirrored + components: + - type: Item + size: Small + - type: Sprite + state: plushie_lizard_mirrored + - type: entity parent: BasePlushie id: PlushieSpaceLizard #ᵂᵉʰ! @@ -336,6 +348,8 @@ name: ratvar plushie description: A small stuffed doll of the elder god Ratvar. components: + - type: Item + size: Normal - type: Sprite state: plushie_ratvar @@ -345,6 +359,8 @@ name: nar'sie plushie description: A small stuffed doll of the elder goddess Nar'Sie. components: + - type: Item + size: Normal - type: Sprite state: narplush @@ -427,6 +443,8 @@ name: rubber ducky description: Not carried here by ocean currents. components: + - type: Item + size: Tiny - type: Sprite sprite: Objects/Fun/ducky.rsi state: icon @@ -473,6 +491,8 @@ name: xeno plushie description: An adorable stuffed toy that resembles a scary xenomorf. You're lucky it's just a toy. components: + - type: Item + size: Normal - type: Sprite state: plushie_xeno - type: EmitSoundOnUse @@ -547,6 +567,8 @@ name: ian toy description: Unable to eat, but just as fluffy as the real guy! components: + - type: Item + size: Tiny - type: Sprite state: ian - type: EmitSoundOnUse @@ -771,7 +793,7 @@ sprite: Objects/Fun/toys.rsi state: corgib - type: Item - size: Normal + size: Small sprite: Objects/Fun/toys.rsi heldPrefix: corgib - type: Damageable @@ -796,7 +818,7 @@ intensity: 2000 falloffPower: 2.6 - type: Item - size: Small + size: Normal sprite: Objects/Fun/toys.rsi heldPrefix: singularitytoy diff --git a/Resources/Prototypes/Entities/Objects/Magic/books.yml b/Resources/Prototypes/Entities/Objects/Magic/books.yml index 812949fb0b9..89acd9e7dab 100644 --- a/Resources/Prototypes/Entities/Objects/Magic/books.yml +++ b/Resources/Prototypes/Entities/Objects/Magic/books.yml @@ -92,6 +92,8 @@ name: scroll of runes parent: BaseSpellbook components: + - type: Item + size: Normal - type: Sprite sprite: Objects/Magic/magicactions.rsi layers: diff --git a/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml b/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml index ccd4d942366..6096de5c7c7 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml @@ -31,7 +31,7 @@ sprite: Objects/Specific/Chapel/bible.rsi state: icon - type: Item - size: Normal + size: Small sprite: Objects/Specific/Chapel/bible.rsi - type: Clothing slots: diff --git a/Resources/Prototypes/Magic/staves.yml b/Resources/Prototypes/Magic/staves.yml index 4713a838f84..5d894e0f416 100644 --- a/Resources/Prototypes/Magic/staves.yml +++ b/Resources/Prototypes/Magic/staves.yml @@ -17,6 +17,7 @@ actions: - ActionRgbLight - type: Item + size: Normal inhandVisuals: left: - state: staff-inhand-left diff --git a/Resources/Textures/Objects/Fun/toys.rsi/meta.json b/Resources/Textures/Objects/Fun/toys.rsi/meta.json index 7ab46a31083..00999ac01e5 100644 --- a/Resources/Textures/Objects/Fun/toys.rsi/meta.json +++ b/Resources/Textures/Objects/Fun/toys.rsi/meta.json @@ -49,6 +49,9 @@ }, { "name": "plushie_lizard" + }, + { + "name": "plushie_lizard_mirrored" }, { "name": "plushie_lamp" diff --git a/Resources/Textures/Objects/Fun/toys.rsi/plushie_lizard_mirrored.png b/Resources/Textures/Objects/Fun/toys.rsi/plushie_lizard_mirrored.png new file mode 100644 index 0000000000000000000000000000000000000000..a8ad75da91d3c2283f2370b45b4465387e65e8ba GIT binary patch literal 262 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv-2k5u*Z*ul76^E(R0~>Q9=5?e z@q$VE8Hc>1&TS7PR=lp-`mXiAg2I1W+yDRnH?#eh04ilH3GxeOaCmkj4ajNtba4#P zIG>y#5z?@C&mIO>hk!kMoCG@0{|MNyXHOu5r-Oh-K%?S?#+){n%F0T2W~T*qv6|@|cS6GJIhKvz8Db7hQCyt;U5~A$VPod;S9f=dEASYYnXz%{IL|nl zbZ6Sms_Q%|-Z56U($1Z6*tV7VMNZ0e;{p?&f))k_^L^UW7Vf(K6XX|9S3j3^P6D= literal 0 HcmV?d00001 From 4fee0dcd36251e2e914e1c00cefb56f6d20d05f9 Mon Sep 17 00:00:00 2001 From: PJBot Date: Tue, 12 Dec 2023 03:03:49 -0500 Subject: [PATCH 10/47] Automatic changelog update --- Resources/Changelog/Changelog.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index e800bc98728..4638f30f514 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,9 +1,4 @@ Entries: -- author: DrSmugleaf - changes: - - {message: Fixed fultons losing their beacon when the stack is split., type: Fix} - id: 4845 - time: '2023-09-18T00:22:26.0000000+00:00' - author: Psychpsyo changes: - {message: The advanced mop no longer looks boring when attached to the janitorial @@ -2900,3 +2895,9 @@ Entries: - {message: syndicate pens now come in suitably sized discarding boxes., type: Tweak} id: 5345 time: '2023-12-12T08:01:33.0000000+00:00' +- author: IProduceWidgets + changes: + - {message: Mops are now larger!, type: Tweak} + - {message: Defibs are now larger!, type: Tweak} + id: 5346 + time: '2023-12-12T08:02:44.0000000+00:00' From 90a3a35572c0dc8585fc94edeafb4e7716188357 Mon Sep 17 00:00:00 2001 From: IProduceWidgets <107586145+IProduceWidgets@users.noreply.github.com> Date: Tue, 12 Dec 2023 03:38:42 -0500 Subject: [PATCH 11/47] Make ERT PDAs and give them to the right presets. (#22392) * Pdas made * ID cards * Role fills * Trim Item heldPrefix overrides. * Sorta funky parenting. --- .../Entities/Objects/Devices/pda.yml | 51 ++++++++++++ .../Objects/Misc/identification_cards.yml | 77 +++++++++++++++++-- .../Roles/Jobs/Fun/emergencyresponseteam.yml | 18 ++--- 3 files changed, 131 insertions(+), 15 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml index 2cf629b816b..c2a977642e1 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml @@ -743,6 +743,7 @@ parent: BasePDA id: ERTLeaderPDA name: ERT PDA + suffix: Leader description: Red for firepower. components: - type: Pda @@ -755,6 +756,56 @@ - type: Icon state: pda-ert +- type: entity + parent: ERTLeaderPDA + id: ERTChaplainPDA + name: ERT PDA + suffix: Chaplain + components: + - type: Pda + id: ERTChaplainIDCard + state: pda-ert + +- type: entity + parent: ERTLeaderPDA + id: ERTEngineerPDA + name: ERT PDA + suffix: Engineer + components: + - type: Pda + id: ERTEngineerIDCard + state: pda-ert + +- type: entity + parent: ERTLeaderPDA + id: ERTJanitorPDA + name: ERT PDA + suffix: Janitor + components: + - type: Pda + id: ERTJanitorIDCard + state: pda-ert + +- type: entity + parent: ERTLeaderPDA + id: ERTMedicPDA + name: ERT PDA + suffix: Medic + components: + - type: Pda + id: ERTMedicIDCard + state: pda-ert + +- type: entity + parent: ERTLeaderPDA + id: ERTSecurityPDA + name: ERT PDA + suffix: Security + components: + - type: Pda + id: ERTSecurityIDCard + state: pda-ert + - type: entity parent: ERTLeaderPDA id: CBURNPDA diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml index e7a5523725d..69c0099825d 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml @@ -460,15 +460,79 @@ - type: entity parent: CentcomIDCard id: ERTLeaderIDCard - name: ERT ID card + name: ERT leader ID card components: - type: Sprite layers: - state: gold - - state: ert_commander # we have the sprites but don't need individual ID entities for now. + - state: ert_commander + - type: IdCard + jobTitle: ERT Company Commander - type: Item heldPrefix: gold +- type: entity + parent: ERTLeaderIDCard + id: ERTChaplainIDCard + name: ERT Chaplain ID card + components: + - type: Sprite + layers: + - state: gold + - state: ert_chaplain # we have the sprite for the id but dont have chaplain ERT equipment for now. + - type: IdCard + jobTitle: ERT Soul Officer + - type: Item + heldPrefix: blue + +- type: entity + parent: ERTChaplainIDCard + id: ERTEngineerIDCard + name: ERT Engineer ID card + components: + - type: Sprite + layers: + - state: gold + - state: ert_engineer + - type: IdCard + jobTitle: ERT Field Engineer + +- type: entity + parent: ERTChaplainIDCard + id: ERTJanitorIDCard + name: ERT Janitor ID card + components: + - type: Sprite + layers: + - state: gold + - state: ert_janitor + - type: IdCard + jobTitle: ERT Custodian + +- type: entity + parent: ERTChaplainIDCard + id: ERTMedicIDCard + name: ERT Medic ID card + components: + - type: Sprite + layers: + - state: gold + - state: ert_medic + - type: IdCard + jobTitle: ERT Medical Doctor + +- type: entity + parent: ERTChaplainIDCard + id: ERTSecurityIDCard + name: ERT Security ID card + components: + - type: Sprite + layers: + - state: gold + - state: ert_security + - type: IdCard + jobTitle: ERT Field Officer + - type: entity parent: IDCardStandard id: CentcomIDCardSyndie @@ -706,14 +770,15 @@ parent: CentcomIDCard id: CBURNIDcard name: CBURN ID card + suffix: CBURN components: - type: Sprite layers: - - state: gold - - state: idcentcom + - state: centcom - type: Item - heldPrefix: gold - + heldPrefix: blue + - type: IdCard + jobTitle: Centcom Quarantine Officer - type: entity parent: IDCardStandard diff --git a/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml b/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml index 2be50b2e4b4..d2c59f5829e 100644 --- a/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml +++ b/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml @@ -88,7 +88,7 @@ eyes: ClothingEyesGlassesMeson gloves: ClothingHandsGlovesCombat outerClothing: ClothingOuterArmorBasicSlim - id: ERTLeaderPDA + id: ERTEngineerPDA ears: ClothingHeadsetAltCentCom belt: ClothingBeltChiefEngineerFilled pocket1: Flare @@ -105,7 +105,7 @@ gloves: ClothingHandsGlovesCombat outerClothing: ClothingOuterHardsuitERTEngineer suitstorage: AirTankFilled - id: ERTLeaderPDA + id: ERTEngineerPDA ears: ClothingHeadsetAltCentCom belt: ClothingBeltChiefEngineerFilled pocket1: Flare @@ -135,7 +135,7 @@ eyes: ClothingEyesGlassesSecurity gloves: ClothingHandsGlovesCombat outerClothing: ClothingOuterArmorBasicSlim - id: ERTLeaderPDA + id: ERTSecurityPDA ears: ClothingHeadsetAltCentCom belt: ClothingBeltSecurityFilled pocket1: WeaponPistolMk58Nonlethal @@ -152,7 +152,7 @@ gloves: ClothingHandsGlovesCombat outerClothing: ClothingOuterHardsuitERTSecurity suitstorage: AirTankFilled - id: ERTLeaderPDA + id: ERTSecurityPDA ears: ClothingHeadsetAltCentCom belt: ClothingBeltSecurityFilled pocket1: WeaponPistolMk58Nonlethal @@ -169,7 +169,7 @@ gloves: ClothingHandsGlovesCombat outerClothing: ClothingOuterHardsuitERTSecurity suitstorage: WeaponRifleLecter - id: ERTLeaderPDA + id: ERTSecurityPDA ears: ClothingHeadsetAltCentCom belt: ClothingBeltSecurityFilled pocket1: MagazineRifle @@ -201,7 +201,7 @@ eyes: ClothingEyesHudMedical gloves: ClothingHandsGlovesNitrile outerClothing: ClothingOuterArmorBasicSlim - id: ERTLeaderPDA + id: ERTMedicPDA ears: ClothingHeadsetAltCentCom belt: ClothingBeltMedicalFilled pocket1: HandheldHealthAnalyzer @@ -218,7 +218,7 @@ gloves: ClothingHandsGlovesNitrile outerClothing: ClothingOuterHardsuitERTMedical suitstorage: AirTankFilled - id: ERTLeaderPDA + id: ERTMedicPDA ears: ClothingHeadsetAltCentCom belt: ClothingBeltMedicalFilled pocket1: HandheldHealthAnalyzer @@ -247,7 +247,7 @@ head: ClothingHeadHelmetERTJanitor gloves: ClothingHandsGlovesColorPurple outerClothing: ClothingOuterArmorBasicSlim - id: ERTLeaderPDA + id: ERTJanitorPDA ears: ClothingHeadsetAltCentCom belt: ClothingBeltJanitorFilled pocket1: Flare @@ -262,7 +262,7 @@ gloves: ClothingHandsGlovesColorPurple outerClothing: ClothingOuterHardsuitERTJanitor suitstorage: AirTankFilled - id: ERTLeaderPDA + id: ERTJanitorPDA ears: ClothingHeadsetAltCentCom belt: ClothingBeltJanitorFilled pocket1: Flare From 0e7275a74ce267c6cba1adb071fb058bd57c6e9e Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Tue, 12 Dec 2023 20:20:33 +1100 Subject: [PATCH 12/47] Restricted range cleanup (#22402) --- .../Gateway/Systems/GatewayGeneratorSystem.cs | 27 +++++--------- .../Salvage/RestrictedRangeSystem.cs | 35 +++++++++++++++++++ .../Shuttles/Systems/ArrivalsSystem.cs | 11 ++++-- .../Salvage/RestrictedRangeComponent.cs | 3 ++ 4 files changed, 54 insertions(+), 22 deletions(-) diff --git a/Content.Server/Gateway/Systems/GatewayGeneratorSystem.cs b/Content.Server/Gateway/Systems/GatewayGeneratorSystem.cs index 9adf3092c0c..3bee8a65694 100644 --- a/Content.Server/Gateway/Systems/GatewayGeneratorSystem.cs +++ b/Content.Server/Gateway/Systems/GatewayGeneratorSystem.cs @@ -3,6 +3,7 @@ using Content.Server.Gateway.Components; using Content.Server.Parallax; using Content.Server.Procedural; +using Content.Server.Salvage; using Content.Shared.CCVar; using Content.Shared.Dataset; using Content.Shared.Movement.Components; @@ -36,11 +37,10 @@ public sealed class GatewayGeneratorSystem : EntitySystem [Dependency] private readonly ITileDefinitionManager _tileDefManager = default!; [Dependency] private readonly BiomeSystem _biome = default!; [Dependency] private readonly DungeonSystem _dungeon = default!; - [Dependency] private readonly FixtureSystem _fixtures = default!; [Dependency] private readonly GatewaySystem _gateway = default!; [Dependency] private readonly MetaDataSystem _metadata = default!; + [Dependency] private readonly RestrictedRangeSystem _restricted = default!; [Dependency] private readonly SharedMapSystem _maps = default!; - [Dependency] private readonly SharedPhysicsSystem _physics = default!; [ValidatePrototypeId] private const string PlanetNames = "names_borer"; @@ -120,8 +120,12 @@ private void GenerateDestination(EntityUid uid, GatewayGeneratorComponent? gener _metadata.SetEntityName(mapUid, gatewayName); var origin = new Vector2i(random.Next(-MaxOffset, MaxOffset), random.Next(-MaxOffset, MaxOffset)); - var restriction = AddComp(mapUid); - restriction.Origin = origin; + var restricted = new RestrictedRangeComponent + { + Origin = origin + }; + AddComp(mapUid, restricted); + _biome.EnsurePlanet(mapUid, _protoManager.Index("Continental"), seed); var grid = Comp(mapUid); @@ -145,21 +149,6 @@ private void GenerateDestination(EntityUid uid, GatewayGeneratorComponent? gener genDest.Seed = seed; genDest.Generator = uid; - // Enclose the area - var boundaryUid = Spawn(null, originCoords); - var boundaryPhysics = AddComp(boundaryUid); - var cShape = new ChainShape(); - // Don't need it to be a perfect circle, just need it to be loosely accurate. - cShape.CreateLoop(Vector2.Zero, restriction.Range + 1f, false, count: 4); - _fixtures.TryCreateFixture( - boundaryUid, - cShape, - "boundary", - collisionLayer: (int) (CollisionGroup.HighImpassable | CollisionGroup.Impassable | CollisionGroup.LowImpassable), - body: boundaryPhysics); - _physics.WakeBody(boundaryUid, body: boundaryPhysics); - AddComp(boundaryUid); - // Create the gateway. var gatewayUid = SpawnAtPosition(generator.Proto, originCoords); var gatewayComp = Comp(gatewayUid); diff --git a/Content.Server/Salvage/RestrictedRangeSystem.cs b/Content.Server/Salvage/RestrictedRangeSystem.cs index bc8b6931d28..b7a35fb1ce4 100644 --- a/Content.Server/Salvage/RestrictedRangeSystem.cs +++ b/Content.Server/Salvage/RestrictedRangeSystem.cs @@ -1,8 +1,43 @@ +using System.Numerics; +using Content.Shared.Physics; using Content.Shared.Salvage; +using Robust.Shared.Map; +using Robust.Shared.Physics.Collision.Shapes; +using Robust.Shared.Physics.Components; +using Robust.Shared.Physics.Systems; namespace Content.Server.Salvage; public sealed class RestrictedRangeSystem : SharedRestrictedRangeSystem { + [Dependency] private readonly FixtureSystem _fixtures = default!; + [Dependency] private readonly SharedPhysicsSystem _physics = default!; + public override void Initialize() + { + base.Initialize(); + SubscribeLocalEvent(OnRestrictedMapInit); + } + + private void OnRestrictedMapInit(EntityUid uid, RestrictedRangeComponent component, MapInitEvent args) + { + component.BoundaryEntity = CreateBoundary(new EntityCoordinates(uid, component.Origin), component.Range); + } + + public EntityUid CreateBoundary(EntityCoordinates coordinates, float range) + { + var boundaryUid = Spawn(null, coordinates); + var boundaryPhysics = AddComp(boundaryUid); + var cShape = new ChainShape(); + // Don't need it to be a perfect circle, just need it to be loosely accurate. + cShape.CreateLoop(Vector2.Zero, range + 0.25f, false, count: 4); + _fixtures.TryCreateFixture( + boundaryUid, + cShape, + "boundary", + collisionLayer: (int) (CollisionGroup.HighImpassable | CollisionGroup.Impassable | CollisionGroup.LowImpassable), + body: boundaryPhysics); + _physics.WakeBody(boundaryUid, body: boundaryPhysics); + return boundaryUid; + } } diff --git a/Content.Server/Shuttles/Systems/ArrivalsSystem.cs b/Content.Server/Shuttles/Systems/ArrivalsSystem.cs index 53ede9b9245..79d26ea14fa 100644 --- a/Content.Server/Shuttles/Systems/ArrivalsSystem.cs +++ b/Content.Server/Shuttles/Systems/ArrivalsSystem.cs @@ -1,8 +1,10 @@ using System.Linq; +using System.Numerics; using Content.Server.Administration; using Content.Server.GameTicking; using Content.Server.GameTicking.Events; using Content.Server.Parallax; +using Content.Server.Salvage; using Content.Server.Shuttles.Components; using Content.Server.Shuttles.Events; using Content.Server.Spawners.Components; @@ -44,6 +46,7 @@ public sealed class ArrivalsSystem : EntitySystem [Dependency] private readonly BiomeSystem _biomes = default!; [Dependency] private readonly GameTicker _ticker = default!; [Dependency] private readonly MapLoaderSystem _loader = default!; + [Dependency] private readonly RestrictedRangeSystem _restricted = default!; [Dependency] private readonly SharedTransformSystem _transform = default!; [Dependency] private readonly ShuttleSystem _shuttles = default!; [Dependency] private readonly StationSpawningSystem _stationSpawning = default!; @@ -429,9 +432,11 @@ private void SetupArrivalsStation() { var template = _random.Pick(_arrivalsBiomeOptions); _biomes.EnsurePlanet(mapUid, _protoManager.Index(template)); - var range = AddComp(mapUid); - range.Range = 32f; - Dirty(mapUid, range); + var restricted = new RestrictedRangeComponent + { + Range = 32f + }; + AddComp(mapUid, restricted); } _mapManager.DoMapInitialize(mapId); diff --git a/Content.Shared/Salvage/RestrictedRangeComponent.cs b/Content.Shared/Salvage/RestrictedRangeComponent.cs index 01eaa800404..92d3c3d3929 100644 --- a/Content.Shared/Salvage/RestrictedRangeComponent.cs +++ b/Content.Shared/Salvage/RestrictedRangeComponent.cs @@ -14,4 +14,7 @@ public sealed partial class RestrictedRangeComponent : Component [DataField, AutoNetworkedField, ViewVariables(VVAccess.ReadWrite)] public Vector2 Origin; + + [DataField] + public EntityUid BoundaryEntity; } From 09180e9929d8914f7eeddc738f579f0642fa688a Mon Sep 17 00:00:00 2001 From: PJBot Date: Tue, 12 Dec 2023 04:21:36 -0500 Subject: [PATCH 13/47] Automatic changelog update --- Resources/Changelog/Changelog.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 4638f30f514..89175d19e42 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,10 +1,4 @@ Entries: -- author: Psychpsyo - changes: - - {message: The advanced mop no longer looks boring when attached to the janitorial - trolley., type: Tweak} - id: 4846 - time: '2023-09-18T00:23:35.0000000+00:00' - author: lapatison changes: - {message: 'Now you can light matches with certain types (combat, work, merc, explorer) @@ -2901,3 +2895,8 @@ Entries: - {message: Defibs are now larger!, type: Tweak} id: 5346 time: '2023-12-12T08:02:44.0000000+00:00' +- author: metalgearsloth + changes: + - {message: 'Fix arrivals fog not actually blocking, no more free roaming.', type: Fix} + id: 5347 + time: '2023-12-12T09:20:33.0000000+00:00' From 1f700d9c9fc545a32552d301aac7d15fd330af5f Mon Sep 17 00:00:00 2001 From: JoeHammad1844 <130668733+JoeHammad1844@users.noreply.github.com> Date: Tue, 12 Dec 2023 21:02:08 +1100 Subject: [PATCH 14/47] Adds nitrile gloves to syndie medical bundle (#22147) * Add files via upload * removed selling point * rollah bed * hopefully fixes angry test --- Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml index 55691e4ba8f..499122f7bcc 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml @@ -44,6 +44,8 @@ - id: Cautery - id: Retractor - id: ScalpelAdvanced + - id: ClothingHandsGlovesNitrile + - id: EmergencyRollerBedSpawnFolded - type: entity parent: ClothingBackpackDuffelSyndicateBundle @@ -330,6 +332,6 @@ - id: Defibrillator - id: CombatMedipen amount: 3 - - id: ClothingHandsGlovesLatex + - id: ClothingHandsGlovesNitrile - id: SyringeTranexamicAcid - id: SyringeHyronalin From 454eb5307f1db4ab7c8120074ad9172b60990815 Mon Sep 17 00:00:00 2001 From: Kevin Zheng Date: Tue, 12 Dec 2023 02:03:01 -0800 Subject: [PATCH 15/47] Turn off speedup and heat scaling to isolate bug (#22405) --- Content.Shared/CCVar/CCVars.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs index 704705c3d98..a263cfc4f5d 100644 --- a/Content.Shared/CCVar/CCVars.cs +++ b/Content.Shared/CCVar/CCVars.cs @@ -1051,14 +1051,14 @@ public static readonly CVarDef /// in-game. /// public static readonly CVarDef AtmosSpeedup = - CVarDef.Create("atmos.speedup", 8f, CVar.SERVERONLY); + CVarDef.Create("atmos.speedup", 1f, CVar.SERVERONLY); /// /// Like atmos.speedup, but only for gas and reaction heat values. 64x means /// gases heat up and cool down 64x faster than real life. /// public static readonly CVarDef AtmosHeatScale = - CVarDef.Create("atmos.heat_scale", 64f, CVar.SERVERONLY); + CVarDef.Create("atmos.heat_scale", 1f, CVar.SERVERONLY); /* * MIDI instruments From 84fedaee13f17811ca5f76e5fd3803b489e9f0bd Mon Sep 17 00:00:00 2001 From: Emisse <99158783+Emisse@users.noreply.github.com> Date: Tue, 12 Dec 2023 03:27:32 -0700 Subject: [PATCH 16/47] aspid update (#22409) --- Resources/Maps/aspid.yml | 8857 +++++++++++++++++++------------------- 1 file changed, 4432 insertions(+), 4425 deletions(-) diff --git a/Resources/Maps/aspid.yml b/Resources/Maps/aspid.yml index e92198a48a1..f62ad09498d 100644 --- a/Resources/Maps/aspid.yml +++ b/Resources/Maps/aspid.yml @@ -79,7 +79,7 @@ entities: version: 6 0,1: ind: 0,1 - tiles: VwAAAAADdwAAAAAAVwAAAAABVwAAAAADVwAAAAACdwAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAVwAAAAADVwAAAAACVwAAAAACVwAAAAABVwAAAAAAbwAAAAAAagAAAAABagAAAAACagAAAAADagAAAAADagAAAAABagAAAAABagAAAAACdwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAABVwAAAAADVwAAAAAAVwAAAAADbwAAAAACagAAAAADagAAAAACagAAAAAAagAAAAAAagAAAAADagAAAAADagAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAACVwAAAAACVwAAAAABVwAAAAAAVwAAAAAAdwAAAAAAagAAAAACagAAAAADagAAAAAAagAAAAABagAAAAABagAAAAACagAAAAADdwAAAAAAVwAAAAAAVwAAAAAAVwAAAAACdwAAAAAAdwAAAAAAVwAAAAAAVwAAAAACdwAAAAAAagAAAAABagAAAAACagAAAAABagAAAAAAagAAAAAAagAAAAADagAAAAABdwAAAAAAVwAAAAAAVwAAAAAAVwAAAAACdwAAAAAAagAAAAABagAAAAADagAAAAABdwAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAbwAAAAABagAAAAAAdwAAAAAAdwAAAAAAZwAAAAAAVwAAAAACdwAAAAAAagAAAAAAbgAAAAAAbgAAAAADagAAAAAAagAAAAADagAAAAACagAAAAADagAAAAADagAAAAABagAAAAAAagAAAAABZwAAAAAAdwAAAAAAdwAAAAAAVwAAAAACdwAAAAAAagAAAAABbgAAAAABbgAAAAAAbgAAAAACagAAAAABagAAAAADagAAAAABagAAAAABagAAAAADawAAAAACagAAAAACdwAAAAAAZwAAAAAAdwAAAAAAVwAAAAADdwAAAAAAagAAAAABbgAAAAADbgAAAAADbgAAAAACagAAAAADagAAAAADagAAAAADdwAAAAAAagAAAAACawAAAAABagAAAAADdwAAAAAAdwAAAAAAdwAAAAAAVwAAAAADdwAAAAAAagAAAAAAagAAAAABagAAAAACagAAAAADagAAAAABdwAAAAAAdwAAAAAAdwAAAAAAagAAAAAAawAAAAAAagAAAAACdwAAAAAAZgAAAAAAZgAAAAAAVwAAAAABdwAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAbwAAAAACdwAAAAAAagAAAAAAagAAAAAAagAAAAADawAAAAAAagAAAAADdwAAAAAAdwAAAAAAdwAAAAAAVwAAAAACdwAAAAAAbgAAAAAAbgAAAAAAbgAAAAAAdwAAAAAAagAAAAABagAAAAAAagAAAAAAagAAAAABagAAAAAAawAAAAAAagAAAAABagAAAAAAagAAAAADagAAAAABVwAAAAADdwAAAAAAbgAAAAAAbgAAAAAAbgAAAAAAdwAAAAAAagAAAAADagAAAAABagAAAAAAagAAAAADagAAAAAAagAAAAACagAAAAADagAAAAAAagAAAAACagAAAAAAVwAAAAADdwAAAAAAbgAAAAAAbgAAAAAAagAAAAADdwAAAAAAagAAAAAAagAAAAAAdwAAAAAAdwAAAAAAGwAAAAAAGwAAAAAAdwAAAAAAdwAAAAAAagAAAAAAagAAAAADVwAAAAABdwAAAAAAbgAAAAAAbgAAAAAAagAAAAAAagAAAAAAagAAAAADagAAAAADdwAAAAAAGwAAAAABGwAAAAACGwAAAAAAGwAAAAAAdwAAAAAAdwAAAAAAagAAAAAAVwAAAAACdwAAAAAAbgAAAAAAbgAAAAAAawAAAAABawAAAAADawAAAAABagAAAAAAdwAAAAAAGwAAAAABGwAAAAAAGwAAAAABGwAAAAACdwAAAAAAagAAAAAAagAAAAAA + tiles: VwAAAAADdwAAAAAAVwAAAAABVwAAAAADVwAAAAACdwAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAVwAAAAADVwAAAAACVwAAAAACVwAAAAABVwAAAAAAbwAAAAAAagAAAAABagAAAAACagAAAAADagAAAAADagAAAAABagAAAAABagAAAAACdwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAABVwAAAAADVwAAAAAAVwAAAAADbwAAAAACagAAAAADagAAAAACagAAAAAAagAAAAAAagAAAAADagAAAAADagAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAACVwAAAAACVwAAAAABVwAAAAAAVwAAAAAAdwAAAAAAagAAAAACagAAAAADagAAAAAAagAAAAABagAAAAABagAAAAACagAAAAADdwAAAAAAVwAAAAAAVwAAAAAAVwAAAAACdwAAAAAAdwAAAAAAVwAAAAAAVwAAAAACdwAAAAAAagAAAAABagAAAAACagAAAAABagAAAAAAagAAAAAAagAAAAADagAAAAABdwAAAAAAVwAAAAAAVwAAAAAAVwAAAAACdwAAAAAAagAAAAABagAAAAADagAAAAABdwAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAagAAAAAAagAAAAAAdwAAAAAAdwAAAAAAZwAAAAAAVwAAAAACdwAAAAAAagAAAAAAbgAAAAAAbgAAAAADagAAAAAAagAAAAADagAAAAACagAAAAADagAAAAADagAAAAABagAAAAAAagAAAAABZwAAAAAAdwAAAAAAdwAAAAAAVwAAAAACdwAAAAAAagAAAAABbgAAAAABbgAAAAAAbgAAAAACagAAAAABagAAAAADagAAAAABagAAAAABagAAAAADawAAAAACagAAAAACdwAAAAAAZwAAAAAAdwAAAAAAVwAAAAADdwAAAAAAagAAAAABbgAAAAADbgAAAAADbgAAAAACagAAAAADagAAAAADagAAAAADdwAAAAAAagAAAAACawAAAAABagAAAAADdwAAAAAAdwAAAAAAdwAAAAAAVwAAAAADdwAAAAAAagAAAAAAagAAAAABagAAAAACagAAAAADagAAAAABdwAAAAAAdwAAAAAAdwAAAAAAagAAAAAAawAAAAAAagAAAAACdwAAAAAAZgAAAAAAZgAAAAAAVwAAAAABdwAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAbwAAAAACdwAAAAAAagAAAAAAagAAAAAAagAAAAADawAAAAAAagAAAAADdwAAAAAAdwAAAAAAdwAAAAAAVwAAAAACdwAAAAAAbgAAAAAAbgAAAAAAbgAAAAAAdwAAAAAAagAAAAABagAAAAAAagAAAAAAagAAAAABagAAAAAAawAAAAAAagAAAAABagAAAAAAagAAAAADagAAAAABVwAAAAADdwAAAAAAbgAAAAAAbgAAAAAAbgAAAAAAdwAAAAAAagAAAAADagAAAAABagAAAAAAagAAAAADagAAAAAAagAAAAACagAAAAADagAAAAAAagAAAAACagAAAAAAVwAAAAADdwAAAAAAbgAAAAAAbgAAAAAAagAAAAADdwAAAAAAagAAAAAAagAAAAAAdwAAAAAAdwAAAAAAGwAAAAAAGwAAAAAAdwAAAAAAdwAAAAAAagAAAAAAagAAAAADVwAAAAABdwAAAAAAbgAAAAAAbgAAAAAAagAAAAAAagAAAAAAagAAAAADagAAAAADdwAAAAAAGwAAAAABGwAAAAACGwAAAAAAGwAAAAAAdwAAAAAAdwAAAAAAagAAAAAAVwAAAAACdwAAAAAAbgAAAAAAbgAAAAAAawAAAAABawAAAAADawAAAAABagAAAAAAdwAAAAAAGwAAAAABGwAAAAAAGwAAAAABGwAAAAACdwAAAAAAagAAAAAAagAAAAAA version: 6 1,0: ind: 1,0 @@ -336,87 +336,87 @@ entities: color: '#FFFFFFFF' id: Arrows decals: - 4997: -43,28 - 4998: -43,27 - 5017: -46,27 - 5018: -46,28 - 5188: -9,-53 + 4878: -43,28 + 4879: -43,27 + 4898: -46,27 + 4899: -46,28 + 5069: -9,-53 - node: color: '#FFFFFFFF' id: Arrows decals: - 5187: -6,61 + 5068: -6,61 - node: angle: 1.5707963267948966 rad color: '#FFFFFFFF' id: Arrows decals: - 5126: -6,-31 - 5127: -6,-29 - 5128: -6,-27 - 5129: -6,-23 - 5130: -6,-21 - 5131: -6,-25 - 5189: 7,-53 + 5007: -6,-31 + 5008: -6,-29 + 5009: -6,-27 + 5010: -6,-23 + 5011: -6,-21 + 5012: -6,-25 + 5070: 7,-53 - node: color: '#FFFFFFFF' id: Bot decals: - 1222: -16,-27 - 1223: -15,-27 - 1224: -16,-28 - 1225: -15,-28 - 1226: -16,-29 - 1227: -15,-29 - 1228: -16,-30 - 1229: -15,-30 - 1230: -14,-27 - 1231: -14,-28 - 1232: -14,-29 - 1233: -14,-30 - 1611: 4,-37 - 1612: 5,-37 - 1613: 8,-37 - 1614: 9,-37 - 1915: 7,-22 - 2293: 27,23 - 2294: 27,26 - 2295: 48,42 - 2296: 27,43 - 2297: 18,36 - 2299: 7,34 - 2300: -10,23 - 2301: -22,25 - 2302: -16,30 - 2303: -25,38 - 2304: -31,22 - 2305: -46,44 - 2306: -18,53 - 2307: 4,52 - 2308: -4,57 - 2309: -3,68 - 2310: 2,70 - 2311: -8,76 - 2312: -2,27 - 2314: 45,12 - 2315: 33,7 - 2316: 45,-7 - 2317: 17,-4 - 2318: 10,-16 - 2319: -8,-15 - 2320: 3,2 - 2321: -14,1 - 2322: 11,7 - 2323: 7,-6 - 2324: -18,-20 - 2325: -39,-3 - 2326: -46,12 - 2327: -35,16 - 2328: -24,15 - 2329: 14,47 - 2330: -34,-9 - 4982: -37,24 - 5222: 16,29 + 1139: -16,-27 + 1140: -15,-27 + 1141: -16,-28 + 1142: -15,-28 + 1143: -16,-29 + 1144: -15,-29 + 1145: -16,-30 + 1146: -15,-30 + 1147: -14,-27 + 1148: -14,-28 + 1149: -14,-29 + 1150: -14,-30 + 1528: 4,-37 + 1529: 5,-37 + 1530: 8,-37 + 1531: 9,-37 + 1820: 7,-22 + 2198: 27,23 + 2199: 27,26 + 2200: 48,42 + 2201: 27,43 + 2202: 18,36 + 2203: 7,34 + 2204: -10,23 + 2205: -22,25 + 2206: -16,30 + 2207: -25,38 + 2208: -31,22 + 2209: -46,44 + 2210: -18,53 + 2211: 4,52 + 2212: -4,57 + 2213: -3,68 + 2214: 2,70 + 2215: -8,76 + 2216: -2,27 + 2217: 45,12 + 2218: 33,7 + 2219: 45,-7 + 2220: 17,-4 + 2221: 10,-16 + 2222: -8,-15 + 2223: 3,2 + 2224: -14,1 + 2225: 11,7 + 2226: 7,-6 + 2227: -18,-20 + 2228: -39,-3 + 2229: -46,12 + 2230: -35,16 + 2231: -24,15 + 2232: 14,47 + 2233: -34,-9 + 4863: -37,24 + 5100: 16,29 - node: color: '#52B4E996' id: BotGreyscale @@ -424,36 +424,36 @@ entities: 459: -2,72 460: -1,72 461: 0,72 - 1902: 1,47 - 1903: 1,46 - 1904: 3,47 - 1905: 3,46 - 1906: 18,-11 - 1907: 19,-11 - 1908: 14,-24 - 1909: 15,-24 + 1807: 1,47 + 1808: 1,46 + 1809: 3,47 + 1810: 3,46 + 1811: 18,-11 + 1812: 19,-11 + 1813: 14,-24 + 1814: 15,-24 - node: color: '#52B4E996' id: BotLeftGreyscale decals: - 2169: 27,5 - 2170: 27,6 - 2171: 27,4 + 2074: 27,5 + 2075: 27,6 + 2076: 27,4 - node: color: '#FFFFFFFF' id: BotRight decals: - 1144: -15,20 - 1145: -15,19 - 1146: -15,18 - 1147: -15,17 + 1078: -15,20 + 1079: -15,19 + 1080: -15,18 + 1081: -15,17 - node: angle: 1.5707963267948966 rad color: '#FFFFFFFF' id: BotRight decals: - 5001: -41,24 - 5002: -41,22 + 4882: -41,24 + 4883: -41,22 - node: color: '#FFFFFFFF' id: BrickTileDarkBox @@ -478,35 +478,35 @@ entities: 690: 34,47 691: 34,45 692: 34,43 - 1372: -1,10 - 1373: -1,-3 - 1374: -1,-5 - 1375: 2,-5 - 1376: 2,-3 - 1377: 2,0 - 1378: 2,2 - 1379: 2,5 - 1380: 2,7 - 1381: 2,10 - 1382: -4,10 - 1383: -4,7 - 1384: -1,7 - 1385: -1,5 - 1386: -4,5 - 1387: -13,2 - 1388: -13,0 - 1389: -10,0 - 1390: -10,2 - 1391: -7,2 - 1392: -7,0 - 1393: -4,2 - 1394: -1,0 - 1395: -1,2 - 1396: -4,-5 - 1397: -4,-3 - 4874: -13,-5 - 4875: -13,-3 - 4876: -10,-3 + 1289: -1,10 + 1290: -1,-3 + 1291: -1,-5 + 1292: 2,-5 + 1293: 2,-3 + 1294: 2,0 + 1295: 2,2 + 1296: 2,5 + 1297: 2,7 + 1298: 2,10 + 1299: -4,10 + 1300: -4,7 + 1301: -1,7 + 1302: -1,5 + 1303: -4,5 + 1304: -13,2 + 1305: -13,0 + 1306: -10,0 + 1307: -10,2 + 1308: -7,2 + 1309: -7,0 + 1310: -4,2 + 1311: -1,0 + 1312: -1,2 + 1313: -4,-5 + 1314: -4,-3 + 4755: -13,-5 + 4756: -13,-3 + 4757: -10,-3 - node: color: '#FFFFFFFF' id: BrickTileDarkCornerNe @@ -517,15 +517,15 @@ entities: 40: -2,83 41: 5,82 42: -5,82 - 1129: -16,22 - 1524: 9,9 - 1693: 6,-25 - 1799: 18,-22 - 1842: -11,-18 - 1898: 5,47 - 2157: 13,54 - 2192: 18,-34 - 4878: 19,-14 + 1063: -16,22 + 1441: 9,9 + 1610: 6,-25 + 1704: 18,-22 + 1747: -11,-18 + 1803: 5,47 + 2062: 13,54 + 2097: 18,-34 + 4759: 19,-14 - node: color: '#FFFFFFFF' id: BrickTileDarkCornerNw @@ -536,35 +536,35 @@ entities: 44: -3,83 45: 0,83 46: 3,82 - 1127: -18,22 - 1528: 7,9 - 1670: 4,-18 - 1690: 5,-25 - 1829: 18,-14 - 1899: 4,47 - 2158: 8,54 + 1061: -18,22 + 1445: 7,9 + 1587: 4,-18 + 1607: 5,-25 + 1734: 18,-14 + 1804: 4,47 + 2063: 8,54 - node: color: '#FFFFFFFF' id: BrickTileDarkCornerSe decals: - 1529: 9,6 - 1691: 6,-26 - 1800: 18,-26 - 1828: 19,-18 - 1900: 5,46 - 1916: 7,-27 - 2159: 13,53 - 2189: 18,-38 + 1446: 9,6 + 1608: 6,-26 + 1705: 18,-26 + 1733: 19,-18 + 1805: 5,46 + 1821: 7,-27 + 2064: 13,53 + 2094: 18,-38 - node: color: '#FFFFFFFF' id: BrickTileDarkCornerSw decals: 567: -20,44 - 1527: 7,6 - 1692: 5,-26 - 1827: 18,-18 - 1901: 4,46 - 2160: 8,53 + 1444: 7,6 + 1609: 5,-26 + 1732: 18,-18 + 1806: 4,46 + 2065: 8,53 - node: color: '#FFFFFFFF' id: BrickTileDarkEndE @@ -575,18 +575,18 @@ entities: color: '#FFFFFFFF' id: BrickTileDarkEndN decals: - 1792: 17,-23 - 1933: -4,83 - 1934: -1,83 - 1935: 2,83 + 1697: 17,-23 + 1838: -4,83 + 1839: -1,83 + 1840: 2,83 - node: color: '#FFFFFFFF' id: BrickTileDarkEndS decals: - 1793: 17,-25 - 1930: -4,82 - 1931: -1,82 - 1932: 2,82 + 1698: 17,-25 + 1835: -4,82 + 1836: -1,82 + 1837: 2,82 - node: color: '#FFFFFFFF' id: BrickTileDarkEndW @@ -597,34 +597,34 @@ entities: color: '#FFFFFFFF' id: BrickTileDarkInnerNe decals: - 1836: 13,-25 - 1885: 0,45 - 2191: 18,-35 - 2193: 17,-34 + 1741: 13,-25 + 1790: 0,45 + 2096: 18,-35 + 2098: 17,-34 - node: color: '#FFFFFFFF' id: BrickTileDarkInnerNw decals: - 2227: 29,2 + 2132: 29,2 - node: color: '#FFFFFFFF' id: BrickTileDarkInnerSe decals: 27: -3,77 414: -3,76 - 1812: 17,-10 - 1837: 13,-23 - 1884: 0,48 - 2190: 18,-37 - 2194: 17,-38 + 1717: 17,-10 + 1742: 13,-23 + 1789: 0,48 + 2095: 18,-37 + 2099: 17,-38 - node: color: '#FFFFFFFF' id: BrickTileDarkInnerSw decals: 28: 1,77 415: 1,76 - 1813: 20,-10 - 2226: 29,7 + 1718: 20,-10 + 2131: 29,7 - node: color: '#FFFFFFFF' id: BrickTileDarkLineE @@ -656,50 +656,50 @@ entities: 627: -6,54 628: -6,53 629: -6,52 - 1044: -10,27 - 1045: -10,28 - 1046: -10,29 - 1047: -10,30 - 1048: -10,31 - 1049: -10,32 - 1050: -10,33 - 1051: -10,34 - 1056: -15,20 - 1057: -15,19 - 1058: -15,18 - 1059: -15,17 - 1130: -16,21 - 1193: -14,27 - 1194: -14,28 - 1525: 9,8 - 1526: 9,7 - 1621: 13,-24 - 1795: 17,-24 - 1796: 18,-24 - 1797: 18,-23 - 1798: 18,-25 - 1830: 19,-15 - 1831: 19,-16 - 1832: 19,-17 - 1840: -11,-19 - 1841: -11,-20 - 1882: 0,47 - 1883: 0,46 - 1917: 7,-26 - 1918: 7,-25 - 1919: 7,-24 - 2013: -37,28 - 2014: -37,27 - 2015: -37,23 - 2016: -37,26 - 2017: -37,25 - 2051: -35,-1 - 2052: -35,-2 - 2053: -35,-3 - 2054: -35,-4 - 2055: -35,-5 - 2056: -35,-6 - 4980: -37,24 + 978: -10,27 + 979: -10,28 + 980: -10,29 + 981: -10,30 + 982: -10,31 + 983: -10,32 + 984: -10,33 + 985: -10,34 + 990: -15,20 + 991: -15,19 + 992: -15,18 + 993: -15,17 + 1064: -16,21 + 1127: -14,27 + 1128: -14,28 + 1442: 9,8 + 1443: 9,7 + 1538: 13,-24 + 1700: 17,-24 + 1701: 18,-24 + 1702: 18,-23 + 1703: 18,-25 + 1735: 19,-15 + 1736: 19,-16 + 1737: 19,-17 + 1745: -11,-19 + 1746: -11,-20 + 1787: 0,47 + 1788: 0,46 + 1822: 7,-26 + 1823: 7,-25 + 1824: 7,-24 + 1918: -37,28 + 1919: -37,27 + 1920: -37,23 + 1921: -37,26 + 1922: -37,25 + 1956: -35,-1 + 1957: -35,-2 + 1958: -35,-3 + 1959: -35,-4 + 1960: -35,-5 + 1961: -35,-6 + 4861: -37,24 - node: color: '#FFFFFFFF' id: BrickTileDarkLineN @@ -728,58 +728,58 @@ entities: 637: -14,50 638: -13,50 639: -12,50 - 1128: -17,22 - 1205: 18,34 - 1206: 19,34 - 1207: 20,34 - 1208: 21,34 - 1533: 8,9 - 1671: 5,-18 - 1672: 6,-18 - 1673: 7,-18 - 1802: 17,-22 - 1843: -12,-18 - 1844: -13,-18 - 1845: -14,-18 - 1846: -15,-18 - 1942: -37,11 - 1943: -36,11 - 1944: -35,11 - 2074: 26,-12 - 2075: 27,-12 - 2076: 28,-12 - 2077: 29,-12 - 2078: 30,-12 - 2125: 41,44 - 2126: 42,44 - 2127: 43,44 - 2128: 44,44 - 2161: 9,54 - 2162: 10,54 - 2163: 11,54 - 2164: 12,54 - 4895: 22,-17 - 4896: 21,-17 - 4897: 20,-17 - 4898: 20,-15 - 4899: 21,-15 - 4900: 22,-15 - 4901: 15,-15 - 4902: 16,-15 - 4903: 17,-15 - 4904: 15,-17 - 4905: 16,-17 - 4906: 17,-17 - 4943: 18,-13 - 4944: 19,-13 - 5005: -46,28 - 5006: -45,28 + 1062: -17,22 + 1131: 18,34 + 1132: 19,34 + 1133: 20,34 + 1134: 21,34 + 1450: 8,9 + 1588: 5,-18 + 1589: 6,-18 + 1590: 7,-18 + 1707: 17,-22 + 1748: -12,-18 + 1749: -13,-18 + 1750: -14,-18 + 1751: -15,-18 + 1847: -37,11 + 1848: -36,11 + 1849: -35,11 + 1979: 26,-12 + 1980: 27,-12 + 1981: 28,-12 + 1982: 29,-12 + 1983: 30,-12 + 2030: 41,44 + 2031: 42,44 + 2032: 43,44 + 2033: 44,44 + 2066: 9,54 + 2067: 10,54 + 2068: 11,54 + 2069: 12,54 + 4776: 22,-17 + 4777: 21,-17 + 4778: 20,-17 + 4779: 20,-15 + 4780: 21,-15 + 4781: 22,-15 + 4782: 15,-15 + 4783: 16,-15 + 4784: 17,-15 + 4785: 15,-17 + 4786: 16,-17 + 4787: 17,-17 + 4824: 18,-13 + 4825: 19,-13 + 4886: -46,28 + 4887: -45,28 - node: color: '#D4D4D479' id: BrickTileDarkLineS decals: - 4937: 18,-12 - 4938: 19,-12 + 4818: 18,-12 + 4819: 19,-12 - node: color: '#FFFFFFFF' id: BrickTileDarkLineS @@ -840,48 +840,48 @@ entities: 641: -14,48 642: -13,48 643: -12,48 - 1152: -10,17 - 1153: -9,17 - 1154: -8,17 - 1530: 8,6 - 1801: 17,-26 - 1810: 18,-10 - 1811: 19,-10 - 1920: 6,-27 - 1921: 5,-27 - 1922: 4,-27 - 1939: -37,9 - 1940: -36,9 - 1941: -35,9 - 2069: 26,-14 - 2070: 27,-14 - 2071: 28,-14 - 2072: 29,-14 - 2073: 30,-14 - 2121: 41,42 - 2122: 42,42 - 2123: 43,42 - 2124: 44,42 - 2165: 9,53 - 2166: 10,53 - 2167: 11,53 - 2168: 12,53 - 4883: 22,-15 - 4884: 21,-15 - 4885: 20,-15 - 4886: 17,-15 - 4887: 16,-15 - 4888: 15,-15 - 4889: 15,-17 - 4890: 16,-17 - 4891: 17,-17 - 4892: 20,-17 - 4893: 21,-17 - 4894: 22,-17 - 4941: 18,-13 - 4942: 19,-13 - 5003: -45,27 - 5004: -46,27 + 1086: -10,17 + 1087: -9,17 + 1088: -8,17 + 1447: 8,6 + 1706: 17,-26 + 1715: 18,-10 + 1716: 19,-10 + 1825: 6,-27 + 1826: 5,-27 + 1827: 4,-27 + 1844: -37,9 + 1845: -36,9 + 1846: -35,9 + 1974: 26,-14 + 1975: 27,-14 + 1976: 28,-14 + 1977: 29,-14 + 1978: 30,-14 + 2026: 41,42 + 2027: 42,42 + 2028: 43,42 + 2029: 44,42 + 2070: 9,53 + 2071: 10,53 + 2072: 11,53 + 2073: 12,53 + 4764: 22,-15 + 4765: 21,-15 + 4766: 20,-15 + 4767: 17,-15 + 4768: 16,-15 + 4769: 15,-15 + 4770: 15,-17 + 4771: 16,-17 + 4772: 17,-17 + 4773: 20,-17 + 4774: 21,-17 + 4775: 22,-17 + 4822: 18,-13 + 4823: 19,-13 + 4884: -45,27 + 4885: -46,27 - node: color: '#FFFFFFFF' id: BrickTileDarkLineW @@ -909,61 +909,61 @@ entities: 521: -17,56 522: -17,55 530: -12,57 - 1036: -12,27 - 1037: -12,28 - 1038: -12,29 - 1039: -12,30 - 1040: -12,31 - 1041: -12,32 - 1042: -12,33 - 1043: -12,34 - 1122: -19,17 - 1123: -19,18 - 1124: -19,19 - 1125: -19,20 - 1126: -18,21 - 1531: 7,7 - 1532: 7,8 - 1615: 21,-27 - 1674: 4,-19 - 1675: 4,-20 - 1676: 4,-21 - 1677: 4,-22 - 1794: 17,-24 - 1833: 18,-17 - 1834: 18,-16 - 1835: 18,-15 - 1854: -14,-38 - 1855: -14,-37 - 1856: -14,-36 - 1857: -14,-35 - 1858: -14,-34 - 1859: -14,-33 - 1860: -14,-32 - 1861: -14,-25 - 1862: -14,-24 - 1863: -14,-23 - 1864: -14,-22 - 2007: -40,17 - 2008: -40,18 - 2009: -40,19 - 2010: -40,20 - 2011: -40,29 - 2012: -40,30 - 2045: -37,-1 - 2046: -37,-2 - 2047: -37,-3 - 2048: -37,-4 - 2049: -37,-5 - 2050: -37,-6 - 2224: 29,4 - 2225: 29,5 - 4983: -43,26 - 4984: -43,25 - 4985: -43,24 - 4986: -43,23 - 4987: -43,22 - 4988: -43,21 + 970: -12,27 + 971: -12,28 + 972: -12,29 + 973: -12,30 + 974: -12,31 + 975: -12,32 + 976: -12,33 + 977: -12,34 + 1056: -19,17 + 1057: -19,18 + 1058: -19,19 + 1059: -19,20 + 1060: -18,21 + 1448: 7,7 + 1449: 7,8 + 1532: 21,-27 + 1591: 4,-19 + 1592: 4,-20 + 1593: 4,-21 + 1594: 4,-22 + 1699: 17,-24 + 1738: 18,-17 + 1739: 18,-16 + 1740: 18,-15 + 1759: -14,-38 + 1760: -14,-37 + 1761: -14,-36 + 1762: -14,-35 + 1763: -14,-34 + 1764: -14,-33 + 1765: -14,-32 + 1766: -14,-25 + 1767: -14,-24 + 1768: -14,-23 + 1769: -14,-22 + 1912: -40,17 + 1913: -40,18 + 1914: -40,19 + 1915: -40,20 + 1916: -40,29 + 1917: -40,30 + 1950: -37,-1 + 1951: -37,-2 + 1952: -37,-3 + 1953: -37,-4 + 1954: -37,-5 + 1955: -37,-6 + 2129: 29,4 + 2130: 29,5 + 4864: -43,26 + 4865: -43,25 + 4866: -43,24 + 4867: -43,23 + 4868: -43,22 + 4869: -43,21 - node: color: '#FFFFFFFF' id: BrickTileSteelBox @@ -990,101 +990,101 @@ entities: 703: 10,67 704: 11,68 705: 10,69 - 1759: -32,37 - 1760: -32,33 - 1761: -32,30 - 1762: -32,27 - 1763: -32,24 - 1764: -32,21 - 1765: -32,18 - 1766: -32,14 - 1767: -32,10 - 1768: -32,7 - 1769: -32,4 - 1770: -32,1 - 1771: -32,-2 - 1772: -32,-5 - 1773: -32,-9 - 1774: 31,-9 - 1775: 31,-5 - 1776: 31,-2 - 1777: 31,1 - 1778: 31,4 - 1779: 31,7 - 1780: 31,10 - 1781: 31,14 - 1782: 31,18 - 1783: 31,21 - 1784: 31,24 - 1785: 31,27 - 1786: 31,30 - 1787: 31,33 - 1788: 31,37 + 1664: -32,37 + 1665: -32,33 + 1666: -32,30 + 1667: -32,27 + 1668: -32,24 + 1669: -32,21 + 1670: -32,18 + 1671: -32,14 + 1672: -32,10 + 1673: -32,7 + 1674: -32,4 + 1675: -32,1 + 1676: -32,-2 + 1677: -32,-5 + 1678: -32,-9 + 1679: 31,-9 + 1680: 31,-5 + 1681: 31,-2 + 1682: 31,1 + 1683: 31,4 + 1684: 31,7 + 1685: 31,10 + 1686: 31,14 + 1687: 31,18 + 1688: 31,21 + 1689: 31,24 + 1690: 31,27 + 1691: 31,30 + 1692: 31,33 + 1693: 31,37 - node: color: '#FFFFFFFF' id: BrickTileSteelCornerNe decals: 733: 21,42 - 1092: -14,23 - 1279: -10,-13 - 1301: 11,-13 - 1319: -8,-12 - 1716: 4,19 - 1755: -45,41 - 5150: -40,-6 + 1026: -14,23 + 1196: -10,-13 + 1218: 11,-13 + 1236: -8,-12 + 1633: 4,19 + 1660: -45,41 + 5031: -40,-6 - node: color: '#FFFFFFFF' id: BrickTileSteelCornerNw decals: 734: 19,42 - 982: -22,34 - 1078: -22,25 - 1093: -20,23 - 1280: -13,-13 - 1302: 8,-13 - 1345: 6,-12 - 1727: -6,19 - 1756: -48,41 - 1990: -36,7 - 2035: -4,57 - 2251: 26,18 - 5149: -43,-6 + 916: -22,34 + 1012: -22,25 + 1027: -20,23 + 1197: -13,-13 + 1219: 8,-13 + 1262: 6,-12 + 1644: -6,19 + 1661: -48,41 + 1895: -36,7 + 1940: -4,57 + 2156: 26,18 + 5030: -43,-6 - node: color: '#FFFFFFFF' id: BrickTileSteelCornerSe decals: 731: 21,40 - 1277: -10,-15 - 1300: 11,-15 - 2245: 23,20 - 5152: -40,-7 + 1194: -10,-15 + 1217: 11,-15 + 2150: 23,20 + 5033: -40,-7 - node: color: '#FFFFFFFF' id: BrickTileSteelCornerSw decals: 732: 19,40 - 984: -22,32 - 989: -19,30 - 1278: -13,-15 - 1299: 8,-15 - 1991: -36,4 - 2030: -4,52 - 5151: -43,-7 + 918: -22,32 + 923: -19,30 + 1195: -13,-15 + 1216: 8,-15 + 1896: -36,4 + 1935: -4,52 + 5032: -43,-7 - node: color: '#FFFFFFFF' id: BrickTileSteelEndN decals: - 2115: -28,33 + 2020: -28,33 - node: color: '#FFFFFFFF' id: BrickTileSteelEndS decals: - 2116: -28,30 + 2021: -28,30 - node: color: '#FFFFFFFF' id: BrickTileSteelInnerSw decals: - 987: -19,32 + 921: -19,32 - node: color: '#FFFFFFFF' id: BrickTileSteelLineE @@ -1092,135 +1092,135 @@ entities: 693: 29,40 694: 29,41 735: 21,41 - 1060: -12,17 - 1061: -12,18 - 1062: -12,19 - 1063: -12,20 - 1064: -10,21 - 1065: -10,22 - 1066: -10,23 - 1091: -14,22 - 1281: -10,-14 - 1303: 11,-14 - 1315: -8,-16 - 1316: -8,-15 - 1317: -8,-14 - 1318: -8,-13 - 1616: 13,-21 - 1617: 13,-22 - 1618: 13,-23 - 1619: 13,-25 - 1620: 13,-26 - 1622: 13,-27 - 1623: 13,-28 - 1624: 13,-29 - 1625: 13,-30 - 1626: 13,-35 - 1627: 13,-36 - 1628: 13,-37 - 1629: 13,-38 - 1713: 4,16 - 1714: 4,17 - 1715: 4,18 - 1758: -45,40 - 1955: -39,-3 - 1956: -39,-2 - 1957: -39,-1 - 1958: -39,0 - 1959: -38,3 - 1960: -38,4 - 1961: -38,5 - 1962: -38,6 - 1963: -38,7 - 1969: -35,1 - 1970: -35,2 - 2117: -28,32 - 2118: -28,31 - 2246: 23,21 - 2247: 23,22 + 994: -12,17 + 995: -12,18 + 996: -12,19 + 997: -12,20 + 998: -10,21 + 999: -10,22 + 1000: -10,23 + 1025: -14,22 + 1198: -10,-14 + 1220: 11,-14 + 1232: -8,-16 + 1233: -8,-15 + 1234: -8,-14 + 1235: -8,-13 + 1533: 13,-21 + 1534: 13,-22 + 1535: 13,-23 + 1536: 13,-25 + 1537: 13,-26 + 1539: 13,-27 + 1540: 13,-28 + 1541: 13,-29 + 1542: 13,-30 + 1543: 13,-35 + 1544: 13,-36 + 1545: 13,-37 + 1546: 13,-38 + 1630: 4,16 + 1631: 4,17 + 1632: 4,18 + 1663: -45,40 + 1860: -39,-3 + 1861: -39,-2 + 1862: -39,-1 + 1863: -39,0 + 1864: -38,3 + 1865: -38,4 + 1866: -38,5 + 1867: -38,6 + 1868: -38,7 + 1874: -35,1 + 1875: -35,2 + 2022: -28,32 + 2023: -28,31 + 2151: 23,21 + 2152: 23,22 - node: color: '#FFFFFFFF' id: BrickTileSteelLineN decals: 736: 20,42 - 977: -21,34 - 978: -20,34 - 979: -19,34 - 980: -18,34 - 981: -17,34 - 1067: -11,25 - 1068: -12,25 - 1069: -13,25 - 1070: -14,25 - 1071: -15,25 - 1072: -16,25 - 1073: -17,25 - 1074: -18,25 - 1075: -19,25 - 1076: -20,25 - 1077: -21,25 - 1285: -12,-13 - 1286: -11,-13 - 1305: 9,-13 - 1306: 10,-13 - 1310: -14,-16 - 1311: -14,-12 - 1312: -14,-13 - 1320: -9,-12 - 1321: -10,-12 - 1322: -11,-12 - 1323: -12,-12 - 1324: -13,-12 - 1325: -15,-12 - 1338: 13,-12 - 1339: 12,-12 - 1340: 11,-12 - 1341: 10,-12 - 1342: 9,-12 - 1343: 8,-12 - 1344: 7,-12 - 1363: -14,-15 - 1717: 3,19 - 1718: 2,19 - 1719: 1,19 - 1731: -5,19 - 1732: -4,19 - 1733: -3,19 - 1753: -47,41 - 1754: -46,41 - 1993: -35,7 - 1994: -34,7 - 2036: -3,57 - 2250: 27,18 - 5153: -41,-6 - 5154: -42,-6 + 911: -21,34 + 912: -20,34 + 913: -19,34 + 914: -18,34 + 915: -17,34 + 1001: -11,25 + 1002: -12,25 + 1003: -13,25 + 1004: -14,25 + 1005: -15,25 + 1006: -16,25 + 1007: -17,25 + 1008: -18,25 + 1009: -19,25 + 1010: -20,25 + 1011: -21,25 + 1202: -12,-13 + 1203: -11,-13 + 1222: 9,-13 + 1223: 10,-13 + 1227: -14,-16 + 1228: -14,-12 + 1229: -14,-13 + 1237: -9,-12 + 1238: -10,-12 + 1239: -11,-12 + 1240: -12,-12 + 1241: -13,-12 + 1242: -15,-12 + 1255: 13,-12 + 1256: 12,-12 + 1257: 11,-12 + 1258: 10,-12 + 1259: 9,-12 + 1260: 8,-12 + 1261: 7,-12 + 1280: -14,-15 + 1634: 3,19 + 1635: 2,19 + 1636: 1,19 + 1648: -5,19 + 1649: -4,19 + 1650: -3,19 + 1658: -47,41 + 1659: -46,41 + 1898: -35,7 + 1899: -34,7 + 1941: -3,57 + 2155: 27,18 + 5034: -41,-6 + 5035: -42,-6 - node: color: '#FFFFFFFF' id: BrickTileSteelLineS decals: 738: 20,40 - 985: -21,32 - 986: -20,32 - 990: -18,30 - 991: -17,30 - 992: -16,30 - 993: -15,30 - 994: -14,30 - 1283: -12,-15 - 1284: -11,-15 - 1307: 9,-15 - 1308: 10,-15 - 1309: -14,-16 - 1313: -14,-13 - 1314: -14,-12 - 1362: -14,-15 - 1995: -35,4 - 1996: -34,4 - 2029: -3,52 - 2248: 21,20 - 2262: 22,20 - 5155: -42,-7 - 5156: -41,-7 + 919: -21,32 + 920: -20,32 + 924: -18,30 + 925: -17,30 + 926: -16,30 + 927: -15,30 + 928: -14,30 + 1200: -12,-15 + 1201: -11,-15 + 1224: 9,-15 + 1225: 10,-15 + 1226: -14,-16 + 1230: -14,-13 + 1231: -14,-12 + 1279: -14,-15 + 1900: -35,4 + 1901: -34,4 + 1934: -3,52 + 2153: 21,20 + 2167: 22,20 + 5036: -42,-7 + 5037: -41,-7 - node: color: '#FFFFFFFF' id: BrickTileSteelLineW @@ -1228,70 +1228,70 @@ entities: 695: 32,41 696: 32,40 737: 19,41 - 983: -22,33 - 988: -19,31 - 1079: -22,24 - 1080: -22,23 - 1081: -22,22 - 1082: -22,21 - 1083: -22,20 - 1084: -22,19 - 1085: -22,18 - 1086: -22,17 - 1094: -20,22 - 1282: -13,-14 - 1304: 8,-14 - 1346: 6,-13 - 1347: 6,-14 - 1348: 6,-15 - 1349: 6,-16 - 1630: 9,-21 - 1631: 9,-22 - 1632: 9,-23 - 1633: 9,-24 - 1634: 9,-25 - 1635: 9,-26 - 1636: 9,-27 - 1637: 4,-33 - 1638: 4,-34 - 1639: 4,-35 - 1640: 11,-36 - 1641: 11,-37 - 1642: 11,-38 - 1728: -6,18 - 1729: -6,17 - 1730: -6,16 - 1757: -48,40 - 1952: -44,-1 - 1953: -44,-2 - 1954: -44,-3 - 1964: -41,7 - 1965: -41,8 - 1966: -41,9 - 1967: -41,10 - 1968: -41,11 - 1992: -36,6 - 2031: -4,53 - 2032: -4,54 - 2033: -4,55 - 2034: -4,56 - 2119: -28,31 - 2120: -28,32 - 2244: 26,17 + 917: -22,33 + 922: -19,31 + 1013: -22,24 + 1014: -22,23 + 1015: -22,22 + 1016: -22,21 + 1017: -22,20 + 1018: -22,19 + 1019: -22,18 + 1020: -22,17 + 1028: -20,22 + 1199: -13,-14 + 1221: 8,-14 + 1263: 6,-13 + 1264: 6,-14 + 1265: 6,-15 + 1266: 6,-16 + 1547: 9,-21 + 1548: 9,-22 + 1549: 9,-23 + 1550: 9,-24 + 1551: 9,-25 + 1552: 9,-26 + 1553: 9,-27 + 1554: 4,-33 + 1555: 4,-34 + 1556: 4,-35 + 1557: 11,-36 + 1558: 11,-37 + 1559: 11,-38 + 1645: -6,18 + 1646: -6,17 + 1647: -6,16 + 1662: -48,40 + 1857: -44,-1 + 1858: -44,-2 + 1859: -44,-3 + 1869: -41,7 + 1870: -41,8 + 1871: -41,9 + 1872: -41,10 + 1873: -41,11 + 1897: -36,6 + 1936: -4,53 + 1937: -4,54 + 1938: -4,55 + 1939: -4,56 + 2024: -28,31 + 2025: -28,32 + 2149: 26,17 - node: color: '#334E6DC8' id: BrickTileWhiteCornerNe decals: 55: -2,80 - 1803: 18,-22 + 1708: 18,-22 - node: color: '#52B4E996' id: BrickTileWhiteCornerNe decals: 56: 5,82 - 875: 12,28 - 932: 7,34 - 1723: 4,19 + 829: 12,28 + 886: 7,34 + 1640: 4,19 - node: color: '#A4610696' id: BrickTileWhiteCornerNe @@ -1302,7 +1302,7 @@ entities: id: BrickTileWhiteCornerNe decals: 69: -2,83 - 1141: -16,22 + 1075: -16,22 - node: color: '#DE3A3A96' id: BrickTileWhiteCornerNe @@ -1313,19 +1313,19 @@ entities: id: BrickTileWhiteCornerNe decals: 70: -5,82 - 1330: -8,-12 - 1851: -11,-18 + 1247: -8,-12 + 1756: -11,-18 - node: color: '#FFFFFFFF' id: BrickTileWhiteCornerNe decals: - 833: 12,28 - 915: 5,24 - 931: 7,34 - 950: 6,33 - 1174: -5,23 - 2235: -17,-40 - 2240: 16,-40 + 787: 12,28 + 869: 5,24 + 885: 7,34 + 904: 6,33 + 1108: -5,23 + 2140: -17,-40 + 2145: 16,-40 - node: color: '#334E6DC8' id: BrickTileWhiteCornerNw @@ -1341,170 +1341,170 @@ entities: id: BrickTileWhiteCornerNw decals: 63: 0,83 - 2001: -36,7 + 1906: -36,7 - node: color: '#D381C996' id: BrickTileWhiteCornerNw decals: 68: -3,83 - 1007: -22,34 - 1113: -22,25 - 1142: -18,22 - 1734: -6,19 + 941: -22,34 + 1047: -22,25 + 1076: -18,22 + 1651: -6,19 - node: color: '#D56F18EF' id: BrickTileWhiteCornerNw decals: - 894: 2,25 + 848: 2,25 - node: color: '#DE3A3A96' id: BrickTileWhiteCornerNw decals: 77: 0,80 - 2038: -4,57 + 1943: -4,57 - node: color: '#EFB34196' id: BrickTileWhiteCornerNw decals: 71: -7,82 - 1354: 6,-12 - 1685: 4,-18 + 1271: 6,-12 + 1602: 4,-18 - node: color: '#FFFFFFFF' id: BrickTileWhiteCornerNw decals: - 885: 2,25 - 916: 3,24 - 951: 4,33 - 1175: -7,23 - 2237: -18,-40 - 2238: 15,-40 + 839: 2,25 + 870: 3,24 + 905: 4,33 + 1109: -7,23 + 2142: -18,-40 + 2143: 15,-40 - node: color: '#334E6DC8' id: BrickTileWhiteCornerSe decals: - 1804: 18,-26 + 1709: 18,-26 - node: color: '#52B4E996' id: BrickTileWhiteCornerSe decals: - 937: 7,30 + 891: 7,30 - node: color: '#D381C996' id: BrickTileWhiteCornerSe decals: - 1185: -4,21 + 1119: -4,21 - node: color: '#EFB34196' id: BrickTileWhiteCornerSe decals: - 1923: 7,-27 + 1828: 7,-27 - node: color: '#FFFFFFFF' id: BrickTileWhiteCornerSe decals: - 913: 4,22 - 914: 5,23 - 922: 7,30 - 952: 6,31 - 1169: -4,21 - 1170: -5,22 - 2234: -17,-41 - 2239: 16,-41 + 867: 4,22 + 868: 5,23 + 876: 7,30 + 906: 6,31 + 1103: -4,21 + 1104: -5,22 + 2139: -17,-41 + 2144: 16,-41 - node: color: '#52B4E996' id: BrickTileWhiteCornerSw decals: - 857: 8,26 + 811: 8,26 - node: color: '#A4610696' id: BrickTileWhiteCornerSw decals: - 1999: -36,4 + 1904: -36,4 - node: color: '#D381C996' id: BrickTileWhiteCornerSw decals: - 1000: -19,30 - 1005: -22,32 + 934: -19,30 + 939: -22,32 - node: color: '#D56F18EF' id: BrickTileWhiteCornerSw decals: - 890: 2,21 + 844: 2,21 - node: color: '#DE3A3A96' id: BrickTileWhiteCornerSw decals: 568: -20,44 - 2043: -4,52 + 1948: -4,52 - node: color: '#FFFFFFFF' id: BrickTileWhiteCornerSw decals: - 823: 8,26 - 889: 2,21 - 912: 3,22 - 948: 4,31 - 1176: -7,22 - 2236: -18,-41 - 2241: 15,-41 + 777: 8,26 + 843: 2,21 + 866: 3,22 + 902: 4,31 + 1110: -7,22 + 2141: -18,-41 + 2146: 15,-41 - node: color: '#FFFFFFFF' id: BrickTileWhiteEndN decals: - 867: 11,27 + 821: 11,27 - node: color: '#FFFFFFFF' id: BrickTileWhiteEndS decals: - 868: 11,23 + 822: 11,23 - node: color: '#334E6DC8' id: BrickTileWhiteInnerNe decals: - 1839: 13,-25 - 1887: 0,45 + 1744: 13,-25 + 1792: 0,45 - node: color: '#334E6DC8' id: BrickTileWhiteInnerNw decals: - 2229: 29,2 + 2134: 29,2 - node: color: '#334E6DC8' id: BrickTileWhiteInnerSe decals: - 1816: 17,-10 - 1838: 13,-23 - 1886: 0,48 + 1721: 17,-10 + 1743: 13,-23 + 1791: 0,48 - node: color: '#FFFFFFFF' id: BrickTileWhiteInnerSe decals: - 919: 4,23 + 873: 4,23 - node: color: '#334E6DC8' id: BrickTileWhiteInnerSw decals: - 1817: 20,-10 - 2228: 29,7 + 1722: 20,-10 + 2133: 29,7 - node: color: '#52B4E996' id: BrickTileWhiteInnerSw decals: - 855: 8,27 - 856: 10,26 + 809: 8,27 + 810: 10,26 - node: color: '#D381C996' id: BrickTileWhiteInnerSw decals: - 1002: -19,32 + 936: -19,32 - node: color: '#FFFFFFFF' id: BrickTileWhiteInnerSw decals: - 821: 10,26 - 824: 8,27 + 775: 10,26 + 778: 8,27 - node: color: '#334E6DC8' id: BrickTileWhiteLineE @@ -1514,80 +1514,80 @@ entities: 437: 0,73 438: 0,71 439: 0,70 - 1669: 13,-24 - 1805: 18,-25 - 1806: 18,-24 - 1807: 18,-23 - 1888: 0,46 - 1889: 0,47 + 1586: 13,-24 + 1710: 18,-25 + 1711: 18,-24 + 1712: 18,-23 + 1793: 0,46 + 1794: 0,47 - node: color: '#52B4E996' id: BrickTileWhiteLineE decals: 59: 5,81 - 840: 12,22 - 841: 12,23 - 842: 12,24 - 843: 12,25 - 844: 12,26 - 845: 12,27 - 933: 7,33 - 934: 7,32 - 935: 7,31 - 1724: 4,18 - 1725: 4,17 - 1726: 4,16 + 794: 12,22 + 795: 12,23 + 796: 12,24 + 797: 12,25 + 798: 12,26 + 799: 12,27 + 887: 7,33 + 888: 7,32 + 889: 7,31 + 1641: 4,18 + 1642: 4,17 + 1643: 4,16 - node: color: '#A4610696' id: BrickTileWhiteLineE decals: 65: 1,82 - 1971: -35,1 - 1972: -35,2 - 1973: -39,-3 - 1974: -39,-2 - 1975: -39,-1 - 1976: -39,0 - 1977: -38,7 - 1978: -38,6 - 1979: -38,5 - 1980: -38,4 - 1981: -38,3 - 2018: -37,28 - 2019: -37,27 - 2020: -37,26 - 2021: -37,25 - 2022: -37,23 - 4981: -37,24 + 1876: -35,1 + 1877: -35,2 + 1878: -39,-3 + 1879: -39,-2 + 1880: -39,-1 + 1881: -39,0 + 1882: -38,7 + 1883: -38,6 + 1884: -38,5 + 1885: -38,4 + 1886: -38,3 + 1923: -37,28 + 1924: -37,27 + 1925: -37,26 + 1926: -37,25 + 1927: -37,23 + 4862: -37,24 - node: color: '#D381C996' id: BrickTileWhiteLineE decals: 66: -2,82 - 1095: -12,17 - 1096: -12,18 - 1097: -12,19 - 1098: -12,20 - 1099: -10,21 - 1100: -10,22 - 1101: -10,23 - 1131: -15,20 - 1132: -15,19 - 1133: -15,18 - 1134: -15,17 - 1140: -16,21 - 1186: -4,22 - 1187: -4,23 - 1188: -4,24 - 1195: -14,27 - 1196: -14,28 + 1029: -12,17 + 1030: -12,18 + 1031: -12,19 + 1032: -12,20 + 1033: -10,21 + 1034: -10,22 + 1035: -10,23 + 1065: -15,20 + 1066: -15,19 + 1067: -15,18 + 1068: -15,17 + 1074: -16,21 + 1120: -4,22 + 1121: -4,23 + 1122: -4,24 + 1129: -14,27 + 1130: -14,28 - node: color: '#D56F18EF' id: BrickTileWhiteLineE decals: - 899: 8,24 - 900: 8,23 - 901: 8,22 + 853: 8,24 + 854: 8,23 + 855: 8,22 - node: color: '#DE3A3A96' id: BrickTileWhiteLineE @@ -1610,67 +1610,67 @@ entities: 633: -6,54 634: -6,53 635: -6,52 - 2057: -35,-6 - 2058: -35,-5 - 2059: -35,-4 - 2060: -35,-3 - 2061: -35,-2 - 2062: -35,-1 + 1962: -35,-6 + 1963: -35,-5 + 1964: -35,-4 + 1965: -35,-3 + 1966: -35,-2 + 1967: -35,-1 - node: color: '#EFB34196' id: BrickTileWhiteLineE decals: - 1326: -8,-16 - 1327: -8,-15 - 1328: -8,-14 - 1329: -8,-13 - 1643: 13,-21 - 1644: 13,-22 - 1645: 13,-23 - 1646: 13,-25 - 1647: 13,-26 - 1648: 13,-27 - 1649: 13,-28 - 1650: 13,-29 - 1651: 13,-30 - 1652: 13,-35 - 1653: 13,-36 - 1654: 13,-37 - 1655: 13,-38 - 1852: -11,-19 - 1853: -11,-20 - 1927: 7,-26 - 1928: 7,-25 - 1929: 7,-24 + 1243: -8,-16 + 1244: -8,-15 + 1245: -8,-14 + 1246: -8,-13 + 1560: 13,-21 + 1561: 13,-22 + 1562: 13,-23 + 1563: 13,-25 + 1564: 13,-26 + 1565: 13,-27 + 1566: 13,-28 + 1567: 13,-29 + 1568: 13,-30 + 1569: 13,-35 + 1570: 13,-36 + 1571: 13,-37 + 1572: 13,-38 + 1757: -11,-19 + 1758: -11,-20 + 1832: 7,-26 + 1833: 7,-25 + 1834: 7,-24 - node: color: '#FFFFFFFF' id: BrickTileWhiteLineE decals: - 834: 12,27 - 835: 12,26 - 836: 12,25 - 837: 12,24 - 838: 12,23 - 839: 12,22 - 869: 11,24 - 870: 11,25 - 871: 11,26 - 878: 8,22 - 879: 8,23 - 880: 8,24 - 923: 7,31 - 924: 7,32 - 925: 7,33 - 953: 6,32 - 1171: -4,22 - 1172: -4,23 - 1173: -4,24 - 5116: 3,29 - 5117: 3,30 - 5118: 3,31 - 5119: 3,32 - 5120: 3,33 - 5121: 3,34 + 788: 12,27 + 789: 12,26 + 790: 12,25 + 791: 12,24 + 792: 12,23 + 793: 12,22 + 823: 11,24 + 824: 11,25 + 825: 11,26 + 832: 8,22 + 833: 8,23 + 834: 8,24 + 877: 7,31 + 878: 7,32 + 879: 7,33 + 907: 6,32 + 1105: -4,22 + 1106: -4,23 + 1107: -4,24 + 4997: 3,29 + 4998: 3,30 + 4999: 3,31 + 5000: 3,32 + 5001: 3,33 + 5002: 3,34 - node: color: '#334E6DC8' id: BrickTileWhiteLineN @@ -1682,89 +1682,89 @@ entities: 453: 6,74 454: 5,74 455: 7,74 - 1808: 17,-22 - 4907: 17,-15 - 4922: 20,-15 + 1713: 17,-22 + 4788: 17,-15 + 4803: 20,-15 - node: color: '#52B4E996' id: BrickTileWhiteLineN decals: 58: 4,82 - 846: 11,28 - 847: 10,28 - 848: 9,28 - 849: 7,28 - 850: 8,28 - 851: 6,28 - 928: 4,34 - 929: 5,34 - 936: 6,34 - 1209: 18,34 - 1210: 20,34 - 1211: 19,34 - 1212: 21,34 - 1720: 1,19 - 1721: 2,19 - 1722: 3,19 - 4910: 15,-17 - 4917: 22,-17 + 800: 11,28 + 801: 10,28 + 802: 9,28 + 803: 7,28 + 804: 8,28 + 805: 6,28 + 882: 4,34 + 883: 5,34 + 890: 6,34 + 1135: 18,34 + 1136: 20,34 + 1137: 19,34 + 1138: 21,34 + 1637: 1,19 + 1638: 2,19 + 1639: 3,19 + 4791: 15,-17 + 4798: 22,-17 - node: color: '#9FED5896' id: BrickTileWhiteLineN decals: - 4909: 15,-15 - 4924: 22,-15 + 4790: 15,-15 + 4805: 22,-15 - node: color: '#A4610696' id: BrickTileWhiteLineN decals: - 1949: -37,11 - 1950: -36,11 - 1951: -35,11 - 2002: -35,7 - 2003: -34,7 - 4908: 16,-15 - 4923: 21,-15 - 5009: -46,28 - 5010: -45,28 + 1854: -37,11 + 1855: -36,11 + 1856: -35,11 + 1907: -35,7 + 1908: -34,7 + 4789: 16,-15 + 4804: 21,-15 + 4890: -46,28 + 4891: -45,28 - node: color: '#D381C996' id: BrickTileWhiteLineN decals: - 1008: -21,34 - 1009: -20,34 - 1010: -19,34 - 1011: -18,34 - 1012: -17,34 - 1102: -11,25 - 1103: -12,25 - 1104: -13,25 - 1105: -14,25 - 1106: -15,25 - 1107: -16,25 - 1108: -17,25 - 1109: -18,25 - 1110: -19,25 - 1111: -20,25 - 1112: -21,25 - 1143: -17,22 - 1735: -5,19 - 1736: -4,19 - 1737: -3,19 + 942: -21,34 + 943: -20,34 + 944: -19,34 + 945: -18,34 + 946: -17,34 + 1036: -11,25 + 1037: -12,25 + 1038: -13,25 + 1039: -14,25 + 1040: -15,25 + 1041: -16,25 + 1042: -17,25 + 1043: -18,25 + 1044: -19,25 + 1045: -20,25 + 1046: -21,25 + 1077: -17,22 + 1652: -5,19 + 1653: -4,19 + 1654: -3,19 - node: color: '#D4D4D426' id: BrickTileWhiteLineN decals: - 4935: 18,-12 - 4936: 19,-12 + 4816: 18,-12 + 4817: 19,-12 - node: color: '#D56F18EF' id: BrickTileWhiteLineN decals: - 895: 3,25 - 896: 4,25 - 897: 5,25 - 898: 6,25 + 849: 3,25 + 850: 4,25 + 851: 5,25 + 852: 6,25 - node: color: '#DE3A3A96' id: BrickTileWhiteLineN @@ -1783,69 +1783,69 @@ entities: 649: -14,50 650: -13,50 651: -12,50 - 2037: -3,57 - 2079: 26,-12 - 2080: 27,-12 - 2081: 28,-12 - 2082: 29,-12 - 2083: 30,-12 - 2129: 41,44 - 2130: 42,44 - 2131: 43,44 - 2132: 44,44 - 4911: 16,-17 - 4918: 21,-17 + 1942: -3,57 + 1984: 26,-12 + 1985: 27,-12 + 1986: 28,-12 + 1987: 29,-12 + 1988: 30,-12 + 2034: 41,44 + 2035: 42,44 + 2036: 43,44 + 2037: 44,44 + 4792: 16,-17 + 4799: 21,-17 - node: color: '#EFB34196' id: BrickTileWhiteLineN decals: 72: -6,82 - 1331: -9,-12 - 1332: -10,-12 - 1333: -11,-12 - 1334: -12,-12 - 1335: -13,-12 - 1336: -14,-12 - 1337: -15,-12 - 1355: 7,-12 - 1356: 8,-12 - 1357: 9,-12 - 1358: 10,-12 - 1359: 11,-12 - 1360: 12,-12 - 1361: 13,-12 - 1678: 7,-18 - 1679: 6,-18 - 1680: 5,-18 - 1847: -15,-18 - 1848: -14,-18 - 1849: -13,-18 - 1850: -12,-18 - 4912: 17,-17 - 4921: 20,-17 + 1248: -9,-12 + 1249: -10,-12 + 1250: -11,-12 + 1251: -12,-12 + 1252: -13,-12 + 1253: -14,-12 + 1254: -15,-12 + 1272: 7,-12 + 1273: 8,-12 + 1274: 9,-12 + 1275: 10,-12 + 1276: 11,-12 + 1277: 12,-12 + 1278: 13,-12 + 1595: 7,-18 + 1596: 6,-18 + 1597: 5,-18 + 1752: -15,-18 + 1753: -14,-18 + 1754: -13,-18 + 1755: -12,-18 + 4793: 17,-17 + 4802: 20,-17 - node: color: '#FFFFFFFF' id: BrickTileWhiteLineN decals: - 827: 6,28 - 828: 7,28 - 829: 8,28 - 830: 9,28 - 831: 10,28 - 832: 11,28 - 881: 6,25 - 882: 5,25 - 883: 4,25 - 884: 3,25 - 917: 4,24 - 926: 5,34 - 927: 4,34 - 930: 6,34 - 954: 5,33 - 1178: -6,23 - 5113: 4,28 - 5114: 3,28 - 5115: 2,28 + 781: 6,28 + 782: 7,28 + 783: 8,28 + 784: 9,28 + 785: 10,28 + 786: 11,28 + 835: 6,25 + 836: 5,25 + 837: 4,25 + 838: 3,25 + 871: 4,24 + 880: 5,34 + 881: 4,34 + 884: 6,34 + 908: 5,33 + 1112: -6,23 + 4994: 4,28 + 4995: 3,28 + 4996: 2,28 - node: color: '#334E6DC8' id: BrickTileWhiteLineS @@ -1870,20 +1870,20 @@ entities: 447: 6,70 448: 5,70 449: 7,70 - 1809: 17,-26 - 1814: 18,-10 - 1815: 19,-10 + 1714: 17,-26 + 1719: 18,-10 + 1720: 19,-10 - node: color: '#52B4E996' id: BrickTileWhiteLineS decals: - 852: 6,27 - 853: 7,27 - 854: 9,26 - 938: 6,30 - 939: 5,30 - 4915: 15,-15 - 4916: 22,-15 + 806: 6,27 + 807: 7,27 + 808: 9,26 + 892: 6,30 + 893: 5,30 + 4796: 15,-15 + 4797: 22,-15 - node: color: '#5A5A605A' id: BrickTileWhiteLineS @@ -1902,51 +1902,51 @@ entities: color: '#A4610696' id: BrickTileWhiteLineS decals: - 1946: -37,9 - 1947: -36,9 - 1948: -35,9 - 1997: -34,4 - 1998: -35,4 - 5007: -45,27 - 5008: -46,27 + 1851: -37,9 + 1852: -36,9 + 1853: -35,9 + 1902: -34,4 + 1903: -35,4 + 4888: -45,27 + 4889: -46,27 - node: color: '#D381C996' id: BrickTileWhiteLineS decals: - 995: -14,30 - 996: -15,30 - 997: -16,30 - 998: -17,30 - 999: -18,30 - 1003: -20,32 - 1004: -21,32 - 1155: -10,17 - 1156: -9,17 - 1157: -8,17 - 1181: -8,21 - 1182: -7,21 - 1183: -6,21 - 1184: -5,21 - 4925: 16,-17 - 4930: 21,-17 + 929: -14,30 + 930: -15,30 + 931: -16,30 + 932: -17,30 + 933: -18,30 + 937: -20,32 + 938: -21,32 + 1089: -10,17 + 1090: -9,17 + 1091: -8,17 + 1115: -8,21 + 1116: -7,21 + 1117: -6,21 + 1118: -5,21 + 4806: 16,-17 + 4811: 21,-17 - node: color: '#D4D4D428' id: BrickTileWhiteLineS decals: - 4928: 15,-17 - 4929: 22,-17 + 4809: 15,-17 + 4810: 22,-17 - node: color: '#D4D4D496' id: BrickTileWhiteLineS decals: - 4926: 17,-17 - 4927: 20,-17 + 4807: 17,-17 + 4808: 20,-17 - node: color: '#D56F18EF' id: BrickTileWhiteLineS decals: - 902: 3,21 - 903: 4,21 + 856: 3,21 + 857: 4,21 - node: color: '#DE3A3A96' id: BrickTileWhiteLineS @@ -1984,44 +1984,44 @@ entities: 645: -14,48 646: -13,48 647: -12,48 - 2044: -3,52 - 2084: 26,-14 - 2085: 27,-14 - 2086: 28,-14 - 2087: 29,-14 - 2088: 30,-14 - 2133: 41,42 - 2134: 42,42 - 2135: 43,42 - 2136: 44,42 - 4914: 16,-15 - 4919: 21,-15 + 1949: -3,52 + 1989: 26,-14 + 1990: 27,-14 + 1991: 28,-14 + 1992: 29,-14 + 1993: 30,-14 + 2038: 41,42 + 2039: 42,42 + 2040: 43,42 + 2041: 44,42 + 4795: 16,-15 + 4800: 21,-15 - node: color: '#EFB34196' id: BrickTileWhiteLineS decals: - 1924: 6,-27 - 1925: 5,-27 - 1926: 4,-27 - 4913: 17,-15 - 4920: 20,-15 + 1829: 6,-27 + 1830: 5,-27 + 1831: 4,-27 + 4794: 17,-15 + 4801: 20,-15 - node: color: '#FFFFFFFF' id: BrickTileWhiteLineS decals: - 822: 9,26 - 825: 7,27 - 826: 6,27 - 876: 3,21 - 877: 4,21 - 920: 5,30 - 921: 6,30 - 955: 5,31 - 1167: -6,21 - 1168: -5,21 - 1177: -6,22 - 1179: -7,21 - 1180: -8,21 + 776: 9,26 + 779: 7,27 + 780: 6,27 + 830: 3,21 + 831: 4,21 + 874: 5,30 + 875: 6,30 + 909: 5,31 + 1101: -6,21 + 1102: -5,21 + 1111: -6,22 + 1113: -7,21 + 1114: -8,21 - node: color: '#334E6DC8' id: BrickTileWhiteLineW @@ -2031,73 +2031,73 @@ entities: 441: -2,73 442: -2,71 443: -2,70 - 2230: 29,4 - 2231: 29,5 + 2135: 29,4 + 2136: 29,5 - node: color: '#52B4E996' id: BrickTileWhiteLineW decals: - 858: 10,25 - 859: 10,24 - 860: 10,23 - 861: 10,22 + 812: 10,25 + 813: 10,24 + 814: 10,23 + 815: 10,22 - node: color: '#A4610696' id: BrickTileWhiteLineW decals: 62: 0,82 - 1982: -41,11 - 1983: -41,10 - 1984: -41,9 - 1985: -41,8 - 1986: -41,7 - 1987: -44,-1 - 1988: -44,-2 - 1989: -44,-3 - 2000: -36,6 - 2023: -40,30 - 2024: -40,29 - 2025: -40,20 - 2026: -40,19 - 2027: -40,18 - 2028: -40,17 - 4989: -43,26 - 4990: -43,25 - 4991: -43,24 - 4992: -43,23 - 4993: -43,22 - 4994: -43,21 - 5157: -41,6 + 1887: -41,11 + 1888: -41,10 + 1889: -41,9 + 1890: -41,8 + 1891: -41,7 + 1892: -44,-1 + 1893: -44,-2 + 1894: -44,-3 + 1905: -36,6 + 1928: -40,30 + 1929: -40,29 + 1930: -40,20 + 1931: -40,19 + 1932: -40,18 + 1933: -40,17 + 4870: -43,26 + 4871: -43,25 + 4872: -43,24 + 4873: -43,23 + 4874: -43,22 + 4875: -43,21 + 5038: -41,6 - node: color: '#D381C996' id: BrickTileWhiteLineW decals: 67: -3,82 - 1001: -19,31 - 1006: -22,33 - 1114: -22,24 - 1115: -22,23 - 1116: -22,22 - 1117: -22,21 - 1118: -22,20 - 1119: -22,19 - 1120: -22,18 - 1121: -22,17 - 1135: -19,17 - 1136: -19,18 - 1137: -19,19 - 1138: -19,20 - 1139: -18,21 - 1738: -6,18 - 1739: -6,17 - 1740: -6,16 + 935: -19,31 + 940: -22,33 + 1048: -22,24 + 1049: -22,23 + 1050: -22,22 + 1051: -22,21 + 1052: -22,20 + 1053: -22,19 + 1054: -22,18 + 1055: -22,17 + 1069: -19,17 + 1070: -19,18 + 1071: -19,19 + 1072: -19,20 + 1073: -18,21 + 1655: -6,18 + 1656: -6,17 + 1657: -6,16 - node: color: '#D56F18EF' id: BrickTileWhiteLineW decals: - 891: 2,22 - 892: 2,23 - 893: 2,24 + 845: 2,22 + 846: 2,23 + 847: 2,24 - node: color: '#DE3A3A96' id: BrickTileWhiteLineW @@ -2116,155 +2116,155 @@ entities: 564: -20,47 565: -20,46 566: -20,45 - 2039: -4,56 - 2040: -4,55 - 2041: -4,54 - 2042: -4,53 - 2063: -37,-6 - 2064: -37,-5 - 2065: -37,-4 - 2066: -37,-3 - 2067: -37,-2 - 2068: -37,-1 + 1944: -4,56 + 1945: -4,55 + 1946: -4,54 + 1947: -4,53 + 1968: -37,-6 + 1969: -37,-5 + 1970: -37,-4 + 1971: -37,-3 + 1972: -37,-2 + 1973: -37,-1 - node: color: '#EFB34196' id: BrickTileWhiteLineW decals: 73: -7,81 - 1350: 6,-16 - 1351: 6,-15 - 1352: 6,-14 - 1353: 6,-13 - 1656: 11,-38 - 1657: 11,-37 - 1658: 11,-36 - 1659: 4,-35 - 1660: 4,-34 - 1661: 4,-33 - 1662: 9,-27 - 1663: 9,-26 - 1664: 9,-25 - 1665: 9,-24 - 1666: 9,-23 - 1667: 9,-22 - 1668: 9,-21 - 1681: 4,-22 - 1682: 4,-21 - 1683: 4,-20 - 1684: 4,-19 - 1865: -14,-22 - 1866: -14,-23 - 1867: -14,-24 - 1868: -14,-25 - 1869: -14,-32 - 1870: -14,-33 - 1871: -14,-34 - 1872: -14,-35 - 1873: -14,-36 - 1874: -14,-37 - 1875: -14,-38 + 1267: 6,-16 + 1268: 6,-15 + 1269: 6,-14 + 1270: 6,-13 + 1573: 11,-38 + 1574: 11,-37 + 1575: 11,-36 + 1576: 4,-35 + 1577: 4,-34 + 1578: 4,-33 + 1579: 9,-27 + 1580: 9,-26 + 1581: 9,-25 + 1582: 9,-24 + 1583: 9,-23 + 1584: 9,-22 + 1585: 9,-21 + 1598: 4,-22 + 1599: 4,-21 + 1600: 4,-20 + 1601: 4,-19 + 1770: -14,-22 + 1771: -14,-23 + 1772: -14,-24 + 1773: -14,-25 + 1774: -14,-32 + 1775: -14,-33 + 1776: -14,-34 + 1777: -14,-35 + 1778: -14,-36 + 1779: -14,-37 + 1780: -14,-38 - node: color: '#FFFFFFFF' id: BrickTileWhiteLineW decals: - 817: 10,22 - 818: 10,23 - 819: 10,24 - 820: 10,25 - 872: 11,26 - 873: 11,25 - 874: 11,24 - 886: 2,24 - 887: 2,23 - 888: 2,22 - 918: 3,23 - 956: 4,32 + 771: 10,22 + 772: 10,23 + 773: 10,24 + 774: 10,25 + 826: 11,26 + 827: 11,25 + 828: 11,24 + 840: 2,24 + 841: 2,23 + 842: 2,22 + 872: 3,23 + 910: 4,32 - node: color: '#80C71FA4' id: Busha1 decals: - 4852: -47.70598,40.43374 + 4733: -47.70598,40.43374 - node: color: '#80C71FAB' id: Busha1 decals: - 2254: 22.65236,20.282064 + 2159: 22.65236,20.282064 - node: color: '#FFFFFF7F' id: Busha1 decals: - 2203: 32.123173,40.915573 + 2108: 32.123173,40.915573 - node: color: '#80C71FA4' id: Busha2 decals: - 4854: -45.230186,40.743168 + 4735: -45.230186,40.743168 - node: color: '#80C71FCA' id: Busha2 decals: - 2253: 22.247696,21.53798 + 2158: 22.247696,21.53798 - node: color: '#FFFFFF7F' id: Busha2 decals: - 2202: 28.87165,40.802044 - 2204: 32.094776,39.978962 + 2107: 28.87165,40.802044 + 2109: 32.094776,39.978962 - node: color: '#FFFFFF7F' id: Busha3 decals: - 2205: 28.928446,39.978962 + 2110: 28.928446,39.978962 - node: color: '#80C71FA4' id: Bushb1 decals: - 4851: -46.05545,40.68423 - 4855: -47.396503,39.873817 + 4732: -46.05545,40.68423 + 4736: -47.396503,39.873817 - node: color: '#80C71FCA' id: Bushb1 decals: - 2252: 21.225384,20.367212 + 2157: 21.225384,20.367212 - node: color: '#FFFFFF7F' id: Bushb1 decals: - 2206: 28.857452,41.01491 - 2207: 32.123173,41.043293 + 2111: 28.857452,41.01491 + 2112: 32.123173,41.043293 - node: color: '#80C71FAB' id: Bushb3 decals: - 2255: 26.187859,16.8762 + 2160: 26.187859,16.8762 - node: color: '#80C71FA4' id: Bushc2 decals: - 4853: -45.30387,39.903286 + 4734: -45.30387,39.903286 - node: color: '#FFFFFF7F' id: Bushf1 decals: - 2198: 28.885849,40.418884 - 2199: 32.13737,41.057484 + 2103: 28.885849,40.418884 + 2104: 32.13737,41.057484 - node: color: '#80C71FAB' id: Bushf2 decals: - 2256: 26.99719,17.621233 + 2161: 26.99719,17.621233 - node: color: '#FFFFFF7F' id: Bushf3 decals: - 2196: 32.108974,39.865433 - 2197: 28.87165,41.01491 + 2101: 32.108974,39.865433 + 2102: 28.87165,41.01491 - node: color: '#FFFFFF7F' id: Bushg3 decals: - 2200: 28.843252,39.879623 - 2201: 32.165768,40.518223 + 2105: 28.843252,39.879623 + 2106: 32.165768,40.518223 - node: color: '#DE3A3A96' id: CautionGreyscale @@ -2282,2921 +2282,2921 @@ entities: color: '#52B4E996' id: CheckerNESW decals: - 5234: 22,27 - 5235: 21,27 - 5236: 20,27 - 5237: 20,26 - 5238: 21,26 - 5239: 22,26 - 5240: 19,26 - 5241: 18,26 - 5242: 18,27 - 5243: 19,27 - 5244: 19,28 - 5245: 18,28 - 5246: 18,29 - 5247: 19,29 + 5106: 22,27 + 5107: 21,27 + 5108: 20,27 + 5109: 20,26 + 5110: 21,26 + 5111: 22,26 + 5112: 19,26 + 5113: 18,26 + 5114: 18,27 + 5115: 19,27 + 5116: 19,28 + 5117: 18,28 + 5118: 18,29 + 5119: 19,29 - node: color: '#79150096' id: CheckerNESW decals: - 1398: -3,11 - 1399: -3,10 - 1400: -3,9 - 1401: -3,8 - 1402: -3,7 - 1403: 1,11 - 1404: 1,10 - 1405: 1,8 - 1406: 1,9 - 1407: 1,7 - 1408: 0,8 - 1409: -1,8 - 1410: -2,8 - 1411: -2,9 - 1412: -1,9 - 1413: 0,9 - 1414: -3,6 - 1415: -3,5 - 1416: -3,4 - 1417: -3,3 - 1418: -2,4 - 1419: -1,4 - 1420: 0,4 - 1421: -2,3 - 1422: -1,3 - 1423: 0,3 - 1424: 1,3 - 1425: 1,4 - 1426: 1,5 - 1427: 1,6 - 1428: -3,2 - 1429: -3,1 - 1430: -3,0 - 1431: -3,-1 - 1432: -3,-2 - 1433: -2,-1 - 1434: -2,-2 - 1435: -1,-2 - 1436: -1,-1 - 1437: 0,-1 - 1438: 0,-2 - 1439: 1,-2 - 1440: 1,-1 - 1441: 1,0 - 1442: 1,1 - 1443: 1,2 - 1444: 1,-3 - 1445: 1,-4 - 1446: 1,-5 - 1447: 1,-6 - 1448: -3,-6 - 1449: -3,-5 - 1450: -3,-4 - 1451: -3,-3 - 1452: -4,-2 - 1453: -5,-2 - 1454: -6,-2 - 1455: -7,-2 - 1456: -7,-1 - 1457: -6,-1 - 1458: -5,-1 - 1459: -4,-1 - 1460: -14,-1 - 1461: -14,-2 - 1462: -13,-2 - 1463: -12,-1 - 1464: -12,-2 - 1465: -13,-1 - 1466: -11,-1 - 1467: -11,-2 - 1468: -10,-2 - 1469: -10,-1 - 1470: -9,-1 - 1471: -9,-2 - 1472: -8,-2 - 1473: -8,-1 - 1474: -14,3 - 1475: -13,3 - 1476: -12,3 - 1477: -11,3 - 1478: -10,3 - 1479: -9,3 - 1480: -8,3 - 1481: -6,3 - 1482: -7,3 - 1483: -5,3 - 1484: -4,3 - 1485: -14,4 - 1486: -13,4 - 1487: -12,4 - 1488: -11,4 - 1489: -4,4 + 1315: -3,11 + 1316: -3,10 + 1317: -3,9 + 1318: -3,8 + 1319: -3,7 + 1320: 1,11 + 1321: 1,10 + 1322: 1,8 + 1323: 1,9 + 1324: 1,7 + 1325: 0,8 + 1326: -1,8 + 1327: -2,8 + 1328: -2,9 + 1329: -1,9 + 1330: 0,9 + 1331: -3,6 + 1332: -3,5 + 1333: -3,4 + 1334: -3,3 + 1335: -2,4 + 1336: -1,4 + 1337: 0,4 + 1338: -2,3 + 1339: -1,3 + 1340: 0,3 + 1341: 1,3 + 1342: 1,4 + 1343: 1,5 + 1344: 1,6 + 1345: -3,2 + 1346: -3,1 + 1347: -3,0 + 1348: -3,-1 + 1349: -3,-2 + 1350: -2,-1 + 1351: -2,-2 + 1352: -1,-2 + 1353: -1,-1 + 1354: 0,-1 + 1355: 0,-2 + 1356: 1,-2 + 1357: 1,-1 + 1358: 1,0 + 1359: 1,1 + 1360: 1,2 + 1361: 1,-3 + 1362: 1,-4 + 1363: 1,-5 + 1364: 1,-6 + 1365: -3,-6 + 1366: -3,-5 + 1367: -3,-4 + 1368: -3,-3 + 1369: -4,-2 + 1370: -5,-2 + 1371: -6,-2 + 1372: -7,-2 + 1373: -7,-1 + 1374: -6,-1 + 1375: -5,-1 + 1376: -4,-1 + 1377: -14,-1 + 1378: -14,-2 + 1379: -13,-2 + 1380: -12,-1 + 1381: -12,-2 + 1382: -13,-1 + 1383: -11,-1 + 1384: -11,-2 + 1385: -10,-2 + 1386: -10,-1 + 1387: -9,-1 + 1388: -9,-2 + 1389: -8,-2 + 1390: -8,-1 + 1391: -14,3 + 1392: -13,3 + 1393: -12,3 + 1394: -11,3 + 1395: -10,3 + 1396: -9,3 + 1397: -8,3 + 1398: -6,3 + 1399: -7,3 + 1400: -5,3 + 1401: -4,3 + 1402: -14,4 + 1403: -13,4 + 1404: -12,4 + 1405: -11,4 + 1406: -4,4 - node: color: '#3E5C23A8' id: CheckerNWSE decals: - 1534: 6,6 - 1535: 6,7 - 1536: 6,8 - 1537: 6,9 - 1538: 6,10 - 1539: 7,10 - 1540: 8,10 - 1541: 9,10 - 1542: 10,10 - 1543: 10,9 - 1544: 10,8 - 1545: 10,7 - 1546: 10,6 - 1547: 10,5 - 1548: 9,5 - 1549: 8,5 - 1550: 7,5 - 1551: 6,5 + 1451: 6,6 + 1452: 6,7 + 1453: 6,8 + 1454: 6,9 + 1455: 6,10 + 1456: 7,10 + 1457: 8,10 + 1458: 9,10 + 1459: 10,10 + 1460: 10,9 + 1461: 10,8 + 1462: 10,7 + 1463: 10,6 + 1464: 10,5 + 1465: 9,5 + 1466: 8,5 + 1467: 7,5 + 1468: 6,5 - node: color: '#52B4E996' id: CheckerNWSE decals: - 5201: 14,31 - 5202: 15,31 - 5203: 16,31 - 5204: 16,32 - 5205: 15,32 - 5206: 14,32 - 5207: 14,33 - 5208: 15,33 - 5209: 16,33 - 5210: 16,34 - 5211: 15,34 - 5212: 14,34 - 5213: 15,30 + 5082: 14,31 + 5083: 15,31 + 5084: 16,31 + 5085: 16,32 + 5086: 15,32 + 5087: 14,32 + 5088: 14,33 + 5089: 15,33 + 5090: 16,33 + 5091: 16,34 + 5092: 15,34 + 5093: 14,34 + 5094: 15,30 - node: color: '#79150096' id: CheckerNWSE decals: - 1597: 9,-7 - 1598: 10,-7 - 1599: 11,-7 + 1514: 9,-7 + 1515: 10,-7 + 1516: 11,-7 - node: color: '#B02E26FF' id: CheckerNWSE decals: - 5166: -9,63 - 5167: -9,64 - 5168: -9,62 - 5169: -8,62 - 5170: -8,63 - 5171: -8,64 - 5172: -7,61 - 5173: -7,60 - 5174: -6,60 - 5175: -6,61 - 5176: -5,61 - 5177: -5,60 + 5047: -9,63 + 5048: -9,64 + 5049: -9,62 + 5050: -8,62 + 5051: -8,63 + 5052: -8,64 + 5053: -7,61 + 5054: -7,60 + 5055: -6,60 + 5056: -6,61 + 5057: -5,61 + 5058: -5,60 - node: color: '#FFFFFFFF' id: Delivery decals: - 1234: -13,-30 - 1235: -13,-29 - 1236: -13,-28 - 1237: -13,-27 - 5165: -10,60 - 5261: 13,18 + 1151: -13,-30 + 1152: -13,-29 + 1153: -13,-28 + 1154: -13,-27 + 5046: -10,60 + 5123: 13,18 - node: color: '#52B4E996' id: DeliveryGreyscale decals: - 2172: 27,3 + 2077: 27,3 - node: color: '#334E6DC8' id: DiagonalCheckerAOverlay decals: - 2145: 13,53 - 2146: 13,54 - 2147: 11,54 - 2148: 12,54 - 2149: 12,53 - 2150: 11,53 - 2151: 10,53 - 2152: 10,54 - 2153: 9,54 - 2154: 9,53 - 2155: 8,53 - 2156: 8,54 + 2050: 13,53 + 2051: 13,54 + 2052: 11,54 + 2053: 12,54 + 2054: 12,53 + 2055: 11,53 + 2056: 10,53 + 2057: 10,54 + 2058: 9,54 + 2059: 9,53 + 2060: 8,53 + 2061: 8,54 - node: color: '#52B4E996' id: DiagonalCheckerAOverlay decals: - 862: 11,23 - 863: 11,24 - 864: 11,25 - 865: 11,26 - 866: 11,27 - 940: 4,31 - 941: 4,32 - 942: 4,33 - 943: 6,33 - 944: 6,32 - 945: 6,31 - 946: 5,31 - 947: 5,32 - 949: 5,33 + 816: 11,23 + 817: 11,24 + 818: 11,25 + 819: 11,26 + 820: 11,27 + 894: 4,31 + 895: 4,32 + 896: 4,33 + 897: 6,33 + 898: 6,32 + 899: 6,31 + 900: 5,31 + 901: 5,32 + 903: 5,33 - node: color: '#83543273' id: Dirt decals: - 2331: 6,-9 - 2332: 4,-9 - 2333: 2,-9 - 2334: 0,-9 - 2335: -2,-9 - 2336: -4,-9 - 2337: -6,-9 - 2338: -7,-9 - 2339: -9,-9 - 2340: -11,-9 - 2341: -13,-9 - 2342: -15,-9 - 2343: -17,-9 - 2344: -18,-9 - 2345: -19,-9 - 2346: -21,-9 - 2347: -23,-9 - 2348: -25,-9 - 2349: -27,-9 - 2350: -30,-9 - 2351: -32,-9 - 2352: -32,-7 - 2353: -32,-4 - 2354: -32,-1 - 2355: -32,0 - 2356: -32,4 - 2357: -32,8 - 2358: -32,12 - 2359: -32,14 - 2360: -34,14 - 2361: -36,14 - 2362: -38,14 - 2363: -39,14 - 2364: -42,14 - 2365: -44,14 - 2366: -46,14 - 2367: -48,14 - 2368: -50,14 - 2369: -48,14 - 2370: -46,14 - 2371: -44,14 - 2372: -42,14 - 2373: -40,14 - 2374: -38,14 - 2375: -36,14 - 2376: -29,14 - 2377: -27,14 - 2378: -25,14 - 2379: -23,14 - 2380: -21,14 - 2381: -19,14 - 2382: -17,14 - 2383: -15,14 - 2384: -13,14 - 2385: -11,14 - 2386: -9,14 - 2387: -7,14 - 2388: -5,14 - 2389: -3,14 - 2390: -1,14 - 2391: 1,14 - 2392: 3,14 - 2393: 5,14 - 2394: 7,14 - 2395: 9,14 - 2396: 11,14 - 2397: 13,14 - 2398: 15,14 - 2399: 17,14 - 2400: 19,14 - 2401: 21,14 - 2402: 23,14 - 2403: 25,14 - 2404: 27,14 - 2405: 29,14 - 2406: 31,14 - 2407: 33,14 - 2408: 35,14 - 2409: 37,14 - 2410: 39,14 - 2411: 41,14 - 2412: 43,14 - 2413: 45,14 - 2414: 47,14 - 2415: 49,14 - 2416: 30,14 - 2417: 30,15 - 2418: 30,17 - 2419: 30,19 - 2420: 30,22 - 2421: 30,24 - 2422: 30,26 - 2423: 30,28 - 2424: 30,30 - 2425: 30,32 - 2426: 30,34 - 2427: 31,28 - 2428: 31,24 - 2429: 31,20 - 2430: 32,19 - 2431: 31,10 - 2432: 31,6 - 2433: 30,5 - 2434: 28,3 + 2234: 6,-9 + 2235: 4,-9 + 2236: 2,-9 + 2237: 0,-9 + 2238: -2,-9 + 2239: -4,-9 + 2240: -6,-9 + 2241: -7,-9 + 2242: -9,-9 + 2243: -11,-9 + 2244: -13,-9 + 2245: -15,-9 + 2246: -17,-9 + 2247: -18,-9 + 2248: -19,-9 + 2249: -21,-9 + 2250: -23,-9 + 2251: -25,-9 + 2252: -27,-9 + 2253: -30,-9 + 2254: -32,-9 + 2255: -32,-7 + 2256: -32,-4 + 2257: -32,-1 + 2258: -32,0 + 2259: -32,4 + 2260: -32,8 + 2261: -32,12 + 2262: -32,14 + 2263: -34,14 + 2264: -36,14 + 2265: -38,14 + 2266: -39,14 + 2267: -42,14 + 2268: -44,14 + 2269: -46,14 + 2270: -48,14 + 2271: -50,14 + 2272: -48,14 + 2273: -46,14 + 2274: -44,14 + 2275: -42,14 + 2276: -40,14 + 2277: -38,14 + 2278: -36,14 + 2279: -29,14 + 2280: -27,14 + 2281: -25,14 + 2282: -23,14 + 2283: -21,14 + 2284: -19,14 + 2285: -17,14 + 2286: -15,14 + 2287: -13,14 + 2288: -11,14 + 2289: -9,14 + 2290: -7,14 + 2291: -5,14 + 2292: -3,14 + 2293: -1,14 + 2294: 1,14 + 2295: 3,14 + 2296: 5,14 + 2297: 7,14 + 2298: 9,14 + 2299: 11,14 + 2300: 13,14 + 2301: 15,14 + 2302: 17,14 + 2303: 19,14 + 2304: 21,14 + 2305: 23,14 + 2306: 25,14 + 2307: 27,14 + 2308: 29,14 + 2309: 31,14 + 2310: 33,14 + 2311: 35,14 + 2312: 37,14 + 2313: 39,14 + 2314: 41,14 + 2315: 43,14 + 2316: 45,14 + 2317: 47,14 + 2318: 49,14 + 2319: 30,14 + 2320: 30,15 + 2321: 30,17 + 2322: 30,19 + 2323: 30,22 + 2324: 30,24 + 2325: 30,26 + 2326: 30,28 + 2327: 30,30 + 2328: 30,32 + 2329: 30,34 + 2330: 31,28 + 2331: 31,24 + 2332: 31,20 + 2333: 32,19 + 2334: 31,10 + 2335: 31,6 + 2336: 30,5 + 2337: 28,3 - node: cleanable: True color: '#83543273' id: Dirt decals: - 2435: 27,3 - 2436: 27,4 - 2437: 27,5 - 2438: 27,6 - 2439: 28,6 - 2440: 29,6 - 2441: 29,5 - 2442: 31,5 - 2443: 32,6 - 2444: 32,11 - 2445: 32,14 - 2446: 26,14 - 2447: 21,14 - 2448: 18,14 - 2449: 16,14 - 2450: 14,14 - 2451: 10,14 - 2452: 5,14 - 2453: 2,14 - 2454: -4,14 - 2455: -7,14 - 2456: -10,14 - 2457: -13,14 - 2458: -15,14 - 2459: -19,14 - 2460: -21,14 - 2461: -26,14 - 2462: -28,13 - 2463: -30,13 - 2464: -33,14 - 2465: -35,14 - 2466: -37,13 - 2467: -39,14 - 2468: -41,14 - 2469: -39,15 - 2470: -38,15 - 2471: -37,14 - 2472: -48,13 - 2473: -50,13 - 2474: -51,15 - 2475: -51,13 - 2476: -53,13 - 2477: -53,15 - 2478: -51,14 - 2479: -34,4 - 2480: -34,6 - 2481: -34,7 - 2482: -34,5 - 2483: -36,5 - 2484: -36,4 - 2485: -36,6 - 2486: -36,7 - 2487: -35,7 - 2488: -31,7 - 2489: -31,6 - 2490: -31,4 - 2491: -34,4 - 2492: -36,2 - 2493: -37,2 - 2494: -39,2 - 2495: -40,0 - 2496: -42,2 - 2497: -43,2 - 2498: -44,2 - 2499: -45,2 - 2500: -44,4 - 2501: -43,4 - 2502: -43,4 - 2503: -42,4 - 2504: -40,4 - 2505: -39,6 - 2506: -39,5 - 2507: -40,6 - 2508: -41,8 - 2509: -41,10 - 2510: -41,10 - 2511: -39,7 - 2512: -38,7 - 2513: -41,-1 - 2514: -42,-3 - 2515: -41,-3 - 2516: -42,-2 - 2517: -42,-1 - 2518: -39,-2 - 2519: -39,1 - 2520: -37,1 - 2521: -36,-3 - 2522: -35,-5 - 2523: -35,-5 - 2524: -37,-3 - 2525: -40,-2 - 2526: -35,-6 - 2527: -36,-5 - 2528: -36,-4 - 2529: -37,-3 - 2530: -37,-2 - 2531: -33,-5 - 2532: -32,-5 - 2533: -33,-5 - 2534: -32,-3 - 2535: -32,-2 - 2536: -32,1 - 2537: -32,4 - 2538: -32,8 - 2539: -32,5 - 2540: -32,6 - 2541: -33,7 - 2542: -33,6 - 2543: -33,4 - 2544: -33,3 - 2545: -32,2 - 2546: -32,3 - 2547: -31,0 - 2548: -31,1 - 2549: -32,-6 - 2550: -31,-7 - 2551: -31,-8 - 2552: -30,-8 - 2553: -29,-9 - 2554: -28,-9 - 2555: -27,-8 - 2556: -28,-8 - 2557: -27,-9 - 2558: -28,-10 - 2559: -27,-10 - 2560: -29,-10 - 2561: -25,-9 - 2562: -21,-9 - 2563: -19,-9 - 2564: -17,-9 - 2565: -14,-9 - 2566: -11,-9 - 2567: -9,-9 - 2568: -6,-9 - 2569: -4,-9 - 2570: -2,-9 - 2571: 2,-9 - 2572: 4,-9 - 2573: 6,-9 - 2574: 9,-9 - 2575: 11,-9 - 2576: 13,-9 - 2577: 15,-9 - 2578: 18,-9 - 2579: 20,-9 - 2580: 23,-9 - 2581: 25,-9 - 2582: 27,-9 - 2583: 30,-9 - 2584: 32,-9 - 2585: 35,-9 - 2586: 37,-9 - 2587: 39,-9 - 2588: 42,-9 - 2589: 44,-9 - 2590: 46,-9 - 2591: 48,-9 - 2592: 46,-10 - 2593: 46,-9 - 2594: 47,-9 - 2595: 48,-10 - 2596: 49,-10 - 2597: 49,-9 - 2598: 50,-8 - 2599: 51,-8 - 2600: 50,-8 - 2601: 50,-10 - 2602: 48,-10 - 2603: 44,-10 - 2604: 38,-10 - 2605: 39,-10 - 2606: 41,-10 - 2607: 40,-9 - 2608: 38,-9 - 2609: 38,-10 - 2610: 37,-9 - 2611: 34,-8 - 2612: 33,-8 - 2613: 32,-8 - 2614: 32,-7 - 2615: 30,-8 - 2616: 30,-7 - 2617: 29,-8 - 2618: 29,-10 - 2619: 30,-10 - 2620: 26,-11 - 2621: 27,-10 - 2622: 27,-11 - 2623: 27,-12 - 2624: 27,-13 - 2625: 28,-13 - 2626: 28,-14 - 2627: 28,-15 - 2628: 27,-14 - 2629: 28,-14 - 2630: 27,-9 - 2631: 30,-5 - 2632: 30,-2 - 2633: 32,-2 - 2634: 31,-3 - 2635: 30,-4 - 2636: 30,-4 - 2637: 31,-6 - 2638: 32,-5 - 2639: 30,-1 - 2640: 30,2 - 2641: 29,3 - 2642: 33,3 - 2643: 34,0 - 2644: 34,2 - 2645: 34,5 - 2646: 34,1 - 2647: 32,0 - 2648: 29,4 - 2649: 31,8 - 2650: 32,11 - 2651: 30,14 - 2652: 35,13 - 2653: 39,12 - 2654: 42,14 - 2655: 45,14 - 2656: 50,13 - 2657: 51,13 - 2658: 51,15 - 2659: 50,15 - 2660: 51,15 - 2661: 49,15 - 2662: 48,15 - 2663: 48,17 - 2664: 48,17 - 2665: 48,15 - 2666: 46,15 - 2667: 46,16 - 2668: 46,17 - 2669: 46,15 - 2670: 45,13 - 2671: 48,13 - 2672: 50,13 - 2673: 49,13 - 2674: 46,13 - 2675: 42,13 - 2676: 40,14 - 2677: 39,14 - 2678: 36,13 - 2679: 34,15 - 2680: 31,14 - 2681: 30,13 - 2682: 27,13 - 2683: 26,14 - 2684: 24,15 - 2685: 22,14 - 2686: 21,13 - 2687: 30,16 - 2688: 31,18 - 2689: 29,20 - 2690: 31,22 - 2691: 30,24 - 2692: 28,26 - 2693: 29,26 - 2694: 28,26 - 2695: 28,28 - 2696: 27,25 - 2697: 28,25 - 2698: 28,25 - 2699: 29,25 - 2700: 28,28 - 2701: 29,32 - 2702: 29,32 - 2703: 29,33 - 2704: 27,33 - 2705: 27,32 - 2706: 26,32 - 2707: 25,33 - 2708: 25,35 - 2709: 25,35 - 2710: 26,35 - 2711: 25,36 - 2712: 27,36 - 2713: 25,36 - 2714: 26,36 - 2715: 27,36 - 2716: 30,36 - 2717: 30,37 - 2718: 30,38 - 2719: 31,41 - 2720: 30,41 - 2721: 31,40 - 2722: 30,44 - 2723: 30,45 - 2724: 31,46 - 2725: 31,44 - 2726: 30,47 - 2727: 31,49 - 2728: 32,47 - 2729: 35,47 - 2730: 34,48 - 2731: 31,47 - 2732: 28,47 - 2733: 27,47 - 2734: 27,45 - 2735: 27,43 - 2736: 27,47 - 2737: 27,49 - 2738: 29,47 - 2739: 31,48 - 2740: 32,37 - 2741: 34,37 - 2742: 37,37 - 2743: 41,38 - 2744: 46,37 - 2745: 34,38 - 2746: 34,38 - 2747: 36,38 - 2748: 35,38 - 2749: 35,37 - 2750: 39,37 - 2751: 45,36 - 2752: 41,37 - 2753: 41,39 - 2754: 43,40 - 2755: 42,40 - 2756: 41,40 - 2757: 42,40 - 2758: 41,40 - 2759: 45,40 - 2760: 47,41 - 2761: 47,43 - 2762: 47,44 - 2763: 46,42 - 2764: 47,38 - 2765: 47,37 - 2766: 48,40 - 2767: 48,38 - 2768: 49,37 - 2769: 49,36 - 2770: 50,38 - 2771: 51,38 - 2772: 51,38 - 2773: 48,38 - 2774: 51,36 - 2775: 50,36 - 2776: 49,36 - 2777: 51,36 - 2778: 49,38 - 2779: 48,36 - 2780: 48,35 - 2781: 48,35 - 2782: 49,34 - 2783: 47,35 - 2784: 44,36 - 2785: 46,35 - 2786: 46,35 - 2787: 46,36 - 2788: 46,34 - 2789: 46,34 - 2790: 46,37 - 2791: 43,36 - 2792: 43,36 - 2793: 45,38 - 2794: 44,38 - 2795: 45,39 - 2796: 42,39 - 2797: 46,37 - 2798: 43,37 - 2799: 41,37 - 2800: 44,38 - 2801: 45,38 - 2802: 38,37 - 2803: 41,37 - 2804: 42,37 - 2805: 40,37 - 2806: 42,39 - 2807: 41,40 - 2808: 45,43 - 2809: 45,43 - 2810: 44,43 - 2811: 41,43 - 2812: 41,43 - 2813: 43,43 - 2814: 44,43 - 2815: 41,43 - 2816: 44,42 - 2817: 43,42 - 2818: 27,37 - 2819: 25,38 - 2820: 24,38 - 2821: 25,38 - 2822: 26,38 - 2823: 22,40 - 2824: 22,42 - 2825: 20,42 - 2826: 18,41 - 2827: 17,40 - 2828: 18,39 - 2829: 19,41 - 2830: 22,41 - 2831: 22,40 - 2832: 24,38 - 2833: 17,38 - 2834: 14,39 - 2835: 14,41 - 2836: 14,42 - 2837: 13,42 - 2838: 12,44 - 2839: 12,45 - 2840: 14,45 - 2841: 16,46 - 2842: 17,46 - 2843: 18,46 - 2844: 18,45 - 2845: 18,45 - 2846: 18,46 - 2847: 17,46 - 2848: 18,45 - 2849: 20,45 - 2850: 21,45 - 2851: 21,46 - 2852: 21,47 - 2853: 21,48 - 2854: 20,49 - 2855: 16,50 - 2856: 15,47 - 2857: 15,48 - 2858: 15,49 - 2859: 14,44 - 2860: 15,37 - 2861: 13,38 - 2862: 11,38 - 2863: 7,38 - 2864: 12,38 - 2865: 12,38 - 2866: 7,36 - 2867: 3,36 - 2868: 0,36 - 2869: 0,37 - 2870: 5,37 - 2871: 4,37 - 2872: -5,37 - 2873: -9,37 - 2874: -12,37 - 2875: -13,37 - 2876: -7,37 - 2877: -6,37 - 2878: -13,38 - 2879: -18,37 - 2880: -22,37 - 2881: -27,37 - 2882: -29,37 - 2883: -13,42 - 2884: -14,42 - 2885: -14,41 - 2886: -13,41 - 2887: -13,42 - 2888: -15,40 - 2889: -13,40 - 2890: -13,41 - 2891: -14,40 - 2892: -14,40 - 2893: -13,42 - 2894: -13,42 - 2895: -14,40 - 2896: -13,42 - 2897: -11,42 - 2898: -10,41 - 2899: -11,40 - 2900: -11,42 - 2901: -11,41 - 2902: -10,41 - 2903: -11,42 - 2904: -11,40 - 2905: -10,40 - 2906: -10,42 - 2907: -10,40 - 2908: -10,41 - 2909: -10,42 - 2910: -10,42 - 2911: -10,42 - 2912: -7,42 - 2913: -7,41 - 2914: -7,40 - 2915: -7,42 - 2916: -7,40 - 2917: -7,40 - 2918: -8,42 - 2919: -7,40 - 2920: -7,42 - 2921: -8,41 - 2922: -7,42 - 2923: -7,42 - 2924: -4,42 - 2925: -4,41 - 2926: -5,41 - 2927: -5,40 - 2928: -4,40 - 2929: -4,41 - 2930: -5,42 - 2931: -5,42 - 2932: -4,40 - 2933: -4,40 - 2934: -5,42 - 2935: -5,40 - 2936: -4,42 - 2937: -4,42 - 2938: -4,42 - 2939: -5,41 - 2940: -4,44 - 2941: -5,45 - 2942: -7,45 - 2943: -9,46 - 2944: -6,44 - 2945: -8,45 - 2946: -7,44 - 2947: -8,46 - 2948: -12,46 - 2949: -10,44 - 2950: -11,45 - 2951: -13,46 - 2952: -11,45 - 2953: -10,43 - 2954: -13,45 - 2955: -12,43 - 2956: -14,45 - 2957: -15,46 - 2958: -13,44 - 2959: -16,46 - 2960: -14,45 - 2961: -17,46 - 2962: -18,47 - 2963: -18,50 - 2964: -17,52 - 2965: -17,46 - 2966: -18,48 - 2967: -19,48 - 2968: -20,47 - 2969: -20,48 - 2970: -22,48 - 2971: -22,47 - 2972: -23,47 - 2973: -23,48 - 2974: -24,48 - 2975: -22,49 - 2976: -23,46 - 2977: -24,46 - 2978: -22,46 - 2979: -22,49 - 2980: -23,49 - 2981: -22,46 - 2982: -25,48 - 2983: -26,47 - 2984: -26,47 - 2985: -25,48 - 2986: -29,47 - 2987: -29,48 - 2988: -28,48 - 2989: -29,47 - 2990: -28,48 - 2991: -31,47 - 2992: -32,48 - 2993: -36,48 - 2994: -35,47 - 2995: -33,47 - 2996: -34,48 - 2997: -35,48 - 2998: -32,48 - 2999: -32,46 - 3000: -32,45 - 3001: -32,43 - 3002: -34,43 - 3003: -35,43 - 3004: -30,42 - 3005: -30,43 - 3006: -36,43 - 3007: -35,43 - 3008: -31,42 - 3009: -30,43 - 3010: -34,43 - 3011: -27,42 - 3012: -28,43 - 3013: -28,45 - 3014: -29,45 - 3015: -29,44 - 3016: -29,43 - 3017: -18,49 - 3018: -18,52 - 3019: -16,54 - 3020: -15,55 - 3021: -14,53 - 3022: -11,54 - 3023: -11,59 - 3024: -14,59 - 3025: -16,59 - 3026: -14,59 - 3027: -14,59 - 3028: -9,54 - 3029: -9,53 - 3030: -8,55 - 3031: -7,56 - 3032: -7,54 - 3033: -6,53 - 3034: -7,53 - 3035: -8,55 - 3036: -11,55 - 3037: -9,51 - 3038: -10,50 - 3039: -6,50 - 3040: -3,50 - 3041: -2,50 - 3042: -5,50 - 3043: -8,50 - 3044: -6,50 - 3045: -2,50 - 3046: -2,50 - 3047: -4,50 - 3048: -4,50 - 3049: -2,51 - 3050: -2,51 - 3051: -4,53 - 3052: -4,53 - 3053: -4,54 - 3054: -1,52 - 3055: -1,54 - 3056: 0,57 - 3057: 0,60 - 3058: 0,56 - 3059: 0,54 - 3060: 0,52 - 3061: -2,53 - 3062: -1,56 - 3063: -2,59 - 3064: -1,60 - 3065: -1,64 - 3066: -1,66 - 3067: 0,68 - 3068: 0,67 - 3069: 0,66 - 3070: 0,62 - 3071: 0,59 - 3072: -2,61 - 3073: -1,66 - 3074: -1,69 - 3075: -2,65 - 3076: -1,68 - 3077: -2,71 - 3078: -2,74 - 3079: -1,77 - 3080: 0,67 - 3081: 0,71 - 3082: 0,75 - 3083: 0,78 - 3084: -3,77 - 3085: -5,78 - 3086: -4,79 - 3087: -3,80 - 3088: -4,78 - 3089: -6,77 - 3090: -6,80 - 3091: -4,81 - 3092: -1,81 - 3093: 1,82 - 3094: 3,81 - 3095: 4,81 - 3096: 4,78 - 3097: 5,77 - 3098: 6,76 - 3099: 2,76 - 3100: 1,78 - 3101: -1,79 - 3102: -4,78 - 3103: 1,79 - 3104: 2,79 - 3105: 2,80 - 3106: 4,80 - 3107: 4,78 - 3108: -2,77 - 3109: -6,78 - 3110: -6,80 - 3111: -4,82 - 3112: -8,76 - 3113: -8,75 - 3114: -6,76 - 3115: -6,74 - 3116: -9,72 - 3117: -8,72 - 3118: -9,71 - 3119: -9,70 - 3120: -9,69 - 3121: -8,70 - 3122: -8,69 - 3123: -9,69 - 3124: -9,72 - 3125: -6,75 - 3126: -6,76 - 3127: 1,67 - 3128: 4,67 - 3129: 8,67 - 3130: 9,68 - 3131: 10,69 - 3132: 13,69 - 3133: 7,66 - 3134: 6,67 - 3135: 7,66 - 3136: 9,67 - 3137: 7,66 - 3138: 6,66 - 3139: 9,66 - 3140: 8,66 - 3141: 1,67 - 3142: -1,66 - 3143: 0,62 - 3144: -1,59 - 3145: 1,56 - 3146: 3,55 - 3147: 2,56 - 3148: 3,56 - 3149: 4,56 - 3150: 5,55 - 3151: 7,53 - 3152: 10,53 - 3153: 11,53 - 3154: 14,54 - 3155: 13,55 - 3156: 10,54 - 3157: 7,54 - 3158: 6,52 - 3159: 8,52 - 3160: 11,52 - 3161: 13,52 - 3162: 14,52 - 3163: 11,52 - 3164: 7,52 - 3165: 5,53 - 3166: 3,53 - 3167: 4,53 - 3168: 1,53 - 3169: 0,52 - 3170: 2,52 - 3171: 4,53 - 3172: 0,53 - 3173: 0,50 - 3174: -1,50 - 3175: -1,49 - 3176: -1,47 - 3177: -1,45 - 3178: -1,47 - 3179: -3,48 - 3180: -2,47 - 3181: -2,47 - 3182: -2,48 - 3183: -1,48 - 3184: -1,46 - 3185: -1,44 - 3186: -1,44 - 3187: -2,40 - 3188: -2,39 - 3189: -3,38 - 3190: -4,37 - 3191: -2,38 - 3192: -2,40 - 3193: -2,38 - 3194: -4,38 - 3195: 0,40 - 3196: 0,38 - 3197: 2,37 - 3198: 1,38 - 3199: 0,39 - 3200: -1,40 - 3201: -1,41 - 3202: -1,43 - 3203: -1,44 - 3204: -1,44 - 3205: 1,37 - 3206: 2,37 - 3207: 5,37 - 3208: 10,37 - 3209: 5,37 - 3210: 12,37 - 3211: 15,37 - 3212: 20,37 - 3213: 20,37 - 3214: 11,37 - 3215: 2,37 - 3216: -1,35 - 3217: -1,33 - 3218: -1,31 - 3219: -1,29 - 3220: -1,28 - 3221: -1,28 - 3222: -1,26 - 3223: -1,24 - 3224: -1,22 - 3225: -1,21 - 3226: -1,20 - 3227: -1,18 - 3228: -5,18 - 3229: -6,18 - 3230: -7,18 - 3231: -6,17 - 3232: -7,17 - 3233: -10,17 - 3234: -12,17 - 3235: -9,17 - 3236: -7,17 - 3237: -11,18 - 3238: -9,18 - 3239: -8,17 - 3240: -10,17 - 3241: -6,17 - 3242: -3,17 - 3243: 1,17 - 3244: 5,17 - 3246: 3,18 - 3248: 5,18 - 3262: 5,17 - 3263: 11,19 - 3265: 11,23 - 3266: 11,22 - 3267: 11,21 - 3268: 10,23 - 3269: 10,24 - 3270: 10,26 - 3271: 11,27 - 3272: 11,25 - 3273: 10,26 - 3274: 9,27 - 3275: 7,28 - 3276: 6,28 - 3277: 8,27 - 3278: 6,25 - 3279: 4,23 - 3280: 3,22 - 3281: 7,23 - 3282: 5,24 - 3283: 3,24 - 3284: 7,27 - 3285: 6,28 - 3286: 6,30 - 3287: 6,33 - 3288: 5,34 - 3289: 4,33 - 3290: 4,32 - 3291: 4,31 - 3292: 4,29 - 3293: 3,27 - 3294: 4,27 - 3295: 4,27 - 3296: 4,29 - 3297: 5,32 - 3298: 5,33 - 3299: 6,31 - 3300: 6,29 - 3301: 7,29 - 3302: 7,31 - 3303: 8,28 - 3304: 11,28 - 3305: 11,28 - 3306: 13,28 - 3308: 12,28 - 3310: 19,29 - 3311: 19,30 - 3312: 19,29 - 3313: 19,31 - 3314: 19,32 - 3315: 20,33 - 3316: 20,34 - 3317: 20,33 - 3318: 19,31 - 3319: 18,31 - 3320: 18,33 - 3322: 19,26 - 3324: 21,26 - 3325: 21,26 - 3326: 21,27 - 3328: 20,32 - 3329: 20,33 - 3330: 20,33 - 3331: 19,32 - 3332: 19,31 - 3333: 19,34 - 3334: 19,34 - 3335: 20,33 - 3336: 20,31 - 3337: 20,31 - 3338: 20,32 - 3339: 20,33 - 3340: 20,34 - 3341: 20,32 - 3342: 19,32 - 3343: 19,34 - 3344: 19,31 - 3346: 11,22 - 3347: 10,23 - 3348: 10,25 - 3349: 18,14 - 3350: 20,14 - 3351: 25,14 - 3352: 23,14 - 3353: 23,17 - 3354: 25,19 - 3355: 26,21 - 3356: 27,22 - 3357: 26,21 - 3358: 24,19 - 3359: 23,18 - 3360: 22,18 - 3361: 22,19 - 3362: 24,20 - 3363: 26,22 - 3364: 27,22 - 3365: 27,20 - 3366: 24,18 - 3367: 23,18 - 3368: 27,20 - 3369: 26,20 - 3370: 25,18 - 3371: 25,17 - 3372: 24,17 - 3373: 24,16 - 3374: 23,15 - 3375: 23,16 - 3376: 25,16 - 3377: 25,16 - 3378: 24,16 - 3379: 25,17 - 3380: 28,19 - 3381: 29,20 - 3382: 29,21 - 3383: 28,19 - 3384: 28,20 - 3385: 29,21 - 3386: 29,22 - 3387: 27,25 - 3388: 30,31 - 3389: 30,28 - 3390: 31,26 - 3391: 31,19 - 3392: 31,18 - 3393: 33,16 - 3394: 39,14 - 3395: 44,15 - 3396: 19,13 - 3397: 18,13 - 3398: 17,14 - 3399: 17,13 - 3400: 18,13 - 3401: 19,15 - 3402: 18,14 - 3403: 18,15 - 3404: 23,16 - 3405: 22,17 - 3406: 25,21 - 3407: 27,21 - 3408: 28,21 - 3409: 27,19 - 3410: 27,21 - 3411: 25,18 - 3412: 24,17 - 3427: 10,-12 - 3428: 11,-12 - 3429: 11,-13 - 3430: 11,-15 - 3431: 11,-16 - 3432: 12,-17 - 3433: 11,-15 - 3434: 10,-11 - 3435: 8,-14 - 3436: 5,-16 - 3437: 6,-16 - 3438: 10,-12 - 3439: 12,-14 - 3440: 12,-17 - 3441: 12,-18 - 3442: 11,-14 - 3443: 9,-12 - 3444: 9,-13 - 3445: 5,-13 - 3446: 4,-10 - 3447: 4,-11 - 3448: 4,-13 - 3449: 4,-14 - 3450: 2,-14 - 3451: 4,-11 - 3452: 4,-12 - 3453: 3,-13 - 3454: -4,-14 - 3455: -6,-13 - 3456: -6,-11 - 3457: -7,-8 - 3458: -3,-13 - 3459: -6,-11 - 3460: -7,-9 - 3461: -5,-14 - 3462: -5,-10 - 3463: -1,-11 - 3464: 0,-11 - 3465: -5,-14 - 3466: -6,-11 - 3467: -8,-9 - 3468: -12,-9 - 3469: -10,-10 - 3470: -15,-10 - 3471: -19,-10 - 3472: -19,-13 - 3473: -19,-16 - 3474: -19,-19 - 3475: -16,-10 - 3476: -18,-18 - 3477: -19,-19 - 3478: -17,-12 - 3479: -18,-12 - 3480: -18,-13 - 3481: -19,-12 - 3482: -19,-10 - 3483: -17,-10 - 3484: -15,-9 - 3485: -11,-9 - 3486: -20,-10 - 3487: -20,-10 - 3488: -18,-17 - 3489: -17,-19 - 3490: -17,-20 - 3491: -17,-20 - 3492: -9,-14 - 3493: -13,-12 - 3494: -11,-13 - 3495: -10,-15 - 3496: -10,-15 - 3497: -14,-13 - 3498: -10,-13 - 3499: -9,-16 - 3500: -9,-15 - 3501: -10,-16 - 3502: -9,-16 - 3503: -13,-16 - 3504: -13,-15 - 3505: -13,-13 - 3506: -13,-14 - 3507: -13,-18 - 3508: -13,-19 - 3509: -13,-20 - 3510: -14,-19 - 3511: -12,-19 - 3512: -11,-19 - 3513: -15,-19 - 3514: -8,-19 - 3515: -8,-21 - 3516: -8,-26 - 3517: -8,-28 - 3518: -7,-30 - 3519: -6,-32 - 3520: -9,-34 - 3521: -6,-36 - 3522: -9,-37 - 3523: -10,-39 - 3524: -10,-41 - 3525: -7,-41 - 3526: -9,-39 - 3527: -10,-36 - 3528: -11,-34 - 3529: -10,-38 - 3530: -10,-41 - 3531: -7,-39 - 3532: -7,-33 - 3561: -14,-38 - 3562: -13,-37 - 3563: -13,-35 - 3564: -13,-32 - 3565: -13,-24 - 3566: -13,-24 - 3567: -12,-23 - 3568: -12,-22 - 3569: -13,-22 - 3570: -13,-22 - 3571: -13,-23 - 3572: -13,-24 - 3573: -12,-25 - 3574: 12,-21 - 3575: 12,-22 - 3576: 12,-23 - 3577: 12,-25 - 3578: 12,-27 - 3579: 12,-29 - 3580: 12,-31 - 3581: 12,-33 - 3582: 12,-35 - 3583: 12,-36 - 3584: 12,-37 - 3585: 12,-38 - 3586: 12,-37 - 3587: 12,-35 - 3588: 12,-33 - 3589: 12,-31 - 3590: 12,-29 - 3591: 12,-27 - 3592: 12,-25 - 3593: 12,-23 - 3594: 12,-21 - 3595: 12,-21 - 3596: 12,-25 - 3597: 12,-27 - 3598: 12,-29 - 3599: 12,-34 - 3631: 11,-21 - 3632: 11,-23 - 3633: 11,-25 - 3634: 11,-27 - 3635: 11,-30 - 3636: 11,-32 - 3637: 11,-35 - 3638: 11,-36 - 3639: 11,-35 - 3640: 11,-33 - 3641: 11,-30 - 3642: 11,-27 - 3643: 11,-24 - 3644: 11,-21 - 3645: 13,-24 - 3646: 13,-24 - 3647: 12,-24 - 3648: 11,-24 - 3649: 10,-25 - 3650: 9,-25 - 3651: 10,-25 - 3652: 7,-26 - 3653: 6,-27 - 3654: 4,-26 - 3655: 6,-25 - 3656: 7,-25 - 3657: 10,-21 - 3658: 8,-21 - 3659: 6,-21 - 3660: 5,-20 - 3661: 5,-19 - 3662: 7,-19 - 3664: 7,-18 - 3665: 7,-20 - 3667: 5,-21 - 3668: 5,-21 - 3670: 6,-19 - 3671: 5,-19 - 3672: 6,-20 - 3673: 6,-21 - 3674: 5,-21 - 3679: 10,-21 - 3680: 9,-21 - 3681: 10,-22 - 3682: 9,-22 - 3683: 10,-23 - 3684: 9,-22 - 3685: 11,-22 - 3718: 6,-35 - 3719: 11,-34 - 3720: 7,-37 - 3721: 6,-37 - 3722: 7,-38 - 3723: 7,-37 - 3724: 6,-37 - 3725: 6,-38 - 3726: 6,-38 - 3727: 6,-38 - 3728: 5,-38 - 3729: 4,-40 - 3752: 17,-37 - 3753: 18,-37 - 3754: 18,-37 - 3755: 18,-36 - 3756: 18,-35 - 3757: 18,-35 - 3758: 18,-34 - 3759: 18,-35 - 3760: 18,-35 - 3761: 17,-35 - 3762: 17,-35 - 3763: 17,-34 - 3764: 17,-34 - 3765: 17,-34 - 3766: 17,-34 - 3767: 18,-36 - 3768: 18,-36 - 3769: 18,-36 - 3770: 18,-36 - 3771: 18,-36 - 3782: 15,-41 - 3783: 15,-40 - 3784: 16,-40 - 3785: 16,-41 - 3786: 15,-41 - 3787: 15,-40 - 3788: 15,-38 - 3789: 15,-37 - 3790: 15,-37 - 3791: 15,-38 - 3792: 16,-41 - 3793: 16,-40 - 3794: 15,-41 - 3795: 15,-40 - 3796: 8,-38 - 3797: 9,-39 - 3798: 9,-41 - 3799: 4,-42 - 3800: 4,-39 - 3801: 5,-41 - 3802: -14,-38 - 3803: -13,-35 - 3804: -13,-32 - 3805: -13,-24 - 3806: -12,-23 - 3807: -13,-30 - 3808: -14,-30 - 3809: -16,-27 - 3810: -13,-27 - 3811: -14,-28 - 3812: -16,-29 - 3813: -16,-29 - 3814: -15,-27 - 3815: -13,-28 - 3816: -13,-29 - 3817: -14,-30 - 3818: -13,-29 - 3819: -13,-27 - 3820: -12,-29 - 3821: -7,-6 - 3822: -7,-4 - 3823: -5,-2 - 3824: -2,1 - 3825: -1,4 - 3826: 0,7 - 3827: 2,10 - 3828: 1,8 - 3829: 1,4 - 3830: -3,6 - 3831: -3,11 - 3832: -3,5 - 3833: 1,1 - 3834: -3,-2 - 3835: -1,-5 - 3836: 1,-6 - 3837: 1,-4 - 3838: 1,0 - 3839: 1,4 - 3840: 1,9 - 3841: 2,11 - 3842: 2,7 - 3843: 2,2 - 3844: 3,-2 - 3845: 3,-7 - 3846: 2,-4 - 3847: 1,0 - 3848: 1,5 - 3849: 1,8 - 3850: 1,11 - 3851: -2,11 - 3852: -4,7 - 3853: -4,2 - 3854: -3,-2 - 3855: 7,-5 - 3856: 5,-1 - 3857: 11,-5 - 3858: 11,-3 - 3859: 11,-3 - 3860: 9,-5 - 3861: 8,-5 - 3862: 10,-1 - 3863: 8,-1 - 3864: 11,-1 - 3865: 11,-1 - 3866: 11,-2 - 3867: 11,-1 - 3868: 10,2 - 3869: 10,2 - 3870: 11,2 - 3871: 11,1 - 3872: 10,1 - 3873: 11,1 - 3874: 11,1 - 3875: 12,2 - 3876: 12,2 - 3889: 8,5 - 3890: 7,6 - 3891: 6,8 - 3892: 7,9 - 3893: 9,10 - 3894: 10,9 - 3895: 10,7 - 3896: 7,6 - 3897: 5,11 - 3898: 5,11 - 3899: 5,9 - 3900: 6,6 - 3901: 7,5 - 3902: 11,7 - 3903: 10,10 - 3904: 6,5 - 3905: 5,5 - 3906: 5,5 - 3907: 3,5 - 3908: 4,5 - 3909: 5,5 - 3910: 2,5 - 3911: 3,5 - 3912: 3,5 - 3913: 5,-4 - 3914: 5,-5 - 3915: 6,-5 - 3916: 5,-5 - 3917: 4,-5 - 3929: 5,-3 - 3930: 5,-3 - 3931: 3,-3 - 3932: 3,-2 - 3933: 3,-1 - 3934: 3,-4 - 3935: 2,-6 - 3936: 1,-6 - 3937: 1,-6 - 3938: 1,-5 - 3939: 2,-5 - 3940: 3,-3 - 3941: 3,-2 - 3942: 9,-8 - 3943: 10,-7 - 3944: 11,-7 - 3945: 9,-7 - 3946: 11,-7 - 3947: 10,-7 - 3948: 9,-8 - 3949: 10,-8 - 3950: 10,-9 - 3951: 7,-8 - 3952: 8,-8 - 3953: 7,-8 - 3954: 8,-8 - 3955: 10,-8 - 3956: 10,-7 - 3957: 11,-7 - 3958: 12,-8 - 3959: 13,-8 - 3960: 14,-8 - 3961: 12,-8 - 3962: 13,-9 - 3963: 11,-8 - 3964: 10,-7 - 3965: 9,-8 - 3966: 8,-8 - 3967: 6,-8 - 3968: 9,-8 - 3969: 9,-7 - 3970: 8,-9 - 3981: -3,-1 - 3982: -4,1 - 3983: -4,3 - 3984: -4,4 - 3985: -7,3 - 3986: -9,2 - 3987: -11,-1 - 3988: -11,-1 - 3989: -13,-2 - 3990: -13,-2 - 3991: -15,1 - 3992: -14,0 - 3993: -14,2 - 3994: -14,3 - 3995: -14,4 - 3996: -13,2 - 3997: -13,1 - 3998: -12,0 - 3999: -10,1 - 4000: -9,2 - 4001: -8,2 - 4002: -7,1 - 4003: -8,2 - 4004: -6,0 - 4005: -3,2 - 4006: -3,4 - 4007: -2,6 - 4008: 0,6 - 4015: 3,6 - 4016: 2,6 - 4019: -10,7 - 4020: -9,6 - 4021: -9,6 - 4022: -8,6 - 4023: -7,6 - 4024: -10,7 - 4025: -10,6 - 4026: -10,8 - 4027: -9,8 - 4028: -10,8 - 4029: -11,7 - 4030: -10,6 - 4031: -9,6 - 4032: -9,7 - 4033: -7,8 - 4034: -5,7 - 4035: -5,6 - 4036: -5,5 - 4037: -5,4 - 4038: -8,4 - 4039: -9,4 - 4040: -8,4 - 4041: -9,4 - 4042: -9,4 - 4043: -7,4 - 4044: -5,10 - 4045: -5,10 - 4046: -4,10 - 4047: -4,11 - 4048: -4,11 - 4049: -3,11 - 4050: -4,9 - 4051: -3,10 - 4052: -3,7 - 4053: -3,5 - 4054: -3,3 - 4055: -3,0 - 4056: -3,-2 - 4057: -3,0 - 4058: -3,4 - 4059: -3,8 - 4060: -3,11 - 4061: -3,1 - 4062: -3,-2 - 4063: -3,-5 - 4064: -3,-6 - 4155: -44,43 - 4156: -44,42 - 4157: -44,40 - 4158: -43,38 - 4159: -43,37 - 4160: -43,37 - 4161: -44,39 - 4162: -44,42 - 4163: -45,44 - 4164: -46,43 - 4165: -47,43 - 4166: -48,44 - 4167: -45,43 - 4168: -44,43 - 4169: -45,43 - 4170: -47,43 - 4171: -49,43 - 4172: -49,41 - 4173: -49,39 - 4174: -51,38 - 4175: -51,38 - 4176: -51,37 - 4177: -51,36 - 4178: -51,36 - 4179: -46,36 - 4180: -44,36 - 4181: -49,36 - 4182: -51,36 - 4183: -47,37 - 4184: -51,38 - 4185: -50,38 - 4186: -46,37 - 4187: -43,37 - 4188: -38,37 - 4189: -45,37 - 4190: -51,36 - 4191: -47,36 - 4192: -41,36 - 4193: -44,37 - 4194: -38,37 - 4195: -33,37 - 4196: -38,36 - 4197: -39,36 - 4198: -41,36 - 4199: -39,36 - 4200: -39,37 - 4201: -40,37 - 4202: -40,36 - 4203: -37,37 - 4204: -37,36 - 4205: -41,37 - 4206: -42,37 - 4207: -36,37 - 4208: -35,37 - 4209: -33,36 - 4210: -35,36 - 4211: -35,36 - 4212: -37,37 - 4213: -35,38 - 4214: -30,36 - 4215: -31,36 - 4216: -31,35 - 4217: -31,35 - 4218: -30,37 - 4219: -30,36 - 4220: -31,35 - 4221: -30,33 - 4222: -29,33 - 4223: -27,32 - 4224: -28,31 - 4225: -29,30 - 4226: -30,30 - 4227: -32,30 - 4228: -29,30 - 4229: -28,31 - 4230: -29,33 - 4231: -31,33 - 4232: -31,32 - 4233: -28,33 - 4234: -28,31 - 4235: -28,32 - 4236: -28,33 - 4237: -28,32 - 4238: -28,30 - 4239: -28,30 - 4240: -27,30 - 4241: -27,31 - 4242: -27,33 - 4285: -39,19 - 4286: -39,18 - 4287: -39,20 - 4288: -39,23 - 4289: -39,23 - 4290: -38,26 - 4291: -39,29 - 4292: -38,28 - 4293: -39,26 - 4294: -39,23 - 4295: -39,21 - 4296: -39,27 - 4297: -38,26 - 4298: -38,21 - 4299: -38,19 - 4300: -39,21 - 4301: -39,29 - 4302: -39,27 - 4303: -39,21 - 4304: -39,24 - 4305: -40,27 - 4306: -39,25 - 4307: -39,24 - 4308: -39,26 - 4309: -37,26 - 4310: -37,23 - 4311: -38,20 - 4312: -39,19 - 4313: -39,18 - 4314: -40,18 - 4315: -38,21 - 4316: -38,26 - 4317: -42,26 - 4318: -42,25 - 4319: -41,25 - 4320: -42,25 - 4321: -41,26 - 4322: -41,26 - 4352: -38,15 - 4353: -36,15 - 4354: -36,15 - 4355: -35,15 - 4356: -39,4 - 4357: -40,3 - 4358: -40,2 - 4359: -40,0 - 4360: -40,-1 - 4361: -41,-1 - 4362: -41,-2 - 4363: -42,-2 - 4364: -43,-3 - 4365: -36,2 - 4366: -36,2 - 4367: -36,1 - 4368: -37,2 - 4369: -36,1 - 4370: -40,9 - 4371: -41,9 - 4372: -39,10 - 4373: -39,10 - 4374: -37,10 - 4375: -38,10 - 4376: -37,10 - 4377: -35,10 - 4378: -35,10 - 4379: -36,11 - 4380: -37,10 - 4420: -4,13 - 4421: 2,13 - 4422: 1,13 - 4423: 1,13 - 4424: -3,13 - 4425: -3,13 - 4426: -4,13 - 4427: -5,13 - 4428: -5,13 - 4429: -2,13 - 4430: -2,13 - 4431: 3,13 - 4432: 3,13 - 4433: 0,13 - 4434: 0,13 - 4446: -5,16 - 4447: -4,16 - 4448: -6,16 - 4449: -3,18 - 4450: -3,19 - 4451: 1,18 - 4452: 1,17 - 4453: 1,17 - 4454: 3,16 - 4455: 4,16 - 4456: 2,16 - 4481: 15,47 - 4482: 15,46 - 4483: 14,46 - 4484: 15,47 - 4521: 5,74 - 4522: 5,75 - 4523: 5,76 - 4524: 4,77 - 4525: 4,80 - 4526: 5,81 - 4527: 1,81 - 4528: -2,81 - 4529: 1,82 - 4530: 0,82 - 4531: 1,82 - 4532: 0,83 - 4533: 1,83 - 4534: 1,82 - 4535: 0,83 - 4536: 0,82 - 4537: -1,81 - 4538: -4,81 - 4539: -7,81 - 4540: -5,81 - 4541: 2,79 - 4542: 0,79 - 4543: 0,79 - 4544: -4,76 - 4545: -5,76 - 4546: -6,74 - 4547: -7,74 - 4548: -8,73 - 4549: -9,72 - 4550: -9,73 - 4551: -8,72 - 4552: -8,74 - 4553: -9,70 - 4554: -9,69 - 4555: -8,70 - 4556: 9,66 - 4557: 10,69 - 4558: 12,69 - 4559: 13,58 - 4560: 13,60 - 4561: 12,56 - 4562: 13,56 - 4563: 8,56 - 4564: 8,56 - 4565: 8,56 - 4566: 14,60 - 4567: 14,60 - 4568: 14,61 - 4569: 14,60 - 4570: 22,58 - 4571: 23,57 - 4572: 27,56 - 4573: 28,56 - 4574: 28,55 - 4575: 28,54 - 4576: 34,55 - 4577: 34,54 - 4578: 33,54 - 4579: 30,55 - 4580: 30,56 - 4581: 30,54 - 4582: 31,54 - 4583: 32,54 - 4591: 46,36 - 4592: 46,34 - 4643: 32,16 - 4644: 32,15 - 4645: 32,13 - 4646: 32,11 - 4647: 32,13 - 4676: 34,1 - 4677: 36,1 - 4678: 37,1 - 4679: 37,1 - 4680: 36,1 - 4681: 35,1 - 4682: 35,3 - 4683: 37,3 - 4684: 19,-4 - 4685: 18,-5 - 4686: 17,-6 - 4687: 17,-5 - 4688: 17,-4 - 4689: 18,-6 - 4690: 21,-6 - 4691: 19,-4 - 4692: 22,-4 - 4693: 21,-5 - 4694: 20,-6 - 4695: 22,-6 - 4696: 21,-4 - 4697: 21,-4 - 4698: 19,-5 - 4699: 20,-4 - 4700: 20,-4 - 4701: 20,-5 - 4702: 17,-4 - 4717: -9,-6 - 4718: -9,-5 - 4719: -9,-3 - 4720: -11,-2 - 4721: -10,-2 - 4722: -9,-3 - 4723: -9,-5 - 4724: -16,1 - 4725: -14,0 - 4726: -14,0 - 4727: -14,0 - 4728: -14,-1 - 4729: -13,0 - 4730: -13,1 - 4737: -10,-9 - 4738: -9,-10 - 4739: -6,-10 - 4740: -4,-11 - 4741: -2,-11 - 4742: -6,-14 - 4743: -6,-13 - 4744: 4,-14 - 4745: 4,-13 - 4746: 3,-11 - 4747: 3,-9 - 4748: 1,-9 - 4749: 5,-9 - 4750: 7,-9 - 4751: 8,-10 - 4752: 3,-5 - 4753: 4,-5 - 4754: 3,-5 - 4804: 12,9 - 4805: 13,9 - 4806: 14,9 - 4807: 14,8 - 4808: 14,7 - 4809: 15,9 - 4810: 15,10 - 4811: 15,10 - 4812: 13,10 - 4813: 9,10 - 4814: 6,10 - 4815: 6,8 - 4816: 7,6 - 4817: 7,9 - 4818: 8,8 - 4819: 7,7 - 4820: 8,7 - 4821: 8,9 - 4822: 8,6 - 4823: 8,7 - 4824: 8,9 - 4825: 7,10 - 4826: 6,11 - 4827: 8,11 - 4828: 10,10 - 4829: 10,6 - 4832: 14,38 - 4833: 15,38 - 4834: 14,38 - 4835: 15,38 - 4836: 14,38 + 2338: 27,3 + 2339: 27,4 + 2340: 27,5 + 2341: 27,6 + 2342: 28,6 + 2343: 29,6 + 2344: 29,5 + 2345: 31,5 + 2346: 32,6 + 2347: 32,11 + 2348: 32,14 + 2349: 26,14 + 2350: 21,14 + 2351: 18,14 + 2352: 16,14 + 2353: 14,14 + 2354: 10,14 + 2355: 5,14 + 2356: 2,14 + 2357: -4,14 + 2358: -7,14 + 2359: -10,14 + 2360: -13,14 + 2361: -15,14 + 2362: -19,14 + 2363: -21,14 + 2364: -26,14 + 2365: -28,13 + 2366: -30,13 + 2367: -33,14 + 2368: -35,14 + 2369: -37,13 + 2370: -39,14 + 2371: -41,14 + 2372: -39,15 + 2373: -38,15 + 2374: -37,14 + 2375: -48,13 + 2376: -50,13 + 2377: -51,15 + 2378: -51,13 + 2379: -53,13 + 2380: -53,15 + 2381: -51,14 + 2382: -34,4 + 2383: -34,6 + 2384: -34,7 + 2385: -34,5 + 2386: -36,5 + 2387: -36,4 + 2388: -36,6 + 2389: -36,7 + 2390: -35,7 + 2391: -31,7 + 2392: -31,6 + 2393: -31,4 + 2394: -34,4 + 2395: -36,2 + 2396: -37,2 + 2397: -39,2 + 2398: -40,0 + 2399: -42,2 + 2400: -43,2 + 2401: -44,2 + 2402: -45,2 + 2403: -44,4 + 2404: -43,4 + 2405: -43,4 + 2406: -42,4 + 2407: -40,4 + 2408: -39,6 + 2409: -39,5 + 2410: -40,6 + 2411: -41,8 + 2412: -41,10 + 2413: -41,10 + 2414: -39,7 + 2415: -38,7 + 2416: -41,-1 + 2417: -42,-3 + 2418: -41,-3 + 2419: -42,-2 + 2420: -42,-1 + 2421: -39,-2 + 2422: -39,1 + 2423: -37,1 + 2424: -36,-3 + 2425: -35,-5 + 2426: -35,-5 + 2427: -37,-3 + 2428: -40,-2 + 2429: -35,-6 + 2430: -36,-5 + 2431: -36,-4 + 2432: -37,-3 + 2433: -37,-2 + 2434: -33,-5 + 2435: -32,-5 + 2436: -33,-5 + 2437: -32,-3 + 2438: -32,-2 + 2439: -32,1 + 2440: -32,4 + 2441: -32,8 + 2442: -32,5 + 2443: -32,6 + 2444: -33,7 + 2445: -33,6 + 2446: -33,4 + 2447: -33,3 + 2448: -32,2 + 2449: -32,3 + 2450: -31,0 + 2451: -31,1 + 2452: -32,-6 + 2453: -31,-7 + 2454: -31,-8 + 2455: -30,-8 + 2456: -29,-9 + 2457: -28,-9 + 2458: -27,-8 + 2459: -28,-8 + 2460: -27,-9 + 2461: -28,-10 + 2462: -27,-10 + 2463: -29,-10 + 2464: -25,-9 + 2465: -21,-9 + 2466: -19,-9 + 2467: -17,-9 + 2468: -14,-9 + 2469: -11,-9 + 2470: -9,-9 + 2471: -6,-9 + 2472: -4,-9 + 2473: -2,-9 + 2474: 2,-9 + 2475: 4,-9 + 2476: 6,-9 + 2477: 9,-9 + 2478: 11,-9 + 2479: 13,-9 + 2480: 15,-9 + 2481: 18,-9 + 2482: 20,-9 + 2483: 23,-9 + 2484: 25,-9 + 2485: 27,-9 + 2486: 30,-9 + 2487: 32,-9 + 2488: 35,-9 + 2489: 37,-9 + 2490: 39,-9 + 2491: 42,-9 + 2492: 44,-9 + 2493: 46,-9 + 2494: 48,-9 + 2495: 46,-10 + 2496: 46,-9 + 2497: 47,-9 + 2498: 48,-10 + 2499: 49,-10 + 2500: 49,-9 + 2501: 50,-8 + 2502: 51,-8 + 2503: 50,-8 + 2504: 50,-10 + 2505: 48,-10 + 2506: 44,-10 + 2507: 38,-10 + 2508: 39,-10 + 2509: 41,-10 + 2510: 40,-9 + 2511: 38,-9 + 2512: 38,-10 + 2513: 37,-9 + 2514: 34,-8 + 2515: 33,-8 + 2516: 32,-8 + 2517: 32,-7 + 2518: 30,-8 + 2519: 30,-7 + 2520: 29,-8 + 2521: 29,-10 + 2522: 30,-10 + 2523: 26,-11 + 2524: 27,-10 + 2525: 27,-11 + 2526: 27,-12 + 2527: 27,-13 + 2528: 28,-13 + 2529: 28,-14 + 2530: 28,-15 + 2531: 27,-14 + 2532: 28,-14 + 2533: 27,-9 + 2534: 30,-5 + 2535: 30,-2 + 2536: 32,-2 + 2537: 31,-3 + 2538: 30,-4 + 2539: 30,-4 + 2540: 31,-6 + 2541: 32,-5 + 2542: 30,-1 + 2543: 30,2 + 2544: 29,3 + 2545: 33,3 + 2546: 34,0 + 2547: 34,2 + 2548: 34,5 + 2549: 34,1 + 2550: 32,0 + 2551: 29,4 + 2552: 31,8 + 2553: 32,11 + 2554: 30,14 + 2555: 35,13 + 2556: 39,12 + 2557: 42,14 + 2558: 45,14 + 2559: 50,13 + 2560: 51,13 + 2561: 51,15 + 2562: 50,15 + 2563: 51,15 + 2564: 49,15 + 2565: 48,15 + 2566: 48,17 + 2567: 48,17 + 2568: 48,15 + 2569: 46,15 + 2570: 46,16 + 2571: 46,17 + 2572: 46,15 + 2573: 45,13 + 2574: 48,13 + 2575: 50,13 + 2576: 49,13 + 2577: 46,13 + 2578: 42,13 + 2579: 40,14 + 2580: 39,14 + 2581: 36,13 + 2582: 34,15 + 2583: 31,14 + 2584: 30,13 + 2585: 27,13 + 2586: 26,14 + 2587: 24,15 + 2588: 22,14 + 2589: 21,13 + 2590: 30,16 + 2591: 31,18 + 2592: 29,20 + 2593: 31,22 + 2594: 30,24 + 2595: 28,26 + 2596: 29,26 + 2597: 28,26 + 2598: 28,28 + 2599: 27,25 + 2600: 28,25 + 2601: 28,25 + 2602: 29,25 + 2603: 28,28 + 2604: 29,32 + 2605: 29,32 + 2606: 29,33 + 2607: 27,33 + 2608: 27,32 + 2609: 26,32 + 2610: 25,33 + 2611: 25,35 + 2612: 25,35 + 2613: 26,35 + 2614: 25,36 + 2615: 27,36 + 2616: 25,36 + 2617: 26,36 + 2618: 27,36 + 2619: 30,36 + 2620: 30,37 + 2621: 30,38 + 2622: 31,41 + 2623: 30,41 + 2624: 31,40 + 2625: 30,44 + 2626: 30,45 + 2627: 31,46 + 2628: 31,44 + 2629: 30,47 + 2630: 31,49 + 2631: 32,47 + 2632: 35,47 + 2633: 34,48 + 2634: 31,47 + 2635: 28,47 + 2636: 27,47 + 2637: 27,45 + 2638: 27,43 + 2639: 27,47 + 2640: 27,49 + 2641: 29,47 + 2642: 31,48 + 2643: 32,37 + 2644: 34,37 + 2645: 37,37 + 2646: 41,38 + 2647: 46,37 + 2648: 34,38 + 2649: 34,38 + 2650: 36,38 + 2651: 35,38 + 2652: 35,37 + 2653: 39,37 + 2654: 45,36 + 2655: 41,37 + 2656: 41,39 + 2657: 43,40 + 2658: 42,40 + 2659: 41,40 + 2660: 42,40 + 2661: 41,40 + 2662: 45,40 + 2663: 47,41 + 2664: 47,43 + 2665: 47,44 + 2666: 46,42 + 2667: 47,38 + 2668: 47,37 + 2669: 48,40 + 2670: 48,38 + 2671: 49,37 + 2672: 49,36 + 2673: 50,38 + 2674: 51,38 + 2675: 51,38 + 2676: 48,38 + 2677: 51,36 + 2678: 50,36 + 2679: 49,36 + 2680: 51,36 + 2681: 49,38 + 2682: 48,36 + 2683: 48,35 + 2684: 48,35 + 2685: 49,34 + 2686: 47,35 + 2687: 44,36 + 2688: 46,35 + 2689: 46,35 + 2690: 46,36 + 2691: 46,34 + 2692: 46,34 + 2693: 46,37 + 2694: 43,36 + 2695: 43,36 + 2696: 45,38 + 2697: 44,38 + 2698: 45,39 + 2699: 42,39 + 2700: 46,37 + 2701: 43,37 + 2702: 41,37 + 2703: 44,38 + 2704: 45,38 + 2705: 38,37 + 2706: 41,37 + 2707: 42,37 + 2708: 40,37 + 2709: 42,39 + 2710: 41,40 + 2711: 45,43 + 2712: 45,43 + 2713: 44,43 + 2714: 41,43 + 2715: 41,43 + 2716: 43,43 + 2717: 44,43 + 2718: 41,43 + 2719: 44,42 + 2720: 43,42 + 2721: 27,37 + 2722: 25,38 + 2723: 24,38 + 2724: 25,38 + 2725: 26,38 + 2726: 22,40 + 2727: 22,42 + 2728: 20,42 + 2729: 18,41 + 2730: 17,40 + 2731: 18,39 + 2732: 19,41 + 2733: 22,41 + 2734: 22,40 + 2735: 24,38 + 2736: 17,38 + 2737: 14,39 + 2738: 14,41 + 2739: 14,42 + 2740: 13,42 + 2741: 12,44 + 2742: 12,45 + 2743: 14,45 + 2744: 16,46 + 2745: 17,46 + 2746: 18,46 + 2747: 18,45 + 2748: 18,45 + 2749: 18,46 + 2750: 17,46 + 2751: 18,45 + 2752: 20,45 + 2753: 21,45 + 2754: 21,46 + 2755: 21,47 + 2756: 21,48 + 2757: 20,49 + 2758: 16,50 + 2759: 15,47 + 2760: 15,48 + 2761: 15,49 + 2762: 14,44 + 2763: 15,37 + 2764: 13,38 + 2765: 11,38 + 2766: 7,38 + 2767: 12,38 + 2768: 12,38 + 2769: 7,36 + 2770: 3,36 + 2771: 0,36 + 2772: 0,37 + 2773: 5,37 + 2774: 4,37 + 2775: -5,37 + 2776: -9,37 + 2777: -12,37 + 2778: -13,37 + 2779: -7,37 + 2780: -6,37 + 2781: -13,38 + 2782: -18,37 + 2783: -22,37 + 2784: -27,37 + 2785: -29,37 + 2786: -13,42 + 2787: -14,42 + 2788: -14,41 + 2789: -13,41 + 2790: -13,42 + 2791: -15,40 + 2792: -13,40 + 2793: -13,41 + 2794: -14,40 + 2795: -14,40 + 2796: -13,42 + 2797: -13,42 + 2798: -14,40 + 2799: -13,42 + 2800: -11,42 + 2801: -10,41 + 2802: -11,40 + 2803: -11,42 + 2804: -11,41 + 2805: -10,41 + 2806: -11,42 + 2807: -11,40 + 2808: -10,40 + 2809: -10,42 + 2810: -10,40 + 2811: -10,41 + 2812: -10,42 + 2813: -10,42 + 2814: -10,42 + 2815: -7,42 + 2816: -7,41 + 2817: -7,40 + 2818: -7,42 + 2819: -7,40 + 2820: -7,40 + 2821: -8,42 + 2822: -7,40 + 2823: -7,42 + 2824: -8,41 + 2825: -7,42 + 2826: -7,42 + 2827: -4,42 + 2828: -4,41 + 2829: -5,41 + 2830: -5,40 + 2831: -4,40 + 2832: -4,41 + 2833: -5,42 + 2834: -5,42 + 2835: -4,40 + 2836: -4,40 + 2837: -5,42 + 2838: -5,40 + 2839: -4,42 + 2840: -4,42 + 2841: -4,42 + 2842: -5,41 + 2843: -4,44 + 2844: -5,45 + 2845: -7,45 + 2846: -9,46 + 2847: -6,44 + 2848: -8,45 + 2849: -7,44 + 2850: -8,46 + 2851: -12,46 + 2852: -10,44 + 2853: -11,45 + 2854: -13,46 + 2855: -11,45 + 2856: -10,43 + 2857: -13,45 + 2858: -12,43 + 2859: -14,45 + 2860: -15,46 + 2861: -13,44 + 2862: -16,46 + 2863: -14,45 + 2864: -17,46 + 2865: -18,47 + 2866: -18,50 + 2867: -17,52 + 2868: -17,46 + 2869: -18,48 + 2870: -19,48 + 2871: -20,47 + 2872: -20,48 + 2873: -22,48 + 2874: -22,47 + 2875: -23,47 + 2876: -23,48 + 2877: -24,48 + 2878: -22,49 + 2879: -23,46 + 2880: -24,46 + 2881: -22,46 + 2882: -22,49 + 2883: -23,49 + 2884: -22,46 + 2885: -25,48 + 2886: -26,47 + 2887: -26,47 + 2888: -25,48 + 2889: -29,47 + 2890: -29,48 + 2891: -28,48 + 2892: -29,47 + 2893: -28,48 + 2894: -31,47 + 2895: -32,48 + 2896: -36,48 + 2897: -35,47 + 2898: -33,47 + 2899: -34,48 + 2900: -35,48 + 2901: -32,48 + 2902: -32,46 + 2903: -32,45 + 2904: -32,43 + 2905: -34,43 + 2906: -35,43 + 2907: -30,42 + 2908: -30,43 + 2909: -36,43 + 2910: -35,43 + 2911: -31,42 + 2912: -30,43 + 2913: -34,43 + 2914: -27,42 + 2915: -28,43 + 2916: -28,45 + 2917: -29,45 + 2918: -29,44 + 2919: -29,43 + 2920: -18,49 + 2921: -18,52 + 2922: -16,54 + 2923: -15,55 + 2924: -14,53 + 2925: -11,54 + 2926: -11,59 + 2927: -14,59 + 2928: -16,59 + 2929: -14,59 + 2930: -14,59 + 2931: -9,54 + 2932: -9,53 + 2933: -8,55 + 2934: -7,56 + 2935: -7,54 + 2936: -6,53 + 2937: -7,53 + 2938: -8,55 + 2939: -11,55 + 2940: -9,51 + 2941: -10,50 + 2942: -6,50 + 2943: -3,50 + 2944: -2,50 + 2945: -5,50 + 2946: -8,50 + 2947: -6,50 + 2948: -2,50 + 2949: -2,50 + 2950: -4,50 + 2951: -4,50 + 2952: -2,51 + 2953: -2,51 + 2954: -4,53 + 2955: -4,53 + 2956: -4,54 + 2957: -1,52 + 2958: -1,54 + 2959: 0,57 + 2960: 0,60 + 2961: 0,56 + 2962: 0,54 + 2963: 0,52 + 2964: -2,53 + 2965: -1,56 + 2966: -2,59 + 2967: -1,60 + 2968: -1,64 + 2969: -1,66 + 2970: 0,68 + 2971: 0,67 + 2972: 0,66 + 2973: 0,62 + 2974: 0,59 + 2975: -2,61 + 2976: -1,66 + 2977: -1,69 + 2978: -2,65 + 2979: -1,68 + 2980: -2,71 + 2981: -2,74 + 2982: -1,77 + 2983: 0,67 + 2984: 0,71 + 2985: 0,75 + 2986: 0,78 + 2987: -3,77 + 2988: -5,78 + 2989: -4,79 + 2990: -3,80 + 2991: -4,78 + 2992: -6,77 + 2993: -6,80 + 2994: -4,81 + 2995: -1,81 + 2996: 1,82 + 2997: 3,81 + 2998: 4,81 + 2999: 4,78 + 3000: 5,77 + 3001: 6,76 + 3002: 2,76 + 3003: 1,78 + 3004: -1,79 + 3005: -4,78 + 3006: 1,79 + 3007: 2,79 + 3008: 2,80 + 3009: 4,80 + 3010: 4,78 + 3011: -2,77 + 3012: -6,78 + 3013: -6,80 + 3014: -4,82 + 3015: -8,76 + 3016: -8,75 + 3017: -6,76 + 3018: -6,74 + 3019: -9,72 + 3020: -8,72 + 3021: -9,71 + 3022: -9,70 + 3023: -9,69 + 3024: -8,70 + 3025: -8,69 + 3026: -9,69 + 3027: -9,72 + 3028: -6,75 + 3029: -6,76 + 3030: 1,67 + 3031: 4,67 + 3032: 8,67 + 3033: 9,68 + 3034: 10,69 + 3035: 13,69 + 3036: 7,66 + 3037: 6,67 + 3038: 7,66 + 3039: 9,67 + 3040: 7,66 + 3041: 6,66 + 3042: 9,66 + 3043: 8,66 + 3044: 1,67 + 3045: -1,66 + 3046: 0,62 + 3047: -1,59 + 3048: 1,56 + 3049: 3,55 + 3050: 2,56 + 3051: 3,56 + 3052: 4,56 + 3053: 5,55 + 3054: 7,53 + 3055: 10,53 + 3056: 11,53 + 3057: 14,54 + 3058: 13,55 + 3059: 10,54 + 3060: 7,54 + 3061: 6,52 + 3062: 8,52 + 3063: 11,52 + 3064: 13,52 + 3065: 14,52 + 3066: 11,52 + 3067: 7,52 + 3068: 5,53 + 3069: 3,53 + 3070: 4,53 + 3071: 1,53 + 3072: 0,52 + 3073: 2,52 + 3074: 4,53 + 3075: 0,53 + 3076: 0,50 + 3077: -1,50 + 3078: -1,49 + 3079: -1,47 + 3080: -1,45 + 3081: -1,47 + 3082: -3,48 + 3083: -2,47 + 3084: -2,47 + 3085: -2,48 + 3086: -1,48 + 3087: -1,46 + 3088: -1,44 + 3089: -1,44 + 3090: -2,40 + 3091: -2,39 + 3092: -3,38 + 3093: -4,37 + 3094: -2,38 + 3095: -2,40 + 3096: -2,38 + 3097: -4,38 + 3098: 0,40 + 3099: 0,38 + 3100: 2,37 + 3101: 1,38 + 3102: 0,39 + 3103: -1,40 + 3104: -1,41 + 3105: -1,43 + 3106: -1,44 + 3107: -1,44 + 3108: 1,37 + 3109: 2,37 + 3110: 5,37 + 3111: 10,37 + 3112: 5,37 + 3113: 12,37 + 3114: 15,37 + 3115: 20,37 + 3116: 20,37 + 3117: 11,37 + 3118: 2,37 + 3119: -1,35 + 3120: -1,33 + 3121: -1,31 + 3122: -1,29 + 3123: -1,28 + 3124: -1,28 + 3125: -1,26 + 3126: -1,24 + 3127: -1,22 + 3128: -1,21 + 3129: -1,20 + 3130: -1,18 + 3131: -5,18 + 3132: -6,18 + 3133: -7,18 + 3134: -6,17 + 3135: -7,17 + 3136: -10,17 + 3137: -12,17 + 3138: -9,17 + 3139: -7,17 + 3140: -11,18 + 3141: -9,18 + 3142: -8,17 + 3143: -10,17 + 3144: -6,17 + 3145: -3,17 + 3146: 1,17 + 3147: 5,17 + 3148: 3,18 + 3149: 5,18 + 3150: 5,17 + 3151: 11,19 + 3152: 11,23 + 3153: 11,22 + 3154: 11,21 + 3155: 10,23 + 3156: 10,24 + 3157: 10,26 + 3158: 11,27 + 3159: 11,25 + 3160: 10,26 + 3161: 9,27 + 3162: 7,28 + 3163: 6,28 + 3164: 8,27 + 3165: 6,25 + 3166: 4,23 + 3167: 3,22 + 3168: 7,23 + 3169: 5,24 + 3170: 3,24 + 3171: 7,27 + 3172: 6,28 + 3173: 6,30 + 3174: 6,33 + 3175: 5,34 + 3176: 4,33 + 3177: 4,32 + 3178: 4,31 + 3179: 4,29 + 3180: 3,27 + 3181: 4,27 + 3182: 4,27 + 3183: 4,29 + 3184: 5,32 + 3185: 5,33 + 3186: 6,31 + 3187: 6,29 + 3188: 7,29 + 3189: 7,31 + 3190: 8,28 + 3191: 11,28 + 3192: 11,28 + 3193: 13,28 + 3194: 12,28 + 3195: 19,29 + 3196: 19,30 + 3197: 19,29 + 3198: 19,31 + 3199: 19,32 + 3200: 20,33 + 3201: 20,34 + 3202: 20,33 + 3203: 19,31 + 3204: 18,31 + 3205: 18,33 + 3206: 19,26 + 3207: 21,26 + 3208: 21,26 + 3209: 21,27 + 3210: 20,32 + 3211: 20,33 + 3212: 20,33 + 3213: 19,32 + 3214: 19,31 + 3215: 19,34 + 3216: 19,34 + 3217: 20,33 + 3218: 20,31 + 3219: 20,31 + 3220: 20,32 + 3221: 20,33 + 3222: 20,34 + 3223: 20,32 + 3224: 19,32 + 3225: 19,34 + 3226: 19,31 + 3227: 11,22 + 3228: 10,23 + 3229: 10,25 + 3230: 18,14 + 3231: 20,14 + 3232: 25,14 + 3233: 23,14 + 3234: 23,17 + 3235: 25,19 + 3236: 26,21 + 3237: 27,22 + 3238: 26,21 + 3239: 24,19 + 3240: 23,18 + 3241: 22,18 + 3242: 22,19 + 3243: 24,20 + 3244: 26,22 + 3245: 27,22 + 3246: 27,20 + 3247: 24,18 + 3248: 23,18 + 3249: 27,20 + 3250: 26,20 + 3251: 25,18 + 3252: 25,17 + 3253: 24,17 + 3254: 24,16 + 3255: 23,15 + 3256: 23,16 + 3257: 25,16 + 3258: 25,16 + 3259: 24,16 + 3260: 25,17 + 3261: 28,19 + 3262: 29,20 + 3263: 29,21 + 3264: 28,19 + 3265: 28,20 + 3266: 29,21 + 3267: 29,22 + 3268: 27,25 + 3269: 30,31 + 3270: 30,28 + 3271: 31,26 + 3272: 31,19 + 3273: 31,18 + 3274: 33,16 + 3275: 39,14 + 3276: 44,15 + 3277: 19,13 + 3278: 18,13 + 3279: 17,14 + 3280: 17,13 + 3281: 18,13 + 3282: 19,15 + 3283: 18,14 + 3284: 18,15 + 3285: 23,16 + 3286: 22,17 + 3287: 25,21 + 3288: 27,21 + 3289: 28,21 + 3290: 27,19 + 3291: 27,21 + 3292: 25,18 + 3293: 24,17 + 3308: 10,-12 + 3309: 11,-12 + 3310: 11,-13 + 3311: 11,-15 + 3312: 11,-16 + 3313: 12,-17 + 3314: 11,-15 + 3315: 10,-11 + 3316: 8,-14 + 3317: 5,-16 + 3318: 6,-16 + 3319: 10,-12 + 3320: 12,-14 + 3321: 12,-17 + 3322: 12,-18 + 3323: 11,-14 + 3324: 9,-12 + 3325: 9,-13 + 3326: 5,-13 + 3327: 4,-10 + 3328: 4,-11 + 3329: 4,-13 + 3330: 4,-14 + 3331: 2,-14 + 3332: 4,-11 + 3333: 4,-12 + 3334: 3,-13 + 3335: -4,-14 + 3336: -6,-13 + 3337: -6,-11 + 3338: -7,-8 + 3339: -3,-13 + 3340: -6,-11 + 3341: -7,-9 + 3342: -5,-14 + 3343: -5,-10 + 3344: -1,-11 + 3345: 0,-11 + 3346: -5,-14 + 3347: -6,-11 + 3348: -8,-9 + 3349: -12,-9 + 3350: -10,-10 + 3351: -15,-10 + 3352: -19,-10 + 3353: -19,-13 + 3354: -19,-16 + 3355: -19,-19 + 3356: -16,-10 + 3357: -18,-18 + 3358: -19,-19 + 3359: -17,-12 + 3360: -18,-12 + 3361: -18,-13 + 3362: -19,-12 + 3363: -19,-10 + 3364: -17,-10 + 3365: -15,-9 + 3366: -11,-9 + 3367: -20,-10 + 3368: -20,-10 + 3369: -18,-17 + 3370: -17,-19 + 3371: -17,-20 + 3372: -17,-20 + 3373: -9,-14 + 3374: -13,-12 + 3375: -11,-13 + 3376: -10,-15 + 3377: -10,-15 + 3378: -14,-13 + 3379: -10,-13 + 3380: -9,-16 + 3381: -9,-15 + 3382: -10,-16 + 3383: -9,-16 + 3384: -13,-16 + 3385: -13,-15 + 3386: -13,-13 + 3387: -13,-14 + 3388: -13,-18 + 3389: -13,-19 + 3390: -13,-20 + 3391: -14,-19 + 3392: -12,-19 + 3393: -11,-19 + 3394: -15,-19 + 3395: -8,-19 + 3396: -8,-21 + 3397: -8,-26 + 3398: -8,-28 + 3399: -7,-30 + 3400: -6,-32 + 3401: -9,-34 + 3402: -6,-36 + 3403: -9,-37 + 3404: -10,-39 + 3405: -10,-41 + 3406: -7,-41 + 3407: -9,-39 + 3408: -10,-36 + 3409: -11,-34 + 3410: -10,-38 + 3411: -10,-41 + 3412: -7,-39 + 3413: -7,-33 + 3442: -14,-38 + 3443: -13,-37 + 3444: -13,-35 + 3445: -13,-32 + 3446: -13,-24 + 3447: -13,-24 + 3448: -12,-23 + 3449: -12,-22 + 3450: -13,-22 + 3451: -13,-22 + 3452: -13,-23 + 3453: -13,-24 + 3454: -12,-25 + 3455: 12,-21 + 3456: 12,-22 + 3457: 12,-23 + 3458: 12,-25 + 3459: 12,-27 + 3460: 12,-29 + 3461: 12,-31 + 3462: 12,-33 + 3463: 12,-35 + 3464: 12,-36 + 3465: 12,-37 + 3466: 12,-38 + 3467: 12,-37 + 3468: 12,-35 + 3469: 12,-33 + 3470: 12,-31 + 3471: 12,-29 + 3472: 12,-27 + 3473: 12,-25 + 3474: 12,-23 + 3475: 12,-21 + 3476: 12,-21 + 3477: 12,-25 + 3478: 12,-27 + 3479: 12,-29 + 3480: 12,-34 + 3512: 11,-21 + 3513: 11,-23 + 3514: 11,-25 + 3515: 11,-27 + 3516: 11,-30 + 3517: 11,-32 + 3518: 11,-35 + 3519: 11,-36 + 3520: 11,-35 + 3521: 11,-33 + 3522: 11,-30 + 3523: 11,-27 + 3524: 11,-24 + 3525: 11,-21 + 3526: 13,-24 + 3527: 13,-24 + 3528: 12,-24 + 3529: 11,-24 + 3530: 10,-25 + 3531: 9,-25 + 3532: 10,-25 + 3533: 7,-26 + 3534: 6,-27 + 3535: 4,-26 + 3536: 6,-25 + 3537: 7,-25 + 3538: 10,-21 + 3539: 8,-21 + 3540: 6,-21 + 3541: 5,-20 + 3542: 5,-19 + 3543: 7,-19 + 3545: 7,-18 + 3546: 7,-20 + 3548: 5,-21 + 3549: 5,-21 + 3551: 6,-19 + 3552: 5,-19 + 3553: 6,-20 + 3554: 6,-21 + 3555: 5,-21 + 3560: 10,-21 + 3561: 9,-21 + 3562: 10,-22 + 3563: 9,-22 + 3564: 10,-23 + 3565: 9,-22 + 3566: 11,-22 + 3599: 6,-35 + 3600: 11,-34 + 3601: 7,-37 + 3602: 6,-37 + 3603: 7,-38 + 3604: 7,-37 + 3605: 6,-37 + 3606: 6,-38 + 3607: 6,-38 + 3608: 6,-38 + 3609: 5,-38 + 3610: 4,-40 + 3633: 17,-37 + 3634: 18,-37 + 3635: 18,-37 + 3636: 18,-36 + 3637: 18,-35 + 3638: 18,-35 + 3639: 18,-34 + 3640: 18,-35 + 3641: 18,-35 + 3642: 17,-35 + 3643: 17,-35 + 3644: 17,-34 + 3645: 17,-34 + 3646: 17,-34 + 3647: 17,-34 + 3648: 18,-36 + 3649: 18,-36 + 3650: 18,-36 + 3651: 18,-36 + 3652: 18,-36 + 3663: 15,-41 + 3664: 15,-40 + 3665: 16,-40 + 3666: 16,-41 + 3667: 15,-41 + 3668: 15,-40 + 3669: 15,-38 + 3670: 15,-37 + 3671: 15,-37 + 3672: 15,-38 + 3673: 16,-41 + 3674: 16,-40 + 3675: 15,-41 + 3676: 15,-40 + 3677: 8,-38 + 3678: 9,-39 + 3679: 9,-41 + 3680: 4,-42 + 3681: 4,-39 + 3682: 5,-41 + 3683: -14,-38 + 3684: -13,-35 + 3685: -13,-32 + 3686: -13,-24 + 3687: -12,-23 + 3688: -13,-30 + 3689: -14,-30 + 3690: -16,-27 + 3691: -13,-27 + 3692: -14,-28 + 3693: -16,-29 + 3694: -16,-29 + 3695: -15,-27 + 3696: -13,-28 + 3697: -13,-29 + 3698: -14,-30 + 3699: -13,-29 + 3700: -13,-27 + 3701: -12,-29 + 3702: -7,-6 + 3703: -7,-4 + 3704: -5,-2 + 3705: -2,1 + 3706: -1,4 + 3707: 0,7 + 3708: 2,10 + 3709: 1,8 + 3710: 1,4 + 3711: -3,6 + 3712: -3,11 + 3713: -3,5 + 3714: 1,1 + 3715: -3,-2 + 3716: -1,-5 + 3717: 1,-6 + 3718: 1,-4 + 3719: 1,0 + 3720: 1,4 + 3721: 1,9 + 3722: 2,11 + 3723: 2,7 + 3724: 2,2 + 3725: 3,-2 + 3726: 3,-7 + 3727: 2,-4 + 3728: 1,0 + 3729: 1,5 + 3730: 1,8 + 3731: 1,11 + 3732: -2,11 + 3733: -4,7 + 3734: -4,2 + 3735: -3,-2 + 3736: 7,-5 + 3737: 5,-1 + 3738: 11,-5 + 3739: 11,-3 + 3740: 11,-3 + 3741: 9,-5 + 3742: 8,-5 + 3743: 10,-1 + 3744: 8,-1 + 3745: 11,-1 + 3746: 11,-1 + 3747: 11,-2 + 3748: 11,-1 + 3749: 10,2 + 3750: 10,2 + 3751: 11,2 + 3752: 11,1 + 3753: 10,1 + 3754: 11,1 + 3755: 11,1 + 3756: 12,2 + 3757: 12,2 + 3770: 8,5 + 3771: 7,6 + 3772: 6,8 + 3773: 7,9 + 3774: 9,10 + 3775: 10,9 + 3776: 10,7 + 3777: 7,6 + 3778: 5,11 + 3779: 5,11 + 3780: 5,9 + 3781: 6,6 + 3782: 7,5 + 3783: 11,7 + 3784: 10,10 + 3785: 6,5 + 3786: 5,5 + 3787: 5,5 + 3788: 3,5 + 3789: 4,5 + 3790: 5,5 + 3791: 2,5 + 3792: 3,5 + 3793: 3,5 + 3794: 5,-4 + 3795: 5,-5 + 3796: 6,-5 + 3797: 5,-5 + 3798: 4,-5 + 3810: 5,-3 + 3811: 5,-3 + 3812: 3,-3 + 3813: 3,-2 + 3814: 3,-1 + 3815: 3,-4 + 3816: 2,-6 + 3817: 1,-6 + 3818: 1,-6 + 3819: 1,-5 + 3820: 2,-5 + 3821: 3,-3 + 3822: 3,-2 + 3823: 9,-8 + 3824: 10,-7 + 3825: 11,-7 + 3826: 9,-7 + 3827: 11,-7 + 3828: 10,-7 + 3829: 9,-8 + 3830: 10,-8 + 3831: 10,-9 + 3832: 7,-8 + 3833: 8,-8 + 3834: 7,-8 + 3835: 8,-8 + 3836: 10,-8 + 3837: 10,-7 + 3838: 11,-7 + 3839: 12,-8 + 3840: 13,-8 + 3841: 14,-8 + 3842: 12,-8 + 3843: 13,-9 + 3844: 11,-8 + 3845: 10,-7 + 3846: 9,-8 + 3847: 8,-8 + 3848: 6,-8 + 3849: 9,-8 + 3850: 9,-7 + 3851: 8,-9 + 3862: -3,-1 + 3863: -4,1 + 3864: -4,3 + 3865: -4,4 + 3866: -7,3 + 3867: -9,2 + 3868: -11,-1 + 3869: -11,-1 + 3870: -13,-2 + 3871: -13,-2 + 3872: -15,1 + 3873: -14,0 + 3874: -14,2 + 3875: -14,3 + 3876: -14,4 + 3877: -13,2 + 3878: -13,1 + 3879: -12,0 + 3880: -10,1 + 3881: -9,2 + 3882: -8,2 + 3883: -7,1 + 3884: -8,2 + 3885: -6,0 + 3886: -3,2 + 3887: -3,4 + 3888: -2,6 + 3889: 0,6 + 3896: 3,6 + 3897: 2,6 + 3900: -10,7 + 3901: -9,6 + 3902: -9,6 + 3903: -8,6 + 3904: -7,6 + 3905: -10,7 + 3906: -10,6 + 3907: -10,8 + 3908: -9,8 + 3909: -10,8 + 3910: -11,7 + 3911: -10,6 + 3912: -9,6 + 3913: -9,7 + 3914: -7,8 + 3915: -5,7 + 3916: -5,6 + 3917: -5,5 + 3918: -5,4 + 3919: -8,4 + 3920: -9,4 + 3921: -8,4 + 3922: -9,4 + 3923: -9,4 + 3924: -7,4 + 3925: -5,10 + 3926: -5,10 + 3927: -4,10 + 3928: -4,11 + 3929: -4,11 + 3930: -3,11 + 3931: -4,9 + 3932: -3,10 + 3933: -3,7 + 3934: -3,5 + 3935: -3,3 + 3936: -3,0 + 3937: -3,-2 + 3938: -3,0 + 3939: -3,4 + 3940: -3,8 + 3941: -3,11 + 3942: -3,1 + 3943: -3,-2 + 3944: -3,-5 + 3945: -3,-6 + 4036: -44,43 + 4037: -44,42 + 4038: -44,40 + 4039: -43,38 + 4040: -43,37 + 4041: -43,37 + 4042: -44,39 + 4043: -44,42 + 4044: -45,44 + 4045: -46,43 + 4046: -47,43 + 4047: -48,44 + 4048: -45,43 + 4049: -44,43 + 4050: -45,43 + 4051: -47,43 + 4052: -49,43 + 4053: -49,41 + 4054: -49,39 + 4055: -51,38 + 4056: -51,38 + 4057: -51,37 + 4058: -51,36 + 4059: -51,36 + 4060: -46,36 + 4061: -44,36 + 4062: -49,36 + 4063: -51,36 + 4064: -47,37 + 4065: -51,38 + 4066: -50,38 + 4067: -46,37 + 4068: -43,37 + 4069: -38,37 + 4070: -45,37 + 4071: -51,36 + 4072: -47,36 + 4073: -41,36 + 4074: -44,37 + 4075: -38,37 + 4076: -33,37 + 4077: -38,36 + 4078: -39,36 + 4079: -41,36 + 4080: -39,36 + 4081: -39,37 + 4082: -40,37 + 4083: -40,36 + 4084: -37,37 + 4085: -37,36 + 4086: -41,37 + 4087: -42,37 + 4088: -36,37 + 4089: -35,37 + 4090: -33,36 + 4091: -35,36 + 4092: -35,36 + 4093: -37,37 + 4094: -35,38 + 4095: -30,36 + 4096: -31,36 + 4097: -31,35 + 4098: -31,35 + 4099: -30,37 + 4100: -30,36 + 4101: -31,35 + 4102: -30,33 + 4103: -29,33 + 4104: -27,32 + 4105: -28,31 + 4106: -29,30 + 4107: -30,30 + 4108: -32,30 + 4109: -29,30 + 4110: -28,31 + 4111: -29,33 + 4112: -31,33 + 4113: -31,32 + 4114: -28,33 + 4115: -28,31 + 4116: -28,32 + 4117: -28,33 + 4118: -28,32 + 4119: -28,30 + 4120: -28,30 + 4121: -27,30 + 4122: -27,31 + 4123: -27,33 + 4166: -39,19 + 4167: -39,18 + 4168: -39,20 + 4169: -39,23 + 4170: -39,23 + 4171: -38,26 + 4172: -39,29 + 4173: -38,28 + 4174: -39,26 + 4175: -39,23 + 4176: -39,21 + 4177: -39,27 + 4178: -38,26 + 4179: -38,21 + 4180: -38,19 + 4181: -39,21 + 4182: -39,29 + 4183: -39,27 + 4184: -39,21 + 4185: -39,24 + 4186: -40,27 + 4187: -39,25 + 4188: -39,24 + 4189: -39,26 + 4190: -37,26 + 4191: -37,23 + 4192: -38,20 + 4193: -39,19 + 4194: -39,18 + 4195: -40,18 + 4196: -38,21 + 4197: -38,26 + 4198: -42,26 + 4199: -42,25 + 4200: -41,25 + 4201: -42,25 + 4202: -41,26 + 4203: -41,26 + 4233: -38,15 + 4234: -36,15 + 4235: -36,15 + 4236: -35,15 + 4237: -39,4 + 4238: -40,3 + 4239: -40,2 + 4240: -40,0 + 4241: -40,-1 + 4242: -41,-1 + 4243: -41,-2 + 4244: -42,-2 + 4245: -43,-3 + 4246: -36,2 + 4247: -36,2 + 4248: -36,1 + 4249: -37,2 + 4250: -36,1 + 4251: -40,9 + 4252: -41,9 + 4253: -39,10 + 4254: -39,10 + 4255: -37,10 + 4256: -38,10 + 4257: -37,10 + 4258: -35,10 + 4259: -35,10 + 4260: -36,11 + 4261: -37,10 + 4301: -4,13 + 4302: 2,13 + 4303: 1,13 + 4304: 1,13 + 4305: -3,13 + 4306: -3,13 + 4307: -4,13 + 4308: -5,13 + 4309: -5,13 + 4310: -2,13 + 4311: -2,13 + 4312: 3,13 + 4313: 3,13 + 4314: 0,13 + 4315: 0,13 + 4327: -5,16 + 4328: -4,16 + 4329: -6,16 + 4330: -3,18 + 4331: -3,19 + 4332: 1,18 + 4333: 1,17 + 4334: 1,17 + 4335: 3,16 + 4336: 4,16 + 4337: 2,16 + 4362: 15,47 + 4363: 15,46 + 4364: 14,46 + 4365: 15,47 + 4402: 5,74 + 4403: 5,75 + 4404: 5,76 + 4405: 4,77 + 4406: 4,80 + 4407: 5,81 + 4408: 1,81 + 4409: -2,81 + 4410: 1,82 + 4411: 0,82 + 4412: 1,82 + 4413: 0,83 + 4414: 1,83 + 4415: 1,82 + 4416: 0,83 + 4417: 0,82 + 4418: -1,81 + 4419: -4,81 + 4420: -7,81 + 4421: -5,81 + 4422: 2,79 + 4423: 0,79 + 4424: 0,79 + 4425: -4,76 + 4426: -5,76 + 4427: -6,74 + 4428: -7,74 + 4429: -8,73 + 4430: -9,72 + 4431: -9,73 + 4432: -8,72 + 4433: -8,74 + 4434: -9,70 + 4435: -9,69 + 4436: -8,70 + 4437: 9,66 + 4438: 10,69 + 4439: 12,69 + 4440: 13,58 + 4441: 13,60 + 4442: 12,56 + 4443: 13,56 + 4444: 8,56 + 4445: 8,56 + 4446: 8,56 + 4447: 14,60 + 4448: 14,60 + 4449: 14,61 + 4450: 14,60 + 4451: 22,58 + 4452: 23,57 + 4453: 27,56 + 4454: 28,56 + 4455: 28,55 + 4456: 28,54 + 4457: 34,55 + 4458: 34,54 + 4459: 33,54 + 4460: 30,55 + 4461: 30,56 + 4462: 30,54 + 4463: 31,54 + 4464: 32,54 + 4472: 46,36 + 4473: 46,34 + 4524: 32,16 + 4525: 32,15 + 4526: 32,13 + 4527: 32,11 + 4528: 32,13 + 4557: 34,1 + 4558: 36,1 + 4559: 37,1 + 4560: 37,1 + 4561: 36,1 + 4562: 35,1 + 4563: 35,3 + 4564: 37,3 + 4565: 19,-4 + 4566: 18,-5 + 4567: 17,-6 + 4568: 17,-5 + 4569: 17,-4 + 4570: 18,-6 + 4571: 21,-6 + 4572: 19,-4 + 4573: 22,-4 + 4574: 21,-5 + 4575: 20,-6 + 4576: 22,-6 + 4577: 21,-4 + 4578: 21,-4 + 4579: 19,-5 + 4580: 20,-4 + 4581: 20,-4 + 4582: 20,-5 + 4583: 17,-4 + 4598: -9,-6 + 4599: -9,-5 + 4600: -9,-3 + 4601: -11,-2 + 4602: -10,-2 + 4603: -9,-3 + 4604: -9,-5 + 4605: -16,1 + 4606: -14,0 + 4607: -14,0 + 4608: -14,0 + 4609: -14,-1 + 4610: -13,0 + 4611: -13,1 + 4618: -10,-9 + 4619: -9,-10 + 4620: -6,-10 + 4621: -4,-11 + 4622: -2,-11 + 4623: -6,-14 + 4624: -6,-13 + 4625: 4,-14 + 4626: 4,-13 + 4627: 3,-11 + 4628: 3,-9 + 4629: 1,-9 + 4630: 5,-9 + 4631: 7,-9 + 4632: 8,-10 + 4633: 3,-5 + 4634: 4,-5 + 4635: 3,-5 + 4685: 12,9 + 4686: 13,9 + 4687: 14,9 + 4688: 14,8 + 4689: 14,7 + 4690: 15,9 + 4691: 15,10 + 4692: 15,10 + 4693: 13,10 + 4694: 9,10 + 4695: 6,10 + 4696: 6,8 + 4697: 7,6 + 4698: 7,9 + 4699: 8,8 + 4700: 7,7 + 4701: 8,7 + 4702: 8,9 + 4703: 8,6 + 4704: 8,7 + 4705: 8,9 + 4706: 7,10 + 4707: 6,11 + 4708: 8,11 + 4709: 10,10 + 4710: 10,6 + 4713: 14,38 + 4714: 15,38 + 4715: 14,38 + 4716: 15,38 + 4717: 14,38 - node: cleanable: True angle: -1.5707963267948966 rad color: '#A461065E' id: Dirt decals: - 5050: -42,22 - 5051: -41,22 - 5052: -41,22 + 4931: -42,22 + 4932: -41,22 + 4933: -41,22 - node: cleanable: True angle: -1.5707963267948966 rad color: '#A46106A4' id: Dirt decals: - 5053: -41,22 - 5054: -42,22 - 5055: -42,24 - 5056: -42,24 - 5057: -41,24 - 5058: -42,23 - 5059: -43,23 - 5060: -39,22 - 5061: -40,22 - 5062: -40,24 - 5063: -40,25 - 5064: -40,26 - 5065: -42,27 - 5066: -43,27 - 5067: -41,28 - 5068: -40,28 - 5069: -41,27 - 5070: -44,27 - 5071: -44,28 - 5072: -45,28 - 5073: -46,27 - 5074: -47,28 - 5075: -47,27 - 5076: -46,28 - 5077: -38,23 - 5078: -38,24 - 5079: -38,27 - 5080: -38,29 - 5081: -42,24 - 5082: -42,22 - 5083: -41,21 - 5084: -43,21 - 5085: -42,21 - 5086: -43,22 - 5087: -43,25 - 5088: -43,24 - 5089: -41,24 - 5090: -41,22 - 5091: -41,24 - 5092: -40,20 - 5093: -38,17 - 5094: -38,22 + 4934: -41,22 + 4935: -42,22 + 4936: -42,24 + 4937: -42,24 + 4938: -41,24 + 4939: -42,23 + 4940: -43,23 + 4941: -39,22 + 4942: -40,22 + 4943: -40,24 + 4944: -40,25 + 4945: -40,26 + 4946: -42,27 + 4947: -43,27 + 4948: -41,28 + 4949: -40,28 + 4950: -41,27 + 4951: -44,27 + 4952: -44,28 + 4953: -45,28 + 4954: -46,27 + 4955: -47,28 + 4956: -47,27 + 4957: -46,28 + 4958: -38,23 + 4959: -38,24 + 4960: -38,27 + 4961: -38,29 + 4962: -42,24 + 4963: -42,22 + 4964: -41,21 + 4965: -43,21 + 4966: -42,21 + 4967: -43,22 + 4968: -43,25 + 4969: -43,24 + 4970: -41,24 + 4971: -41,22 + 4972: -41,24 + 4973: -40,20 + 4974: -38,17 + 4975: -38,22 - node: cleanable: True color: '#83543273' id: DirtHeavy decals: - 3413: 29,6 - 3418: 46,-10 - 3419: 48,-10 - 3533: -13,-41 - 3534: -11,-41 - 3535: -11,-40 - 3536: -10,-37 - 3537: -9,-34 - 3538: -7,-37 - 3539: -8,-40 - 3540: -6,-39 - 3541: -7,-34 - 3542: -7,-28 - 3543: -7,-24 - 3544: -7,-26 - 3545: -7,-30 - 3546: -9,-35 - 3547: -10,-38 - 3548: -10,-40 - 3600: 12,-37 - 3601: 12,-35 - 3602: 12,-34 - 3603: 12,-30 - 3604: 12,-28 - 3605: 12,-26 - 3606: 12,-23 - 3607: 12,-21 - 3608: 12,-20 - 3663: 6,-19 - 3666: 5,-19 - 3669: 5,-20 - 3686: 11,-22 - 3687: 11,-24 - 3688: 11,-27 - 3689: 11,-29 - 3690: 11,-32 - 3691: 11,-34 - 3692: 11,-36 - 3713: 7,-35 - 3714: 5,-35 - 3715: 9,-34 - 3716: 10,-34 - 3717: 8,-35 - 3730: 4,-39 - 3731: 6,-38 - 3732: 7,-38 - 3733: 7,-37 - 3734: 8,-38 - 3735: 9,-39 - 3736: 18,-38 - 3737: 18,-37 - 3738: 17,-37 - 3739: 17,-35 - 3740: 17,-34 - 3741: 17,-34 - 3775: 18,-36 - 3776: 18,-36 - 3777: 16,-41 - 3877: 10,1 - 3878: 10,1 - 3879: 12,2 - 3928: 8,-1 - 3971: 8,-8 - 4013: 3,4 - 4014: 2,4 - 4065: -3,-6 - 4066: -5,-6 - 4067: -3,-4 - 4068: -4,-2 - 4069: -3,1 - 4070: -4,4 - 4071: -4,6 - 4072: -3,8 - 4073: -5,9 - 4074: -3,10 - 4087: 3,14 - 4088: -1,17 - 4089: 0,20 - 4090: -1,25 - 4091: -1,30 - 4092: -1,33 - 4093: -1,36 - 4094: -2,38 - 4095: -1,49 - 4096: -1,50 - 4097: -2,50 - 4121: -7,48 - 4122: -8,48 - 4123: -9,46 - 4124: -10,45 - 4125: -11,45 - 4126: -13,45 - 4127: -16,45 - 4128: -17,45 - 4129: -9,46 - 4130: -7,46 - 4131: -5,45 - 4132: -7,46 - 4133: -8,48 - 4134: -9,49 - 4135: -11,53 - 4136: -14,55 - 4137: -17,53 - 4138: -13,53 - 4139: -12,54 - 4140: -14,53 - 4141: -16,53 - 4142: -18,52 - 4143: -19,51 - 4144: -19,50 - 4145: -19,48 - 4146: -20,48 - 4147: -20,47 - 4148: -20,47 - 4149: -18,46 - 4150: -16,45 - 4243: -27,33 - 4244: -30,33 - 4245: -29,33 - 4253: -29,33 - 4254: -27,30 - 4381: -41,10 - 4382: -40,10 - 4383: -40,9 - 4384: -40,8 - 4385: -39,5 - 4386: -39,4 - 4387: -39,5 - 4388: -40,2 - 4411: -38,6 - 4412: -39,4 - 4413: -38,3 - 4414: -39,3 - 4415: -38,2 - 4416: -38,1 - 4417: -36,2 - 4418: -36,4 - 4419: -36,3 - 4435: -5,13 - 4436: -3,13 - 4437: -2,13 - 4438: 1,13 - 4439: 2,13 - 4485: 15,47 - 4486: 15,47 - 4487: 15,46 - 4488: 14,46 - 4489: 15,45 - 4490: 15,44 - 4491: 2,56 - 4492: 2,54 - 4493: 3,53 - 4494: 4,53 - 4495: 2,53 - 4496: 4,54 - 4497: 4,56 - 4498: 4,56 - 4499: 5,55 - 4500: -2,54 - 4501: -2,54 - 4502: -2,70 - 4503: -2,70 - 4504: -2,68 - 4505: -2,68 - 4506: 0,68 - 4507: -2,67 - 4508: -3,67 - 4509: -3,67 - 4584: 32,54 - 4585: 33,54 - 4593: 46,36 - 4594: 45,36 - 4595: 46,36 - 4596: 49,36 - 4597: 48,36 - 4598: 48,35 - 4599: 48,34 - 4600: 48,35 - 4601: 48,36 - 4630: 27,25 - 4631: 29,25 - 4632: 30,26 - 4633: 30,23 - 4634: 30,24 - 4635: 30,25 - 4636: 30,24 - 4637: 32,19 - 4638: 32,16 - 4639: 32,15 - 4640: 33,15 - 4641: 32,15 - 4642: 32,16 - 4648: 39,14 - 4649: 41,15 - 4650: 42,15 - 4651: 45,14 - 4652: 46,15 - 4653: 48,15 - 4654: 47,15 - 4655: 49,15 - 4656: 49,13 - 4657: 45,15 - 4703: 17,-4 - 4704: 16,-5 - 4705: 16,-6 - 4706: 18,-5 - 4707: 18,-4 - 4708: 19,-6 - 4709: 20,-6 - 4710: 20,-4 - 4711: 20,-5 - 4712: 20,-5 - 4713: 21,-6 - 4714: 21,-4 - 4715: 22,-3 - 4716: 20,-3 - 4731: -12,-10 - 4732: -13,-10 - 4733: -12,-9 - 4734: -13,-10 - 4735: -12,-10 - 4736: -11,-10 - 4755: 3,-5 - 4756: 2,-6 - 4837: 14,38 + 3294: 29,6 + 3299: 46,-10 + 3300: 48,-10 + 3414: -13,-41 + 3415: -11,-41 + 3416: -11,-40 + 3417: -10,-37 + 3418: -9,-34 + 3419: -7,-37 + 3420: -8,-40 + 3421: -6,-39 + 3422: -7,-34 + 3423: -7,-28 + 3424: -7,-24 + 3425: -7,-26 + 3426: -7,-30 + 3427: -9,-35 + 3428: -10,-38 + 3429: -10,-40 + 3481: 12,-37 + 3482: 12,-35 + 3483: 12,-34 + 3484: 12,-30 + 3485: 12,-28 + 3486: 12,-26 + 3487: 12,-23 + 3488: 12,-21 + 3489: 12,-20 + 3544: 6,-19 + 3547: 5,-19 + 3550: 5,-20 + 3567: 11,-22 + 3568: 11,-24 + 3569: 11,-27 + 3570: 11,-29 + 3571: 11,-32 + 3572: 11,-34 + 3573: 11,-36 + 3594: 7,-35 + 3595: 5,-35 + 3596: 9,-34 + 3597: 10,-34 + 3598: 8,-35 + 3611: 4,-39 + 3612: 6,-38 + 3613: 7,-38 + 3614: 7,-37 + 3615: 8,-38 + 3616: 9,-39 + 3617: 18,-38 + 3618: 18,-37 + 3619: 17,-37 + 3620: 17,-35 + 3621: 17,-34 + 3622: 17,-34 + 3656: 18,-36 + 3657: 18,-36 + 3658: 16,-41 + 3758: 10,1 + 3759: 10,1 + 3760: 12,2 + 3809: 8,-1 + 3852: 8,-8 + 3894: 3,4 + 3895: 2,4 + 3946: -3,-6 + 3947: -5,-6 + 3948: -3,-4 + 3949: -4,-2 + 3950: -3,1 + 3951: -4,4 + 3952: -4,6 + 3953: -3,8 + 3954: -5,9 + 3955: -3,10 + 3968: 3,14 + 3969: -1,17 + 3970: 0,20 + 3971: -1,25 + 3972: -1,30 + 3973: -1,33 + 3974: -1,36 + 3975: -2,38 + 3976: -1,49 + 3977: -1,50 + 3978: -2,50 + 4002: -7,48 + 4003: -8,48 + 4004: -9,46 + 4005: -10,45 + 4006: -11,45 + 4007: -13,45 + 4008: -16,45 + 4009: -17,45 + 4010: -9,46 + 4011: -7,46 + 4012: -5,45 + 4013: -7,46 + 4014: -8,48 + 4015: -9,49 + 4016: -11,53 + 4017: -14,55 + 4018: -17,53 + 4019: -13,53 + 4020: -12,54 + 4021: -14,53 + 4022: -16,53 + 4023: -18,52 + 4024: -19,51 + 4025: -19,50 + 4026: -19,48 + 4027: -20,48 + 4028: -20,47 + 4029: -20,47 + 4030: -18,46 + 4031: -16,45 + 4124: -27,33 + 4125: -30,33 + 4126: -29,33 + 4134: -29,33 + 4135: -27,30 + 4262: -41,10 + 4263: -40,10 + 4264: -40,9 + 4265: -40,8 + 4266: -39,5 + 4267: -39,4 + 4268: -39,5 + 4269: -40,2 + 4292: -38,6 + 4293: -39,4 + 4294: -38,3 + 4295: -39,3 + 4296: -38,2 + 4297: -38,1 + 4298: -36,2 + 4299: -36,4 + 4300: -36,3 + 4316: -5,13 + 4317: -3,13 + 4318: -2,13 + 4319: 1,13 + 4320: 2,13 + 4366: 15,47 + 4367: 15,47 + 4368: 15,46 + 4369: 14,46 + 4370: 15,45 + 4371: 15,44 + 4372: 2,56 + 4373: 2,54 + 4374: 3,53 + 4375: 4,53 + 4376: 2,53 + 4377: 4,54 + 4378: 4,56 + 4379: 4,56 + 4380: 5,55 + 4381: -2,54 + 4382: -2,54 + 4383: -2,70 + 4384: -2,70 + 4385: -2,68 + 4386: -2,68 + 4387: 0,68 + 4388: -2,67 + 4389: -3,67 + 4390: -3,67 + 4465: 32,54 + 4466: 33,54 + 4474: 46,36 + 4475: 45,36 + 4476: 46,36 + 4477: 49,36 + 4478: 48,36 + 4479: 48,35 + 4480: 48,34 + 4481: 48,35 + 4482: 48,36 + 4511: 27,25 + 4512: 29,25 + 4513: 30,26 + 4514: 30,23 + 4515: 30,24 + 4516: 30,25 + 4517: 30,24 + 4518: 32,19 + 4519: 32,16 + 4520: 32,15 + 4521: 33,15 + 4522: 32,15 + 4523: 32,16 + 4529: 39,14 + 4530: 41,15 + 4531: 42,15 + 4532: 45,14 + 4533: 46,15 + 4534: 48,15 + 4535: 47,15 + 4536: 49,15 + 4537: 49,13 + 4538: 45,15 + 4584: 17,-4 + 4585: 16,-5 + 4586: 16,-6 + 4587: 18,-5 + 4588: 18,-4 + 4589: 19,-6 + 4590: 20,-6 + 4591: 20,-4 + 4592: 20,-5 + 4593: 20,-5 + 4594: 21,-6 + 4595: 21,-4 + 4596: 22,-3 + 4597: 20,-3 + 4612: -12,-10 + 4613: -13,-10 + 4614: -12,-9 + 4615: -13,-10 + 4616: -12,-10 + 4617: -11,-10 + 4636: 3,-5 + 4637: 2,-6 + 4718: 14,38 - node: cleanable: True angle: -1.5707963267948966 rad color: '#A4610696' id: DirtHeavy decals: - 5019: -40,21 - 5020: -41,22 - 5021: -43,23 - 5022: -43,27 - 5023: -43,28 - 5024: -42,28 - 5025: -46,28 - 5026: -45,28 - 5027: -45,27 - 5028: -47,27 - 5029: -38,20 - 5030: -41,20 - 5031: -42,27 - 5032: -41,24 - 5033: -42,24 + 4900: -40,21 + 4901: -41,22 + 4902: -43,23 + 4903: -43,27 + 4904: -43,28 + 4905: -42,28 + 4906: -46,28 + 4907: -45,28 + 4908: -45,27 + 4909: -47,27 + 4910: -38,20 + 4911: -41,20 + 4912: -42,27 + 4913: -41,24 + 4914: -42,24 - node: cleanable: True color: '#83543273' id: DirtLight decals: - 3414: 29,6 - 3416: 46,-10 - 3417: 48,-10 - 3420: 46,-10 - 3423: 18,-9 - 3424: 22,-9 - 3609: 12,-36 - 3610: 12,-34 - 3611: 12,-30 - 3612: 12,-28 - 3613: 12,-26 - 3614: 12,-24 - 3615: 12,-22 - 3616: 12,-20 - 3617: 12,-18 - 3618: 12,-18 - 3619: 11,-19 - 3620: 12,-19 - 3675: 6,-21 - 3676: 5,-19 - 3710: 9,-35 - 3711: 7,-35 - 3712: 8,-35 - 3778: 15,-40 - 3779: 16,-40 - 3918: 5,-5 - 3919: 7,-5 - 3920: 10,-5 - 3921: 11,-2 - 3972: 9,-8 - 3973: 10,-8 - 3974: 10,-9 - 3975: 10,-9 - 3976: 9,-9 - 3977: 9,-9 - 3978: 12,-9 - 3979: 11,-8 - 3980: 11,-9 - 4009: -1,6 - 4017: -8,6 - 4018: -11,7 - 4075: 1,11 - 4076: 2,10 - 4077: 1,8 - 4078: 1,6 - 4079: 2,4 - 4080: 0,2 - 4081: 2,0 - 4082: 1,-3 - 4083: 2,-5 - 4084: 1,-6 - 4085: 1,4 - 4086: 2,7 - 4098: -2,48 - 4099: -2,50 - 4151: -44,43 - 4152: -44,43 - 4246: -31,31 - 4247: -31,30 - 4248: -29,30 - 4249: -32,33 - 4250: -31,33 - 4251: -31,30 - 4252: -29,30 - 4255: -27,31 - 4256: -27,32 - 4389: -41,-1 - 4390: -42,-2 - 4391: -40,-1 - 4392: -40,2 - 4393: -37,2 - 4394: -36,2 - 4395: -36,4 - 4396: -35,4 - 4402: -39,10 - 4403: -36,10 - 4404: -35,10 - 4405: -37,10 - 4406: -38,10 - 4407: -36,11 - 4408: -41,10 - 4409: -41,9 - 4410: -42,9 - 4440: 1,13 - 4441: 3,13 - 4442: 5,14 - 4443: 5,14 - 4444: 3,15 - 4445: 2,15 - 4457: 3,16 - 4458: 3,16 - 4459: 4,17 - 4460: 4,18 - 4461: 3,18 - 4470: 6,28 - 4471: 7,28 - 4472: 7,29 - 4473: 6,29 - 4474: 6,30 - 4475: 3,31 - 4476: 3,33 - 4477: 5,29 - 4478: 4,28 - 4479: 4,28 - 4480: 4,30 - 4658: 46,15 - 4659: 46,17 - 4660: 46,17 - 4661: 48,17 - 4662: 49,17 - 4663: 49,17 - 4664: 48,17 - 4757: 3,-5 - 4758: 3,-5 - 4759: 2,-6 - 4838: 15,38 + 3295: 29,6 + 3297: 46,-10 + 3298: 48,-10 + 3301: 46,-10 + 3304: 18,-9 + 3305: 22,-9 + 3490: 12,-36 + 3491: 12,-34 + 3492: 12,-30 + 3493: 12,-28 + 3494: 12,-26 + 3495: 12,-24 + 3496: 12,-22 + 3497: 12,-20 + 3498: 12,-18 + 3499: 12,-18 + 3500: 11,-19 + 3501: 12,-19 + 3556: 6,-21 + 3557: 5,-19 + 3591: 9,-35 + 3592: 7,-35 + 3593: 8,-35 + 3659: 15,-40 + 3660: 16,-40 + 3799: 5,-5 + 3800: 7,-5 + 3801: 10,-5 + 3802: 11,-2 + 3853: 9,-8 + 3854: 10,-8 + 3855: 10,-9 + 3856: 10,-9 + 3857: 9,-9 + 3858: 9,-9 + 3859: 12,-9 + 3860: 11,-8 + 3861: 11,-9 + 3890: -1,6 + 3898: -8,6 + 3899: -11,7 + 3956: 1,11 + 3957: 2,10 + 3958: 1,8 + 3959: 1,6 + 3960: 2,4 + 3961: 0,2 + 3962: 2,0 + 3963: 1,-3 + 3964: 2,-5 + 3965: 1,-6 + 3966: 1,4 + 3967: 2,7 + 3979: -2,48 + 3980: -2,50 + 4032: -44,43 + 4033: -44,43 + 4127: -31,31 + 4128: -31,30 + 4129: -29,30 + 4130: -32,33 + 4131: -31,33 + 4132: -31,30 + 4133: -29,30 + 4136: -27,31 + 4137: -27,32 + 4270: -41,-1 + 4271: -42,-2 + 4272: -40,-1 + 4273: -40,2 + 4274: -37,2 + 4275: -36,2 + 4276: -36,4 + 4277: -35,4 + 4283: -39,10 + 4284: -36,10 + 4285: -35,10 + 4286: -37,10 + 4287: -38,10 + 4288: -36,11 + 4289: -41,10 + 4290: -41,9 + 4291: -42,9 + 4321: 1,13 + 4322: 3,13 + 4323: 5,14 + 4324: 5,14 + 4325: 3,15 + 4326: 2,15 + 4338: 3,16 + 4339: 3,16 + 4340: 4,17 + 4341: 4,18 + 4342: 3,18 + 4351: 6,28 + 4352: 7,28 + 4353: 7,29 + 4354: 6,29 + 4355: 6,30 + 4356: 3,31 + 4357: 3,33 + 4358: 5,29 + 4359: 4,28 + 4360: 4,28 + 4361: 4,30 + 4539: 46,15 + 4540: 46,17 + 4541: 46,17 + 4542: 48,17 + 4543: 49,17 + 4544: 49,17 + 4545: 48,17 + 4638: 3,-5 + 4639: 3,-5 + 4640: 2,-6 + 4719: 15,38 - node: cleanable: True angle: -1.5707963267948966 rad color: '#A461065E' id: DirtLight decals: - 5047: -41,22 - 5048: -42,23 - 5049: -41,23 + 4928: -41,22 + 4929: -42,23 + 4930: -41,23 - node: cleanable: True color: '#FFFFFFFF' id: DirtLight decals: - 4951: 46,-11 - 4952: 45,-11 - 4953: 46,-13 - 4954: 47,-14 - 4955: 48,-12 - 4956: 48,-12 - 4957: 48,-14 - 4958: 47,-14 - 4959: 49,-15 - 4960: 49,-8 - 4961: 48,-8 + 4832: 46,-11 + 4833: 45,-11 + 4834: 46,-13 + 4835: 47,-14 + 4836: 48,-12 + 4837: 48,-12 + 4838: 48,-14 + 4839: 47,-14 + 4840: 49,-15 + 4841: 49,-8 + 4842: 48,-8 - node: cleanable: True color: '#83543273' id: DirtMedium decals: - 3415: 28,-14 - 3421: 48,-10 - 3422: 37,-9 - 3425: 11,-9 - 3426: 9,-9 - 3549: -10,-42 - 3550: -10,-37 - 3551: -10,-34 - 3552: -8,-33 - 3553: -14,-36 - 3554: -13,-33 - 3555: -12,-37 - 3556: -13,-36 - 3557: -12,-34 - 3558: -13,-34 - 3559: -13,-36 - 3560: -13,-37 - 3621: 11,-19 - 3622: 11,-18 - 3623: 12,-18 - 3624: 12,-20 - 3625: 12,-22 - 3626: 12,-25 - 3627: 12,-28 - 3628: 12,-30 - 3629: 12,-34 - 3630: 12,-36 - 3677: 7,-21 - 3678: 7,-21 - 3693: 11,-37 - 3694: 11,-35 - 3695: 11,-32 - 3696: 11,-29 - 3697: 11,-26 - 3698: 11,-24 - 3699: 7,-31 - 3700: 6,-31 - 3701: 5,-35 - 3702: 6,-34 - 3703: 7,-34 - 3704: 6,-35 - 3705: 7,-35 - 3706: 6,-35 - 3707: 8,-34 - 3708: 10,-34 - 3709: 10,-35 - 3742: 17,-37 - 3743: 17,-36 - 3744: 17,-35 - 3745: 17,-35 - 3746: 17,-37 - 3747: 18,-37 - 3748: 18,-35 - 3749: 18,-34 - 3750: 18,-36 - 3751: 18,-37 - 3772: 17,-36 - 3773: 17,-36 - 3774: 18,-35 - 3780: 15,-40 - 3781: 15,-40 - 3880: 11,3 - 3881: 10,2 - 3882: 11,1 - 3883: 11,1 - 3884: 12,2 - 3885: 12,2 - 3886: 12,2 - 3887: 10,1 - 3888: 10,1 - 3922: 5,-1 - 3923: 8,2 - 3924: 8,-1 - 3925: 9,-5 - 3926: 6,-5 - 3927: 11,-5 - 4010: -3,5 - 4011: -4,6 - 4012: -2,5 - 4100: -7,50 - 4101: -7,47 - 4102: -8,50 - 4103: -9,47 - 4104: -9,46 - 4105: -14,45 - 4106: -16,45 - 4107: -19,47 - 4108: -19,49 - 4109: -17,53 - 4110: -15,54 - 4111: -13,54 - 4112: -11,55 - 4113: -10,57 - 4114: -9,55 - 4115: -9,55 - 4116: -9,55 - 4117: -7,48 - 4118: -7,48 - 4119: -7,50 - 4120: -7,50 - 4153: -44,43 - 4154: -44,43 - 4257: -27,33 - 4258: -27,30 - 4259: -33,25 - 4260: -33,24 - 4261: -33,22 - 4262: -33,20 - 4263: -33,17 - 4264: -36,13 - 4265: -43,13 - 4266: -48,14 - 4267: -50,14 - 4268: -46,14 - 4269: -45,14 - 4270: -45,14 - 4271: -46,15 - 4272: -48,15 - 4273: -49,13 - 4274: -42,14 - 4275: -39,15 - 4276: -38,15 - 4277: -36,15 - 4278: -39,17 - 4279: -38,17 - 4280: -38,18 - 4281: -39,16 - 4282: -38,18 - 4283: -39,19 - 4284: -38,17 - 4323: -41,26 - 4324: -42,25 - 4325: -42,25 - 4326: -41,25 - 4327: -38,28 - 4328: -38,29 - 4329: -38,28 - 4330: -40,29 - 4331: -40,29 - 4332: -39,27 - 4333: -39,25 - 4334: -38,23 - 4335: -39,21 - 4336: -39,20 - 4337: -39,19 - 4338: -41,18 - 4339: -40,17 - 4340: -40,18 - 4341: -39,17 - 4342: -38,18 - 4343: -38,15 - 4344: -39,15 - 4345: -38,14 - 4346: -37,15 - 4347: -36,14 - 4348: -36,15 - 4349: -36,16 - 4350: -36,16 - 4351: -36,16 - 4397: -36,2 - 4398: -36,3 - 4399: -35,4 - 4400: -38,6 - 4401: -38,7 - 4462: 3,17 - 4463: 4,17 - 4464: 3,18 - 4465: 3,18 - 4466: 3,17 - 4467: 4,27 - 4468: 7,30 - 4469: 6,30 - 4510: -3,67 - 4511: -3,67 - 4512: -2,68 - 4513: 0,68 - 4514: 0,70 - 4515: 0,74 - 4516: 2,76 - 4517: 3,76 - 4518: 5,76 - 4519: 5,75 - 4520: 5,74 - 4586: 32,54 - 4587: 31,54 - 4588: 40,47 - 4589: 44,43 - 4590: 42,43 - 4602: 47,36 - 4603: 47,37 - 4604: 47,36 - 4605: 47,37 - 4606: 47,37 - 4607: 45,37 - 4608: 45,35 - 4609: 43,36 - 4610: 42,37 - 4611: 41,37 - 4612: 41,40 - 4613: 41,40 - 4614: 39,37 - 4615: 39,36 - 4616: 36,38 - 4617: 34,38 - 4618: 32,38 - 4619: 29,37 - 4620: 30,36 - 4621: 30,38 - 4622: 31,38 - 4623: 31,38 - 4624: 31,38 - 4625: 28,26 - 4626: 27,25 - 4627: 27,25 - 4628: 29,29 - 4629: 30,27 - 4665: 46,15 - 4666: 48,15 - 4667: 46,16 - 4668: 46,17 - 4669: 46,16 - 4670: 34,5 - 4671: 34,5 - 4672: 35,5 - 4673: 34,3 - 4674: 34,3 - 4675: 34,1 - 4760: 2,-6 - 4761: 1,-5 - 4762: 0,-1 - 4763: 1,0 - 4764: 0,0 - 4765: -2,1 - 4766: -2,0 - 4767: 1,3 - 4768: 1,9 - 4769: -2,6 - 4770: -6,0 - 4771: -8,-2 - 4772: -10,-2 - 4773: -11,-1 - 4774: -7,-1 - 4775: -6,-1 - 4776: -4,-1 - 4777: -5,-1 - 4778: -5,0 - 4779: -8,3 - 4780: -9,3 - 4781: -9,3 - 4782: -7,3 - 4783: -4,6 - 4784: 7,4 - 4785: 6,5 - 4786: 6,7 - 4787: 10,10 - 4788: 10,8 - 4789: 10,5 - 4790: 8,5 - 4791: 9,5 - 4792: 13,9 - 4793: 14,8 - 4794: 14,8 - 4795: 14,9 - 4796: 13,10 - 4797: 14,9 - 4798: 15,10 - 4799: 15,9 - 4800: 13,10 - 4801: 15,10 - 4802: 14,10 - 4803: 13,9 - 4839: 14,38 - 4840: 15,38 - 4841: 15,38 + 3296: 28,-14 + 3302: 48,-10 + 3303: 37,-9 + 3306: 11,-9 + 3307: 9,-9 + 3430: -10,-42 + 3431: -10,-37 + 3432: -10,-34 + 3433: -8,-33 + 3434: -14,-36 + 3435: -13,-33 + 3436: -12,-37 + 3437: -13,-36 + 3438: -12,-34 + 3439: -13,-34 + 3440: -13,-36 + 3441: -13,-37 + 3502: 11,-19 + 3503: 11,-18 + 3504: 12,-18 + 3505: 12,-20 + 3506: 12,-22 + 3507: 12,-25 + 3508: 12,-28 + 3509: 12,-30 + 3510: 12,-34 + 3511: 12,-36 + 3558: 7,-21 + 3559: 7,-21 + 3574: 11,-37 + 3575: 11,-35 + 3576: 11,-32 + 3577: 11,-29 + 3578: 11,-26 + 3579: 11,-24 + 3580: 7,-31 + 3581: 6,-31 + 3582: 5,-35 + 3583: 6,-34 + 3584: 7,-34 + 3585: 6,-35 + 3586: 7,-35 + 3587: 6,-35 + 3588: 8,-34 + 3589: 10,-34 + 3590: 10,-35 + 3623: 17,-37 + 3624: 17,-36 + 3625: 17,-35 + 3626: 17,-35 + 3627: 17,-37 + 3628: 18,-37 + 3629: 18,-35 + 3630: 18,-34 + 3631: 18,-36 + 3632: 18,-37 + 3653: 17,-36 + 3654: 17,-36 + 3655: 18,-35 + 3661: 15,-40 + 3662: 15,-40 + 3761: 11,3 + 3762: 10,2 + 3763: 11,1 + 3764: 11,1 + 3765: 12,2 + 3766: 12,2 + 3767: 12,2 + 3768: 10,1 + 3769: 10,1 + 3803: 5,-1 + 3804: 8,2 + 3805: 8,-1 + 3806: 9,-5 + 3807: 6,-5 + 3808: 11,-5 + 3891: -3,5 + 3892: -4,6 + 3893: -2,5 + 3981: -7,50 + 3982: -7,47 + 3983: -8,50 + 3984: -9,47 + 3985: -9,46 + 3986: -14,45 + 3987: -16,45 + 3988: -19,47 + 3989: -19,49 + 3990: -17,53 + 3991: -15,54 + 3992: -13,54 + 3993: -11,55 + 3994: -10,57 + 3995: -9,55 + 3996: -9,55 + 3997: -9,55 + 3998: -7,48 + 3999: -7,48 + 4000: -7,50 + 4001: -7,50 + 4034: -44,43 + 4035: -44,43 + 4138: -27,33 + 4139: -27,30 + 4140: -33,25 + 4141: -33,24 + 4142: -33,22 + 4143: -33,20 + 4144: -33,17 + 4145: -36,13 + 4146: -43,13 + 4147: -48,14 + 4148: -50,14 + 4149: -46,14 + 4150: -45,14 + 4151: -45,14 + 4152: -46,15 + 4153: -48,15 + 4154: -49,13 + 4155: -42,14 + 4156: -39,15 + 4157: -38,15 + 4158: -36,15 + 4159: -39,17 + 4160: -38,17 + 4161: -38,18 + 4162: -39,16 + 4163: -38,18 + 4164: -39,19 + 4165: -38,17 + 4204: -41,26 + 4205: -42,25 + 4206: -42,25 + 4207: -41,25 + 4208: -38,28 + 4209: -38,29 + 4210: -38,28 + 4211: -40,29 + 4212: -40,29 + 4213: -39,27 + 4214: -39,25 + 4215: -38,23 + 4216: -39,21 + 4217: -39,20 + 4218: -39,19 + 4219: -41,18 + 4220: -40,17 + 4221: -40,18 + 4222: -39,17 + 4223: -38,18 + 4224: -38,15 + 4225: -39,15 + 4226: -38,14 + 4227: -37,15 + 4228: -36,14 + 4229: -36,15 + 4230: -36,16 + 4231: -36,16 + 4232: -36,16 + 4278: -36,2 + 4279: -36,3 + 4280: -35,4 + 4281: -38,6 + 4282: -38,7 + 4343: 3,17 + 4344: 4,17 + 4345: 3,18 + 4346: 3,18 + 4347: 3,17 + 4348: 4,27 + 4349: 7,30 + 4350: 6,30 + 4391: -3,67 + 4392: -3,67 + 4393: -2,68 + 4394: 0,68 + 4395: 0,70 + 4396: 0,74 + 4397: 2,76 + 4398: 3,76 + 4399: 5,76 + 4400: 5,75 + 4401: 5,74 + 4467: 32,54 + 4468: 31,54 + 4469: 40,47 + 4470: 44,43 + 4471: 42,43 + 4483: 47,36 + 4484: 47,37 + 4485: 47,36 + 4486: 47,37 + 4487: 47,37 + 4488: 45,37 + 4489: 45,35 + 4490: 43,36 + 4491: 42,37 + 4492: 41,37 + 4493: 41,40 + 4494: 41,40 + 4495: 39,37 + 4496: 39,36 + 4497: 36,38 + 4498: 34,38 + 4499: 32,38 + 4500: 29,37 + 4501: 30,36 + 4502: 30,38 + 4503: 31,38 + 4504: 31,38 + 4505: 31,38 + 4506: 28,26 + 4507: 27,25 + 4508: 27,25 + 4509: 29,29 + 4510: 30,27 + 4546: 46,15 + 4547: 48,15 + 4548: 46,16 + 4549: 46,17 + 4550: 46,16 + 4551: 34,5 + 4552: 34,5 + 4553: 35,5 + 4554: 34,3 + 4555: 34,3 + 4556: 34,1 + 4641: 2,-6 + 4642: 1,-5 + 4643: 0,-1 + 4644: 1,0 + 4645: 0,0 + 4646: -2,1 + 4647: -2,0 + 4648: 1,3 + 4649: 1,9 + 4650: -2,6 + 4651: -6,0 + 4652: -8,-2 + 4653: -10,-2 + 4654: -11,-1 + 4655: -7,-1 + 4656: -6,-1 + 4657: -4,-1 + 4658: -5,-1 + 4659: -5,0 + 4660: -8,3 + 4661: -9,3 + 4662: -9,3 + 4663: -7,3 + 4664: -4,6 + 4665: 7,4 + 4666: 6,5 + 4667: 6,7 + 4668: 10,10 + 4669: 10,8 + 4670: 10,5 + 4671: 8,5 + 4672: 9,5 + 4673: 13,9 + 4674: 14,8 + 4675: 14,8 + 4676: 14,9 + 4677: 13,10 + 4678: 14,9 + 4679: 15,10 + 4680: 15,9 + 4681: 13,10 + 4682: 15,10 + 4683: 14,10 + 4684: 13,9 + 4720: 14,38 + 4721: 15,38 + 4722: 15,38 - node: cleanable: True angle: -1.5707963267948966 rad color: '#A461065E' id: DirtMedium decals: - 5038: -43,27 - 5039: -43,28 - 5040: -46,28 - 5041: -46,27 - 5042: -41,24 - 5043: -40,21 - 5044: -41,27 - 5045: -41,23 - 5046: -41,22 + 4919: -43,27 + 4920: -43,28 + 4921: -46,28 + 4922: -46,27 + 4923: -41,24 + 4924: -40,21 + 4925: -41,27 + 4926: -41,23 + 4927: -41,22 - node: cleanable: True angle: -1.5707963267948966 rad color: '#A4610696' id: DirtMedium decals: - 5034: -42,22 - 5035: -43,24 - 5036: -42,25 - 5037: -42,28 + 4915: -42,22 + 4916: -43,24 + 4917: -42,25 + 4918: -42,28 - node: color: '#80C71FA4' id: Flowersbr1 decals: - 4859: -45.480713,39.888554 + 4740: -45.480713,39.888554 - node: color: '#80C71FA4' id: Flowersbr2 decals: - 4861: -47.82387,40.787373 + 4742: -47.82387,40.787373 - node: color: '#80C71FAE' id: Flowerspv2 decals: - 2273: 22.31159,21.239965 + 2178: 22.31159,21.239965 - node: color: '#80C71FAE' id: Flowerspv3 decals: - 2272: 22.119907,20.303352 + 2177: 22.119907,20.303352 - node: color: '#80C71FA4' id: Flowersy1 decals: - 4856: -45.40703,40.65476 - 4858: -46.468082,40.168514 + 4737: -45.40703,40.65476 + 4739: -46.468082,40.168514 - node: color: '#80C71FAE' id: Flowersy2 decals: - 2269: 21.097595,20.409784 - 2274: 21.012402,21.21868 - 2275: 22.780151,20.0692 + 2174: 21.097595,20.409784 + 2179: 21.012402,21.21868 + 2180: 22.780151,20.0692 - node: color: '#80C71FA4' id: Flowersy3 decals: - 4860: -46.61545,40.787373 + 4741: -46.61545,40.787373 - node: color: '#80C71FAE' id: Flowersy3 decals: - 2268: 22.013416,21.53798 - 2270: 26.379543,16.769766 - 2276: 21.928225,20.32464 + 2173: 22.013416,21.53798 + 2175: 26.379543,16.769766 + 2181: 21.928225,20.32464 - node: color: '#80C71FA4' id: Flowersy4 decals: - 4857: -47.750187,39.991695 + 4738: -47.750187,39.991695 - node: color: '#80C71FAE' id: Flowersy4 decals: - 2271: 27.061085,17.45094 + 2176: 27.061085,17.45094 - node: color: '#18A2D50C' id: FullTileOverlayGreyscale @@ -5235,193 +5235,193 @@ entities: color: '#80C71FAB' id: Grassa1 decals: - 2264: 20.991104,21.857279 - 2266: 26.975891,16.94006 + 2169: 20.991104,21.857279 + 2171: 26.975891,16.94006 - node: color: '#80C71FB4' id: Grassa1 decals: - 2289: 20.92721,20.19692 + 2194: 20.92721,20.19692 - node: color: '#80C71FA4' id: Grassa2 decals: - 4843: -47.73545,40.050636 - 4847: -47.764923,40.698963 - 4849: -46.24703,40.743168 - 4850: -46.084923,39.918022 + 4724: -47.73545,40.050636 + 4728: -47.764923,40.698963 + 4730: -46.24703,40.743168 + 4731: -46.084923,39.918022 - node: color: '#80C71FB4' id: Grassa2 decals: - 2290: 22.865343,21.921139 - 2291: 26.358244,16.94006 + 2195: 22.865343,21.921139 + 2196: 26.358244,16.94006 - node: color: '#80C71F95' id: Grassa3 decals: - 2285: 22.247696,20.388498 + 2190: 22.247696,20.388498 - node: color: '#80C71FA4' id: Grassa3 decals: - 4844: -45.421764,40.669495 + 4725: -45.421764,40.669495 - node: color: '#80C71FA4' id: Grassa4 decals: - 4845: -45.40703,39.918022 + 4726: -45.40703,39.918022 - node: color: '#80C71FAB' id: Grassa4 decals: - 2263: 21.885628,21.303825 + 2168: 21.885628,21.303825 - node: color: '#80C71FB4' id: Grassa4 decals: - 2286: 21.992119,21.3464 - 2292: 27.124979,17.599947 + 2191: 21.992119,21.3464 + 2197: 27.124979,17.599947 - node: color: '#80C71FA4' id: Grassa5 decals: - 4846: -46.60071,39.873817 + 4727: -46.60071,39.873817 - node: color: '#80C71FAB' id: Grassa5 decals: - 2265: 26.209158,17.685093 - 2267: 21.566154,21.814705 + 2170: 26.209158,17.685093 + 2172: 21.566154,21.814705 - node: color: '#80C71FB4' id: Grassa5 decals: - 2287: 21.523558,20.409784 - 2288: 20.756824,21.835993 + 2192: 21.523558,20.409784 + 2193: 20.756824,21.835993 - node: color: '#80C71FA4' id: Grassb2 decals: - 4867: -46.541767,41.02313 - 4869: -44.994396,39.829613 + 4748: -46.541767,41.02313 + 4750: -44.994396,39.829613 - node: color: '#80C71FAB' id: Grassb2 decals: - 2259: 27.188873,17.578661 - 2260: 20.92721,20.111773 - 2261: 23.057028,20.239492 + 2164: 27.188873,17.578661 + 2165: 20.92721,20.111773 + 2166: 23.057028,20.239492 - node: color: '#80C71FAB' id: Grassb3 decals: - 2257: 21.821733,20.154345 - 2258: 26.954594,16.897486 + 2162: 21.821733,20.154345 + 2163: 26.954594,16.897486 - node: color: '#80C71FA4' id: Grassb4 decals: - 4863: -45.392292,40.65476 - 4866: -47.88282,40.743168 - 4868: -47.853344,39.991695 - 4870: -45.30387,40.919987 + 4744: -45.392292,40.65476 + 4747: -47.88282,40.743168 + 4749: -47.853344,39.991695 + 4751: -45.30387,40.919987 - node: color: '#80C71F95' id: Grassc1 decals: - 2282: 27.061085,17.770239 + 2187: 27.061085,17.770239 - node: color: '#80C71FA4' id: Grassc1 decals: - 4865: -46.52703,40.301125 + 4746: -46.52703,40.301125 - node: color: '#FFFFFF7F' id: Grassc1 decals: - 2211: 32.165768,40.007343 + 2116: 32.165768,40.007343 - node: color: '#80C71F95' id: Grassc2 decals: - 2281: 26.081367,17.770239 + 2186: 26.081367,17.770239 - node: color: '#80C71FA4' id: Grassc2 decals: - 4848: -46.29124,40.640026 + 4729: -46.29124,40.640026 - node: color: '#FFFFFF7F' id: Grassc2 decals: - 2210: 32.108974,40.943954 + 2115: 32.108974,40.943954 - node: color: '#80C71F95' id: Grassc3 decals: - 2280: 26.52863,16.897486 + 2185: 26.52863,16.897486 - node: color: '#80C71FA4' id: Grassc3 decals: - 4862: -47.70598,40.0359 + 4743: -47.70598,40.0359 - node: color: '#FFFFFF7F' id: Grassc3 decals: - 2208: 28.90005,40.85881 + 2113: 28.90005,40.85881 - node: color: '#80C71F95' id: Grassc4 decals: - 2277: 21.054998,20.45236 + 2182: 21.054998,20.45236 - node: color: '#FFFFFF7F' id: Grassc4 decals: - 2209: 28.87165,40.035725 + 2114: 28.87165,40.035725 - node: color: '#FFFFFFEF' id: Grassd1 decals: - 2214: 32.13737,39.978962 + 2119: 32.13737,39.978962 - node: color: '#FFFFFFEF' id: Grassd2 decals: - 2212: 28.90005,40.049915 + 2117: 28.90005,40.049915 - node: color: '#80C71FA4' id: Grassd3 decals: - 4864: -45.30387,39.976963 + 4745: -45.30387,39.976963 - node: color: '#FFFFFFEF' id: Grassd3 decals: - 2213: 28.942644,41.057484 + 2118: 28.942644,41.057484 - node: color: '#80C71F95' id: Grasse1 decals: - 2283: 26.379543,17.025208 - 2284: 21.331875,20.494932 + 2188: 26.379543,17.025208 + 2189: 21.331875,20.494932 - node: color: '#FFFFFFEF' id: Grasse1 decals: - 2215: 32.15157,40.943954 + 2120: 32.15157,40.943954 - node: color: '#80C71F95' id: Grasse2 decals: - 2278: 22.375484,21.729559 + 2183: 22.375484,21.729559 - node: color: '#80C71F95' id: Grasse3 decals: - 2279: 22.65236,20.175632 + 2184: 22.65236,20.175632 - node: color: '#5A5A6015' id: HalfTileOverlayGreyscale @@ -5433,8 +5433,8 @@ entities: color: '#D4D4D426' id: HalfTileOverlayGreyscale decals: - 4931: 19,-12 - 4932: 18,-12 + 4812: 19,-12 + 4813: 18,-12 - node: color: '#334E6DC8' id: HalfTileOverlayGreyscale180 @@ -5446,7 +5446,7 @@ entities: color: '#52B4E996' id: HalfTileOverlayGreyscale180 decals: - 5281: 15,17 + 5142: 15,17 - node: color: '#5A5A605A' id: HalfTileOverlayGreyscale180 @@ -5458,8 +5458,8 @@ entities: color: '#D4D4D40C' id: HalfTileOverlayGreyscale180 decals: - 4933: 18,-12 - 4934: 19,-12 + 4814: 18,-12 + 4815: 19,-12 - node: color: '#334E6DC8' id: HalfTileOverlayGreyscale270 @@ -5469,19 +5469,19 @@ entities: color: '#52B4E996' id: HalfTileOverlayGreyscale270 decals: - 5282: 14,19 + 5143: 14,19 - node: color: '#D381C9FF' id: HalfTileOverlayGreyscale270 decals: - 1020: -12,27 - 1021: -12,28 - 1022: -12,29 - 1023: -12,30 - 1024: -12,31 - 1025: -12,32 - 1026: -12,33 - 1027: -12,34 + 954: -12,27 + 955: -12,28 + 956: -12,29 + 957: -12,30 + 958: -12,31 + 959: -12,32 + 960: -12,33 + 961: -12,34 - node: color: '#334E6DC8' id: HalfTileOverlayGreyscale90 @@ -5491,94 +5491,94 @@ entities: color: '#52B4E996' id: HalfTileOverlayGreyscale90 decals: - 5275: 16,18 - 5276: 16,19 + 5136: 16,18 + 5137: 16,19 - node: color: '#D381C9FF' id: HalfTileOverlayGreyscale90 decals: - 1028: -10,27 - 1029: -10,28 - 1030: -10,29 - 1031: -10,30 - 1032: -10,31 - 1033: -10,32 - 1034: -10,33 - 1035: -10,34 + 962: -10,27 + 963: -10,28 + 964: -10,29 + 965: -10,30 + 966: -10,31 + 967: -10,32 + 968: -10,33 + 969: -10,34 - node: angle: 1.5707963267948966 rad color: '#A46105C0' id: LoadingArea decals: - 2005: -36,5 + 1910: -36,5 - node: angle: -1.5707963267948966 rad color: '#FFFFFFFF' id: LoadingArea decals: - 5148: -43,1 + 5029: -43,1 - node: color: '#FFFFFFFF' id: LoadingArea decals: - 5186: -9,61 + 5067: -9,61 - node: angle: 1.5707963267948966 rad color: '#FFFFFFFF' id: LoadingArea decals: - 4999: -42,24 - 5000: -42,22 - 5147: -43,5 + 4880: -42,24 + 4881: -42,22 + 5028: -43,5 - node: angle: -1.5707963267948966 rad color: '#52B4E996' id: LoadingAreaGreyscale decals: - 2174: 28,6 + 2079: 28,6 - node: angle: 1.5707963267948966 rad color: '#52B4E996' id: LoadingAreaGreyscale decals: - 2173: 28,3 + 2078: 28,3 - node: color: '#334E6DC8' id: MiniTileCheckerAOverlay decals: - 1789: 17,-25 - 1790: 17,-24 - 1791: 17,-23 - 1818: 18,-18 - 1819: 19,-18 - 1820: 19,-17 - 1821: 18,-17 - 1822: 18,-16 - 1823: 19,-16 - 1824: 19,-15 - 1825: 18,-15 - 1826: 18,-14 - 1894: 4,46 - 1895: 5,46 - 1896: 5,47 - 1897: 4,47 - 4877: 19,-14 + 1694: 17,-25 + 1695: 17,-24 + 1696: 17,-23 + 1723: 18,-18 + 1724: 19,-18 + 1725: 19,-17 + 1726: 18,-17 + 1727: 18,-16 + 1728: 19,-16 + 1729: 19,-15 + 1730: 18,-15 + 1731: 18,-14 + 1799: 4,46 + 1800: 5,46 + 1801: 5,47 + 1802: 4,47 + 4758: 19,-14 - node: color: '#52B4E996' id: MiniTileCheckerAOverlay decals: - 1253: -13,-15 - 1254: -13,-14 - 1255: -13,-13 - 1256: -12,-13 - 1257: -11,-13 - 1258: -10,-13 - 1259: -10,-14 - 1260: -10,-15 - 1261: -11,-15 - 1262: -12,-15 - 1263: -12,-14 - 1264: -11,-14 + 1170: -13,-15 + 1171: -13,-14 + 1172: -13,-13 + 1173: -12,-13 + 1174: -11,-13 + 1175: -10,-13 + 1176: -10,-14 + 1177: -10,-15 + 1178: -11,-15 + 1179: -12,-15 + 1180: -12,-14 + 1181: -11,-14 - node: color: '#52B4E9FF' id: MiniTileCheckerAOverlay @@ -5596,56 +5596,56 @@ entities: color: '#D381C996' id: MiniTileCheckerAOverlay decals: - 1087: -14,23 - 1088: -14,22 + 1021: -14,23 + 1022: -14,22 - node: color: '#EFB34196' id: MiniTileCheckerAOverlay decals: - 1686: 5,-26 - 1687: 5,-25 - 1688: 6,-25 - 1689: 6,-26 + 1603: 5,-26 + 1604: 5,-25 + 1605: 6,-25 + 1606: 6,-26 - node: color: '#3E5C23A8' id: MiniTileCheckerBOverlay decals: - 1512: 7,9 - 1513: 8,9 - 1514: 9,9 - 1515: 7,8 - 1516: 8,8 - 1517: 9,8 - 1518: 7,7 - 1519: 8,7 - 1520: 9,7 - 1521: 7,6 - 1522: 8,6 - 1523: 9,6 + 1429: 7,9 + 1430: 8,9 + 1431: 9,9 + 1432: 7,8 + 1433: 8,8 + 1434: 9,8 + 1435: 7,7 + 1436: 8,7 + 1437: 9,7 + 1438: 7,6 + 1439: 8,6 + 1440: 9,6 - node: color: '#D381C996' id: MiniTileCheckerBOverlay decals: - 1089: -20,23 - 1090: -20,22 - 1161: -7,22 - 1162: -6,22 - 1163: -5,22 - 1164: -5,23 - 1165: -6,23 - 1166: -7,23 + 1023: -20,23 + 1024: -20,22 + 1095: -7,22 + 1096: -6,22 + 1097: -5,22 + 1098: -5,23 + 1099: -6,23 + 1100: -7,23 - node: color: '#D56F18EF' id: MiniTileCheckerBOverlay decals: - 904: 3,22 - 905: 3,23 - 906: 3,24 - 907: 4,24 - 908: 5,24 - 909: 5,23 - 910: 4,23 - 911: 4,22 + 858: 3,22 + 859: 3,23 + 860: 3,24 + 861: 4,24 + 862: 5,24 + 863: 5,23 + 864: 4,23 + 865: 4,22 - node: color: '#DE3A3A96' id: MiniTileCheckerBOverlay @@ -5658,52 +5658,52 @@ entities: color: '#EFB34196' id: MiniTileCheckerBOverlay decals: - 1265: -13,-13 - 1266: -12,-13 - 1267: -11,-13 - 1268: -10,-13 - 1269: -10,-14 - 1270: -10,-15 - 1271: -11,-15 - 1272: -12,-15 - 1273: -13,-15 - 1274: -13,-14 - 1275: -12,-14 - 1276: -11,-14 - 1287: 8,-13 - 1288: 8,-14 - 1289: 8,-15 - 1290: 9,-15 - 1291: 9,-14 - 1292: 9,-13 - 1293: 10,-13 - 1294: 10,-14 - 1295: 10,-15 - 1296: 11,-15 - 1297: 11,-14 - 1298: 11,-13 + 1182: -13,-13 + 1183: -12,-13 + 1184: -11,-13 + 1185: -10,-13 + 1186: -10,-14 + 1187: -10,-15 + 1188: -11,-15 + 1189: -12,-15 + 1190: -13,-15 + 1191: -13,-14 + 1192: -12,-14 + 1193: -11,-14 + 1204: 8,-13 + 1205: 8,-14 + 1206: 8,-15 + 1207: 9,-15 + 1208: 9,-14 + 1209: 9,-13 + 1210: 10,-13 + 1211: 10,-14 + 1212: 10,-15 + 1213: 11,-15 + 1214: 11,-14 + 1215: 11,-13 - node: color: '#52B4E996' id: MiniTileOverlay decals: - 5095: 4,27 - 5096: 3,27 - 5097: 2,27 - 5098: 2,28 - 5099: 4,28 - 5100: 3,28 - 5101: 3,29 - 5102: 2,29 - 5103: 2,30 - 5104: 3,30 - 5105: 3,31 - 5106: 2,31 - 5107: 2,32 - 5108: 3,32 - 5109: 3,33 - 5110: 2,33 - 5111: 3,34 - 5112: 2,34 + 4976: 4,27 + 4977: 3,27 + 4978: 2,27 + 4979: 2,28 + 4980: 4,28 + 4981: 3,28 + 4982: 3,29 + 4983: 2,29 + 4984: 2,30 + 4985: 3,30 + 4986: 3,31 + 4987: 2,31 + 4988: 2,32 + 4989: 3,32 + 4990: 3,33 + 4991: 2,33 + 4992: 3,34 + 4993: 2,34 - node: color: '#18A2D50C' id: MonoOverlay @@ -5746,8 +5746,8 @@ entities: 228: 5,68 229: 6,68 230: 7,68 - 2232: -2,67 - 2233: 1,68 + 2137: -2,67 + 2138: 1,68 - node: color: '#52B4E996' id: QuarterTileOverlayGreyscale @@ -5765,26 +5765,26 @@ entities: 178: 15,15 179: 16,15 180: 17,15 - 5220: 14,29 - 5267: 11,18 - 5269: 9,20 - 5270: 8,20 - 5271: 7,20 - 5272: 6,20 - 5273: 6,19 + 5099: 14,29 + 5129: 11,18 + 5131: 9,20 + 5132: 8,20 + 5133: 7,20 + 5134: 6,20 + 5135: 6,19 - node: color: '#79150096' id: QuarterTileOverlayGreyscale decals: - 1588: 4,-8 - 1589: 5,-8 - 1590: 6,-8 - 1591: 7,-8 - 1592: 8,-8 - 1593: 9,-8 - 1594: 10,-8 - 1595: 11,-8 - 1596: 12,-8 + 1505: 4,-8 + 1506: 5,-8 + 1507: 6,-8 + 1508: 7,-8 + 1509: 8,-8 + 1510: 9,-8 + 1511: 10,-8 + 1512: 11,-8 + 1513: 12,-8 - node: color: '#A4610696' id: QuarterTileOverlayGreyscale @@ -5887,26 +5887,26 @@ entities: 165: 15,36 166: 16,36 167: 17,36 - 5223: 16,27 - 5224: 15,27 - 5225: 14,27 - 5226: 13,27 - 5227: 17,27 - 5268: 10,19 + 5101: 16,27 + 5102: 15,27 + 5103: 14,27 + 5104: 13,27 + 5105: 17,27 + 5130: 10,19 - node: color: '#79150096' id: QuarterTileOverlayGreyscale180 decals: - 1566: -6,13 - 1567: -7,13 - 1568: -8,13 - 1569: -9,13 - 1570: -10,13 - 1571: -11,13 - 1572: -12,13 - 1573: -13,13 - 1574: -14,13 - 1575: -15,13 + 1483: -6,13 + 1484: -7,13 + 1485: -8,13 + 1486: -9,13 + 1487: -10,13 + 1488: -11,13 + 1489: -12,13 + 1490: -13,13 + 1491: -14,13 + 1492: -15,13 - node: color: '#A4610696' id: QuarterTileOverlayGreyscale180 @@ -5922,7 +5922,7 @@ entities: 303: -43,13 304: -44,13 305: -45,13 - 1945: -40,13 + 1850: -40,13 - node: color: '#334E6DC8' id: QuarterTileOverlayGreyscale270 @@ -5949,25 +5949,25 @@ entities: 374: -12,-10 375: -14,-10 376: -16,-10 - 5259: 9,18 + 5121: 9,18 - node: color: '#79150096' id: QuarterTileOverlayGreyscale270 decals: - 1552: 5,13 - 1553: 6,13 - 1554: 8,13 - 1555: 7,13 - 1556: 9,13 - 1557: 10,13 - 1558: 11,13 - 1559: 12,13 - 1560: 13,13 - 1561: 14,13 - 1562: 15,13 - 1563: 16,13 - 1564: 17,13 - 1565: 4,13 + 1469: 5,13 + 1470: 6,13 + 1471: 8,13 + 1472: 7,13 + 1473: 9,13 + 1474: 10,13 + 1475: 11,13 + 1476: 12,13 + 1477: 13,13 + 1478: 14,13 + 1479: 15,13 + 1480: 16,13 + 1481: 17,13 + 1482: 4,13 - node: color: '#9FED5896' id: QuarterTileOverlayGreyscale270 @@ -6094,23 +6094,23 @@ entities: color: '#52B4E996' id: QuarterTileOverlayGreyscale90 decals: - 5260: 8,17 + 5122: 8,17 - node: color: '#79150096' id: QuarterTileOverlayGreyscale90 decals: - 1576: -6,-8 - 1577: -7,-8 - 1578: -8,-8 - 1579: -9,-8 - 1580: -10,-8 - 1581: -11,-8 - 1582: -12,-8 - 1583: -13,-8 - 1584: -14,-8 - 1585: -15,-8 - 1586: -16,-8 - 1587: -17,-8 + 1493: -6,-8 + 1494: -7,-8 + 1495: -8,-8 + 1496: -9,-8 + 1497: -10,-8 + 1498: -11,-8 + 1499: -12,-8 + 1500: -13,-8 + 1501: -14,-8 + 1502: -15,-8 + 1503: -16,-8 + 1504: -17,-8 - node: color: '#9FED5896' id: QuarterTileOverlayGreyscale90 @@ -6153,10 +6153,10 @@ entities: 276: 22,38 277: 23,38 278: 24,38 - 1880: 0,49 - 1881: 0,48 - 4830: 14,38 - 4831: 15,38 + 1785: 0,49 + 1786: 0,48 + 4711: 14,38 + 4712: 15,38 - node: color: '#A4610696' id: QuarterTileOverlayGreyscale90 @@ -6206,88 +6206,88 @@ entities: color: '#FFFFFFFF' id: Rock03 decals: - 2249: 22.524572,21.835993 + 2154: 22.524572,21.835993 - node: color: '#FFFFFFFF' id: SpaceStationSign1 decals: - 2175: -4,14 + 2080: -4,14 - node: color: '#FFFFFFFF' id: SpaceStationSign2 decals: - 2176: -3,14 + 2081: -3,14 - node: color: '#FFFFFFFF' id: SpaceStationSign3 decals: - 2177: -2,14 + 2082: -2,14 - node: color: '#FFFFFFFF' id: SpaceStationSign4 decals: - 2178: -1,14 + 2083: -1,14 - node: color: '#FFFFFFFF' id: SpaceStationSign5 decals: - 2179: 0,14 + 2084: 0,14 - node: color: '#FFFFFFFF' id: SpaceStationSign6 decals: - 2180: 1,14 + 2085: 1,14 - node: color: '#FFFFFFFF' id: SpaceStationSign7 decals: - 2181: 2,14 + 2086: 2,14 - node: angle: 1.5707963267948966 rad color: '#A46105C0' id: StandClear decals: - 2004: -36,5 + 1909: -36,5 - node: color: '#A4610696' id: StandClear decals: - 2006: -38,16 + 1911: -38,16 - node: color: '#FFFFFFFF' id: StandClear decals: - 1055: -7,27 - 1238: -12,-27 - 1239: -12,-28 - 1240: -12,-29 - 1241: -12,-30 - 1694: 8,-25 - 1695: 8,-21 - 1696: 11,-20 - 1697: 12,-20 - 1698: 11,-17 - 1699: 12,-17 - 1700: 10,-11 - 1701: 11,-11 - 1702: -12,-11 - 1703: -13,-11 - 1704: -13,-17 - 1705: -10,-19 - 1706: -13,-21 - 1707: 12,-39 - 1708: 6,-36 - 1709: 7,-36 - 1710: 6,-32 - 1711: 7,-32 - 1712: -20,-19 - 1914: -9,-17 - 1936: -42,9 - 1937: -38,10 - 1938: -36,3 - 2242: -20,-13 - 2243: -21,-13 - 4842: -40,12 + 989: -7,27 + 1155: -12,-27 + 1156: -12,-28 + 1157: -12,-29 + 1158: -12,-30 + 1611: 8,-25 + 1612: 8,-21 + 1613: 11,-20 + 1614: 12,-20 + 1615: 11,-17 + 1616: 12,-17 + 1617: 10,-11 + 1618: 11,-11 + 1619: -12,-11 + 1620: -13,-11 + 1621: -13,-17 + 1622: -10,-19 + 1623: -13,-21 + 1624: 12,-39 + 1625: 6,-36 + 1626: 7,-36 + 1627: 6,-32 + 1628: 7,-32 + 1629: -20,-19 + 1819: -9,-17 + 1841: -42,9 + 1842: -38,10 + 1843: -36,3 + 2147: -20,-13 + 2148: -21,-13 + 4723: -40,12 - node: color: '#52B4E996' id: StandClearGreyscale @@ -6295,375 +6295,375 @@ entities: 456: -2,72 457: -1,72 458: 0,72 - 1890: 1,47 - 1891: 1,46 - 1892: 3,47 - 1893: 3,46 - 1910: 15,-24 - 1911: 14,-24 - 1912: 18,-11 - 1913: 19,-11 - 4939: 18,-13 - 4940: 19,-13 + 1795: 1,47 + 1796: 1,46 + 1797: 3,47 + 1798: 3,46 + 1815: 15,-24 + 1816: 14,-24 + 1817: 18,-11 + 1818: 19,-11 + 4820: 18,-13 + 4821: 19,-13 - node: color: '#A4610696' id: StandClearGreyscale decals: - 5011: -44,27 - 5012: -44,28 + 4892: -44,27 + 4893: -44,28 - node: color: '#D381C9FF' id: StandClearGreyscale decals: - 4947: -16,35 - 4948: -15,35 - 4949: -14,35 + 4828: -16,35 + 4829: -15,35 + 4830: -14,35 - node: color: '#52B4E996' id: ThreeQuarterTileOverlayGreyscale decals: - 5250: 9,17 - 5278: 14,20 + 5120: 9,17 + 5139: 14,20 - node: color: '#52B4E996' id: ThreeQuarterTileOverlayGreyscale180 decals: - 5280: 16,17 + 5141: 16,17 - node: color: '#52B4E996' id: ThreeQuarterTileOverlayGreyscale270 decals: - 5266: 11,19 - 5279: 14,17 + 5128: 11,19 + 5140: 14,17 - node: color: '#52B4E996' id: ThreeQuarterTileOverlayGreyscale90 decals: - 5277: 16,20 + 5138: 16,20 - node: color: '#FFFFFFFF' id: VentSmall decals: - 5164: -9,60 + 5045: -9,60 - node: color: '#79150096' id: WarnBox decals: - 1366: -15,-13 - 1367: -15,-12 + 1283: -15,-13 + 1284: -15,-12 - node: color: '#791500FF' id: WarnBox decals: - 1368: -15,-13 - 1369: -15,-12 + 1285: -15,-13 + 1286: -15,-12 - node: color: '#DE3A3AFF' id: WarnBox decals: - 1189: -10,25 - 1364: -15,-15 - 1365: -15,-16 + 1123: -10,25 + 1281: -15,-15 + 1282: -15,-16 - node: color: '#52B4E996' id: WarnBoxGreyscale decals: - 1370: -15,-13 - 1371: -15,-12 + 1287: -15,-13 + 1288: -15,-12 - node: color: '#52B4E9FF' id: WarnBoxGreyscale decals: - 1190: -10,24 + 1124: -10,24 - node: color: '#FFFFFFFF' id: WarnCornerNE decals: - 1610: 8,-39 - 2218: -22,-16 - 4945: -14,35 - 5136: -40,4 + 1527: 8,-39 + 2123: -22,-16 + 4826: -14,35 + 5017: -40,4 - node: color: '#FFFFFFFF' id: WarnCornerNW decals: - 1609: 5,-39 - 2217: -24,-16 - 4950: -16,35 - 4976: 25,31 - 5135: -42,4 + 1526: 5,-39 + 2122: -24,-16 + 4831: -16,35 + 4857: 25,31 + 5016: -42,4 - node: color: '#FFFFFFFF' id: WarnCornerSE decals: - 1017: -14,32 - 1608: 8,-42 - 2216: -22,-18 - 5137: -40,0 + 951: -14,32 + 1525: 8,-42 + 2121: -22,-18 + 5018: -40,0 - node: color: '#FFFFFFFF' id: WarnCornerSW decals: - 1016: -16,32 - 1607: 5,-42 - 2219: -24,-18 - 4966: -7,-18 - 4968: 13,-34 - 4977: 27,34 - 5134: -42,0 + 950: -16,32 + 1524: 5,-42 + 2124: -24,-18 + 4847: -7,-18 + 4849: 13,-34 + 4858: 27,34 + 5015: -42,0 - node: angle: 4.71238898038469 rad color: '#FFFFFFFF' id: WarnCornerSW decals: - 5133: 13,-31 + 5014: 13,-31 - node: color: '#FFFFFFFF' id: WarnCornerSmallSW decals: - 2187: 19,-33 + 2092: 19,-33 - node: color: '#FFFFFFFF' id: WarnFullGreyscale decals: - 5184: -9,61 - 5185: -8,60 + 5065: -9,61 + 5066: -8,60 - node: color: '#FFFFFFFF' id: WarnLineE decals: - 1018: -14,33 - 1019: -14,34 - 1242: -12,-38 - 1243: -12,-37 - 1244: -12,-36 - 1245: -12,-35 - 1246: -12,-34 - 1247: -12,-33 - 1248: -12,-32 - 1249: -12,-25 - 1250: -12,-24 - 1251: -12,-23 - 1252: -12,-22 - 1605: 8,-40 - 1606: 8,-41 - 1878: 12,-18 - 1879: 12,-19 - 2220: -22,-17 - 4879: 20,-12 - 4880: 20,-13 - 4970: 23,34 - 4971: 23,33 - 4972: 23,32 - 4973: 23,31 - 5013: -45,27 - 5014: -45,28 - 5141: -40,1 - 5142: -40,2 - 5143: -40,3 - 5161: -10,62 - 5162: -10,63 - 5163: -10,64 - 5181: -8,62 - 5182: -8,63 - 5183: -8,64 + 952: -14,33 + 953: -14,34 + 1159: -12,-38 + 1160: -12,-37 + 1161: -12,-36 + 1162: -12,-35 + 1163: -12,-34 + 1164: -12,-33 + 1165: -12,-32 + 1166: -12,-25 + 1167: -12,-24 + 1168: -12,-23 + 1169: -12,-22 + 1522: 8,-40 + 1523: 8,-41 + 1783: 12,-18 + 1784: 12,-19 + 2125: -22,-17 + 4760: 20,-12 + 4761: 20,-13 + 4851: 23,34 + 4852: 23,33 + 4853: 23,32 + 4854: 23,31 + 4894: -45,27 + 4895: -45,28 + 5022: -40,1 + 5023: -40,2 + 5024: -40,3 + 5042: -10,62 + 5043: -10,63 + 5044: -10,64 + 5062: -8,62 + 5063: -8,63 + 5064: -8,64 - node: angle: 3.141592653589793 rad color: '#FFFFFFFF' id: WarnLineE decals: - 5132: 13,-32 + 5013: 13,-32 - node: color: '#52B4E996' id: WarnLineGreyscaleE decals: - 5262: 12,18 - 5263: 12,19 - 5264: 12,17 - 5265: 12,20 + 5124: 12,18 + 5125: 12,19 + 5126: 12,17 + 5127: 12,20 - node: color: '#52B4E996' id: WarnLineGreyscaleN decals: - 5214: 9,32 - 5215: 10,32 - 5216: 11,32 - 5217: 12,32 - 5284: 15,20 + 5095: 9,32 + 5096: 10,32 + 5097: 11,32 + 5098: 12,32 + 5145: 15,20 - node: color: '#52B4E996' id: WarnLineGreyscaleW decals: - 5283: 14,18 + 5144: 14,18 - node: color: '#FFA500FF' id: WarnLineN decals: - 4963: -28,-29 - 4964: 26,-29 + 4844: -28,-29 + 4845: 26,-29 - node: color: '#FFFFFFFF' id: WarnLineN decals: - 1013: -15,32 - 1052: -8,32 - 1053: -7,32 - 1054: -6,32 - 1600: 6,-42 - 1601: 7,-42 - 2188: 18,-33 - 2195: 17,-33 - 2223: -23,-18 - 4967: -6,-18 - 4978: -29,49 - 4979: -28,49 - 5139: -41,0 - 5140: -41,0 + 947: -15,32 + 986: -8,32 + 987: -7,32 + 988: -6,32 + 1517: 6,-42 + 1518: 7,-42 + 2093: 18,-33 + 2100: 17,-33 + 2128: -23,-18 + 4848: -6,-18 + 4859: -29,49 + 4860: -28,49 + 5020: -41,0 + 5021: -41,0 - node: color: '#FFFFFFFF' id: WarnLineS decals: - 1014: -16,33 - 1015: -16,34 - 1191: -15,27 - 1192: -15,28 - 1602: 5,-41 - 1603: 5,-40 - 1876: 11,-19 - 1877: 11,-18 - 2182: 19,-35 - 2183: 19,-34 - 2184: 19,-36 - 2185: 19,-37 - 2186: 19,-38 - 2222: -24,-17 - 4881: 17,-13 - 4882: 17,-12 - 4969: 13,-33 - 4995: -43,27 - 4996: -43,28 - 5015: -46,28 - 5016: -46,27 - 5144: -42,1 - 5145: -42,2 - 5146: -42,3 + 948: -16,33 + 949: -16,34 + 1125: -15,27 + 1126: -15,28 + 1519: 5,-41 + 1520: 5,-40 + 1781: 11,-19 + 1782: 11,-18 + 2087: 19,-35 + 2088: 19,-34 + 2089: 19,-36 + 2090: 19,-37 + 2091: 19,-38 + 2127: -24,-17 + 4762: 17,-13 + 4763: 17,-12 + 4850: 13,-33 + 4876: -43,27 + 4877: -43,28 + 4896: -46,28 + 4897: -46,27 + 5025: -42,1 + 5026: -42,2 + 5027: -42,3 - node: color: '#FFA500FF' id: WarnLineW decals: - 4962: -28,-29 - 4965: 26,-29 + 4843: -28,-29 + 4846: 26,-29 - node: color: '#FFFFFFFF' id: WarnLineW decals: - 1158: -10,18 - 1159: -9,18 - 1160: -8,18 - 1604: 6,-39 - 2221: -23,-16 - 4946: -15,35 - 4974: 27,31 - 4975: 26,31 - 5138: -41,4 - 5158: -5,59 - 5159: -6,59 - 5160: -7,59 - 5178: -5,61 - 5179: -6,61 - 5180: -7,61 + 1092: -10,18 + 1093: -9,18 + 1094: -8,18 + 1521: 6,-39 + 2126: -23,-16 + 4827: -15,35 + 4855: 27,31 + 4856: 26,31 + 5019: -41,4 + 5039: -5,59 + 5040: -6,59 + 5041: -7,59 + 5059: -5,61 + 5060: -6,61 + 5061: -7,61 - node: color: '#E7B795FF' id: WoodTrimThinCornerNe decals: - 2093: 43,51 - 2110: 46,48 + 1998: 43,51 + 2015: 46,48 - node: color: '#FFD381FF' id: WoodTrimThinCornerNe decals: - 1494: -5,8 + 1411: -5,8 - node: color: '#FFFFFFFF' id: WoodTrimThinCornerNe decals: 707: 14,61 - 1149: -24,21 - 5190: -7,-3 - 5191: -6,-5 + 1083: -24,21 + 5071: -7,-3 + 5072: -6,-5 - node: color: '#E7B795FF' id: WoodTrimThinCornerNw decals: - 2094: 41,51 - 2099: 40,49 - 2111: 45,48 + 1999: 41,51 + 2004: 40,49 + 2016: 45,48 - node: color: '#FFD381FF' id: WoodTrimThinCornerNw decals: - 1505: -12,8 + 1422: -12,8 - node: color: '#FFFFFFFF' id: WoodTrimThinCornerNw decals: 706: 7,61 - 5192: -9,-3 - 5193: -10,-5 + 5073: -9,-3 + 5074: -10,-5 - node: color: '#E7B795FF' id: WoodTrimThinCornerSe decals: - 2108: 46,46 + 2013: 46,46 - node: color: '#FFD381FF' id: WoodTrimThinCornerSe decals: - 1490: -5,4 + 1407: -5,4 - node: color: '#FFFFFFFF' id: WoodTrimThinCornerSe decals: - 2144: 14,56 + 2049: 14,56 - node: color: '#E7B795FF' id: WoodTrimThinCornerSw decals: - 2102: 40,46 + 2007: 40,46 - node: color: '#FFD381FF' id: WoodTrimThinCornerSw decals: - 1499: -10,4 - 1503: -12,6 + 1416: -10,4 + 1420: -12,6 - node: color: '#FFFFFFFF' id: WoodTrimThinCornerSw decals: - 2143: 7,56 + 2048: 7,56 - node: color: '#E7B795FF' id: WoodTrimThinInnerNe decals: - 2098: 43,46 + 2003: 43,46 - node: color: '#FFFFFFFF' id: WoodTrimThinInnerNe decals: 481: 3,70 - 5199: -7,-5 + 5080: -7,-5 - node: color: '#E7B795FF' id: WoodTrimThinInnerNw decals: - 2097: 41,49 - 2113: 45,46 + 2002: 41,49 + 2018: 45,46 - node: color: '#FFFFFFFF' id: WoodTrimThinInnerNw decals: 482: 7,70 - 5194: -9,-5 + 5075: -9,-5 - node: color: '#FFFFFFFF' id: WoodTrimThinInnerSe @@ -6673,7 +6673,7 @@ entities: color: '#FFD381FF' id: WoodTrimThinInnerSw decals: - 1501: -10,6 + 1418: -10,6 - node: color: '#FFFFFFFF' id: WoodTrimThinInnerSw @@ -6683,18 +6683,18 @@ entities: color: '#E7B795FF' id: WoodTrimThinLineE decals: - 2089: 43,47 - 2090: 43,48 - 2091: 43,49 - 2092: 43,50 - 2109: 46,47 + 1994: 43,47 + 1995: 43,48 + 1996: 43,49 + 1997: 43,50 + 2014: 46,47 - node: color: '#FFD381FF' id: WoodTrimThinLineE decals: - 1491: -5,5 - 1492: -5,6 - 1493: -5,7 + 1408: -5,5 + 1409: -5,6 + 1410: -5,7 - node: color: '#FFFFFFFF' id: WoodTrimThinLineE @@ -6706,26 +6706,26 @@ entities: 719: 14,58 720: 14,59 721: 14,60 - 1150: -24,20 - 1151: -24,19 - 5197: -6,-6 - 5198: -7,-4 + 1084: -24,20 + 1085: -24,19 + 5078: -6,-6 + 5079: -7,-4 - node: color: '#E7B795FF' id: WoodTrimThinLineN decals: - 2095: 42,51 - 2114: 44,46 + 2000: 42,51 + 2019: 44,46 - node: color: '#FFD381FF' id: WoodTrimThinLineN decals: - 1506: -11,8 - 1507: -10,8 - 1508: -9,8 - 1509: -8,8 - 1510: -7,8 - 1511: -6,8 + 1423: -11,8 + 1424: -10,8 + 1425: -9,8 + 1426: -8,8 + 1427: -7,8 + 1428: -6,8 - node: color: '#FFFFFFFF' id: WoodTrimThinLineN @@ -6739,30 +6739,30 @@ entities: 711: 11,61 712: 12,61 713: 13,61 - 1148: -25,21 - 5122: 5,59 - 5123: 3,59 - 5124: 2,59 - 5125: 4,59 - 5200: -8,-3 + 1082: -25,21 + 5003: 5,59 + 5004: 3,59 + 5005: 2,59 + 5006: 4,59 + 5081: -8,-3 - node: color: '#E7B795FF' id: WoodTrimThinLineS decals: - 2103: 41,46 - 2104: 42,46 - 2105: 43,46 - 2106: 44,46 - 2107: 45,46 + 2008: 41,46 + 2009: 42,46 + 2010: 43,46 + 2011: 44,46 + 2012: 45,46 - node: color: '#FFD381FF' id: WoodTrimThinLineS decals: - 1495: -6,4 - 1496: -7,4 - 1497: -8,4 - 1498: -9,4 - 1502: -11,6 + 1412: -6,4 + 1413: -7,4 + 1414: -8,4 + 1415: -9,4 + 1419: -11,6 - node: color: '#FFFFFFFF' id: WoodTrimThinLineS @@ -6770,26 +6770,26 @@ entities: 472: 4,74 473: 5,74 474: 6,74 - 2137: 8,56 - 2138: 9,56 - 2139: 10,56 - 2140: 11,56 - 2141: 12,56 - 2142: 13,56 + 2042: 8,56 + 2043: 9,56 + 2044: 10,56 + 2045: 11,56 + 2046: 12,56 + 2047: 13,56 - node: color: '#E7B795FF' id: WoodTrimThinLineW decals: - 2096: 41,50 - 2100: 40,48 - 2101: 40,47 - 2112: 45,47 + 2001: 41,50 + 2005: 40,48 + 2006: 40,47 + 2017: 45,47 - node: color: '#FFD381FF' id: WoodTrimThinLineW decals: - 1500: -10,5 - 1504: -12,7 + 1417: -10,5 + 1421: -12,7 - node: color: '#FFFFFFFF' id: WoodTrimThinLineW @@ -6801,23 +6801,23 @@ entities: 715: 7,59 716: 7,58 717: 7,57 - 5195: -9,-4 - 5196: -10,-6 + 5076: -9,-4 + 5077: -10,-6 - node: color: '#80C71F76' id: grasssnowa2 decals: - 4873: -45.348083,39.888554 + 4754: -45.348083,39.888554 - node: color: '#80C71F76' id: grasssnowb1 decals: - 4872: -45.952293,40.610558 + 4753: -45.952293,40.610558 - node: color: '#80C71F76' id: grasssnowc1 decals: - 4871: -47.55861,40.00643 + 4752: -47.55861,40.00643 type: DecalGrid - version: 2 data: @@ -7962,12 +7962,14 @@ entities: 0: 64443 3,16: 0: 32767 + 2: 32768 3,17: 0: 30591 3,18: 0: 1863 4,16: 0: 4095 + 2: 61440 4,17: 0: 15 5,16: @@ -8541,16 +8543,16 @@ entities: id: docking21483 localAnchorB: -5,0.5 localAnchorA: 38,3.5 - damping: 791.6383 - stiffness: 7105.729 + damping: 791.64215 + stiffness: 7105.7637 docking21482: !type:WeldJoint bodyB: 8756 bodyA: 1 id: docking21482 localAnchorB: -5,-1.5 localAnchorA: 38,1.5 - damping: 791.6383 - stiffness: 7105.729 + damping: 791.64215 + stiffness: 7105.7637 type: Joint - type: SpreaderGrid - type: GridPathfinding @@ -8741,16 +8743,16 @@ entities: id: docking21483 localAnchorB: -5,0.5 localAnchorA: 38,3.5 - damping: 791.6383 - stiffness: 7105.729 + damping: 791.64215 + stiffness: 7105.7637 docking21482: !type:WeldJoint bodyB: 8756 bodyA: 1 id: docking21482 localAnchorB: -5,-1.5 localAnchorA: 38,1.5 - damping: 791.6383 - stiffness: 7105.729 + damping: 791.64215 + stiffness: 7105.7637 type: Joint - type: SpreaderGrid - type: GridPathfinding @@ -11698,11 +11700,6 @@ entities: - pos: 19.5,16.5 parent: 1 type: Transform - - uid: 8327 - components: - - pos: 15.5,21.5 - parent: 1 - type: Transform - uid: 8329 components: - pos: 14.5,-5.5 @@ -11790,6 +11787,11 @@ entities: type: Transform - proto: AirlockMaintMedLocked entities: + - uid: 2614 + components: + - pos: 15.5,21.5 + parent: 1 + type: Transform - uid: 8505 components: - pos: 23.5,27.5 @@ -14936,6 +14938,11 @@ entities: - pos: 14.5,18.5 parent: 1 type: Transform + - uid: 3023 + components: + - pos: -35.5,11.5 + parent: 1 + type: Transform - uid: 3679 components: - pos: 14.5,67.5 @@ -58263,6 +58270,16 @@ entities: - pos: -13.5,-8.5 parent: 1 type: Transform + - uid: 2621 + components: + - pos: 17.5,27.5 + parent: 1 + type: Transform + - uid: 2643 + components: + - pos: 12.5,21.5 + parent: 1 + type: Transform - uid: 3458 components: - pos: 21.5,-6.5 @@ -59577,6 +59594,26 @@ entities: - 17490 - 8155 type: DeviceNetwork + - uid: 8327 + components: + - pos: 17.5,28.5 + parent: 1 + type: Transform + - uid: 8425 + components: + - pos: 13.5,27.5 + parent: 1 + type: Transform + - uid: 8561 + components: + - pos: 13.5,28.5 + parent: 1 + type: Transform + - uid: 8562 + components: + - pos: 11.5,29.5 + parent: 1 + type: Transform - uid: 8861 components: - pos: -1.5,-2.5 @@ -101405,34 +101442,6 @@ entities: - pos: -16.5,41.5 parent: 1 type: Transform -- proto: SpawnPointSeniorEngineer - entities: - - uid: 2621 - components: - - pos: 6.5,-18.5 - parent: 1 - type: Transform -- proto: SpawnPointSeniorOfficer - entities: - - uid: 2643 - components: - - pos: -17.5,42.5 - parent: 1 - type: Transform -- proto: SpawnPointSeniorPhysician - entities: - - uid: 8425 - components: - - pos: 20.5,27.5 - parent: 1 - type: Transform -- proto: SpawnPointSeniorResearcher - entities: - - uid: 2614 - components: - - pos: -16.5,24.5 - parent: 1 - type: Transform - proto: SpawnPointServiceWorker entities: - uid: 18174 @@ -118331,6 +118340,12 @@ entities: - pos: 7.5,19.5 parent: 1 type: Transform + - uid: 3723 + components: + - rot: -1.5707963267948966 rad + pos: 13.5,18.5 + parent: 1 + type: Transform - uid: 9373 components: - rot: 1.5707963267948966 rad @@ -118343,14 +118358,6 @@ entities: pos: 3.5,33.5 parent: 1 type: Transform -- proto: WindoorSecureParamedicLocked - entities: - - uid: 3723 - components: - - rot: -1.5707963267948966 rad - pos: 13.5,18.5 - parent: 1 - type: Transform - proto: WindoorSecureSalvageLocked entities: - uid: 8500 From 17270bb321c78ac08c8139ff4a614890cee89cb2 Mon Sep 17 00:00:00 2001 From: KP <13428215+nok-ko@users.noreply.github.com> Date: Tue, 12 Dec 2023 13:57:54 -0800 Subject: [PATCH 17/47] Fix glorfcode again (#22420) --- .../Systems/Chat/ChatUIController.cs | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs b/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs index 772c999130d..0213eb59026 100644 --- a/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs +++ b/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs @@ -707,17 +707,24 @@ public void SendMessage(ChatBox box, ChatSelectChannel channel) private void OnDamageForceSay(DamageForceSayEvent ev, EntitySessionEventArgs _) { var chatBox = UIManager.ActiveScreen?.GetWidget() ?? UIManager.ActiveScreen?.GetWidget(); + if (chatBox == null) + return; + + var msg = chatBox.ChatInput.Input.Text.TrimEnd(); // Don't send on OOC/LOOC obviously! - if (chatBox?.SelectedChannel is not (ChatSelectChannel.Local or - ChatSelectChannel.Radio or - ChatSelectChannel.Whisper)) + if (SplitInputContents(msg).chatChannel + is not ( + ChatSelectChannel.Local or + ChatSelectChannel.Radio or + ChatSelectChannel.Whisper + ) + ) return; if (_player.LocalSession?.AttachedEntity is not { } ent || !EntityManager.TryGetComponent(ent, out var forceSay)) return; - var msg = chatBox.ChatInput.Input.Text.TrimEnd(); if (string.IsNullOrWhiteSpace(msg)) return; From 942e91884d8d2e91ae24273e801404c122997915 Mon Sep 17 00:00:00 2001 From: luckyshotpictures <126210746+luckyshotpictures@users.noreply.github.com> Date: Wed, 13 Dec 2023 00:43:27 +0100 Subject: [PATCH 18/47] Tracking & Implanter Crate (#22414) This adds a crate containing mindshield and tracking implanters, locked by security access. The crate contains 4 items of both implanters. This has been requested by some mappers. The crate is not obtainable through normal means like cargo. --- .../Prototypes/Catalog/Fills/Crates/security.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Resources/Prototypes/Catalog/Fills/Crates/security.yml b/Resources/Prototypes/Catalog/Fills/Crates/security.yml index c895e00d49c..ea8c7ce0d33 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/security.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/security.yml @@ -86,4 +86,16 @@ - id: ClothingMaskSterile amount: 2 +- type: entity + id: CrateSecurityTrackingMindshieldImplants + name: Implanter Crate + parent: CrateSecgear + components: + - type: StorageFill + contents: + - id: MindShieldImplanter + amount: 4 + - id: TrackingImplanter + amount: 4 + # Cosmetic Crates From e7de7fa0756d53ba3056b22c43ae76c8eae15e08 Mon Sep 17 00:00:00 2001 From: themias <89101928+themias@users.noreply.github.com> Date: Tue, 12 Dec 2023 19:01:24 -0500 Subject: [PATCH 19/47] Add fill layers to Hot Cocoa drink (#22419) --- .../Objects/Consumable/Drinks/drinks_cups.yml | 8 ++++++ .../Consumable/Drinks/hot_coco.rsi/icon-0.png | Bin 0 -> 318 bytes .../Consumable/Drinks/hot_coco.rsi/icon-1.png | Bin 0 -> 149 bytes .../Consumable/Drinks/hot_coco.rsi/icon-2.png | Bin 0 -> 158 bytes .../Consumable/Drinks/hot_coco.rsi/icon-3.png | Bin 0 -> 160 bytes .../Consumable/Drinks/hot_coco.rsi/icon-4.png | Bin 0 -> 164 bytes .../Consumable/Drinks/hot_coco.rsi/icon.png | Bin 305 -> 0 bytes .../Consumable/Drinks/hot_coco.rsi/meta.json | 26 +++++++++++++++++- 8 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi/icon-0.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi/icon-1.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi/icon-2.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi/icon-3.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi/icon-4.png delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi/icon.png diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml index 793383ae5c8..e626e21cb88 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml @@ -187,6 +187,14 @@ Quantity: 20 - type: Sprite sprite: Objects/Consumable/Drinks/hot_coco.rsi + layers: + - state: icon-0 + - map: ["enum.SolutionContainerLayers.Fill"] + state: icon-4 + - type: Appearance + - type: SolutionContainerVisuals + maxFillLevels: 4 + fillBaseName: icon- - type: TrashOnSolutionEmpty solution: drink diff --git a/Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi/icon-0.png b/Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi/icon-0.png new file mode 100644 index 0000000000000000000000000000000000000000..d2a5ef967aa5a6572b56ac10e7db2ca8e7afe73c GIT binary patch literal 318 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!;AKx2$B+p3WC_;A2_ijBg8UK-O*|jGTej+j2&U{@&|twVJ)djF|JRpg+rG=kO?u0rrr|5X5P9zGAJH63>Fqi! z%r_MbzXT|XO?bi}@L*yYb2JaLf|&;oi$kBnRYeu+2TvC-4iIBHaKzyv!=d+iXH{WSGuHK6WyWRQ?x$ZYd||7+v1>p<@@c)I$ztaD0e F0s!wKYpehO literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi/icon-1.png b/Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi/icon-1.png new file mode 100644 index 0000000000000000000000000000000000000000..c97ead8da8530a03451da7a9f4928c5ca14f244b GIT binary patch literal 149 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!pq8hLV@QPi+hZGf85DR}Hm3YvsOYqxLG@7H pJ1&NO*I!OG-Q?b{!*C#bm08Ds7N(o54!S^H44$rjF6*2UngDw2Dlq^6 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi/icon-2.png b/Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi/icon-2.png new file mode 100644 index 0000000000000000000000000000000000000000..18ff175dadad15aa8176531790f36105fe7fa7c1 GIT binary patch literal 158 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!ps}ZmV@QPi+p~&%3<^BV2j2egZ|h`r6j1Pd z=QDd28$(U{ly#>wcTb(`|Lw3&EF(jmup#5Oh1|dXJ+rd|YG?3t^>bP0l+XkK7|t%k literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi/icon-3.png b/Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi/icon-3.png new file mode 100644 index 0000000000000000000000000000000000000000..a60b6edb6dbf9af1e7887fdadd418099f0f307d3 GIT binary patch literal 160 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!psA;eV@QPi+jELS3<^BV8$SMbKYWBo<3NLl zPj*>0!-4FzMbZAD>bjw}MWtK%cGU7Qd}!=o6wBdYE=qbV4K#qk)78&qol`;+092VR AYXATM literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi/icon-4.png b/Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi/icon-4.png new file mode 100644 index 0000000000000000000000000000000000000000..52a03df50852262789b681a9fc36bd6d54defc2b GIT binary patch literal 164 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!prxmaV@QPi+Y5?(3xtJ#Y{^{GV9Uu9D+IS|L&FJJ|*=?K=3FI+&y85}Sb4q9e E0B=w+d;kCd literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi/icon.png deleted file mode 100644 index 9b9bfe86d23167849cc559b4e9c53b5f81570faf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 305 zcmV-10nYx3P)3-b7{>8`tT;p{chf;3E-j@~mv%}&PCrBip+mubu3MU+Tz3aun#oBK%-|9ihiW}A zQF|2fZ1+MgKX@M^%Ce-%v>LrV0TLhq5&&q&98%KwpWoJL@n--fjnA`!&gBgNtHl^F zJ{A!KP}2DB#ghK*^Va;s5|e?}<)V0kB%yO%dVoPI!Q7bbW9aq5yTNM*jRIJavKq)@iYC z*R%OF`Y{S#fpuE&{n6Y@c Date: Tue, 12 Dec 2023 19:01:51 -0500 Subject: [PATCH 20/47] Fix construction graph ghost examine message (#22424) --- Content.Client/Construction/ConstructionSystem.cs | 7 ++++++- .../Recipes/Construction/Graphs/structures/secretdoor.yml | 1 - 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Content.Client/Construction/ConstructionSystem.cs b/Content.Client/Construction/ConstructionSystem.cs index d0a14860f11..4035c68cc75 100644 --- a/Content.Client/Construction/ConstructionSystem.cs +++ b/Content.Client/Construction/ConstructionSystem.cs @@ -2,6 +2,7 @@ using Content.Client.Popups; using Content.Shared.Construction; using Content.Shared.Construction.Prototypes; +using Content.Shared.Construction.Steps; using Content.Shared.Examine; using Content.Shared.Input; using Content.Shared.Interaction; @@ -97,7 +98,11 @@ private void HandleConstructionGhostExamined(EntityUid uid, ConstructionGhostCom return; } - edge.Steps[0].DoExamine(args); + foreach (ConstructionGraphStep step in edge.Steps) + { + args.Message.PushNewline(); + step.DoExamine(args); + } } public event EventHandler? CraftingAvailabilityChanged; diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/secretdoor.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/secretdoor.yml index 336933a36b3..2c5a0db2b82 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/secretdoor.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/secretdoor.yml @@ -12,7 +12,6 @@ - material: Steel amount: 4 doAfter: 4 - - material: MetalRod amount: 4 doAfter: 4 From 21be01acdf9c13c4a223b5406e304122eb0b3f60 Mon Sep 17 00:00:00 2001 From: Errant <35878406+Errant-4@users.noreply.github.com> Date: Wed, 13 Dec 2023 01:02:29 +0100 Subject: [PATCH 21/47] Blood-red medic armor ID change (#22422) * Rename blood-red medic hardsuit prototype * Update guidebook * Migration --- .../Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml | 4 ++-- Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml | 2 +- .../ServerInfo/Guidebook/Antagonist/Nuclear Operatives.xml | 4 ++-- Resources/migration.yml | 4 ++++ 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml index de653b3bdfd..1a93a18e194 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml @@ -472,7 +472,7 @@ # Syndicate Medic Hardsuit - type: entity parent: ClothingOuterHardsuitSyndie - id: ClothingOuterHardsuitMedic + id: ClothingOuterHardsuitSyndieMedic name: blood-red medic hardsuit description: A heavily armored and agile advanced hardsuit specifically designed for field medic operations. components: @@ -739,7 +739,7 @@ #ERT Medic Hardsuit - type: entity - parent: ClothingOuterHardsuitMedic + parent: ClothingOuterHardsuitSyndieMedic id: ClothingOuterHardsuitERTMedical name: ERT medic's hardsuit description: A protective hardsuit worn by the medics of an emergency response team. diff --git a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml index 85e9b634d6f..c8d8aff12b7 100644 --- a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml +++ b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml @@ -148,7 +148,7 @@ eyes: ClothingEyesHudSyndicate ears: ClothingHeadsetAltSyndicate gloves: ClothingHandsGlovesCombat - outerClothing: ClothingOuterHardsuitMedic + outerClothing: ClothingOuterHardsuitSyndieMedic shoes: ClothingShoesBootsMagSyndie id: SyndiAgentPDA pocket1: DoubleEmergencyOxygenTankFilled diff --git a/Resources/ServerInfo/Guidebook/Antagonist/Nuclear Operatives.xml b/Resources/ServerInfo/Guidebook/Antagonist/Nuclear Operatives.xml index 767156452cf..f3ced7eeda3 100644 --- a/Resources/ServerInfo/Guidebook/Antagonist/Nuclear Operatives.xml +++ b/Resources/ServerInfo/Guidebook/Antagonist/Nuclear Operatives.xml @@ -13,9 +13,9 @@ - - The [color=#a4885c]Nukie Agent[/color] wears the black elite hardsuit, and can act as a combat medic for the mission. + - The [color=#a4885c]Nukie Agent[/color] wears the blood-red medic hardsuit, and can act as a combat medic for the mission. - + - Regular [color=#a4885c]Nuclear Operatives[/color], who have the normal blood red hardsuit. diff --git a/Resources/migration.yml b/Resources/migration.yml index 07a6c77831e..a8f09ea0428 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -93,3 +93,7 @@ SpawnPointSeniorResearcher: null SpawnPointSeniorOfficer: null SpawnPointSeniorEngineer: null SpawnPointSeniorPhysician: null + +# 2023-12-12 +#No this is not the CMO hardsuit, their prototype IDs were just confusingly similar +ClothingOuterHardsuitMedic: ClothingOuterHardsuitSyndieMedic From 2fe4772f92d8d8ea754cee9c9ac8a21eb8ee4b3e Mon Sep 17 00:00:00 2001 From: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com> Date: Tue, 12 Dec 2023 18:02:43 -0600 Subject: [PATCH 22/47] Add proper suffix (#22417) Co-authored-by: Jeff --- Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml b/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml index 3b01b73db44..37642106e18 100644 --- a/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml +++ b/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml @@ -43,7 +43,7 @@ - type: entity id: ToolboxElectricalTurretFilled name: electrical toolbox - suffix: Filled + suffix: Syndicate, Turret, Filled parent: ToolboxElectricalTurret components: - type: StorageFill From 971c07c35ded36e8e6743c47a8f94b75d6400c8e Mon Sep 17 00:00:00 2001 From: PJBot Date: Tue, 12 Dec 2023 19:02:57 -0500 Subject: [PATCH 23/47] Automatic changelog update --- Resources/Changelog/Changelog.yml | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 89175d19e42..a88c7a3a484 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,15 +1,4 @@ Entries: -- author: lapatison - changes: - - {message: 'Now you can light matches with certain types (combat, work, merc, explorer) - of boots like a cool dude.', type: Add} - id: 4847 - time: '2023-09-18T00:26:21.0000000+00:00' -- author: JoeHammad - changes: - - {message: 'security now has access to its own beret, fancy!', type: Add} - id: 4848 - time: '2023-09-18T00:30:31.0000000+00:00' - author: peptron1 changes: - {message: 'The chaplain hoodie now comes with its hood as an action, similar to @@ -2900,3 +2889,13 @@ Entries: - {message: 'Fix arrivals fog not actually blocking, no more free roaming.', type: Fix} id: 5347 time: '2023-12-12T09:20:33.0000000+00:00' +- author: themias + changes: + - {message: Added fill visuals to Hot Chocolate, type: Tweak} + id: 5348 + time: '2023-12-13T00:01:24.0000000+00:00' +- author: themias + changes: + - {message: Fixed secret doors not requiring metal rods, type: Fix} + id: 5349 + time: '2023-12-13T00:01:51.0000000+00:00' From d72506d54b7d9378607f7de9148cbcce5781f471 Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Wed, 13 Dec 2023 11:03:46 +1100 Subject: [PATCH 24/47] Hide verb expansion indicators on debug (#22415) I forget if it's actually going to popup or not. --- Content.Client/Verbs/UI/VerbMenuElement.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Content.Client/Verbs/UI/VerbMenuElement.cs b/Content.Client/Verbs/UI/VerbMenuElement.cs index 5997a97384c..1815144f7d7 100644 --- a/Content.Client/Verbs/UI/VerbMenuElement.cs +++ b/Content.Client/Verbs/UI/VerbMenuElement.cs @@ -33,11 +33,14 @@ public VerbMenuElement(Verb verb) : base(verb.Text) Label.SetOnlyStyleClass(verb.TextStyleClass); + // There are no confirmations in debug fam. +#if !DEBUG if (verb.ConfirmationPopup) { ExpansionIndicator.SetOnlyStyleClass(StyleClassVerbMenuConfirmationTexture); ExpansionIndicator.Visible = true; } +#endif var entManager = IoCManager.Resolve(); From b968dea47886fd8a111fa3b2e5cf66aeede6c9a8 Mon Sep 17 00:00:00 2001 From: tgrkzus Date: Wed, 13 Dec 2023 11:07:04 +1100 Subject: [PATCH 25/47] improve deconstruction text (#22404) --- .../Construction/ConstructionSystem.Guided.cs | 13 ++++++++++--- .../components/construction-component.ftl | 3 ++- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/Content.Server/Construction/ConstructionSystem.Guided.cs b/Content.Server/Construction/ConstructionSystem.Guided.cs index 0877ec79ba0..cf6ea4da516 100644 --- a/Content.Server/Construction/ConstructionSystem.Guided.cs +++ b/Content.Server/Construction/ConstructionSystem.Guided.cs @@ -69,9 +69,16 @@ private void HandleConstructionExamined(EntityUid uid, ConstructionComponent com { if (GetTargetNode(uid, component) is {} target) { - args.PushMarkup(Loc.GetString( - "construction-component-to-create-header", - ("targetName", target.Name)) + "\n"); + if (target.Name == component.DeconstructionNode) + { + args.PushMarkup(Loc.GetString("deconstruction-header-text") + "\n"); + } + else + { + args.PushMarkup(Loc.GetString( + "construction-component-to-create-header", + ("targetName", target.Name)) + "\n"); + } } if (component.EdgeIndex == null && GetTargetEdge(uid, component) is {} targetEdge) diff --git a/Resources/Locale/en-US/construction/components/construction-component.ftl b/Resources/Locale/en-US/construction/components/construction-component.ftl index 85276a45aa7..9c781e679a7 100644 --- a/Resources/Locale/en-US/construction/components/construction-component.ftl +++ b/Resources/Locale/en-US/construction/components/construction-component.ftl @@ -1 +1,2 @@ -construction-component-to-create-header = To create {$targetName}... \ No newline at end of file +construction-component-to-create-header = To create {$targetName}... +deconstruction-header-text = To deconstruct... From 7a12f1fcfb321565d59f91ef5d08c53ee6687fe4 Mon Sep 17 00:00:00 2001 From: TsjipTsjip <19798667+TsjipTsjip@users.noreply.github.com> Date: Wed, 13 Dec 2023 01:07:34 +0100 Subject: [PATCH 26/47] Remove paramedic windoor (#22400) --- .../Entities/Structures/Doors/Windoors/windoor.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml b/Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml index b4910f32f4f..ed07c155aea 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml @@ -230,11 +230,3 @@ components: - type: AccessReader access: [["Atmospherics"]] - -- type: entity - parent: WindoorSecure - id: WindoorSecureParamedicLocked - suffix: Paramedic, Locked - components: - - type: AccessReader - access: [["Paramedic"]] From 3cb6b2c3b824847e3625454f734c57b4dbe4b6fa Mon Sep 17 00:00:00 2001 From: Vasilis Date: Wed, 13 Dec 2023 02:58:20 +0100 Subject: [PATCH 27/47] Add generic settings tab and move a bunch of settings over (And add the ability to toggle Discord RPC) (#22430) --- Content.Client/Options/UI/OptionsMenu.xaml | 1 + Content.Client/Options/UI/OptionsMenu.xaml.cs | 9 +- .../Options/UI/Tabs/GraphicsTab.xaml | 6 -- .../Options/UI/Tabs/GraphicsTab.xaml.cs | 31 ------ .../Options/UI/Tabs/KeyRebindTab.xaml.cs | 1 - Content.Client/Options/UI/Tabs/MiscTab.xaml | 41 ++++++++ .../Options/UI/Tabs/MiscTab.xaml.cs | 94 +++++++++++++++++++ .../en-US/escape-menu/ui/options-menu.ftl | 9 ++ 8 files changed, 150 insertions(+), 42 deletions(-) create mode 100644 Content.Client/Options/UI/Tabs/MiscTab.xaml create mode 100644 Content.Client/Options/UI/Tabs/MiscTab.xaml.cs diff --git a/Content.Client/Options/UI/OptionsMenu.xaml b/Content.Client/Options/UI/OptionsMenu.xaml index 5d028879fe8..ab3b88ca4e6 100644 --- a/Content.Client/Options/UI/OptionsMenu.xaml +++ b/Content.Client/Options/UI/OptionsMenu.xaml @@ -3,6 +3,7 @@ Title="{Loc 'ui-options-title'}" MinSize="800 450"> + diff --git a/Content.Client/Options/UI/OptionsMenu.xaml.cs b/Content.Client/Options/UI/OptionsMenu.xaml.cs index 1a924d2af17..c3a8e664705 100644 --- a/Content.Client/Options/UI/OptionsMenu.xaml.cs +++ b/Content.Client/Options/UI/OptionsMenu.xaml.cs @@ -15,10 +15,11 @@ public OptionsMenu() RobustXamlLoader.Load(this); IoCManager.InjectDependencies(this); - Tabs.SetTabTitle(0, Loc.GetString("ui-options-tab-graphics")); - Tabs.SetTabTitle(1, Loc.GetString("ui-options-tab-controls")); - Tabs.SetTabTitle(2, Loc.GetString("ui-options-tab-audio")); - Tabs.SetTabTitle(3, Loc.GetString("ui-options-tab-network")); + Tabs.SetTabTitle(0, Loc.GetString("ui-options-tab-misc")); + Tabs.SetTabTitle(1, Loc.GetString("ui-options-tab-graphics")); + Tabs.SetTabTitle(2, Loc.GetString("ui-options-tab-controls")); + Tabs.SetTabTitle(3, Loc.GetString("ui-options-tab-audio")); + Tabs.SetTabTitle(4, Loc.GetString("ui-options-tab-network")); UpdateTabs(); } diff --git a/Content.Client/Options/UI/Tabs/GraphicsTab.xaml b/Content.Client/Options/UI/Tabs/GraphicsTab.xaml index e3d45c19dae..74a0c78c526 100644 --- a/Content.Client/Options/UI/Tabs/GraphicsTab.xaml +++ b/Content.Client/Options/UI/Tabs/GraphicsTab.xaml @@ -20,12 +20,6 @@ - - - - - - diff --git a/Content.Client/Options/UI/Tabs/GraphicsTab.xaml.cs b/Content.Client/Options/UI/Tabs/GraphicsTab.xaml.cs index 7a11885a89d..1773b2abe5d 100644 --- a/Content.Client/Options/UI/Tabs/GraphicsTab.xaml.cs +++ b/Content.Client/Options/UI/Tabs/GraphicsTab.xaml.cs @@ -101,13 +101,6 @@ public GraphicsTab() UpdateApplyButton(); }; - ShowHeldItemCheckBox.OnToggled += OnCheckBoxToggled; - ShowCombatModeIndicatorsCheckBox.OnToggled += OnCheckBoxToggled; - OpaqueStorageWindowCheckBox.OnToggled += OnCheckBoxToggled; - ShowLoocAboveHeadCheckBox.OnToggled += OnCheckBoxToggled; - ShowLoocAboveHeadCheckBox.OnToggled += OnCheckBoxToggled; - FancySpeechBubblesCheckBox.OnToggled += OnCheckBoxToggled; - FancyNameBackgroundsCheckBox.OnToggled += OnCheckBoxToggled; IntegerScalingCheckBox.OnToggled += OnCheckBoxToggled; ViewportLowResCheckBox.OnToggled += OnCheckBoxToggled; ParallaxLowQualityCheckBox.OnToggled += OnCheckBoxToggled; @@ -124,12 +117,6 @@ public GraphicsTab() ViewportLowResCheckBox.Pressed = !_cfg.GetCVar(CCVars.ViewportScaleRender); ParallaxLowQualityCheckBox.Pressed = _cfg.GetCVar(CCVars.ParallaxLowQuality); FpsCounterCheckBox.Pressed = _cfg.GetCVar(CCVars.HudFpsCounterVisible); - ShowHeldItemCheckBox.Pressed = _cfg.GetCVar(CCVars.HudHeldItemShow); - ShowCombatModeIndicatorsCheckBox.Pressed = _cfg.GetCVar(CCVars.CombatModeIndicatorsPointShow); - OpaqueStorageWindowCheckBox.Pressed = _cfg.GetCVar(CCVars.OpaqueStorageWindow); - ShowLoocAboveHeadCheckBox.Pressed = _cfg.GetCVar(CCVars.LoocAboveHeadShow); - FancySpeechBubblesCheckBox.Pressed = _cfg.GetCVar(CCVars.ChatEnableFancyBubbles); - FancyNameBackgroundsCheckBox.Pressed = _cfg.GetCVar(CCVars.ChatFancyNameBackground); ViewportWidthSlider.Value = _cfg.GetCVar(CCVars.ViewportWidth); _cfg.OnValueChanged(CCVars.ViewportMinimumWidth, _ => UpdateViewportWidthRange()); @@ -175,12 +162,6 @@ private void OnApplyButtonPressed(BaseButton.ButtonEventArgs args) IntegerScalingCheckBox.Pressed ? CCVars.ViewportSnapToleranceMargin.DefaultValue : 0); _cfg.SetCVar(CCVars.ViewportScaleRender, !ViewportLowResCheckBox.Pressed); _cfg.SetCVar(CCVars.ParallaxLowQuality, ParallaxLowQualityCheckBox.Pressed); - _cfg.SetCVar(CCVars.HudHeldItemShow, ShowHeldItemCheckBox.Pressed); - _cfg.SetCVar(CCVars.CombatModeIndicatorsPointShow, ShowCombatModeIndicatorsCheckBox.Pressed); - _cfg.SetCVar(CCVars.OpaqueStorageWindow, OpaqueStorageWindowCheckBox.Pressed); - _cfg.SetCVar(CCVars.LoocAboveHeadShow, ShowLoocAboveHeadCheckBox.Pressed); - _cfg.SetCVar(CCVars.ChatEnableFancyBubbles, FancySpeechBubblesCheckBox.Pressed); - _cfg.SetCVar(CCVars.ChatFancyNameBackground, FancyNameBackgroundsCheckBox.Pressed); _cfg.SetCVar(CCVars.HudFpsCounterVisible, FpsCounterCheckBox.Pressed); _cfg.SetCVar(CCVars.ViewportWidth, (int) ViewportWidthSlider.Value); @@ -216,12 +197,6 @@ private void UpdateApplyButton() var isIntegerScalingSame = IntegerScalingCheckBox.Pressed == (_cfg.GetCVar(CCVars.ViewportSnapToleranceMargin) != 0); var isVPResSame = ViewportLowResCheckBox.Pressed == !_cfg.GetCVar(CCVars.ViewportScaleRender); var isPLQSame = ParallaxLowQualityCheckBox.Pressed == _cfg.GetCVar(CCVars.ParallaxLowQuality); - var isShowHeldItemSame = ShowHeldItemCheckBox.Pressed == _cfg.GetCVar(CCVars.HudHeldItemShow); - var isCombatModeIndicatorsSame = ShowCombatModeIndicatorsCheckBox.Pressed == _cfg.GetCVar(CCVars.CombatModeIndicatorsPointShow); - var isOpaqueStorageWindow = OpaqueStorageWindowCheckBox.Pressed == _cfg.GetCVar(CCVars.OpaqueStorageWindow); - var isLoocShowSame = ShowLoocAboveHeadCheckBox.Pressed == _cfg.GetCVar(CCVars.LoocAboveHeadShow); - var isFancyChatSame = FancySpeechBubblesCheckBox.Pressed == _cfg.GetCVar(CCVars.ChatEnableFancyBubbles); - var isFancyBackgroundSame = FancyNameBackgroundsCheckBox.Pressed == _cfg.GetCVar(CCVars.ChatFancyNameBackground); var isFpsCounterVisibleSame = FpsCounterCheckBox.Pressed == _cfg.GetCVar(CCVars.HudFpsCounterVisible); var isWidthSame = (int) ViewportWidthSlider.Value == _cfg.GetCVar(CCVars.ViewportWidth); var isLayoutSame = HudLayoutOption.SelectedMetadata is string opt && opt == _cfg.GetCVar(CCVars.UILayout); @@ -236,12 +211,6 @@ private void UpdateApplyButton() isVPResSame && isPLQSame && isHudThemeSame && - isShowHeldItemSame && - isCombatModeIndicatorsSame && - isOpaqueStorageWindow && - isLoocShowSame && - isFancyChatSame && - isFancyBackgroundSame && isFpsCounterVisibleSame && isWidthSame && isLayoutSame; diff --git a/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs b/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs index d8ca500486d..ce5cf421aef 100644 --- a/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs +++ b/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs @@ -183,7 +183,6 @@ void AddCheckBox(string checkBoxName, bool currentState, Action + + + + +