diff --git a/Content.IntegrationTests/Tests/Round/JobTest.cs b/Content.IntegrationTests/Tests/Round/JobTest.cs index 865f68db815..befb96c7dcf 100644 --- a/Content.IntegrationTests/Tests/Round/JobTest.cs +++ b/Content.IntegrationTests/Tests/Round/JobTest.cs @@ -19,7 +19,7 @@ namespace Content.IntegrationTests.Tests.Round; public sealed class JobTest { private static readonly ProtoId Passenger = "Contractor"; // Frontier: use job prototypes that exist - private static readonly ProtoId Engineer = "Pilot"; // Frontier + private static readonly ProtoId Engineer = "Prisoner"; // Frontier private static readonly ProtoId Captain = "StationRepresentative"; // Frontier private static string _map = "JobTestMap"; diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index a3b8e99fe18..de7833f805b 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -6310,3 +6310,29 @@ Entries: message: Moved Victory and Shibamata from the lobby music to the jukebox. id: 5642 time: '2025-01-10T17:58:03.0000000+00:00' +- author: blackknight954 + changes: + - type: Add + message: Added shotgun slugs and rubber magazines to the NFSD and Mercfabs + id: 5643 + time: '2025-01-10T21:16:43.0000000+00:00' +- author: dustylens + changes: + - type: Add + message: New ramen dishes from Umami! (Sometimes the SR) + id: 5644 + time: '2025-01-10T21:48:51.0000000+00:00' +- author: MagnusCrowe + changes: + - type: Add + message: Added monkey and kobold cubes to loadout under tools. + id: 5645 + time: '2025-01-10T21:50:07.0000000+00:00' +- author: Alkheemist + changes: + - type: Fix + message: >- + Trade mall has had a new solar array fitted, power should be more + consistent now. + id: 5646 + time: '2025-01-11T08:22:27.0000000+00:00' diff --git a/Resources/Locale/en-US/_NF/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/_NF/flavors/flavor-profiles.ftl index bd350a7b5bb..6d23ac9e55e 100644 --- a/Resources/Locale/en-US/_NF/flavors/flavor-profiles.ftl +++ b/Resources/Locale/en-US/_NF/flavors/flavor-profiles.ftl @@ -10,3 +10,6 @@ flavor-complex-blast = like jungle warfare flavor-complex-torpedo = like convoy raiding flavor-complex-bees = like buzzing and honey flavor-complex-wassail = warm and comforting +flavor-complex-fine-noodles = like fine noodles +flavor-complex-rich-broth = rich broth +flavor-complex-tangy = tangy diff --git a/Resources/Maps/_NF/POI/trademall.yml b/Resources/Maps/_NF/POI/trademall.yml index 21a8a2cbdec..34d2b9ab705 100644 --- a/Resources/Maps/_NF/POI/trademall.yml +++ b/Resources/Maps/_NF/POI/trademall.yml @@ -141,35 +141,35 @@ entities: version: 6 2,1: ind: 2,1 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 3,1: ind: 3,1 - tiles: BQAAAAACAgAAAAADAgAAAAADAgAAAAAABQAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAAAgAAAAABAgAAAAAAAgAAAAACBQAAAAAAgwAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAABAAAAAAABAAAAAAABAAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: BQAAAAACAgAAAAADAgAAAAADAgAAAAAABQAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAABQAAAAAAAgAAAAABAgAAAAAAAgAAAAACBQAAAAAAgwAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAAAgAAAAAAAgAAAAAAAgAAAAAABQAAAAAAgwAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAABAAAAAAABAAAAAAABAAAAAAABQAAAAAAgwAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 3,0: ind: 3,0 - tiles: BAAAAAAAAgAAAAAAAgAAAAADAgAAAAABBAAAAAAAAgAAAAACAgAAAAADAgAAAAACAgAAAAAABAAAAAAAAgAAAAAAAgAAAAACAgAAAAABAgAAAAAAAgAAAAABAgAAAAAABAAAAAAAAgAAAAACAgAAAAACAgAAAAAABAAAAAAAAgAAAAADAgAAAAABAgAAAAADAgAAAAAABAAAAAAAAgAAAAABAgAAAAAAAgAAAAAAAgAAAAABAgAAAAABAgAAAAAAgwAAAAAAAgAAAAAAAgAAAAAAAgAAAAACgwAAAAAABQAAAAAABQAAAAACBQAAAAACBQAAAAABgwAAAAAAAgAAAAADAgAAAAABgwAAAAAAgwAAAAAAgwAAAAAABQAAAAABgwAAAAAAAgAAAAACAgAAAAACAgAAAAAABQAAAAACgwAAAAAABQAAAAACBQAAAAABBQAAAAADgwAAAAAAAgAAAAAAAgAAAAACgwAAAAAAgwAAAAAAgwAAAAAABQAAAAACgwAAAAAAAgAAAAABAgAAAAAAAgAAAAACBQAAAAADBQAAAAABHQAAAAAAHQAAAAAAHQAAAAAAgwAAAAAAAgAAAAABAgAAAAADgwAAAAAAgwAAAAAAgwAAAAAABQAAAAACgwAAAAAAAgAAAAABAgAAAAACAgAAAAACBQAAAAAABQAAAAADHQAAAAAGHQAAAAAAHQAAAAAAgwAAAAAAAgAAAAACAgAAAAAABQAAAAABBQAAAAAABQAAAAAABQAAAAADgwAAAAAAAgAAAAABAgAAAAACAgAAAAAABQAAAAADBQAAAAACHQAAAAAAHQAAAAAAHQAAAAAFgwAAAAAAgwAAAAAABAAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAABAAAAAAABAAAAAAABAAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAEAAAAAADEAAAAAAAgwAAAAAAAgAAAAAAAgAAAAADAgAAAAAAAgAAAAABAgAAAAABAgAAAAABAgAAAAAAAgAAAAADgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAEAAAAAABgwAAAAAAgwAAAAAAAgAAAAADAgAAAAABAgAAAAACAgAAAAAAAgAAAAADAgAAAAAAAgAAAAADAgAAAAAABAAAAAAAEAAAAAACgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAgwAAAAAAAgAAAAADAgAAAAABAgAAAAABgwAAAAAABQAAAAABgwAAAAAABQAAAAADgwAAAAAAEAAAAAADgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAgAAAAACAgAAAAACAgAAAAAABQAAAAABBQAAAAAABQAAAAACBQAAAAAAgwAAAAAAEAAAAAABEAAAAAACgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAgAAAAADAgAAAAAAAgAAAAADBQAAAAADBQAAAAACgwAAAAAABQAAAAABgwAAAAAAEAAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAABQAAAAABAgAAAAAAAgAAAAACAgAAAAADBQAAAAADBQAAAAADBQAAAAABBQAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAABQAAAAAAAgAAAAAAAgAAAAAAAgAAAAABBQAAAAABBQAAAAAABQAAAAABgwAAAAAAgwAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAAAAAAAABQAAAAABBAAAAAAABAAAAAAABAAAAAAABQAAAAADgwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAA + tiles: BAAAAAAAAgAAAAAAAgAAAAADAgAAAAABBAAAAAAAAgAAAAACAgAAAAADAgAAAAACAgAAAAAABAAAAAAAAgAAAAAAAgAAAAACAgAAAAABAgAAAAAAAgAAAAABAgAAAAAABAAAAAAAAgAAAAACAgAAAAACAgAAAAAABAAAAAAAAgAAAAADAgAAAAABAgAAAAADAgAAAAAABAAAAAAAAgAAAAABAgAAAAAAAgAAAAAAAgAAAAABAgAAAAABAgAAAAAAgwAAAAAAAgAAAAAAAgAAAAAAAgAAAAACgwAAAAAABQAAAAAABQAAAAACBQAAAAACBQAAAAABgwAAAAAAAgAAAAADAgAAAAABgwAAAAAAgwAAAAAAgwAAAAAABQAAAAABgwAAAAAAAgAAAAACAgAAAAACAgAAAAAABQAAAAACgwAAAAAABQAAAAACBQAAAAABBQAAAAADgwAAAAAAAgAAAAAAAgAAAAACgwAAAAAAgwAAAAAAgwAAAAAABQAAAAACgwAAAAAAAgAAAAABAgAAAAAAAgAAAAACBQAAAAADBQAAAAABHQAAAAAAHQAAAAAAHQAAAAAAgwAAAAAAAgAAAAABAgAAAAADgwAAAAAAgwAAAAAAgwAAAAAABQAAAAACgwAAAAAAAgAAAAABAgAAAAACAgAAAAACBQAAAAAABQAAAAADHQAAAAAGHQAAAAAAHQAAAAAAgwAAAAAAAgAAAAACAgAAAAAABQAAAAABBQAAAAAABQAAAAAABQAAAAADgwAAAAAAAgAAAAABAgAAAAACAgAAAAAABQAAAAADBQAAAAACHQAAAAAAHQAAAAAAHQAAAAAFgwAAAAAAgwAAAAAABAAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAABAAAAAAABAAAAAAABAAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAEAAAAAADEAAAAAAAgwAAAAAAAgAAAAAAAgAAAAADAgAAAAAAAgAAAAABAgAAAAABAgAAAAABAgAAAAAAAgAAAAADgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAEAAAAAABgwAAAAAAgwAAAAAAAgAAAAADAgAAAAABAgAAAAACAgAAAAAAAgAAAAADAgAAAAAAAgAAAAADAgAAAAAABAAAAAAAEAAAAAACgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAgwAAAAAAAgAAAAADAgAAAAABAgAAAAABgwAAAAAABQAAAAABgwAAAAAABQAAAAADgwAAAAAAEAAAAAADgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAgAAAAACAgAAAAACAgAAAAAABQAAAAABBQAAAAAABQAAAAACBQAAAAAAgwAAAAAAEAAAAAABEAAAAAACgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAgwAAAAAAAgAAAAADAgAAAAAAAgAAAAADBQAAAAADBQAAAAACgwAAAAAABQAAAAABgwAAAAAAEAAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAABQAAAAABAgAAAAAAAgAAAAACAgAAAAADBQAAAAADBQAAAAADBQAAAAABBQAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAABQAAAAAAAgAAAAAAAgAAAAAAAgAAAAABBQAAAAABBQAAAAAABQAAAAABgwAAAAAAgwAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAABQAAAAABBAAAAAAABAAAAAAABAAAAAAABQAAAAADgwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAA version: 6 4,0: ind: 4,0 - tiles: AgAAAAADBAAAAAAAAgAAAAADAgAAAAADBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAADBAAAAAAAAgAAAAAAAgAAAAADBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAABQAAAAADBQAAAAADBQAAAAADgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAACgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAAgwAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: AgAAAAADBAAAAAAAAgAAAAADAgAAAAAAAgAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAADBAAAAAAAAgAAAAAAAgAAAAADAgAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAABQAAAAADBQAAAAADBQAAAAADBQAAAAAABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAACgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAAgwAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 4,-1: ind: 4,-1 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAABgwAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAADgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAADBQAAAAAABQAAAAACBQAAAAACgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAABBAAAAAAAAgAAAAAAAgAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAABgwAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAADgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAADBQAAAAAABQAAAAACBQAAAAACBQAAAAAABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAABBAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 3,-1: ind: 3,-1 - tiles: BQAAAAAAAgAAAAAAAgAAAAABAgAAAAADBQAAAAACgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAADBAAAAAAABAAAAAAABAAAAAAABQAAAAACgwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAABQAAAAAAAgAAAAADAgAAAAABAgAAAAABBQAAAAADBQAAAAADBQAAAAACgwAAAAAAgwAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAAAAAAAABQAAAAADAgAAAAACAgAAAAADAgAAAAACBQAAAAABBQAAAAACBQAAAAABBQAAAAACgwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAABQAAAAADAgAAAAADAgAAAAABAgAAAAABgwAAAAAAgwAAAAAAgwAAAAAABQAAAAAAgwAAAAAAEAAAAAABgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAABQAAAAAAAgAAAAABAgAAAAADAgAAAAABgwAAAAAAgwAAAAAAgwAAAAAABQAAAAABgwAAAAAAEAAAAAABEAAAAAACgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAgAAAAAAAgAAAAABAgAAAAABgwAAAAAAgwAAAAAAgwAAAAAABQAAAAABgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAgAAAAABAgAAAAACAgAAAAAAAgAAAAAAAgAAAAABAgAAAAACAgAAAAACAgAAAAACBAAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAgAAAAADAgAAAAABAgAAAAAAAgAAAAADAgAAAAABAgAAAAABAgAAAAAAAgAAAAABgwAAAAAAEAAAAAABEAAAAAACgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAABAAAAAAABAAAAAAABAAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAEAAAAAADgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAgAAAAADAgAAAAAAAgAAAAAABQAAAAACBQAAAAADHQAAAAABHQAAAAAAHQAAAAAAgwAAAAAAgwAAAAAABAAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAgAAAAACAgAAAAACAgAAAAABBQAAAAACBQAAAAAAHQAAAAAAHQAAAAALHQAAAAAGgwAAAAAAAgAAAAADAgAAAAACBQAAAAADBQAAAAABBQAAAAABBQAAAAAAgwAAAAAAAgAAAAAAAgAAAAAAAgAAAAABBQAAAAACBQAAAAACHQAAAAAAHQAAAAAAHQAAAAAAgwAAAAAAAgAAAAABAgAAAAADgwAAAAAABQAAAAAAAgAAAAABBQAAAAADgwAAAAAAAgAAAAABAgAAAAABAgAAAAABBQAAAAACgwAAAAAABQAAAAAABQAAAAABBQAAAAACgwAAAAAAAgAAAAADAgAAAAABBQAAAAADBQAAAAAABQAAAAAABQAAAAACgwAAAAAAAgAAAAAAAgAAAAADAgAAAAADgwAAAAAABQAAAAACBQAAAAADBQAAAAACBQAAAAAAgwAAAAAAAgAAAAAAAgAAAAACgwAAAAAABQAAAAABBQAAAAAABQAAAAABBAAAAAAAAgAAAAABAgAAAAADAgAAAAAABAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAABAAAAAAAAgAAAAAAAgAAAAABAgAAAAABAgAAAAACAgAAAAADAgAAAAAB + tiles: BQAAAAAAAgAAAAAAAgAAAAABAgAAAAADBQAAAAACgwAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAABQAAAAADBAAAAAAABAAAAAAABAAAAAAABQAAAAACgwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAABQAAAAAAAgAAAAADAgAAAAABAgAAAAABBQAAAAADBQAAAAADBQAAAAACgwAAAAAAgwAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAABQAAAAADAgAAAAACAgAAAAADAgAAAAACBQAAAAABBQAAAAACBQAAAAABBQAAAAACgwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAABQAAAAADAgAAAAADAgAAAAABAgAAAAABgwAAAAAAgwAAAAAAgwAAAAAABQAAAAAAgwAAAAAAEAAAAAABgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAABQAAAAAAAgAAAAABAgAAAAADAgAAAAABgwAAAAAAgwAAAAAAgwAAAAAABQAAAAABgwAAAAAAEAAAAAABEAAAAAACgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAgwAAAAAAAgAAAAAAAgAAAAABAgAAAAABgwAAAAAAgwAAAAAAgwAAAAAABQAAAAABgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAgAAAAABAgAAAAACAgAAAAAAAgAAAAAAAgAAAAABAgAAAAACAgAAAAACAgAAAAACBAAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAgAAAAADAgAAAAABAgAAAAAAAgAAAAADAgAAAAABAgAAAAABAgAAAAAAAgAAAAABgwAAAAAAEAAAAAABEAAAAAACgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAABAAAAAAABAAAAAAABAAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAEAAAAAADgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAgAAAAADAgAAAAAAAgAAAAAABQAAAAACBQAAAAADHQAAAAABHQAAAAAAHQAAAAAAgwAAAAAAgwAAAAAABAAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAgAAAAACAgAAAAACAgAAAAABBQAAAAACBQAAAAAAHQAAAAAAHQAAAAALHQAAAAAGgwAAAAAAAgAAAAADAgAAAAACBQAAAAADBQAAAAABBQAAAAABBQAAAAAAgwAAAAAAAgAAAAAAAgAAAAAAAgAAAAABBQAAAAACBQAAAAACHQAAAAAAHQAAAAAAHQAAAAAAgwAAAAAAAgAAAAABAgAAAAADgwAAAAAABQAAAAAAAgAAAAABBQAAAAADgwAAAAAAAgAAAAABAgAAAAABAgAAAAABBQAAAAACgwAAAAAABQAAAAAABQAAAAABBQAAAAACgwAAAAAAAgAAAAADAgAAAAABBQAAAAADBQAAAAAABQAAAAAABQAAAAACgwAAAAAAAgAAAAAAAgAAAAADAgAAAAADgwAAAAAABQAAAAACBQAAAAADBQAAAAACBQAAAAAAgwAAAAAAAgAAAAAAAgAAAAACgwAAAAAABQAAAAABBQAAAAAABQAAAAABBAAAAAAAAgAAAAABAgAAAAADAgAAAAAABAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAABAAAAAAAAgAAAAAAAgAAAAABAgAAAAABAgAAAAACAgAAAAADAgAAAAAB version: 6 3,-2: ind: 3,-2 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAABAAAAAAABAAAAAAABAAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAAAgAAAAAAAgAAAAACAgAAAAAABQAAAAACgwAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAABAAAAAAABAAAAAAABAAAAAAABQAAAAAAgwAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAAAgAAAAAAAgAAAAAAAgAAAAAABQAAAAAAgwAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAAAgAAAAAAAgAAAAACAgAAAAAABQAAAAACgwAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 2,-2: ind: 2,-2 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAgwAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAA version: 6 - type: Broadphase - type: Physics @@ -1604,13 +1604,15 @@ entities: 959: 6,-7 964: 8,-4 - node: - color: '#B33831FF' + color: '#B32828FF' id: BrickTileSteelLineE decals: - 519: 51,17 - 520: 51,16 - 521: 51,-16 - 522: 51,-17 + 4411: 51,18 + 4412: 51,17 + 4413: 51,16 + 4451: 51,-16 + 4452: 51,-17 + 4453: 51,-18 - node: color: '#FFFFFFFF' id: BrickTileSteelLineE @@ -1620,11 +1622,12 @@ entities: 1711: 43,-4 1712: 43,-4 - node: - color: '#B33831FF' + color: '#B32828FF' id: BrickTileSteelLineN decals: - 525: 67,1 - 526: 66,1 + 4414: 66,1 + 4415: 67,1 + 4416: 68,1 - node: color: '#FFFFFFFF' id: BrickTileSteelLineN @@ -1640,11 +1643,12 @@ entities: 970: 5,-3 971: 4,-3 - node: - color: '#B33831FF' + color: '#B32828FF' id: BrickTileSteelLineS decals: - 523: 66,-1 - 524: 67,-1 + 4417: 66,-1 + 4418: 67,-1 + 4419: 68,-1 - node: color: '#FFFFFFFF' id: BrickTileSteelLineS @@ -1657,13 +1661,15 @@ entities: 960: 7,-7 1710: 41,-5 - node: - color: '#B33831FF' + color: '#B32828FF' id: BrickTileSteelLineW decals: - 515: 49,-17 - 516: 49,-16 - 517: 49,16 - 518: 49,17 + 4408: 49,16 + 4409: 49,17 + 4410: 49,18 + 4448: 49,-16 + 4450: 49,-18 + 4463: 49,-17 - node: color: '#FFFFFFFF' id: BrickTileSteelLineW @@ -2864,10 +2870,7 @@ entities: 2796: 64,4 2797: 64,3 2798: 64,0 - 2799: 66,1 2800: 66,0 - 2801: 66,-1 - 2802: 67,-1 2803: 67,2 2804: 63,0 2805: 63,-2 @@ -2966,25 +2969,11 @@ entities: 2898: 49,-9 2899: 49,-11 2900: 50,-13 - 2901: 48,-16 - 2902: 49,-16 - 2903: 51,-16 - 2904: 51,-16 - 2905: 49,-17 - 2906: 50,-17 - 2907: 51,-17 - 2908: 51,-17 2909: 52,-17 2910: 49,-15 - 2911: 50,-16 2912: 53,-16 - 2913: 49,-16 2914: 48,-17 - 2915: 51,-18 2916: 52,-17 - 2917: 49,-17 - 2918: 51,-18 - 2919: 52,-18 2920: 52,-13 2921: 50,-14 2922: 46,-13 @@ -3090,18 +3079,12 @@ entities: 3022: 50,12 3023: 50,15 3024: 50,13 - 3025: 49,16 - 3026: 51,16 3027: 52,16 3028: 52,17 - 3029: 50,17 - 3030: 48,18 3031: 48,17 3032: 48,17 - 3033: 51,16 3034: 52,16 3035: 52,17 - 3036: 49,17 3037: 48,17 3038: 50,13 3039: 50,11 @@ -4154,6 +4137,32 @@ entities: 4086: 14,19 4087: 15,19 4088: 13,19 + - node: + cleanable: True + color: '#FFFFFFFF' + id: Dirt + decals: + 4454: 49,-18 + 4455: 50,-18 + 4456: 51,-17 + 4457: 50,-17 + 4459: 49,-16 + 4460: 50,-16 + 4461: 51,-16 + 4462: 51,-18 + 4465: 68,0 + 4466: 67,1 + 4473: 50,16 + 4474: 51,18 + 4475: 49,18 + 4476: 49,17 + - node: + cleanable: True + color: '#FFFFFFFF' + id: DirtHeavy + decals: + 4477: 50,18 + 4478: 51,16 - node: cleanable: True color: '#49392696' @@ -4190,8 +4199,6 @@ entities: 4296: 62,0 4297: 63,1 4298: 64,0 - 4299: 67,1 - 4300: 66,-1 4301: 62,0 4302: 59,-1 4303: 59,-4 @@ -4209,8 +4216,6 @@ entities: 4315: 51,12 4316: 50,14 4317: 49,14 - 4318: 49,16 - 4319: 51,17 4320: 54,12 4321: 54,13 4322: 53,13 @@ -4289,12 +4294,25 @@ entities: 4395: -5,0 4396: -3,0 4397: -1,-1 + - node: + cleanable: True + color: '#FFFFFFFF' + id: DirtHeavyMonotile + decals: + 4469: 67,-1 + 4470: 66,1 + - node: + cleanable: True + angle: 1.5707963267948966 rad + color: '#FFFFFFFF' + id: DirtHeavyMonotile + decals: + 4472: 68,-1 - node: cleanable: True color: '#49392696' id: DirtLight decals: - 4219: 67,1 4220: 65,1 4221: 62,1 4222: 59,1 @@ -4343,6 +4361,14 @@ entities: 4265: -18,0 4266: -17,0 4267: -21,1 + - node: + cleanable: True + color: '#FFFFFFFF' + id: DirtLight + decals: + 4464: 49,-17 + 4479: 50,17 + 4480: 49,16 - node: cleanable: True color: '#49392696' @@ -4478,6 +4504,15 @@ entities: 4216: 58,-4 4217: 58,-1 4218: 60,1 + - node: + cleanable: True + color: '#FFFFFFFF' + id: DirtMedium + decals: + 4467: 51,-16 + 4468: 50,-18 + 4471: 66,-1 + 4481: 51,17 - node: color: '#A4610696' id: HalfTileOverlayGreyscale @@ -4964,8 +4999,6 @@ entities: 1349: 50,-7 1350: 51,-7 1353: 46,2 - 1356: 49,18 - 1357: 51,18 1359: 49,7 1360: 50,7 1361: 51,7 @@ -4988,7 +5021,11 @@ entities: 2030: -7,17 4400: 50,-15 4405: 50,15 - 4406: 50,18 + 4436: 48,19 + 4437: 49,19 + 4438: 50,19 + 4439: 51,19 + 4440: 52,19 - node: color: '#FFFFFFFF' id: WarnLineS @@ -5073,8 +5110,6 @@ entities: 1390: 52,-1 1399: 65,-1 1400: 65,1 - 1401: 68,1 - 1402: 68,-1 2002: -35,-1 2003: -35,1 2004: -2,-40 @@ -5087,7 +5122,11 @@ entities: 2011: -2,40 2032: -9,19 4402: 65,0 - 4403: 68,0 + 4431: 69,-2 + 4432: 69,-1 + 4433: 69,0 + 4434: 69,1 + 4435: 69,2 - node: color: '#FFFFFFFF' id: WarnLineW @@ -5176,8 +5215,6 @@ entities: 1337: 50,-7 1338: 51,-7 1339: 49,-7 - 1342: 49,-18 - 1343: 51,-18 1344: 43,-11 1345: 59,-6 1346: 59,6 @@ -5196,9 +5233,13 @@ entities: 2027: -1,43 2028: -5,20 2031: -7,17 - 4398: 50,-18 4399: 50,-15 4404: 50,15 + 4426: 48,-19 + 4427: 49,-19 + 4428: 50,-19 + 4429: 51,-19 + 4430: 52,-19 - node: color: '#FFFFFFFF' id: WoodTrimThinInnerNw @@ -5696,11 +5737,22 @@ entities: parent: 1 - proto: AirlockEngineering entities: + - uid: 74 + components: + - type: Transform + pos: 56.5,9.5 + parent: 1 - uid: 2858 components: - type: Transform pos: -10.5,-1.5 parent: 1 + - uid: 6157 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 59.5,6.5 + parent: 1 - proto: AirlockEngineeringGlass entities: - uid: 5412 @@ -6318,29 +6370,6 @@ entities: parent: 1 - type: Docking name: dock-label-trade-six - - uid: 1526 - components: - - type: Transform - pos: 50.5,-17.5 - parent: 1 - - type: Docking - name: dock-label-trade-cargo-bay-three - - uid: 1730 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 50.5,18.5 - parent: 1 - - type: Docking - name: dock-label-trade-cargo-bay-one - - uid: 1750 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 68.5,0.5 - parent: 1 - - type: Docking - name: dock-label-trade-cargo-bay-two - uid: 1754 components: - type: Transform @@ -6536,60 +6565,65 @@ entities: parent: 1 - type: Docking name: dock-label-guard - - uid: 2842 + - uid: 2852 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 68.5,1.5 + rot: 3.141592653589793 rad + pos: 0.5,45.5 parent: 1 - type: Docking - name: dock-label-trade-cargo-bay-two - - uid: 2843 + name: dock-label-trade-seven-b + - uid: 6166 + components: + - type: Transform + pos: 50.5,-18.5 + parent: 1 + - uid: 6167 + components: + - type: Transform + pos: 51.5,-18.5 + parent: 1 + - uid: 6168 + components: + - type: Transform + pos: 49.5,-18.5 + parent: 1 + - uid: 6169 components: - type: Transform rot: 1.5707963267948966 rad - pos: 68.5,-0.5 + pos: 69.5,-0.5 parent: 1 - - type: Docking - name: dock-label-trade-cargo-bay-two - - uid: 2844 + - uid: 6170 components: - type: Transform - pos: 51.5,-17.5 + rot: 1.5707963267948966 rad + pos: 69.5,0.5 parent: 1 - - type: Docking - name: dock-label-trade-cargo-bay-three - - uid: 2845 + - uid: 6171 components: - type: Transform - pos: 49.5,-17.5 + rot: 1.5707963267948966 rad + pos: 69.5,1.5 parent: 1 - - type: Docking - name: dock-label-trade-cargo-bay-three - - uid: 2846 + - uid: 6172 components: - type: Transform rot: 3.141592653589793 rad - pos: 49.5,18.5 + pos: 51.5,19.5 parent: 1 - - type: Docking - name: dock-label-trade-cargo-bay-one - - uid: 2847 + - uid: 6173 components: - type: Transform rot: 3.141592653589793 rad - pos: 51.5,18.5 + pos: 50.5,19.5 parent: 1 - - type: Docking - name: dock-label-trade-cargo-bay-one - - uid: 2852 + - uid: 6174 components: - type: Transform rot: 3.141592653589793 rad - pos: 0.5,45.5 + pos: 49.5,19.5 parent: 1 - - type: Docking - name: dock-label-trade-seven-b - proto: AirlockGlassShuttleNfsdLocked entities: - uid: 2544 @@ -6655,16 +6689,6 @@ entities: - type: Transform pos: 59.5,-5.5 parent: 1 - - uid: 5379 - components: - - type: Transform - pos: 59.5,6.5 - parent: 1 - - uid: 5380 - components: - - type: Transform - pos: 56.5,9.5 - parent: 1 - proto: AirlockMailCarrierLocked entities: - uid: 5406 @@ -6985,11 +7009,84 @@ entities: parent: 1 - proto: AtmosDeviceFanDirectional entities: + - uid: 35 + components: + - type: Transform + pos: 48.5,-18.5 + parent: 1 - uid: 41 components: - type: Transform pos: -3.5,17.5 parent: 1 + - uid: 60 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 49.5,19.5 + parent: 1 + - uid: 63 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 50.5,19.5 + parent: 1 + - uid: 64 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 48.5,19.5 + parent: 1 + - uid: 67 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 69.5,-1.5 + parent: 1 + - uid: 68 + components: + - type: Transform + pos: 49.5,-18.5 + parent: 1 + - uid: 76 + components: + - type: Transform + pos: 51.5,-18.5 + parent: 1 + - uid: 78 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 69.5,1.5 + parent: 1 + - uid: 82 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 69.5,2.5 + parent: 1 + - uid: 87 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 69.5,0.5 + parent: 1 + - uid: 97 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 51.5,19.5 + parent: 1 + - uid: 99 + components: + - type: Transform + pos: 50.5,-18.5 + parent: 1 + - uid: 101 + components: + - type: Transform + pos: 52.5,-18.5 + parent: 1 - uid: 126 components: - type: Transform @@ -7081,11 +7178,6 @@ entities: - type: Transform pos: -33.5,-3.5 parent: 1 - - uid: 1341 - components: - - type: Transform - pos: 50.5,-17.5 - parent: 1 - uid: 1366 components: - type: Transform @@ -7098,18 +7190,6 @@ entities: rot: 1.5707963267948966 rad pos: 4.5,-39.5 parent: 1 - - uid: 1527 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 68.5,0.5 - parent: 1 - - uid: 1692 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 50.5,18.5 - parent: 1 - uid: 2082 components: - type: Transform @@ -7176,74 +7256,6 @@ entities: rot: -1.5707963267948966 rad pos: 42.5,12.5 parent: 1 - - uid: 4941 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 68.5,1.5 - parent: 1 - - uid: 4942 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 68.5,-0.5 - parent: 1 - - uid: 4943 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 68.5,-1.5 - parent: 1 - - uid: 4944 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 68.5,2.5 - parent: 1 - - uid: 4945 - components: - - type: Transform - pos: 52.5,-17.5 - parent: 1 - - uid: 4946 - components: - - type: Transform - pos: 51.5,-17.5 - parent: 1 - - uid: 4947 - components: - - type: Transform - pos: 49.5,-17.5 - parent: 1 - - uid: 4948 - components: - - type: Transform - pos: 48.5,-17.5 - parent: 1 - - uid: 4949 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 48.5,18.5 - parent: 1 - - uid: 4950 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 49.5,18.5 - parent: 1 - - uid: 4951 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 51.5,18.5 - parent: 1 - - uid: 4952 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 52.5,18.5 - parent: 1 - uid: 5338 components: - type: Transform @@ -7310,6 +7322,18 @@ entities: rot: 1.5707963267948966 rad pos: 4.5,40.5 parent: 1 + - uid: 5469 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 52.5,19.5 + parent: 1 + - uid: 5486 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 69.5,-0.5 + parent: 1 - proto: AtmosFixBlockerMarker entities: - uid: 44 @@ -7542,6 +7566,11 @@ entities: - type: Transform pos: -15.5,-22.5 parent: 1 + - uid: 1762 + components: + - type: Transform + pos: 68.5,-6.5 + parent: 1 - uid: 1947 components: - type: Transform @@ -7562,6 +7591,26 @@ entities: - type: Transform pos: -18.5,-19.5 parent: 1 + - uid: 2581 + components: + - type: Transform + pos: 67.5,5.5 + parent: 1 + - uid: 2582 + components: + - type: Transform + pos: 67.5,6.5 + parent: 1 + - uid: 2583 + components: + - type: Transform + pos: 67.5,-5.5 + parent: 1 + - uid: 2584 + components: + - type: Transform + pos: 67.5,-3.5 + parent: 1 - uid: 2762 components: - type: Transform @@ -7572,6 +7621,36 @@ entities: - type: Transform pos: -17.5,-20.5 parent: 1 + - uid: 2842 + components: + - type: Transform + pos: 66.5,-7.5 + parent: 1 + - uid: 2843 + components: + - type: Transform + pos: 66.5,-5.5 + parent: 1 + - uid: 2844 + components: + - type: Transform + pos: 66.5,-8.5 + parent: 1 + - uid: 2845 + components: + - type: Transform + pos: 66.5,-9.5 + parent: 1 + - uid: 2846 + components: + - type: Transform + pos: 65.5,-7.5 + parent: 1 + - uid: 2847 + components: + - type: Transform + pos: 62.5,-11.5 + parent: 1 - uid: 2853 components: - type: Transform @@ -7627,6 +7706,11 @@ entities: - type: Transform pos: -11.5,-23.5 parent: 1 + - uid: 3448 + components: + - type: Transform + pos: 63.5,-10.5 + parent: 1 - uid: 3488 components: - type: Transform @@ -7657,6 +7741,11 @@ entities: - type: Transform pos: -10.5,-18.5 parent: 1 + - uid: 3499 + components: + - type: Transform + pos: 61.5,-12.5 + parent: 1 - uid: 3505 components: - type: Transform @@ -7677,6 +7766,11 @@ entities: - type: Transform pos: -10.5,-19.5 parent: 1 + - uid: 3844 + components: + - type: Transform + pos: 64.5,-10.5 + parent: 1 - uid: 4052 components: - type: Transform @@ -7722,6 +7816,51 @@ entities: - type: Transform pos: -23.5,8.5 parent: 1 + - uid: 4941 + components: + - type: Transform + pos: 60.5,-13.5 + parent: 1 + - uid: 4942 + components: + - type: Transform + pos: 61.5,-14.5 + parent: 1 + - uid: 4943 + components: + - type: Transform + pos: 60.5,-15.5 + parent: 1 + - uid: 4944 + components: + - type: Transform + pos: 59.5,-14.5 + parent: 1 + - uid: 4945 + components: + - type: Transform + pos: 58.5,-14.5 + parent: 1 + - uid: 4946 + components: + - type: Transform + pos: 65.5,8.5 + parent: 1 + - uid: 4947 + components: + - type: Transform + pos: 56.5,-17.5 + parent: 1 + - uid: 4948 + components: + - type: Transform + pos: 54.5,-16.5 + parent: 1 + - uid: 4950 + components: + - type: Transform + pos: 46.5,-17.5 + parent: 1 - uid: 5680 components: - type: Transform @@ -9047,21 +9186,6 @@ entities: - type: Transform pos: 43.5,-16.5 parent: 1 - - uid: 5961 - components: - - type: Transform - pos: 44.5,-16.5 - parent: 1 - - uid: 5962 - components: - - type: Transform - pos: 45.5,-16.5 - parent: 1 - - uid: 5963 - components: - - type: Transform - pos: 46.5,-16.5 - parent: 1 - uid: 5964 components: - type: Transform @@ -9197,340 +9321,570 @@ entities: - type: Transform pos: 43.5,17.5 parent: 1 - - uid: 5991 + - uid: 6004 components: - type: Transform - pos: 60.5,15.5 + pos: 57.5,14.5 parent: 1 - - uid: 5992 + - uid: 6019 components: - type: Transform - pos: 44.5,17.5 + pos: 64.5,7.5 parent: 1 - - uid: 5993 + - uid: 6020 components: - type: Transform - pos: 45.5,17.5 + pos: 65.5,7.5 parent: 1 - - uid: 5994 + - uid: 6022 components: - type: Transform - pos: 46.5,17.5 + pos: 66.5,6.5 parent: 1 - - uid: 5995 + - uid: 6024 components: - type: Transform - pos: 54.5,17.5 + pos: 66.5,9.5 parent: 1 - - uid: 5996 + - uid: 6025 components: - type: Transform - pos: 55.5,17.5 + pos: 66.5,7.5 parent: 1 - - uid: 5997 + - uid: 6026 components: - type: Transform - pos: 56.5,17.5 + pos: 67.5,8.5 parent: 1 - - uid: 5998 + - uid: 6027 components: - type: Transform - pos: 57.5,17.5 + pos: 66.5,8.5 parent: 1 - - uid: 5999 + - uid: 6028 components: - type: Transform - pos: 57.5,16.5 + pos: 68.5,7.5 parent: 1 - - uid: 6000 + - uid: 6029 components: - type: Transform - pos: 58.5,16.5 + pos: 66.5,11.5 parent: 1 - - uid: 6001 + - uid: 6030 components: - type: Transform - pos: 59.5,16.5 + pos: 67.5,7.5 parent: 1 - - uid: 6002 + - uid: 6031 components: - type: Transform - pos: 60.5,16.5 + pos: 64.5,12.5 parent: 1 - - uid: 6003 + - uid: 6033 components: - type: Transform - pos: 57.5,15.5 + pos: 63.5,13.5 parent: 1 - - uid: 6004 + - uid: 6034 components: - type: Transform - pos: 57.5,14.5 + pos: 64.5,13.5 parent: 1 - - uid: 6005 + - uid: 6035 components: - type: Transform - pos: 61.5,15.5 + pos: 63.5,11.5 parent: 1 - - uid: 6006 + - uid: 6036 + components: + - type: Transform + pos: 63.5,14.5 + parent: 1 + - uid: 6037 + components: + - type: Transform + pos: 62.5,15.5 + parent: 1 + - uid: 6038 components: - type: Transform pos: 61.5,14.5 parent: 1 - - uid: 6007 + - uid: 6039 + components: + - type: Transform + pos: 61.5,16.5 + parent: 1 + - uid: 6040 components: - type: Transform pos: 62.5,14.5 parent: 1 - - uid: 6008 + - uid: 6041 components: - type: Transform - pos: 62.5,13.5 + pos: 59.5,17.5 parent: 1 - - uid: 6009 + - uid: 6042 components: - type: Transform - pos: 63.5,13.5 + pos: 59.5,16.5 parent: 1 - - uid: 6010 + - uid: 6043 components: - type: Transform - pos: 63.5,12.5 + pos: 58.5,17.5 parent: 1 - - uid: 6011 + - uid: 6044 components: - type: Transform - pos: 64.5,12.5 + pos: 58.5,16.5 parent: 1 - - uid: 6012 + - uid: 6045 components: - type: Transform - pos: 64.5,11.5 + pos: 58.5,15.5 parent: 1 - - uid: 6013 + - uid: 6046 components: - type: Transform - pos: 65.5,11.5 + pos: 56.5,16.5 parent: 1 - - uid: 6014 + - uid: 6047 components: - type: Transform - pos: 65.5,10.5 + pos: 57.5,18.5 parent: 1 - - uid: 6015 + - uid: 6048 components: - type: Transform - pos: 66.5,-7.5 + pos: 54.5,18.5 parent: 1 - - uid: 6016 + - uid: 6049 components: - type: Transform - pos: 66.5,10.5 + pos: 54.5,17.5 parent: 1 - - uid: 6017 + - uid: 6050 components: - type: Transform - pos: 66.5,9.5 + pos: 44.5,18.5 parent: 1 - - uid: 6018 + - uid: 6051 components: - type: Transform - pos: 66.5,8.5 + pos: 57.5,-13.5 parent: 1 - - uid: 6019 + - uid: 6052 components: - type: Transform - pos: 64.5,7.5 + pos: 43.5,18.5 parent: 1 - - uid: 6020 + - uid: 6053 components: - type: Transform - pos: 65.5,7.5 + pos: 46.5,18.5 parent: 1 - - uid: 6021 + - uid: 6057 components: - type: Transform - pos: 66.5,7.5 + pos: 11.5,19.5 parent: 1 - - uid: 6022 + - uid: 6058 components: - type: Transform - pos: 67.5,7.5 + pos: 11.5,13.5 parent: 1 - - uid: 6023 + - uid: 6091 components: - type: Transform - pos: 67.5,6.5 + pos: 65.5,-9.5 parent: 1 - - uid: 6024 + - uid: 6092 components: - type: Transform - pos: 67.5,5.5 + pos: 64.5,-11.5 parent: 1 - - uid: 6025 + - uid: 6093 components: - type: Transform - pos: 67.5,4.5 + pos: 63.5,-13.5 parent: 1 - - uid: 6026 + - uid: 6094 components: - type: Transform - pos: 67.5,-3.5 + pos: 67.5,-7.5 parent: 1 - - uid: 6027 + - uid: 6095 components: - type: Transform - pos: 67.5,-4.5 + pos: 65.5,-10.5 parent: 1 - - uid: 6028 + - uid: 6096 components: - type: Transform - pos: 67.5,-5.5 + pos: 57.5,-16.5 parent: 1 - - uid: 6029 + - uid: 6097 components: - type: Transform - pos: 67.5,-6.5 + pos: 57.5,-14.5 parent: 1 - - uid: 6030 + - uid: 6098 components: - type: Transform - pos: 64.5,-6.5 + pos: 61.5,-13.5 parent: 1 - - uid: 6031 + - uid: 6099 + components: + - type: Transform + pos: 56.5,-16.5 + parent: 1 + - uid: 6100 + components: + - type: Transform + pos: 55.5,-17.5 + parent: 1 + - uid: 6101 + components: + - type: Transform + pos: 62.5,-13.5 + parent: 1 + - uid: 6107 components: - type: Transform pos: 66.5,-6.5 parent: 1 - - uid: 6032 + - uid: 6115 + components: + - type: Transform + pos: 68.5,4.5 + parent: 1 + - uid: 6124 + components: + - type: Transform + pos: 68.5,-4.5 + parent: 1 + - uid: 6127 + components: + - type: Transform + pos: 68.5,6.5 + parent: 1 + - uid: 6128 + components: + - type: Transform + pos: 62.5,-14.5 + parent: 1 + - uid: 6129 + components: + - type: Transform + pos: 64.5,-9.5 + parent: 1 + - uid: 6130 + components: + - type: Transform + pos: 57.5,-15.5 + parent: 1 + - uid: 6131 + components: + - type: Transform + pos: 58.5,-16.5 + parent: 1 + - uid: 6185 + components: + - type: Transform + pos: 61.5,15.5 + parent: 1 + - uid: 6186 + components: + - type: Transform + pos: 66.5,10.5 + parent: 1 + - uid: 6187 + components: + - type: Transform + pos: 60.5,15.5 + parent: 1 + - uid: 6188 + components: + - type: Transform + pos: 46.5,19.5 + parent: 1 + - uid: 6189 + components: + - type: Transform + pos: 60.5,14.5 + parent: 1 + - uid: 6190 + components: + - type: Transform + pos: 56.5,17.5 + parent: 1 + - uid: 6191 + components: + - type: Transform + pos: 55.5,17.5 + parent: 1 + - uid: 6192 + components: + - type: Transform + pos: 55.5,18.5 + parent: 1 + - uid: 6193 + components: + - type: Transform + pos: 57.5,16.5 + parent: 1 + - uid: 6194 + components: + - type: Transform + pos: 57.5,17.5 + parent: 1 + - uid: 6195 components: - type: Transform pos: 65.5,-6.5 parent: 1 - - uid: 6033 + - uid: 6196 components: - type: Transform - pos: 66.5,-8.5 + pos: 62.5,12.5 parent: 1 - - uid: 6034 + - uid: 6197 components: - type: Transform - pos: 66.5,-9.5 + pos: 45.5,18.5 parent: 1 - - uid: 6035 + - uid: 6198 components: - type: Transform - pos: 65.5,-9.5 + pos: 63.5,12.5 parent: 1 - - uid: 6036 + - uid: 6199 components: - type: Transform - pos: 65.5,-10.5 + pos: 64.5,10.5 parent: 1 - - uid: 6037 + - uid: 6200 components: - type: Transform - pos: 64.5,-10.5 + pos: 64.5,11.5 parent: 1 - - uid: 6038 + - uid: 6201 components: - type: Transform - pos: 64.5,-11.5 + pos: 65.5,12.5 parent: 1 - - uid: 6039 + - uid: 6203 components: - type: Transform - pos: 63.5,-11.5 + pos: 65.5,10.5 parent: 1 - - uid: 6040 + - uid: 6204 components: - type: Transform - pos: 63.5,-12.5 + pos: 65.5,9.5 parent: 1 - - uid: 6041 + - uid: 6205 components: - type: Transform - pos: 62.5,-12.5 + pos: 67.5,9.5 parent: 1 - - uid: 6042 + - uid: 6222 components: - type: Transform - pos: 62.5,-13.5 + pos: 66.5,-10.5 parent: 1 - - uid: 6043 + - uid: 6223 components: - type: Transform - pos: 61.5,-13.5 + pos: 66.5,-10.5 parent: 1 - - uid: 6044 + - uid: 6237 components: - type: Transform - pos: 61.5,-14.5 + pos: 59.5,15.5 parent: 1 - - uid: 6045 + - uid: 6238 components: - type: Transform - pos: 60.5,-14.5 + pos: 64.5,-12.5 parent: 1 - - uid: 6046 + - uid: 6239 components: - type: Transform - pos: 60.5,-15.5 + pos: 65.5,11.5 parent: 1 - - uid: 6047 + - uid: 6240 components: - type: Transform - pos: 57.5,-16.5 + pos: 62.5,13.5 parent: 1 - - uid: 6048 + - uid: 6241 components: - type: Transform - pos: 59.5,-15.5 + pos: 60.5,16.5 parent: 1 - - uid: 6049 + - uid: 6242 components: - type: Transform - pos: 58.5,-15.5 + pos: 61.5,13.5 parent: 1 - - uid: 6050 + - uid: 6243 components: - type: Transform - pos: 57.5,-15.5 + pos: 64.5,-6.5 parent: 1 - - uid: 6051 + - uid: 6244 components: - type: Transform - pos: 57.5,-13.5 + pos: 57.5,15.5 parent: 1 - - uid: 6052 + - uid: 6245 components: - type: Transform - pos: 57.5,-14.5 + pos: 54.5,19.5 parent: 1 - - uid: 6053 + - uid: 6261 components: - type: Transform - pos: 56.5,-16.5 + pos: 44.5,-17.5 parent: 1 - - uid: 6054 + - uid: 6262 + components: + - type: Transform + pos: 43.5,-17.5 + parent: 1 + - uid: 6274 + components: + - type: Transform + pos: 68.5,5.5 + parent: 1 + - uid: 6275 + components: + - type: Transform + pos: 69.5,4.5 + parent: 1 + - uid: 6276 + components: + - type: Transform + pos: 69.5,-3.5 + parent: 1 + - uid: 6277 + components: + - type: Transform + pos: 67.5,4.5 + parent: 1 + - uid: 6278 + components: + - type: Transform + pos: 68.5,-3.5 + parent: 1 + - uid: 6279 + components: + - type: Transform + pos: 67.5,-4.5 + parent: 1 + - uid: 6280 + components: + - type: Transform + pos: 68.5,-5.5 + parent: 1 + - uid: 6281 + components: + - type: Transform + pos: 67.5,-6.5 + parent: 1 + - uid: 6282 + components: + - type: Transform + pos: 67.5,-8.5 + parent: 1 + - uid: 6283 + components: + - type: Transform + pos: 65.5,-8.5 + parent: 1 + - uid: 6284 + components: + - type: Transform + pos: 65.5,-11.5 + parent: 1 + - uid: 6285 + components: + - type: Transform + pos: 63.5,-11.5 + parent: 1 + - uid: 6286 + components: + - type: Transform + pos: 63.5,-12.5 + parent: 1 + - uid: 6287 + components: + - type: Transform + pos: 62.5,-12.5 + parent: 1 + - uid: 6288 + components: + - type: Transform + pos: 61.5,-15.5 + parent: 1 + - uid: 6289 + components: + - type: Transform + pos: 57.5,-17.5 + parent: 1 + - uid: 6290 + components: + - type: Transform + pos: 60.5,-14.5 + parent: 1 + - uid: 6291 + components: + - type: Transform + pos: 59.5,-15.5 + parent: 1 + - uid: 6292 + components: + - type: Transform + pos: 58.5,-15.5 + parent: 1 + - uid: 6293 + components: + - type: Transform + pos: 56.5,-15.5 + parent: 1 + - uid: 6294 components: - type: Transform pos: 55.5,-16.5 parent: 1 - - uid: 6055 + - uid: 6295 components: - type: Transform - pos: 54.5,-16.5 + pos: 54.5,-17.5 parent: 1 - - uid: 6057 + - uid: 6296 components: - type: Transform - pos: 11.5,19.5 + pos: 46.5,-18.5 parent: 1 - - uid: 6058 + - uid: 6297 components: - type: Transform - pos: 11.5,13.5 + pos: 45.5,-17.5 + parent: 1 + - uid: 6303 + components: + - type: Transform + pos: 56.5,18.5 + parent: 1 + - uid: 6307 + components: + - type: Transform + pos: 54.5,-18.5 parent: 1 - proto: AtmosFixFreezerMarker entities: @@ -9885,6 +10239,12 @@ entities: parent: 1 - proto: BenchSteelMiddle entities: + - uid: 115 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,19.5 + parent: 1 - uid: 3061 components: - type: Transform @@ -9909,11 +10269,11 @@ entities: rot: 3.141592653589793 rad pos: 12.5,-17.5 parent: 1 - - uid: 5383 + - uid: 5384 components: - type: Transform rot: -1.5707963267948966 rad - pos: 2.5,19.5 + pos: 2.5,18.5 parent: 1 - proto: BenchSteelRight entities: @@ -9929,11 +10289,11 @@ entities: rot: 3.141592653589793 rad pos: 10.5,-18.5 parent: 1 - - uid: 5384 + - uid: 5395 components: - type: Transform rot: -1.5707963267948966 rad - pos: 2.5,18.5 + pos: 2.5,17.5 parent: 1 - proto: BoozeDispenserEmpty entities: @@ -13112,6 +13472,11 @@ entities: - type: Transform pos: 17.5,-13.5 parent: 1 + - uid: 5465 + components: + - type: Transform + pos: 50.5,-17.5 + parent: 1 - uid: 5498 components: - type: Transform @@ -13157,6 +13522,16 @@ entities: - type: Transform pos: 0.5,-2.5 parent: 1 + - uid: 5650 + components: + - type: Transform + pos: 50.5,18.5 + parent: 1 + - uid: 5651 + components: + - type: Transform + pos: 68.5,0.5 + parent: 1 - uid: 5673 components: - type: Transform @@ -13231,11 +13606,76 @@ entities: - type: Transform pos: -11.5,-3.5 parent: 1 + - uid: 121 + components: + - type: Transform + pos: 50.5,-0.5 + parent: 1 + - uid: 124 + components: + - type: Transform + pos: 50.5,-1.5 + parent: 1 - uid: 151 components: - type: Transform pos: -16.5,-3.5 parent: 1 + - uid: 163 + components: + - type: Transform + pos: 50.5,-2.5 + parent: 1 + - uid: 168 + components: + - type: Transform + pos: 50.5,-3.5 + parent: 1 + - uid: 171 + components: + - type: Transform + pos: 50.5,-4.5 + parent: 1 + - uid: 172 + components: + - type: Transform + pos: 67.5,6.5 + parent: 1 + - uid: 173 + components: + - type: Transform + pos: 50.5,-5.5 + parent: 1 + - uid: 174 + components: + - type: Transform + pos: 50.5,-8.5 + parent: 1 + - uid: 175 + components: + - type: Transform + pos: 50.5,-6.5 + parent: 1 + - uid: 176 + components: + - type: Transform + pos: 50.5,-7.5 + parent: 1 + - uid: 177 + components: + - type: Transform + pos: 51.5,-8.5 + parent: 1 + - uid: 178 + components: + - type: Transform + pos: 52.5,-8.5 + parent: 1 + - uid: 179 + components: + - type: Transform + pos: 53.5,-8.5 + parent: 1 - uid: 221 components: - type: Transform @@ -13251,6 +13691,11 @@ entities: - type: Transform pos: 0.5,21.5 parent: 1 + - uid: 264 + components: + - type: Transform + pos: 53.5,-8.5 + parent: 1 - uid: 265 components: - type: Transform @@ -13336,6 +13781,11 @@ entities: - type: Transform pos: 23.5,-2.5 parent: 1 + - uid: 355 + components: + - type: Transform + pos: 55.5,-8.5 + parent: 1 - uid: 360 components: - type: Transform @@ -13426,16 +13876,61 @@ entities: - type: Transform pos: -11.5,-6.5 parent: 1 + - uid: 1084 + components: + - type: Transform + pos: 54.5,-8.5 + parent: 1 - uid: 1205 components: - type: Transform pos: 0.5,20.5 parent: 1 + - uid: 1272 + components: + - type: Transform + pos: 67.5,4.5 + parent: 1 + - uid: 1292 + components: + - type: Transform + pos: 65.5,8.5 + parent: 1 + - uid: 1306 + components: + - type: Transform + pos: 65.5,10.5 + parent: 1 - uid: 1321 components: - type: Transform pos: -8.5,-7.5 parent: 1 + - uid: 1341 + components: + - type: Transform + pos: 63.5,11.5 + parent: 1 + - uid: 1382 + components: + - type: Transform + pos: 61.5,14.5 + parent: 1 + - uid: 1527 + components: + - type: Transform + pos: 56.5,16.5 + parent: 1 + - uid: 1730 + components: + - type: Transform + pos: 57.5,-12.5 + parent: 1 + - uid: 1759 + components: + - type: Transform + pos: 57.5,-13.5 + parent: 1 - uid: 1939 components: - type: Transform @@ -15091,6 +15586,11 @@ entities: - type: Transform pos: 42.5,0.5 parent: 1 + - uid: 4952 + components: + - type: Transform + pos: 57.5,16.5 + parent: 1 - uid: 5628 components: - type: Transform @@ -15166,105 +15666,175 @@ entities: - type: Transform pos: 50.5,0.5 parent: 1 - - uid: 5648 + - uid: 5649 components: - type: Transform - pos: 51.5,0.5 + pos: 45.5,0.5 parent: 1 - - uid: 5649 + - uid: 5655 components: - type: Transform - pos: 45.5,0.5 + pos: 57.5,0.5 parent: 1 - - uid: 5650 + - uid: 5662 components: - type: Transform - pos: 52.5,0.5 + pos: 57.5,14.5 parent: 1 - - uid: 5651 + - uid: 5663 components: - type: Transform - pos: 53.5,0.5 + pos: 56.5,-8.5 parent: 1 - - uid: 5652 + - uid: 5664 components: - type: Transform - pos: 54.5,0.5 + pos: 57.5,-8.5 parent: 1 - - uid: 5653 + - uid: 5665 components: - type: Transform - pos: 55.5,0.5 + pos: 57.5,-9.5 parent: 1 - - uid: 5654 + - uid: 5667 components: - type: Transform - pos: 56.5,0.5 + pos: 61.5,7.5 parent: 1 - - uid: 5655 + - uid: 5668 components: - type: Transform - pos: 57.5,0.5 + pos: 61.5,8.5 parent: 1 - - uid: 5656 + - uid: 5859 components: - type: Transform - pos: 59.5,0.5 + pos: 57.5,-10.5 parent: 1 - - uid: 5657 + - uid: 5860 components: - type: Transform - pos: 58.5,0.5 + pos: 57.5,-11.5 parent: 1 - - uid: 5658 + - uid: 5861 components: - type: Transform - pos: 59.5,1.5 + pos: 50.5,1.5 parent: 1 - - uid: 5659 + - uid: 5862 components: - type: Transform - pos: 59.5,2.5 + pos: 50.5,2.5 parent: 1 - - uid: 5660 + - uid: 5863 components: - type: Transform - pos: 59.5,3.5 + pos: 50.5,3.5 parent: 1 - - uid: 5661 + - uid: 5864 components: - type: Transform - pos: 59.5,4.5 + pos: 50.5,4.5 parent: 1 - - uid: 5662 + - uid: 5871 components: - type: Transform - pos: 59.5,5.5 + pos: 50.5,4.5 parent: 1 - - uid: 5663 + - uid: 5872 components: - type: Transform - pos: 59.5,6.5 + pos: 50.5,6.5 parent: 1 - - uid: 5664 + - uid: 5873 components: - type: Transform - pos: 59.5,7.5 + pos: 50.5,5.5 parent: 1 - - uid: 5665 + - uid: 5891 components: - type: Transform - pos: 60.5,7.5 + pos: 50.5,6.5 parent: 1 - - uid: 5667 + - uid: 5961 components: - type: Transform - pos: 61.5,7.5 + pos: 57.5,-15.5 parent: 1 - - uid: 5668 + - uid: 5962 components: - type: Transform - pos: 61.5,8.5 + pos: 57.5,-14.5 + parent: 1 + - uid: 5963 + components: + - type: Transform + pos: 59.5,-14.5 + parent: 1 + - uid: 5991 + components: + - type: Transform + pos: 54.5,-16.5 + parent: 1 + - uid: 5992 + components: + - type: Transform + pos: 58.5,-15.5 + parent: 1 + - uid: 5993 + components: + - type: Transform + pos: 62.5,-12.5 + parent: 1 + - uid: 5994 + components: + - type: Transform + pos: 60.5,-14.5 + parent: 1 + - uid: 5995 + components: + - type: Transform + pos: 60.5,-13.5 + parent: 1 + - uid: 5996 + components: + - type: Transform + pos: 63.5,-11.5 + parent: 1 + - uid: 5997 + components: + - type: Transform + pos: 63.5,-10.5 + parent: 1 + - uid: 5999 + components: + - type: Transform + pos: 64.5,-10.5 + parent: 1 + - uid: 6000 + components: + - type: Transform + pos: 62.5,-11.5 + parent: 1 + - uid: 6001 + components: + - type: Transform + pos: 65.5,-7.5 + parent: 1 + - uid: 6002 + components: + - type: Transform + pos: 66.5,-7.5 + parent: 1 + - uid: 6003 + components: + - type: Transform + pos: 67.5,-3.5 + parent: 1 + - uid: 6005 + components: + - type: Transform + pos: 66.5,-5.5 parent: 1 - uid: 6066 components: @@ -15291,6 +15861,291 @@ entities: - type: Transform pos: 21.5,20.5 parent: 1 + - uid: 6074 + components: + - type: Transform + pos: 50.5,6.5 + parent: 1 + - uid: 6075 + components: + - type: Transform + pos: 50.5,7.5 + parent: 1 + - uid: 6076 + components: + - type: Transform + pos: 50.5,9.5 + parent: 1 + - uid: 6077 + components: + - type: Transform + pos: 50.5,9.5 + parent: 1 + - uid: 6078 + components: + - type: Transform + pos: 50.5,8.5 + parent: 1 + - uid: 6079 + components: + - type: Transform + pos: 51.5,9.5 + parent: 1 + - uid: 6080 + components: + - type: Transform + pos: 52.5,9.5 + parent: 1 + - uid: 6081 + components: + - type: Transform + pos: 53.5,9.5 + parent: 1 + - uid: 6082 + components: + - type: Transform + pos: 55.5,9.5 + parent: 1 + - uid: 6083 + components: + - type: Transform + pos: 54.5,9.5 + parent: 1 + - uid: 6084 + components: + - type: Transform + pos: 56.5,9.5 + parent: 1 + - uid: 6085 + components: + - type: Transform + pos: 57.5,9.5 + parent: 1 + - uid: 6086 + components: + - type: Transform + pos: 57.5,10.5 + parent: 1 + - uid: 6087 + components: + - type: Transform + pos: 57.5,11.5 + parent: 1 + - uid: 6088 + components: + - type: Transform + pos: 57.5,12.5 + parent: 1 + - uid: 6089 + components: + - type: Transform + pos: 57.5,13.5 + parent: 1 + - uid: 6090 + components: + - type: Transform + pos: 57.5,15.5 + parent: 1 + - uid: 6109 + components: + - type: Transform + pos: 63.5,12.5 + parent: 1 + - uid: 6110 + components: + - type: Transform + pos: 60.5,15.5 + parent: 1 + - uid: 6111 + components: + - type: Transform + pos: 56.5,17.5 + parent: 1 + - uid: 6135 + components: + - type: Transform + pos: 54.5,17.5 + parent: 1 + - uid: 6141 + components: + - type: Transform + pos: 64.5,11.5 + parent: 1 + - uid: 6142 + components: + - type: Transform + pos: 66.5,6.5 + parent: 1 + - uid: 6143 + components: + - type: Transform + pos: 66.5,7.5 + parent: 1 + - uid: 6147 + components: + - type: Transform + pos: 62.5,13.5 + parent: 1 + - uid: 6151 + components: + - type: Transform + pos: 58.5,11.5 + parent: 1 + - uid: 6152 + components: + - type: Transform + pos: 59.5,11.5 + parent: 1 + - uid: 6153 + components: + - type: Transform + pos: 59.5,10.5 + parent: 1 + - uid: 6154 + components: + - type: Transform + pos: 59.5,9.5 + parent: 1 + - uid: 6155 + components: + - type: Transform + pos: 59.5,8.5 + parent: 1 + - uid: 6158 + components: + - type: Transform + pos: 61.5,7.5 + parent: 1 + - uid: 6159 + components: + - type: Transform + pos: 61.5,8.5 + parent: 1 + - uid: 6160 + components: + - type: Transform + pos: 60.5,8.5 + parent: 1 + - uid: 6181 + components: + - type: Transform + pos: 56.5,-16.5 + parent: 1 + - uid: 6182 + components: + - type: Transform + pos: 55.5,-16.5 + parent: 1 + - uid: 6183 + components: + - type: Transform + pos: 56.5,-15.5 + parent: 1 + - uid: 6184 + components: + - type: Transform + pos: 58.5,-14.5 + parent: 1 + - uid: 6218 + components: + - type: Transform + pos: 64.5,-9.5 + parent: 1 + - uid: 6219 + components: + - type: Transform + pos: 65.5,-9.5 + parent: 1 + - uid: 6220 + components: + - type: Transform + pos: 61.5,-13.5 + parent: 1 + - uid: 6221 + components: + - type: Transform + pos: 59.5,15.5 + parent: 1 + - uid: 6227 + components: + - type: Transform + pos: 61.5,13.5 + parent: 1 + - uid: 6228 + components: + - type: Transform + pos: 61.5,-12.5 + parent: 1 + - uid: 6229 + components: + - type: Transform + pos: 65.5,-8.5 + parent: 1 + - uid: 6230 + components: + - type: Transform + pos: 67.5,-5.5 + parent: 1 + - uid: 6231 + components: + - type: Transform + pos: 66.5,-6.5 + parent: 1 + - uid: 6233 + components: + - type: Transform + pos: 67.5,-4.5 + parent: 1 + - uid: 6246 + components: + - type: Transform + pos: 67.5,5.5 + parent: 1 + - uid: 6247 + components: + - type: Transform + pos: 56.5,-16.5 + parent: 1 + - uid: 6248 + components: + - type: Transform + pos: 65.5,9.5 + parent: 1 + - uid: 6249 + components: + - type: Transform + pos: 64.5,10.5 + parent: 1 + - uid: 6250 + components: + - type: Transform + pos: 62.5,12.5 + parent: 1 + - uid: 6251 + components: + - type: Transform + pos: 60.5,14.5 + parent: 1 + - uid: 6252 + components: + - type: Transform + pos: 58.5,16.5 + parent: 1 + - uid: 6253 + components: + - type: Transform + pos: 58.5,15.5 + parent: 1 + - uid: 6255 + components: + - type: Transform + pos: 55.5,17.5 + parent: 1 + - uid: 6257 + components: + - type: Transform + pos: 66.5,8.5 + parent: 1 - proto: CableMV entities: - uid: 199 @@ -17216,6 +18071,12 @@ entities: rot: 3.141592653589793 rad pos: 17.5,20.5 parent: 1 + - uid: 6150 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 57.5,11.5 + parent: 1 - proto: CandlePurpleInfinite entities: - uid: 400 @@ -18233,6 +19094,13 @@ entities: - type: Transform pos: 27.5,-5.5 parent: 1 +- proto: ComputerPowerMonitoring + entities: + - uid: 73 + components: + - type: Transform + pos: 59.5,10.5 + parent: 1 - proto: ComputerRadar entities: - uid: 296 @@ -18262,6 +19130,14 @@ entities: - type: Transform pos: -19.5,2.5 parent: 1 +- proto: ComputerSolarControl + entities: + - uid: 354 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 60.5,9.5 + parent: 1 - proto: ComputerTabletopAlert entities: - uid: 1420 @@ -18322,39 +19198,39 @@ entities: rot: -1.5707963267948966 rad pos: 29.5,11.5 parent: 1 -- proto: ComputerTabletopMarketConsoleNFHigh +- proto: ComputerTabletopMarketConsoleNFLow entities: - - uid: 621 + - uid: 27 components: - type: Transform pos: 46.5,-7.5 parent: 1 - - uid: 622 + - uid: 621 components: - type: Transform rot: 3.141592653589793 rad pos: 54.5,8.5 parent: 1 - - uid: 632 + - uid: 622 components: - type: Transform rot: 1.5707963267948966 rad pos: 58.5,-3.5 parent: 1 -- proto: ComputerTabletopPalletConsoleNFVeryLowMarket +- proto: ComputerTabletopPalletConsoleNFLowMarket entities: - - uid: 633 + - uid: 632 components: - type: Transform pos: 53.5,-7.5 parent: 1 - - uid: 634 + - uid: 633 components: - type: Transform rot: 1.5707963267948966 rad pos: 58.5,3.5 parent: 1 - - uid: 637 + - uid: 634 components: - type: Transform rot: 3.141592653589793 rad @@ -18419,16 +19295,41 @@ entities: parent: 1 - proto: ConveyorBelt entities: - - uid: 1813 + - uid: 59 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 48.5,18.5 + parent: 1 + - uid: 71 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 48.5,19.5 + parent: 1 + - uid: 72 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 48.5,-18.5 + parent: 1 + - uid: 1207 components: - type: Transform rot: -1.5707963267948966 rad - pos: -3.5,-13.5 + pos: 69.5,-1.5 parent: 1 - - uid: 1843 + - uid: 1235 components: - type: Transform - pos: 52.5,18.5 + rot: -1.5707963267948966 rad + pos: 68.5,-1.5 + parent: 1 + - uid: 1813 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -3.5,-13.5 parent: 1 - uid: 1844 components: @@ -18474,12 +19375,6 @@ entities: rot: 3.141592653589793 rad pos: 48.5,17.5 parent: 1 - - uid: 1852 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 48.5,18.5 - parent: 1 - uid: 1853 components: - type: Transform @@ -18601,6 +19496,27 @@ entities: rot: -1.5707963267948966 rad pos: -2.5,-13.5 parent: 1 + - uid: 5485 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 69.5,2.5 + parent: 1 + - uid: 5652 + components: + - type: Transform + pos: 52.5,-18.5 + parent: 1 + - uid: 6175 + components: + - type: Transform + pos: 52.5,19.5 + parent: 1 + - uid: 6176 + components: + - type: Transform + pos: 52.5,18.5 + parent: 1 - proto: CrateMachine entities: - uid: 4530 @@ -28201,30 +29117,15 @@ entities: - type: Transform pos: 9.5,32.5 parent: 1 - - uid: 27 - components: - - type: Transform - pos: 54.5,-16.5 - parent: 1 - - uid: 32 - components: - - type: Transform - pos: 46.5,-16.5 - parent: 1 - - uid: 35 - components: - - type: Transform - pos: 66.5,-6.5 - parent: 1 - uid: 37 components: - type: Transform - pos: 45.5,-16.5 + pos: 46.5,-18.5 parent: 1 - uid: 54 components: - type: Transform - pos: 44.5,-16.5 + pos: 56.5,-17.5 parent: 1 - uid: 55 components: @@ -28236,115 +29137,15 @@ entities: - type: Transform pos: 43.5,-13.5 parent: 1 - - uid: 59 - components: - - type: Transform - pos: 64.5,-6.5 - parent: 1 - - uid: 60 - components: - - type: Transform - pos: 65.5,-6.5 - parent: 1 - - uid: 63 - components: - - type: Transform - pos: 66.5,-8.5 - parent: 1 - - uid: 64 - components: - - type: Transform - pos: 66.5,-7.5 - parent: 1 - - uid: 67 - components: - - type: Transform - pos: 67.5,-5.5 - parent: 1 - - uid: 68 - components: - - type: Transform - pos: 67.5,-4.5 - parent: 1 - uid: 70 components: - type: Transform pos: 43.5,16.5 parent: 1 - - uid: 71 - components: - - type: Transform - pos: 64.5,-10.5 - parent: 1 - - uid: 72 - components: - - type: Transform - pos: 63.5,-11.5 - parent: 1 - - uid: 73 - components: - - type: Transform - pos: 64.5,-11.5 - parent: 1 - - uid: 74 - components: - - type: Transform - pos: 62.5,-12.5 - parent: 1 - - uid: 76 - components: - - type: Transform - pos: 62.5,-13.5 - parent: 1 - - uid: 78 - components: - - type: Transform - pos: 65.5,-10.5 - parent: 1 - - uid: 81 - components: - - type: Transform - pos: 60.5,-14.5 - parent: 1 - - uid: 82 - components: - - type: Transform - pos: 57.5,-16.5 - parent: 1 - - uid: 87 - components: - - type: Transform - pos: 55.5,-16.5 - parent: 1 - - uid: 93 - components: - - type: Transform - pos: 60.5,-15.5 - parent: 1 - - uid: 97 - components: - - type: Transform - pos: 58.5,-15.5 - parent: 1 - - uid: 98 - components: - - type: Transform - pos: 59.5,-15.5 - parent: 1 - - uid: 99 - components: - - type: Transform - pos: 57.5,-14.5 - parent: 1 - uid: 100 components: - type: Transform - pos: 57.5,-13.5 - parent: 1 - - uid: 101 - components: - - type: Transform - pos: 57.5,-15.5 + pos: 59.5,-15.5 parent: 1 - uid: 102 components: @@ -28356,55 +29157,10 @@ entities: - type: Transform pos: 43.5,14.5 parent: 1 - - uid: 106 - components: - - type: Transform - pos: 67.5,-3.5 - parent: 1 - - uid: 109 - components: - - type: Transform - pos: 58.5,16.5 - parent: 1 - - uid: 110 - components: - - type: Transform - pos: 56.5,17.5 - parent: 1 - - uid: 111 - components: - - type: Transform - pos: 57.5,17.5 - parent: 1 - - uid: 112 - components: - - type: Transform - pos: 59.5,16.5 - parent: 1 - - uid: 114 - components: - - type: Transform - pos: 57.5,16.5 - parent: 1 - - uid: 115 - components: - - type: Transform - pos: 54.5,17.5 - parent: 1 - - uid: 121 - components: - - type: Transform - pos: 61.5,14.5 - parent: 1 - uid: 123 components: - type: Transform - pos: 57.5,15.5 - parent: 1 - - uid: 124 - components: - - type: Transform - pos: 57.5,14.5 + pos: 57.5,-16.5 parent: 1 - uid: 130 components: @@ -28461,70 +29217,15 @@ entities: - type: Transform pos: 43.5,15.5 parent: 1 - - uid: 163 - components: - - type: Transform - pos: 65.5,7.5 - parent: 1 - uid: 166 components: - type: Transform - pos: 64.5,7.5 - parent: 1 - - uid: 168 - components: - - type: Transform - pos: 67.5,5.5 + pos: 58.5,-16.5 parent: 1 - uid: 169 components: - type: Transform - pos: 45.5,17.5 - parent: 1 - - uid: 171 - components: - - type: Transform - pos: 64.5,11.5 - parent: 1 - - uid: 172 - components: - - type: Transform - pos: 46.5,17.5 - parent: 1 - - uid: 173 - components: - - type: Transform - pos: 65.5,10.5 - parent: 1 - - uid: 174 - components: - - type: Transform - pos: 65.5,11.5 - parent: 1 - - uid: 175 - components: - - type: Transform - pos: 66.5,9.5 - parent: 1 - - uid: 176 - components: - - type: Transform - pos: 62.5,14.5 - parent: 1 - - uid: 177 - components: - - type: Transform - pos: 62.5,13.5 - parent: 1 - - uid: 178 - components: - - type: Transform - pos: 63.5,13.5 - parent: 1 - - uid: 179 - components: - - type: Transform - pos: 64.5,12.5 + pos: 44.5,-17.5 parent: 1 - uid: 180 components: @@ -28584,11 +29285,6 @@ entities: - type: Transform pos: 7.5,-25.5 parent: 1 - - uid: 264 - components: - - type: Transform - pos: 67.5,4.5 - parent: 1 - uid: 269 components: - type: Transform @@ -28719,16 +29415,6 @@ entities: - type: Transform pos: 8.5,32.5 parent: 1 - - uid: 354 - components: - - type: Transform - pos: 66.5,8.5 - parent: 1 - - uid: 355 - components: - - type: Transform - pos: 66.5,7.5 - parent: 1 - uid: 366 components: - type: Transform @@ -29781,6 +30467,11 @@ entities: rot: -1.5707963267948966 rad pos: 44.5,-13.5 parent: 1 + - uid: 1367 + components: + - type: Transform + pos: 63.5,-12.5 + parent: 1 - uid: 1370 components: - type: Transform @@ -29835,6 +30526,41 @@ entities: rot: -1.5707963267948966 rad pos: 32.5,-1.5 parent: 1 + - uid: 1526 + components: + - type: Transform + pos: 54.5,18.5 + parent: 1 + - uid: 1535 + components: + - type: Transform + pos: 44.5,18.5 + parent: 1 + - uid: 1692 + components: + - type: Transform + pos: 57.5,17.5 + parent: 1 + - uid: 1751 + components: + - type: Transform + pos: 46.5,18.5 + parent: 1 + - uid: 1760 + components: + - type: Transform + pos: 63.5,13.5 + parent: 1 + - uid: 1761 + components: + - type: Transform + pos: 64.5,13.5 + parent: 1 + - uid: 1764 + components: + - type: Transform + pos: 65.5,11.5 + parent: 1 - uid: 1766 components: - type: Transform @@ -29876,6 +30602,16 @@ entities: - type: Transform pos: -6.5,2.5 parent: 1 + - uid: 1852 + components: + - type: Transform + pos: 67.5,7.5 + parent: 1 + - uid: 1906 + components: + - type: Transform + pos: 68.5,-4.5 + parent: 1 - uid: 1934 components: - type: Transform @@ -29917,6 +30653,11 @@ entities: - type: Transform pos: -1.5,6.5 parent: 1 + - uid: 2144 + components: + - type: Transform + pos: 68.5,-3.5 + parent: 1 - uid: 2159 components: - type: Transform @@ -29945,6 +30686,16 @@ entities: - type: Transform pos: 38.5,8.5 parent: 1 + - uid: 2579 + components: + - type: Transform + pos: 66.5,-9.5 + parent: 1 + - uid: 2580 + components: + - type: Transform + pos: 65.5,-10.5 + parent: 1 - uid: 2886 components: - type: Transform @@ -30135,121 +30886,282 @@ entities: rot: 1.5707963267948966 rad pos: -1.5,44.5 parent: 1 -- proto: GrilleDiagonal - entities: - - uid: 2887 + - uid: 6021 components: - type: Transform - rot: 3.141592653589793 rad - pos: -11.5,9.5 + pos: 67.5,-8.5 parent: 1 - - uid: 2888 + - uid: 6108 components: - type: Transform - pos: -12.5,10.5 + pos: 61.5,-15.5 parent: 1 - - uid: 2889 + - uid: 6112 + components: + - type: Transform + pos: 62.5,-14.5 + parent: 1 + - uid: 6113 + components: + - type: Transform + pos: 55.5,18.5 + parent: 1 + - uid: 6116 + components: + - type: Transform + pos: 68.5,7.5 + parent: 1 + - uid: 6117 + components: + - type: Transform + pos: 66.5,9.5 + parent: 1 + - uid: 6119 + components: + - type: Transform + pos: 67.5,-7.5 + parent: 1 + - uid: 6120 + components: + - type: Transform + pos: 57.5,18.5 + parent: 1 + - uid: 6121 + components: + - type: Transform + pos: 60.5,16.5 + parent: 1 + - uid: 6122 + components: + - type: Transform + pos: 59.5,16.5 + parent: 1 + - uid: 6123 + components: + - type: Transform + pos: 54.5,-17.5 + parent: 1 + - uid: 6125 + components: + - type: Transform + pos: 68.5,4.5 + parent: 1 + - uid: 6126 + components: + - type: Transform + pos: 64.5,-12.5 + parent: 1 + - uid: 6136 + components: + - type: Transform + pos: 59.5,17.5 + parent: 1 + - uid: 6138 + components: + - type: Transform + pos: 60.5,-15.5 + parent: 1 + - uid: 6139 + components: + - type: Transform + pos: 68.5,5.5 + parent: 1 + - uid: 6140 + components: + - type: Transform + pos: 64.5,12.5 + parent: 1 + - uid: 6144 + components: + - type: Transform + pos: 55.5,-17.5 + parent: 1 + - uid: 6145 + components: + - type: Transform + pos: 46.5,-17.5 + parent: 1 + - uid: 6148 + components: + - type: Transform + pos: 43.5,-17.5 + parent: 1 + - uid: 6149 components: - type: Transform rot: 3.141592653589793 rad - pos: -12.5,8.5 + pos: 54.5,19.5 parent: 1 - - uid: 2945 + - uid: 6180 components: - type: Transform - pos: -13.5,9.5 + pos: 45.5,-17.5 parent: 1 -- proto: GrilleSpawner - entities: - - uid: 1053 + - uid: 6215 components: - type: Transform - pos: 6.5,33.5 + pos: 54.5,-18.5 parent: 1 - - uid: 1057 + - uid: 6224 components: - type: Transform - pos: 43.5,-16.5 + pos: 69.5,-3.5 parent: 1 - - uid: 1083 + - uid: 6226 components: - type: Transform - pos: 43.5,-15.5 + pos: 69.5,4.5 parent: 1 - - uid: 1084 + - uid: 6254 components: - type: Transform - pos: 67.5,6.5 + pos: 62.5,-13.5 parent: 1 - - uid: 1207 + - uid: 6256 components: - type: Transform - pos: 66.5,-9.5 + pos: 56.5,18.5 parent: 1 - - uid: 1235 + - uid: 6258 components: - type: Transform - pos: 67.5,-6.5 + pos: 46.5,19.5 parent: 1 - - uid: 1272 + - uid: 6259 components: - type: Transform - pos: 63.5,-12.5 + pos: 45.5,18.5 parent: 1 - - uid: 1292 + - uid: 6260 components: - type: Transform - pos: 65.5,-9.5 + pos: 58.5,17.5 parent: 1 - - uid: 1306 + - uid: 6264 components: - type: Transform - pos: 61.5,-14.5 + pos: 65.5,12.5 parent: 1 - - uid: 1361 + - uid: 6266 components: - type: Transform - pos: 61.5,-13.5 + pos: 67.5,9.5 parent: 1 - - uid: 1367 + - uid: 6267 components: - type: Transform - pos: 56.5,-16.5 + pos: 68.5,-5.5 parent: 1 - - uid: 1376 + - uid: 6268 + components: + - type: Transform + pos: 67.5,8.5 + parent: 1 + - uid: 6269 + components: + - type: Transform + pos: 68.5,-5.5 + parent: 1 + - uid: 6271 + components: + - type: Transform + pos: 66.5,-8.5 + parent: 1 + - uid: 6272 + components: + - type: Transform + pos: 66.5,-10.5 + parent: 1 + - uid: 6273 + components: + - type: Transform + pos: 65.5,-11.5 + parent: 1 +- proto: GrilleDiagonal + entities: + - uid: 2887 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -11.5,9.5 + parent: 1 + - uid: 2888 + components: + - type: Transform + pos: -12.5,10.5 + parent: 1 + - uid: 2889 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -12.5,8.5 + parent: 1 + - uid: 2945 + components: + - type: Transform + pos: -13.5,9.5 + parent: 1 +- proto: GrilleSpawner + entities: + - uid: 32 components: - type: Transform pos: 61.5,15.5 parent: 1 - - uid: 1382 + - uid: 1053 components: - type: Transform - pos: 55.5,17.5 + pos: 6.5,33.5 parent: 1 - - uid: 1385 + - uid: 1057 components: - type: Transform - pos: 60.5,15.5 + pos: 43.5,-16.5 parent: 1 - - uid: 1387 + - uid: 1083 components: - type: Transform - pos: 67.5,7.5 + pos: 43.5,-15.5 parent: 1 - - uid: 1535 + - uid: 1361 components: - type: Transform - pos: 60.5,16.5 + pos: 62.5,14.5 + parent: 1 + - uid: 1376 + components: + - type: Transform + pos: 61.5,16.5 + parent: 1 + - uid: 1385 + components: + - type: Transform + pos: 63.5,14.5 + parent: 1 + - uid: 1387 + components: + - type: Transform + pos: 66.5,11.5 parent: 1 - uid: 1538 components: - type: Transform pos: 10.5,32.5 parent: 1 - - uid: 1906 + - uid: 1750 components: - type: Transform - pos: 66.5,10.5 + pos: 57.5,-17.5 + parent: 1 + - uid: 1763 + components: + - type: Transform + pos: 63.5,-13.5 + parent: 1 + - uid: 1843 + components: + - type: Transform + pos: 61.5,-14.5 parent: 1 - uid: 1945 components: @@ -30286,11 +31198,6 @@ entities: - type: Transform pos: -23.5,-11.5 parent: 1 - - uid: 3499 - components: - - type: Transform - pos: 63.5,12.5 - parent: 1 - uid: 3503 components: - type: Transform @@ -30346,6 +31253,46 @@ entities: - type: Transform pos: 18.5,27.5 parent: 1 + - uid: 6114 + components: + - type: Transform + pos: 59.5,-16.5 + parent: 1 + - uid: 6118 + components: + - type: Transform + pos: 68.5,6.5 + parent: 1 + - uid: 6137 + components: + - type: Transform + pos: 43.5,18.5 + parent: 1 + - uid: 6146 + components: + - type: Transform + pos: 62.5,15.5 + parent: 1 + - uid: 6263 + components: + - type: Transform + pos: 64.5,-11.5 + parent: 1 + - uid: 6265 + components: + - type: Transform + pos: 67.5,-6.5 + parent: 1 + - uid: 6270 + components: + - type: Transform + pos: 68.5,-6.5 + parent: 1 + - uid: 6298 + components: + - type: Transform + pos: 66.5,10.5 + parent: 1 - proto: HandheldHealthAnalyzerUnpowered entities: - uid: 5519 @@ -30355,16 +31302,25 @@ entities: parent: 1 - proto: HandheldStationMapEmpty entities: - - uid: 2144 + - uid: 2371 components: - type: Transform - pos: 10.485309,-6.4716725 + pos: 18.610277,16.784569 parent: 1 - - uid: 2371 + - uid: 5380 components: - type: Transform - pos: 18.610277,16.784569 + pos: 10.529349,-6.4789734 parent: 1 + - type: PowerCellDraw + canUse: True + canDraw: True + - type: ContainerContainer + containers: + cell_slot: !type:ContainerSlot + showEnts: False + occludes: True + ent: 5383 - proto: HighSecFrontierCommandLocked entities: - uid: 5413 @@ -30491,10 +31447,10 @@ entities: parent: 1 - proto: LessLethalVendingMachinePOI entities: - - uid: 5357 + - uid: 5479 components: - type: Transform - pos: 2.5,14.5 + pos: 27.5,1.5 parent: 1 - proto: LightReplacer entities: @@ -30999,10 +31955,10 @@ entities: bodyType: Static - proto: NonLethalVendingMachine entities: - - uid: 5360 + - uid: 6163 components: - type: Transform - pos: 2.5,13.5 + pos: 28.5,1.5 parent: 1 - proto: OxygenCanister entities: @@ -31067,39 +32023,20 @@ entities: parent: 1 - proto: PlasticFlapsAirtightClear entities: - - uid: 1759 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 48.5,-17.5 - parent: 1 - - uid: 1760 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 52.5,-17.5 - parent: 1 - - uid: 1761 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 68.5,-1.5 - parent: 1 - - uid: 1762 + - uid: 93 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 68.5,2.5 + pos: 52.5,19.5 parent: 1 - - uid: 1763 + - uid: 98 components: - type: Transform - pos: 48.5,18.5 + pos: 48.5,-18.5 parent: 1 - - uid: 1764 + - uid: 106 components: - type: Transform - pos: 52.5,18.5 + pos: 69.5,2.5 parent: 1 - uid: 1837 components: @@ -31133,6 +32070,21 @@ entities: - type: Transform pos: 65.5,-1.5 parent: 1 + - uid: 5464 + components: + - type: Transform + pos: 69.5,-1.5 + parent: 1 + - uid: 5466 + components: + - type: Transform + pos: 48.5,19.5 + parent: 1 + - uid: 5488 + components: + - type: Transform + pos: 52.5,-18.5 + parent: 1 - proto: PlushieAtmosian entities: - uid: 5358 @@ -31182,6 +32134,11 @@ entities: parent: 1 - proto: PottedPlantRandom entities: + - uid: 114 + components: + - type: Transform + pos: 2.5,16.5 + parent: 1 - uid: 2965 components: - type: Transform @@ -31207,30 +32164,25 @@ entities: - type: Transform pos: 45.5,-7.5 parent: 1 - - uid: 5362 - components: - - type: Transform - pos: 2.5,17.5 - parent: 1 - uid: 5385 components: - type: Transform pos: 2.5,11.5 parent: 1 - - uid: 5472 + - uid: 5526 components: - type: Transform - pos: -25.5,1.5 + pos: 3.5,26.5 parent: 1 - - uid: 5473 + - uid: 6309 components: - type: Transform - pos: 1.5,35.5 + pos: -25.5,1.5 parent: 1 - - uid: 5526 + - uid: 6311 components: - type: Transform - pos: 3.5,26.5 + pos: 1.5,38.5 parent: 1 - proto: PottedPlantRandomPlastic entities: @@ -31239,6 +32191,14 @@ entities: - type: Transform pos: -15.5,2.5 parent: 1 +- proto: PowerCellMedium + entities: + - uid: 5383 + components: + - type: Transform + parent: 5380 + - type: Physics + canCollide: False - proto: PowerCellRecharger entities: - uid: 3341 @@ -31781,12 +32741,6 @@ entities: rot: 3.141592653589793 rad pos: 16.5,21.5 parent: 1 - - uid: 3448 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 12.5,27.5 - parent: 1 - uid: 4037 components: - type: Transform @@ -31877,6 +32831,12 @@ entities: - type: Transform pos: 12.5,-12.5 parent: 1 + - uid: 5480 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 11.5,27.5 + parent: 1 - uid: 5531 components: - type: Transform @@ -33721,39 +34681,41 @@ entities: - type: Transform pos: -2.5,-8.5 parent: 1 - - uid: 5483 + - uid: 5487 components: - type: Transform - pos: 48.5,18.5 + rot: 3.141592653589793 rad + pos: 69.5,-1.5 parent: 1 - - uid: 5484 + - uid: 5590 components: - type: Transform - pos: 52.5,18.5 + rot: 3.141592653589793 rad + pos: 52.5,-18.5 parent: 1 - - uid: 5485 + - uid: 5648 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 68.5,2.5 + rot: 3.141592653589793 rad + pos: 69.5,2.5 parent: 1 - - uid: 5486 + - uid: 6177 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 68.5,-1.5 + rot: 3.141592653589793 rad + pos: 48.5,-18.5 parent: 1 - - uid: 5487 + - uid: 6178 components: - type: Transform rot: 3.141592653589793 rad - pos: 52.5,-17.5 + pos: 48.5,19.5 parent: 1 - - uid: 5488 + - uid: 6179 components: - type: Transform rot: 3.141592653589793 rad - pos: 48.5,-17.5 + pos: 52.5,19.5 parent: 1 - proto: ShuttersNormalOpen entities: @@ -34051,9 +35013,9 @@ entities: parent: 1 - type: DeviceLinkSource linkedPorts: - 5488: + 6177: - Pressed: Toggle - 5487: + 5590: - Pressed: Toggle - uid: 5490 components: @@ -34063,9 +35025,9 @@ entities: parent: 1 - type: DeviceLinkSource linkedPorts: - 5486: + 5487: - Pressed: Toggle - 5485: + 5648: - Pressed: Toggle - uid: 5491 components: @@ -34074,9 +35036,9 @@ entities: parent: 1 - type: DeviceLinkSource linkedPorts: - 5484: + 6179: - Pressed: Toggle - 5483: + 6178: - Pressed: Toggle - proto: SignAtmos entities: @@ -34095,41 +35057,41 @@ entities: parent: 1 - proto: SignCargoDock entities: - - uid: 2579 + - uid: 109 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 47.5,-17.5 + rot: 3.141592653589793 rad + pos: 47.5,19.5 parent: 1 - - uid: 2580 + - uid: 112 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 53.5,-17.5 + rot: 3.141592653589793 rad + pos: 69.5,3.5 parent: 1 - - uid: 2581 + - uid: 5470 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 68.5,-2.5 + rot: 3.141592653589793 rad + pos: 47.5,-18.5 parent: 1 - - uid: 2582 + - uid: 5471 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 68.5,3.5 + rot: 3.141592653589793 rad + pos: 69.5,-2.5 parent: 1 - - uid: 2583 + - uid: 5484 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 53.5,18.5 + rot: 3.141592653589793 rad + pos: 53.5,-18.5 parent: 1 - - uid: 2584 + - uid: 5653 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 47.5,18.5 + rot: 3.141592653589793 rad + pos: 53.5,19.5 parent: 1 - proto: SignCryo entities: @@ -34246,6 +35208,18 @@ entities: - type: Transform pos: -11.5,-1.5 parent: 1 + - uid: 6161 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 60.5,6.5 + parent: 1 + - uid: 6162 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 56.5,10.5 + parent: 1 - proto: SignDirectionalSupply entities: - uid: 3831 @@ -34441,6 +35415,11 @@ entities: - type: Transform pos: 17.5,21.5 parent: 1 + - uid: 6156 + components: + - type: Transform + pos: 58.5,11.5 + parent: 1 - proto: SolarPanel entities: - uid: 198 @@ -35229,6 +36208,276 @@ entities: - type: Transform pos: -19.5,15.5 parent: 1 + - uid: 4949 + components: + - type: Transform + pos: 65.5,8.5 + parent: 1 + - uid: 4951 + components: + - type: Transform + pos: 58.5,15.5 + parent: 1 + - uid: 5357 + components: + - type: Transform + pos: 55.5,17.5 + parent: 1 + - uid: 5360 + components: + - type: Transform + pos: 56.5,16.5 + parent: 1 + - uid: 5362 + components: + - type: Transform + pos: 61.5,13.5 + parent: 1 + - uid: 5363 + components: + - type: Transform + pos: 62.5,12.5 + parent: 1 + - uid: 5379 + components: + - type: Transform + pos: 63.5,12.5 + parent: 1 + - uid: 5998 + components: + - type: Transform + pos: 61.5,-12.5 + parent: 1 + - uid: 6006 + components: + - type: Transform + pos: 58.5,-15.5 + parent: 1 + - uid: 6007 + components: + - type: Transform + pos: 56.5,-15.5 + parent: 1 + - uid: 6008 + components: + - type: Transform + pos: 59.5,-14.5 + parent: 1 + - uid: 6009 + components: + - type: Transform + pos: 58.5,-14.5 + parent: 1 + - uid: 6010 + components: + - type: Transform + pos: 60.5,-14.5 + parent: 1 + - uid: 6011 + components: + - type: Transform + pos: 62.5,-11.5 + parent: 1 + - uid: 6012 + components: + - type: Transform + pos: 64.5,-10.5 + parent: 1 + - uid: 6013 + components: + - type: Transform + pos: 63.5,-10.5 + parent: 1 + - uid: 6014 + components: + - type: Transform + pos: 65.5,-7.5 + parent: 1 + - uid: 6015 + components: + - type: Transform + pos: 64.5,10.5 + parent: 1 + - uid: 6016 + components: + - type: Transform + pos: 67.5,-5.5 + parent: 1 + - uid: 6017 + components: + - type: Transform + pos: 66.5,-6.5 + parent: 1 + - uid: 6018 + components: + - type: Transform + pos: 67.5,5.5 + parent: 1 + - uid: 6023 + components: + - type: Transform + pos: 67.5,-3.5 + parent: 1 + - uid: 6032 + components: + - type: Transform + pos: 66.5,7.5 + parent: 1 + - uid: 6054 + components: + - type: Transform + pos: 60.5,15.5 + parent: 1 + - uid: 6055 + components: + - type: Transform + pos: 65.5,10.5 + parent: 1 + - uid: 6102 + components: + - type: Transform + pos: 54.5,17.5 + parent: 1 + - uid: 6103 + components: + - type: Transform + pos: 65.5,9.5 + parent: 1 + - uid: 6104 + components: + - type: Transform + pos: 64.5,11.5 + parent: 1 + - uid: 6105 + components: + - type: Transform + pos: 58.5,16.5 + parent: 1 + - uid: 6106 + components: + - type: Transform + pos: 57.5,16.5 + parent: 1 + - uid: 6132 + components: + - type: Transform + pos: 66.5,8.5 + parent: 1 + - uid: 6133 + components: + - type: Transform + pos: 66.5,6.5 + parent: 1 + - uid: 6134 + components: + - type: Transform + pos: 60.5,14.5 + parent: 1 + - uid: 6202 + components: + - type: Transform + pos: 67.5,-4.5 + parent: 1 + - uid: 6206 + components: + - type: Transform + pos: 67.5,4.5 + parent: 1 + - uid: 6207 + components: + - type: Transform + pos: 66.5,-5.5 + parent: 1 + - uid: 6208 + components: + - type: Transform + pos: 63.5,-11.5 + parent: 1 + - uid: 6209 + components: + - type: Transform + pos: 65.5,-8.5 + parent: 1 + - uid: 6210 + components: + - type: Transform + pos: 64.5,-9.5 + parent: 1 + - uid: 6211 + components: + - type: Transform + pos: 61.5,-13.5 + parent: 1 + - uid: 6212 + components: + - type: Transform + pos: 60.5,-13.5 + parent: 1 + - uid: 6213 + components: + - type: Transform + pos: 56.5,-16.5 + parent: 1 + - uid: 6214 + components: + - type: Transform + pos: 55.5,-16.5 + parent: 1 + - uid: 6216 + components: + - type: Transform + pos: 57.5,-15.5 + parent: 1 + - uid: 6217 + components: + - type: Transform + pos: 54.5,-16.5 + parent: 1 + - uid: 6225 + components: + - type: Transform + pos: 56.5,17.5 + parent: 1 + - uid: 6232 + components: + - type: Transform + pos: 62.5,-12.5 + parent: 1 + - uid: 6234 + components: + - type: Transform + pos: 67.5,6.5 + parent: 1 + - uid: 6235 + components: + - type: Transform + pos: 65.5,-9.5 + parent: 1 + - uid: 6236 + components: + - type: Transform + pos: 66.5,-7.5 + parent: 1 + - uid: 6299 + components: + - type: Transform + pos: 59.5,15.5 + parent: 1 + - uid: 6300 + components: + - type: Transform + pos: 62.5,13.5 + parent: 1 + - uid: 6301 + components: + - type: Transform + pos: 61.5,14.5 + parent: 1 + - uid: 6302 + components: + - type: Transform + pos: 63.5,11.5 + parent: 1 - proto: SolarTracker entities: - uid: 4147 @@ -35313,6 +36562,38 @@ entities: - type: Transform pos: 27.5,7.5 parent: 1 +- proto: SpawnShuttleVendomatsClothes + entities: + - uid: 5473 + components: + - type: Transform + pos: -28.5,1.5 + parent: 1 + - uid: 5654 + components: + - type: Transform + pos: -0.5,-36.5 + parent: 1 + - uid: 5656 + components: + - type: Transform + pos: 1.5,37.5 + parent: 1 + - uid: 5657 + components: + - type: Transform + pos: -26.5,1.5 + parent: 1 + - uid: 5658 + components: + - type: Transform + pos: 1.5,34.5 + parent: 1 + - uid: 5659 + components: + - type: Transform + pos: -0.5,-33.5 + parent: 1 - proto: SpiderWeb entities: - uid: 2006 @@ -36448,7 +37729,7 @@ entities: parent: 1 - type: DeviceLinkSource linkedPorts: - 1843: + 6175: - Left: Forward - Right: Reverse - Middle: Off @@ -36468,6 +37749,10 @@ entities: - Left: Forward - Right: Reverse - Middle: Off + 6176: + - Left: Forward + - Right: Reverse + - Middle: Off - uid: 5493 components: - type: Transform @@ -36495,6 +37780,14 @@ entities: - Left: Forward - Right: Reverse - Middle: Off + 1207: + - Left: Forward + - Right: Reverse + - Middle: Off + 1235: + - Left: Forward + - Right: Reverse + - Middle: Off - uid: 5494 components: - type: Transform @@ -36522,6 +37815,10 @@ entities: - Left: Forward - Right: Reverse - Middle: Off + 72: + - Left: Forward + - Right: Reverse + - Middle: Off - uid: 5495 components: - type: Transform @@ -36549,6 +37846,10 @@ entities: - Left: Forward - Right: Reverse - Middle: Off + 5652: + - Left: Forward + - Right: Reverse + - Middle: Off - uid: 5496 components: - type: Transform @@ -36576,6 +37877,10 @@ entities: - Left: Forward - Right: Reverse - Middle: Off + 5485: + - Left: Forward + - Right: Reverse + - Middle: Off - uid: 5497 components: - type: Transform @@ -36583,7 +37888,7 @@ entities: parent: 1 - type: DeviceLinkSource linkedPorts: - 1852: + 71: - Left: Forward - Right: Reverse - Middle: Off @@ -36603,6 +37908,10 @@ entities: - Left: Forward - Right: Reverse - Middle: Off + 59: + - Left: Forward + - Right: Reverse + - Middle: Off - proto: VendingMachineAstroVendPOI entities: - uid: 5462 @@ -36624,13 +37933,6 @@ entities: - type: Transform pos: 11.5,23.5 parent: 1 -- proto: VendingMachineChapel - entities: - - uid: 5469 - components: - - type: Transform - pos: -0.5,-36.5 - parent: 1 - proto: VendingMachineCigs entities: - uid: 5361 @@ -36659,26 +37961,19 @@ entities: - type: Transform pos: 11.5,22.5 parent: 1 -- proto: VendingMachineCuraDrobe - entities: - - uid: 5471 - components: - - type: Transform - pos: -26.5,1.5 - parent: 1 -- proto: VendingMachineDetDrobe +- proto: VendingMachineDinnerware entities: - - uid: 5470 + - uid: 2357 components: - type: Transform - pos: -28.5,1.5 + pos: -5.5,15.5 parent: 1 -- proto: VendingMachineDinnerware +- proto: VendingMachineEngivendPOI entities: - - uid: 2357 + - uid: 5472 components: - type: Transform - pos: -5.5,15.5 + pos: 2.5,13.5 parent: 1 - proto: VendingMachineFlatpackVend entities: @@ -36694,19 +37989,19 @@ entities: - type: Transform pos: 44.5,1.5 parent: 1 -- proto: VendingMachineJaniDrobe +- proto: VendingMachineGames entities: - - uid: 1388 + - uid: 6310 components: - type: Transform - pos: -6.5,-9.5 + pos: 1.5,35.5 parent: 1 -- proto: VendingMachineLawDrobe +- proto: VendingMachineJaniDrobe entities: - - uid: 5466 + - uid: 1388 components: - type: Transform - pos: -0.5,-34.5 + pos: -6.5,-9.5 parent: 1 - proto: VendingMachineMailDrobe entities: @@ -36736,19 +38031,19 @@ entities: - type: Transform pos: -27.5,1.5 parent: 1 -- proto: VendingMachineRepDrobe +- proto: VendingMachineRobotics entities: - - uid: 5464 + - uid: 5365 components: - type: Transform - pos: 1.5,37.5 + pos: 2.5,15.5 parent: 1 -- proto: VendingMachineRobotics +- proto: VendingMachineSalvagePOI entities: - - uid: 5365 + - uid: 5660 components: - type: Transform - pos: 2.5,15.5 + pos: -0.5,-34.5 parent: 1 - proto: VendingMachineSec entities: @@ -36764,13 +38059,6 @@ entities: - type: Transform pos: 2.5,22.5 parent: 1 -- proto: VendingMachineTheater - entities: - - uid: 5465 - components: - - type: Transform - pos: 1.5,38.5 - parent: 1 - proto: VendingMachineVendomatPOI entities: - uid: 5381 @@ -36780,10 +38068,10 @@ entities: parent: 1 - proto: VendingMachineYouToolPOI entities: - - uid: 5363 + - uid: 5661 components: - type: Transform - pos: 2.5,16.5 + pos: 2.5,14.5 parent: 1 - proto: WallmountTelevision entities: @@ -36834,6 +38122,24 @@ entities: rot: 3.141592653589793 rad pos: 26.5,-12.5 parent: 1 + - uid: 81 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 53.5,19.5 + parent: 1 + - uid: 110 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 69.5,3.5 + parent: 1 + - uid: 111 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 47.5,19.5 + parent: 1 - uid: 127 components: - type: Transform @@ -39856,6 +41162,24 @@ entities: rot: 3.141592653589793 rad pos: -5.5,17.5 parent: 1 + - uid: 5483 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 69.5,-2.5 + parent: 1 + - uid: 6164 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 53.5,-18.5 + parent: 1 + - uid: 6165 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 47.5,-18.5 + parent: 1 - proto: WallReinforcedDiagonal entities: - uid: 395 @@ -41550,7 +42874,6 @@ entities: - type: DeviceLinkSource lastSignals: DoorStatus: True - state: Opening - type: Airlock autoClose: False - uid: 49 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml index 7a1d8763ce2..74692516bbe 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml @@ -15,6 +15,7 @@ FoodCondimentBottleKetchup: 2 FoodCondimentBottleBBQ: 2 FoodCondimentBottleVinegar: 5 # Frontier 2<5 + FoodCondimentBottleSoysauce: 5 # Frontier # ReagentContainerOliveoil: 2 # Frontier - Replaced with OilJarOlive ReagentContainerMayo: 2 OilJarOlive: 1 # Frontier diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml index 64622172a9c..a685f27b714 100644 --- a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml +++ b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml @@ -15,7 +15,6 @@ canBeAntag: false icon: "JobIconPrisoner" supervisors: job-supervisors-prisoner - weight: 10 # Frontier displayWeight: 10 # Frontier special: - !type:AddImplantSpecial diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml index 1fc9b4b2e91..2b151e88215 100644 --- a/Resources/Prototypes/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/Roles/Jobs/departments.yml @@ -12,7 +12,7 @@ name: department-Civilian description: department-NFCivilian-description # Frontier color: "#9FED58" - weight: 0 # Frontier: -10<0 accounted for in jobs + weight: -10 roles: # - Bartender # Frontier # - Botanist # Frontier @@ -79,7 +79,7 @@ - Sheriff # Frontier - StationTrafficController # Frontier primary: false - weight: 2 # Frontier: 100<2 - accounted for in jobs + weight: 100 - type: department id: Engineering diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Crates/materials.yml b/Resources/Prototypes/_NF/Catalog/Fills/Crates/materials.yml index 5f0c4e4a073..41ad228c95c 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Crates/materials.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Crates/materials.yml @@ -19,3 +19,17 @@ contents: - id: MaterialBiomass amount: 3 + +# region Materials +- type: entity + parent: [ CrateGenericSteel, StorageFillMaterialsBasic ] + id: CrateMaterialsBasicFilled + suffix: Filled, Basic Materials (full) + name: materials crate + +- type: entity + parent: [ CrateGenericSteel, StorageFillMaterialsBasic10 ] + id: CrateMaterialsBasic10Filled + suffix: Filled, Basic Materials (10) + name: materials crate +# endregion Materials diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/drinks_special.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/drinks_special.yml index 540220d33a0..aa1b02ed101 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/drinks_special.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/drinks_special.yml @@ -2,7 +2,7 @@ parent: [BaseItem, BartenderMixer] id: DrinkIceBucketEmpty name: ice bucket - suffix: empty + suffix: Empty description: A special bucket that was specifically designed to hold ice. components: - type: SolutionContainerManager diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/Containers/condiments.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/Containers/condiments.yml index 6b43a731960..879d46639c8 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/Containers/condiments.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/Containers/condiments.yml @@ -86,3 +86,39 @@ - type: SolutionContainerVisuals maxFillLevels: 6 fillBaseName: squeeze-bottle-clear + +- type: entity + parent: [DrinkBottleVisualsAll, DrinkBottleGlassBaseFull] + id: FoodCondimentBottleSoysauce + name: soy sauce bottle + description: Used to season dishes to umami perfection. With extra sodium! + components: + - type: Appearance + - type: GenericVisualizer + visuals: + enum.OpenableVisuals.Opened: + enum.OpenableVisuals.Layer: + True: {state: "icon_open"} + False: {state: "icon_empty"} + - type: Item + size: Small + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: Soysauce + Quantity: 30 + - type: SolutionTransfer + playTransferSound: false + canChangeTransferAmount: true + minTransferAmount: 1 + maxTransferAmount: 5 + - type: Sprite + sprite: _NF/Objects/Consumable/Food/soysauce.rsi + state: icon + - type: Openable + closeable: true + - type: SolutionContainerVisuals + maxFillLevels: 5 + fillBaseName: fill- diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/meals.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/meals.yml index 2a16a535a9c..1a37b7f73da 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/meals.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/meals.yml @@ -361,3 +361,193 @@ - type: Tag tags: - Fruit + +- type: entity + name: basic noodles + parent: FoodBowlBase + id: FoodMealBasicNoodles + description: A simple ramen bowl of noodles and broth. Yum! + components: + - type: FlavorProfile + flavors: + - finenoodles + - richbroth + - type: Sprite + sprite: _NF/Objects/Consumable/Food/bowl.rsi + layers: + - state: bowl + - state: basic-noodles + - type: SolutionContainerManager + solutions: + food: + maxVol: 35 + reagents: + - ReagentId: Nutriment + Quantity: 15 + - ReagentId: Flavorol + Quantity: 10 + +- type: entity + name: miso noodles + parent: FoodBowlBase + id: FoodMealMisoNoodles + description: Miso, or fermented bean paste, broth with scallion and egg. Robust! + components: + - type: FlavorProfile + flavors: + - finenoodles + - richbroth + - tangy + - type: Sprite + sprite: _NF/Objects/Consumable/Food/bowl.rsi + layers: + - state: bowl + - state: miso-noodles + - type: SolutionContainerManager + solutions: + food: + maxVol: 35 + reagents: + - ReagentId: Nutriment + Quantity: 15 + - ReagentId: Vitamin + Quantity: 5 + - ReagentId: Flavorol + Quantity: 10 + - ReagentId: Protein + Quantity: 3 + - type: Tag + tags: + - Meat + +- type: entity + name: shio noodles + parent: FoodBowlBase + id: FoodMealShioNoodles + description: Sea salt broth with corn and seaweed. Light! + components: + - type: FlavorProfile + flavors: + - finenoodles + - richbroth + - type: Sprite + sprite: _NF/Objects/Consumable/Food/bowl.rsi + layers: + - state: bowl + - state: shio-noodles + - type: SolutionContainerManager + solutions: + food: + maxVol: 35 + reagents: + - ReagentId: Nutriment + Quantity: 15 + - ReagentId: Vitamin + Quantity: 5 + - ReagentId: Flavorol + Quantity: 10 + - ReagentId: Protein + Quantity: 3 + - type: Tag + tags: + - Vegetable + +- type: entity + name: shoyu noodles + parent: FoodBowlBase + id: FoodMealShoyuNoodles + description: Soy sauce broth with corn, egg, and pork. Salty! + components: + - type: FlavorProfile + flavors: + - finenoodles + - richbroth + - savory + - type: Sprite + sprite: _NF/Objects/Consumable/Food/bowl.rsi + layers: + - state: bowl + - state: shoyu-noodles + - type: SolutionContainerManager + solutions: + food: + maxVol: 35 + reagents: + - ReagentId: Nutriment + Quantity: 15 + - ReagentId: Vitamin + Quantity: 5 + - ReagentId: Flavorol + Quantity: 10 + - ReagentId: Protein + Quantity: 3 + - type: Tag + tags: + - Vegetable + - Meat + +- type: entity + name: spicy noodles + parent: FoodBowlBase + id: FoodMealSpicyNoodles + description: A not-so-simple ramen bowl of noodles, broth, and tofu. Hot! + components: + - type: FlavorProfile + flavors: + - finenoodles + - tofu + - spicy + - type: Sprite + sprite: _NF/Objects/Consumable/Food/bowl.rsi + layers: + - state: bowl + - state: spicy-noodles + - type: SolutionContainerManager + solutions: + food: + maxVol: 35 + reagents: + - ReagentId: Nutriment + Quantity: 15 + - ReagentId: Vitamin + Quantity: 5 + - ReagentId: Flavorol + Quantity: 10 + - ReagentId: CapsaicinOil + Quantity: 3 + - type: Tag + tags: + - Vegetable + +- type: entity + name: tonkatsu noodles + parent: FoodBowlBase + id: FoodMealTonkatsuNoodles + description: Pork bone broth with garlic and pork. Rich! + components: + - type: FlavorProfile + flavors: + - finenoodles + - savory + - garlic + - type: Sprite + sprite: _NF/Objects/Consumable/Food/bowl.rsi + layers: + - state: bowl + - state: tonkatsu-noodles + - type: SolutionContainerManager + solutions: + food: + maxVol: 35 + reagents: + - ReagentId: Nutriment + Quantity: 15 + - ReagentId: Vitamin + Quantity: 5 + - ReagentId: Flavorol + Quantity: 10 + - ReagentId: Protein + Quantity: 3 + - type: Tag + tags: + - Meat diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml index eee26763396..5a227ee8ae2 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml @@ -536,6 +536,13 @@ - TargetHuman - TargetSyndicate - WeaponDisablerPractice + - SpeedLoaderRifleHeavyRubber + - SpeedLoaderMagnumRubber + - MagazineRifleRubber + - MagazineShotgunBeanbag + - MagazineShotgunSlug + - MagazinePistolRubber + - MagazineLightRifleRubber # - WeaponFlareGunSecurity - WeaponLaserCarbinePractice - Zipties @@ -719,11 +726,19 @@ - MagazineBoxRifle - CrossbowBolt - CrossbowBoltBroadhead + - BoxBeanbag + - BoxShotgunSlug + - MagazineBoxLightRifleRubber + - MagazineBoxMagnumRubber + - MagazineBoxPistolRubber + - MagazineBoxRifleRubber ## Mags / Speedloaders / Clips - MagazineNovaliteC1Empty - MagazineNovaliteC1 + - MagazineNovaliteC1Rubber - MagazineLightRifleLowCapacityEmpty - MagazineLightRifleLowCapacity + - MagazineLightRifleLowCapacityRubber - MagazineLightRifle - MagazineLightRifleEmpty - MagazineRifle @@ -732,6 +747,13 @@ - MagazinePistolEmpty - SpeedLoaderRifleHeavy - SpeedLoaderRifleHeavyEmpty + - SpeedLoaderRifleHeavyRubber + - SpeedLoaderMagnumRubber + - MagazineRifleRubber + - MagazineShotgunSlug + - MagazinePistolRubber + - MagazineLightRifleRubber + - MagazineShotgunBeanbag dynamicRecipes: # Shared lathe recipes ## Advanced tools diff --git a/Resources/Prototypes/_NF/Flavors/flavors.yml b/Resources/Prototypes/_NF/Flavors/flavors.yml index 3178c09951e..567e44f6e7a 100644 --- a/Resources/Prototypes/_NF/Flavors/flavors.yml +++ b/Resources/Prototypes/_NF/Flavors/flavors.yml @@ -52,3 +52,18 @@ id: wassail flavorType: Complex description: flavor-complex-wassail + +- type: flavor + id: finenoodles + flavorType: Complex + description: flavor-complex-fine-noodles + +- type: flavor + id: richbroth + flavorType: Complex + description: flavor-complex-rich-broth + +- type: flavor + id: tangy + flavorType: Complex + description: flavor-complex-tangy diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/tools.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/tools.yml index 2dbe0325de8..b14359e7b83 100644 --- a/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/tools.yml +++ b/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/tools.yml @@ -140,3 +140,27 @@ storage: back: - BibleUserImplanter + +- type: loadout + id: ContractorMonkeyCubeWrapped + name: monkey cube + description: Unwrap this to get a monkey cube. + previewEntity: MonkeyCubeWrapped + effects: + - !type:GroupLoadoutEffect + proto: ContractorT2 + price: 500 + inhand: + - MonkeyCubeWrapped + +- type: loadout + id: ContractorKoboldCubeWrapped + name: kobold cube + description: Unwrap this to get a kobold cube. + previewEntity: KoboldCubeWrapped + effects: + - !type:GroupLoadoutEffect + proto: ContractorT2 + price: 500 + inhand: + - KoboldCubeWrapped \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Loadouts/contractor_loadout_groups.yml b/Resources/Prototypes/_NF/Loadouts/contractor_loadout_groups.yml index e3112b8fa0f..fe0fcd4d034 100644 --- a/Resources/Prototypes/_NF/Loadouts/contractor_loadout_groups.yml +++ b/Resources/Prototypes/_NF/Loadouts/contractor_loadout_groups.yml @@ -723,6 +723,8 @@ - ContractorHandheldCrewMonitor - ContractorHypoMini - ContractorBible + - ContractorMonkeyCubeWrapped + - ContractorKoboldCubeWrapped - type: loadoutGroup id: ContractorFun # Left Hand - 1 only diff --git a/Resources/Prototypes/_NF/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/_NF/Recipes/Cooking/meal_recipes.yml index 7be8a8bf2ab..389a2876679 100644 --- a/Resources/Prototypes/_NF/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/_NF/Recipes/Cooking/meal_recipes.yml @@ -663,3 +663,99 @@ recipeType: - Oven - Microwave + +# ramen + +- type: microwaveMealRecipe + id: RecipeBasicNoodles + name: basic noodles + result: FoodMealBasicNoodles + time: 10 + solids: + FoodBowlBig: 1 + FoodNoodlesBoiled: 1 + reagents: + Soysauce: 5 + Water: 15 + recipeType: + - Oven + +- type: microwaveMealRecipe + id: RecipeMisoNoodles + name: miso noodles + result: FoodMealMisoNoodles + time: 20 + solids: + FoodBowlBig: 1 + FoodNoodlesBoiled: 1 + FoodSoybeans: 1 + FoodEgg: 1 + FoodButterSlice: 1 + reagents: + Water: 20 + recipeType: + - Oven + +- type: microwaveMealRecipe + id: RecipeShioNoodles + name: shio noodles + result: FoodMealShioNoodles + time: 15 + solids: + FoodBowlBig: 1 + FoodNoodlesBoiled: 1 + FoodCorn: 1 + reagents: + Water: 20 + recipeType: + - Oven + +- type: microwaveMealRecipe + id: RecipeShoyuNoodles + name: shoyunoodles + result: FoodMealShoyuNoodles + time: 20 + solids: + FoodBowlBig: 1 + FoodNoodlesBoiled: 1 + FoodEgg: 1 + FoodCorn: 1 + FoodMeatBacon: 1 + reagents: + Soysauce: 10 + Water: 10 + recipeType: + - Oven + +- type: microwaveMealRecipe + id: RecipeSpicyNoodles + name: spicynoodles + result: FoodMealSpicyNoodles + time: 20 + solids: + FoodBowlBig: 1 + FoodNoodlesBoiled: 1 + FoodTofuSlice: 1 + FoodChiliPepper: 1 + reagents: + Soysauce: 5 + Water: 15 + recipeType: + - Oven + +- type: microwaveMealRecipe + id: RecipeTonkatsuNoodles + name: tonkatsu noodles + result: FoodMealTonkatsuNoodles + time: 20 + solids: + FoodBowlBig: 1 + FoodNoodlesBoiled: 1 + FoodSoybeans: 1 + FoodGarlic: 1 + FoodMeatBacon: 1 + reagents: + Soysauce: 5 + Water: 15 + recipeType: + - Oven diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/security.yml b/Resources/Prototypes/_NF/Recipes/Lathes/security.yml index e3d7fc24d4b..4e14f94d445 100644 --- a/Resources/Prototypes/_NF/Recipes/Lathes/security.yml +++ b/Resources/Prototypes/_NF/Recipes/Lathes/security.yml @@ -30,12 +30,27 @@ materials: Steel: 245 # 20 [Steel per empty mag] + 15 [bullets] * 15 [Steel per bullet] +- type: latheRecipe # novalite rubber mag + id: MagazineNovaliteC1Rubber + parent: BaseAmmoRecipe + result: MagazineNovaliteC1Rubber + materials: + Steel: 82 #33% of 245 in steel + Plastic: 163 #66% of 245 + - type: latheRecipe # gestio mag empty id: MagazineLightRifleLowCapacityEmpty parent: BaseEmptyAmmoRecipe result: MagazineLightRifleLowCapacityEmpty materials: Steel: 20 +- type: latheRecipe # Gestio small rubber mag + id: MagazineLightRifleLowCapacityRubber + parent: BaseAmmoRecipe + result: MagazineLightRifleLowCapacityRubber + materials: + Steel: 82 #33% of cost in steel + Plastic: 163 #66% of 245 - type: latheRecipe # gestio mag id: MagazineLightRifleLowCapacity @@ -58,6 +73,14 @@ materials: Steel: 140 # 25 [Steel per empty mag] + 8 [bullets] * 15 [Steel per bullet] +- type: latheRecipe + id: SpeedLoaderRifleHeavyRubber #Argenti rubber loader + parent: BaseAmmoRecipe + result: SpeedLoaderRifleHeavyRubber + materials: + Steel: 47 #33% of cost in Steel + Plastic: 93 #66% of cost in Plastic + - type: latheRecipe id: SpeedLoaderRifleHeavyPractice parent: BaseAmmoRecipe @@ -82,6 +105,14 @@ Steel: 25 # 25 [Steel per empty mag] Plastic: 120 # 8 [bullets] * 15 [Plastic per bullet] +- type: latheRecipe + id: MagazinePistolRubber + parent: BaseAmmoRecipe + result: MagazinePistolRubber + materials: + Steel: 100 #50% of box cost + Plastic: 200 #50% of box cost + - type: latheRecipe id: MagazineBoxLightRifleRubber parent: BaseAmmoRecipe @@ -90,6 +121,14 @@ Steel: 300 Plastic: 600 +- type: latheRecipe + id: MagazineLightRifleRubber + parent: BaseAmmoRecipe + result: MagazineLightRifleRubber + materials: + Steel: 150 #50% of ammo box + Plastic: 300 #50% of ammo box + - type: latheRecipe id: MagazineBoxMagnumRubber parent: BaseAmmoRecipe @@ -98,6 +137,14 @@ Steel: 80 Plastic: 160 +- type: latheRecipe + id: SpeedLoaderMagnumRubber + parent: BaseAmmoRecipe + result: SpeedLoaderMagnumRubber + materials: + Steel: 40 #50% of ammo box + Plastic: 80 #50% of ammo box + - type: latheRecipe id: MagazineBoxPistolRubber parent: BaseAmmoRecipe @@ -113,6 +160,13 @@ materials: Steel: 250 Plastic: 500 +- type: latheRecipe + id: MagazineRifleRubber + parent: BaseAmmoRecipe + result: MagazineRifleRubber + materials: + Steel: 125 #50% of ammo box + Plastic: 250 #50% of ammo box - type: latheRecipe id: ShellTranquilizer # Removed upstream @@ -133,4 +187,4 @@ - type: latheRecipe id: HoloprojectorNfsd parent: ClothingEyesHudSecurity - result: HoloprojectorNfsdEmpty \ No newline at end of file + result: HoloprojectorNfsdEmpty diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Civilian/contractor.yml b/Resources/Prototypes/_NF/Roles/Jobs/Civilian/contractor.yml index e7c7e1374cc..8b6876c9a08 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/Civilian/contractor.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/Civilian/contractor.yml @@ -6,7 +6,6 @@ startingGear: ContractorGear icon: "JobIconContractor" supervisors: job-supervisors-hire - weight: -1 # Prioritize station & department jobs displayWeight: 40 # Top accessGroups: # Frontier - GeneralAccess # Frontier diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Civilian/mercenary.yml b/Resources/Prototypes/_NF/Roles/Jobs/Civilian/mercenary.yml index 7f433199fd7..47820530de6 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/Civilian/mercenary.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/Civilian/mercenary.yml @@ -10,7 +10,7 @@ canBeAntag: true icon: "JobIconMercenary" supervisors: job-supervisors-hire - weight: -1 # Prioritize station & department jobs + weight: 3 # Prioritize station & department jobs displayWeight: 20 # Second from the bottom setPreference: true access: diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Civilian/pilot.yml b/Resources/Prototypes/_NF/Roles/Jobs/Civilian/pilot.yml index e65a9a10086..5b44c5ff5f6 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/Civilian/pilot.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/Civilian/pilot.yml @@ -9,7 +9,7 @@ startingGear: PilotGear icon: "JobIconPilot" supervisors: job-supervisors-hire - weight: -1 # Prioritize station & department jobs + weight: 2 # Prioritize station & department jobs displayWeight: 30 # Second from the top accessGroups: # Frontier - GeneralAccess diff --git a/Resources/Prototypes/_NF/Roles/Jobs/departments.yml b/Resources/Prototypes/_NF/Roles/Jobs/departments.yml index 9057f9c8c93..d431d2a6c87 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/departments.yml @@ -3,7 +3,7 @@ name: department-Frontier description: department-NF-description color: "#334E6D" - weight: 1 # accounted for in jobs + weight: 50 # accounted for in jobs roles: - StationRepresentative - StationTrafficController @@ -17,7 +17,7 @@ name: department-Antag description: department-NFAntag-description color: "#DE3A3A" - weight: -1 # accounted for in jobs + weight: -20 # accounted for in jobs roles: - PirateCaptain - PirateFirstMate diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/bowl.rsi/basic-noodles.png b/Resources/Textures/_NF/Objects/Consumable/Food/bowl.rsi/basic-noodles.png new file mode 100644 index 00000000000..7c3ca70dd19 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Food/bowl.rsi/basic-noodles.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/bowl.rsi/meta.json b/Resources/Textures/_NF/Objects/Consumable/Food/bowl.rsi/meta.json index 0a3b323861d..2ceb8176a6a 100644 --- a/Resources/Textures/_NF/Objects/Consumable/Food/bowl.rsi/meta.json +++ b/Resources/Textures/_NF/Objects/Consumable/Food/bowl.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa. Fills created by potato1234_x, edited by Dusty Lens", + "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa. Fills created by potato1234_x, pears, avocado, greek by Dusty Lens, -noodles by wallfloweghost (discord)", "size": { "x": 32, "y": 32 @@ -16,6 +16,24 @@ { "name": "avocado" }, + { + "name": "basic-noodles" + }, + { + "name": "miso-noodles" + }, + { + "name": "shio-noodles" + }, + { + "name": "shoyu-noodles" + }, + { + "name": "spicy-noodles" + }, + { + "name": "tonkatsu-noodles" + }, { "name": "poachedpear" }, diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/bowl.rsi/miso-noodles.png b/Resources/Textures/_NF/Objects/Consumable/Food/bowl.rsi/miso-noodles.png new file mode 100644 index 00000000000..f5ee9aa91ae Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Food/bowl.rsi/miso-noodles.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/bowl.rsi/shio-noodles.png b/Resources/Textures/_NF/Objects/Consumable/Food/bowl.rsi/shio-noodles.png new file mode 100644 index 00000000000..fea572582a0 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Food/bowl.rsi/shio-noodles.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/bowl.rsi/shoyu-noodles.png b/Resources/Textures/_NF/Objects/Consumable/Food/bowl.rsi/shoyu-noodles.png new file mode 100644 index 00000000000..eede6fab3d6 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Food/bowl.rsi/shoyu-noodles.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/bowl.rsi/spicy-noodles.png b/Resources/Textures/_NF/Objects/Consumable/Food/bowl.rsi/spicy-noodles.png new file mode 100644 index 00000000000..fd597a3abf7 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Food/bowl.rsi/spicy-noodles.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/bowl.rsi/tonkatsu-noodles.png b/Resources/Textures/_NF/Objects/Consumable/Food/bowl.rsi/tonkatsu-noodles.png new file mode 100644 index 00000000000..a116fb02451 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Food/bowl.rsi/tonkatsu-noodles.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/soysauce.rsi/fill-1.png b/Resources/Textures/_NF/Objects/Consumable/Food/soysauce.rsi/fill-1.png new file mode 100644 index 00000000000..67507351576 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Food/soysauce.rsi/fill-1.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/soysauce.rsi/fill-2.png b/Resources/Textures/_NF/Objects/Consumable/Food/soysauce.rsi/fill-2.png new file mode 100644 index 00000000000..a3d5cdf4940 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Food/soysauce.rsi/fill-2.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/soysauce.rsi/fill-3.png b/Resources/Textures/_NF/Objects/Consumable/Food/soysauce.rsi/fill-3.png new file mode 100644 index 00000000000..ed62bd33dae Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Food/soysauce.rsi/fill-3.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/soysauce.rsi/fill-4.png b/Resources/Textures/_NF/Objects/Consumable/Food/soysauce.rsi/fill-4.png new file mode 100644 index 00000000000..0ec1498262f Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Food/soysauce.rsi/fill-4.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/soysauce.rsi/fill-5.png b/Resources/Textures/_NF/Objects/Consumable/Food/soysauce.rsi/fill-5.png new file mode 100644 index 00000000000..b0ef447bdc5 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Food/soysauce.rsi/fill-5.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/soysauce.rsi/icon.png b/Resources/Textures/_NF/Objects/Consumable/Food/soysauce.rsi/icon.png new file mode 100644 index 00000000000..670629b242f Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Food/soysauce.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/soysauce.rsi/icon_empty.png b/Resources/Textures/_NF/Objects/Consumable/Food/soysauce.rsi/icon_empty.png new file mode 100644 index 00000000000..65c53fa8d50 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Food/soysauce.rsi/icon_empty.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/soysauce.rsi/icon_open.png b/Resources/Textures/_NF/Objects/Consumable/Food/soysauce.rsi/icon_open.png new file mode 100644 index 00000000000..4d1a8b72d66 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Food/soysauce.rsi/icon_open.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/soysauce.rsi/meta.json b/Resources/Textures/_NF/Objects/Consumable/Food/soysauce.rsi/meta.json new file mode 100644 index 00000000000..7dd987eaf04 --- /dev/null +++ b/Resources/Textures/_NF/Objects/Consumable/Food/soysauce.rsi/meta.json @@ -0,0 +1,36 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "soysauce by wallflowerghost (discord), edited by DustyLens", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + + { + "name": "icon" + }, + { + "name": "icon_open" + }, + { + "name": "icon_empty" + }, + { + "name": "fill-1" + }, + { + "name": "fill-2" + }, + { + "name": "fill-3" + }, + { + "name": "fill-4" + }, + { + "name": "fill-5" + } + ] +} diff --git a/Resources/_NF/migration.yml b/Resources/_NF/migration.yml index 012b6d148dc..e3045dfe41c 100644 --- a/Resources/_NF/migration.yml +++ b/Resources/_NF/migration.yml @@ -183,7 +183,7 @@ ScienceTechFabCircuitboard: ProtolatheMachineCircuitboard ScienceTechFabFlatpack: ProtolatheFlatpack # 2024-12-27 Materials crate -CrateMaterials: LockerMaterialsBasicFilled +CrateMaterials: CrateMaterialsBasicFilled # 2025-01-05 Lights ColoredLightTubeRed: LightTubeCrystalRed