From cf2194f89ec3273828f59a49434e1d16bf44c5f4 Mon Sep 17 00:00:00 2001 From: Emisse <99158783+Emisse@users.noreply.github.com> Date: Mon, 10 Apr 2023 15:34:09 -0600 Subject: [PATCH] [Map] Marathon Updatey (#15289) --- Resources/Maps/marathon.yml | 666 ++++++++++++++---------------------- 1 file changed, 254 insertions(+), 412 deletions(-) diff --git a/Resources/Maps/marathon.yml b/Resources/Maps/marathon.yml index 43fffee04f..52e7348778 100644 --- a/Resources/Maps/marathon.yml +++ b/Resources/Maps/marathon.yml @@ -453,7 +453,7 @@ entities: tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAF0AAAAAAAAAXgAAAF0AAABeAAAAAAAAAF4AAABdAAAAXgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABdAAAAAAAAAF4AAABdAAAAXgAAAAAAAABeAAAAXQAAAF4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAAABeAAAAXQAAAF4AAAAAAAAAXgAAAF0AAABeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAF0AAAAAAAAAXgAAAF0AAABeAAAAAAAAAF4AAABdAAAAXgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABdAAAAAAAAAF4AAABdAAAAXgAAAAAAAABeAAAAXQAAAF4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAF0AAABdAAAAXQAAAF0AAABdAAAAXQAAAF0AAABdAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAF0AAAAAAAAAXgAAAF0AAABeAAAAAAAAAF4AAABdAAAAXgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABdAAAAAAAAAF4AAABdAAAAXgAAAAAAAABeAAAAXQAAAF4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAAABeAAAAXQAAAF4AAAAAAAAAXgAAAF0AAABeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAF0AAAAAAAAAXgAAAF0AAABeAAAAAAAAAF4AAABdAAAAXgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABdAAAAAAAAAF4AAABdAAAAXgAAAAAAAABeAAAAXQAAAF4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAAABeAAAAXQAAAF4AAAAAAAAAXgAAAF0AAABeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAF0AAAAAAAAAXgAAAF0AAABeAAAAAAAAAF4AAABdAAAAXgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABdAAAAAAAAAF4AAABdAAAAXgAAAAAAAABeAAAAXQAAAF4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAAAAAAAAAXQAAAAAAAAAAAAAAAAAAAF0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAF0AAABdAAAAXQAAAF0AAABdAAAAXQAAAF0AAABdAAAAXQAAAA== -4,-2: ind: -4,-2 - tiles: CgAAAAsAAAALAAAACgAAAAoAAAAKAAAACgAAAAoAAAAKAAAAXgAAAF0AAAAAAAAAAAAAAF0AAAAAAAAAAAAAAAoAAAALAAAACwAAAAoAAAAKAAAACgAAAAoAAAAKAAAAXgAAAF4AAABdAAAAXQAAAF0AAABdAAAAXQAAAF0AAAAKAAAACwAAAAsAAAAKAAAACgAAAAoAAAAKAAAAXgAAAF4AAABdAAAAAAAAAAAAAAAAAAAAXQAAAAAAAAAAAAAACgAAAAsAAAALAAAACwAAAAsAAAAKAAAACgAAAF4AAABdAAAAAAAAAAAAAAAAAAAAAAAAAF0AAAAAAAAAAAAAAAoAAAALAAAACwAAAAoAAAALAAAACgAAAAoAAABeAAAAXQAAAF0AAABdAAAAXQAAAF0AAABdAAAAXQAAAF0AAABeAAAAFgAAABYAAAFeAAAACwAAAAoAAAAKAAAAXgAAAF0AAAAAAAAAAAAAAAAAAABdAAAAAAAAAAAAAAAAAAAAXgAAAEQAAABEAAABXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAEQAAAIWAAABFgAAA0QAAANeAAAAFgAAARYAAAMWAAAAXgAAADkAAAA5AAAAOQAAADkAAAA5AAAAOQAAADkAAABEAAADFgAAAxYAAANEAAACXgAAABYAAAMWAAAAFgAAAxYAAAIWAAAAFgAAAxYAAAAWAAABFgAAARYAAAAWAAACFgAAAkQAAABEAAABFgAAABYAAAEWAAAAFgAAABYAAAJeAAAAOQAAADkAAAA5AAAAOQAAADkAAAA5AAAAOQAAABYAAAEWAAAAFgAAABYAAANeAAAAFgAAAxYAAAEWAAABXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAABYAAAIWAAACXgAAAF4AAABeAAAAXgAAAF4AAABdAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABdAAAAXgAAAF4AAABeAAAAXgAAAF4AAAAAAAAAAAAAAAAAAAAAAAAAXQAAAF0AAAAAAAAAAAAAAAAAAAAAAAAAXQAAAF4AAABeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAF0AAABdAAAAAAAAAAAAAAAAAAAAAAAAAF0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABdAAAAXQAAAAAAAAAAAAAAAAAAAAAAAABdAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAA== + tiles: CgAAAAsAAAALAAAACgAAAAoAAAAKAAAACgAAAAoAAAAKAAAAXgAAAF0AAAAAAAAAAAAAAF0AAAAAAAAAAAAAAAoAAAALAAAACwAAAAoAAAAKAAAACgAAAAoAAAAKAAAAXgAAAF4AAABdAAAAXQAAAF0AAABdAAAAXQAAAF0AAAAKAAAACwAAAAsAAAAKAAAACgAAAAoAAAAKAAAAXgAAAF4AAABdAAAAAAAAAAAAAAAAAAAAXQAAAAAAAAAAAAAACgAAAAsAAAALAAAACwAAAAsAAAAKAAAACgAAAF4AAABdAAAAAAAAAAAAAAAAAAAAAAAAAF0AAAAAAAAAAAAAAAoAAAALAAAACwAAAAoAAAALAAAACgAAAAoAAABeAAAAXQAAAF0AAABdAAAAXQAAAF0AAABdAAAAXQAAAF0AAABeAAAAFgAAABYAAAFeAAAACwAAAAoAAAAKAAAAXgAAAF0AAAAAAAAAAAAAAAAAAABdAAAAAAAAAAAAAAAAAAAAXgAAAEQAAABEAAABXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAEQAAAIWAAABFgAAA0QAAANeAAAAFgAAARYAAAMWAAAAXgAAADkAAAA5AAAAOQAAADkAAAA5AAAAOQAAADkAAABEAAADFgAAAxYAAANEAAACXgAAABYAAAMWAAAAFgAAAxYAAAIWAAAAFgAAAxYAAAAWAAABFgAAARYAAAAWAAACFgAAAkQAAABEAAABFgAAABYAAAEWAAAAFgAAABYAAAJeAAAAOQAAADkAAAA5AAAAOQAAADkAAAA5AAAAOQAAABYAAAEWAAAAFgAAABYAAANeAAAAFgAAAxYAAAEWAAABXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAABYAAAIWAAACXgAAAF4AAABeAAAAXgAAAF4AAABdAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABdAAAAXgAAAF4AAABeAAAAXgAAAF4AAAAAAAAAAAAAAAAAAAAAAAAAXQAAAF0AAAAAAAAAAAAAAAAAAAAAAAAAXQAAAF4AAABeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAF0AAABdAAAAAAAAAAAAAAAAAAAAAAAAAF0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABdAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAA== -5,-2: ind: -5,-2 tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAF0AAAAAAAAAXQAAAF4AAAAKAAAACgAAAAoAAAAKAAAACgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABdAAAAAAAAAF0AAABeAAAAXgAAAAoAAAAKAAAACgAAAAoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAF0AAABdAAAAXQAAAF4AAABeAAAACgAAAAoAAAAKAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABdAAAAXgAAAAoAAAAKAAAACgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABdAAAAXQAAAF4AAAAKAAAACgAAAAoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAF0AAABeAAAACgAAAAoAAAAKAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAF0AAABdAAAAXgAAAF4AAAAKAAAAXgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABdAAAAAAAAAF0AAABeAAAAXgAAAF4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAAABdAAAAXQAAAF0AAABeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAF0AAABdAAAAXQAAAF0AAAAAAAAAXgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABdAAAAXQAAAF4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAAABeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAF4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA== @@ -5416,8 +5416,7 @@ entities: 0,-3: 0: 65535 0,-2: - 0: 65503 - 1: 32 + 0: 65535 0,-1: 0: 65535 1,-3: @@ -5456,8 +5455,7 @@ entities: 0: 65535 -4,3: 0: 61167 - 2: 272 - 3: 4096 + 1: 4368 -3,0: 0: 65535 -3,1: @@ -5493,8 +5491,7 @@ entities: -8,1: 0: 65535 -8,2: - 0: 65503 - 1: 32 + 0: 65535 -8,3: 0: 65535 -7,0: @@ -5513,28 +5510,24 @@ entities: 0: 65535 -6,3: 0: 30719 - 3: 34816 + 1: 34816 -5,0: 0: 65535 -5,1: - 0: 65343 - 1: 64 - 4: 128 + 0: 65535 -5,2: 0: 65535 -5,3: 0: 63 - 3: 65472 + 1: 65472 0,5: 0: 65535 0,6: 0: 65535 1,4: - 0: 63999 - 1: 1536 + 0: 65535 1,5: - 0: 65533 - 1: 2 + 0: 65535 1,6: 0: 65535 2,4: @@ -5544,15 +5537,14 @@ entities: 2,6: 0: 65535 -4,4: - 3: 17 + 1: 17 0: 65518 -4,5: 0: 65535 -4,6: 0: 65535 -3,4: - 0: 16383 - 1: 49152 + 0: 65535 -3,5: 0: 65535 -3,6: @@ -5568,8 +5560,7 @@ entities: -1,6: 0: 65535 -8,4: - 0: 65407 - 1: 128 + 0: 65535 -8,5: 0: 65535 -8,6: @@ -5577,8 +5568,7 @@ entities: -8,7: 0: 65535 -7,4: - 0: 48927 - 1: 16608 + 0: 65535 -7,5: 0: 65535 -7,6: @@ -5587,7 +5577,7 @@ entities: 0: 65535 -6,4: 0: 65527 - 3: 8 + 1: 8 -6,5: 0: 65535 -6,6: @@ -5595,7 +5585,7 @@ entities: -6,7: 0: 65535 -5,4: - 3: 207 + 1: 207 0: 65328 -5,5: 0: 65535 @@ -5622,8 +5612,7 @@ entities: -10,1: 0: 65535 -10,2: - 0: 57343 - 1: 8192 + 0: 65535 -10,3: 0: 65535 -9,0: @@ -5633,8 +5622,7 @@ entities: -9,2: 0: 65535 -9,3: - 0: 65399 - 1: 136 + 0: 65535 -12,4: 0: 65535 -12,5: @@ -5642,11 +5630,9 @@ entities: -12,6: 0: 65535 -12,7: - 0: 32767 - 1: 32768 + 0: 65535 -11,4: - 0: 61439 - 1: 4096 + 0: 65535 -11,5: 0: 65535 -11,6: @@ -5654,8 +5640,7 @@ entities: -11,7: 0: 65535 -10,4: - 0: 48063 - 1: 17472 + 0: 65535 -10,5: 0: 65535 -10,6: @@ -5675,11 +5660,9 @@ entities: -15,3: 0: 65535 -15,2: - 0: 61166 - 5: 17 + 0: 61183 -15,1: - 0: 35055 - 5: 30464 + 0: 65519 -14,1: 0: 65535 -14,2: @@ -5713,29 +5696,23 @@ entities: -9,-1: 0: 65535 -15,-2: - 0: 60928 - 5: 4592 + 0: 65520 -15,-1: - 0: 35054 - 5: 1 + 0: 35055 -14,-2: - 0: 65280 - 5: 240 + 0: 65520 -14,-1: 0: 65535 -13,-2: - 0: 65416 - 5: 112 + 0: 65528 -13,-1: 0: 65535 -13,-3: 0: 34952 -8,-1: - 0: 65519 - 1: 16 + 0: 65535 -7,-1: - 0: 63351 - 1: 2184 + 0: 65535 -8,8: 0: 65535 -8,9: @@ -5751,8 +5728,7 @@ entities: -7,10: 0: 65535 -7,11: - 0: 65527 - 1: 8 + 0: 65535 -6,8: 0: 65535 -6,9: @@ -5764,33 +5740,27 @@ entities: -12,8: 0: 65535 -12,9: - 0: 57343 - 1: 8192 + 0: 65535 -12,10: - 0: 64511 - 1: 1024 + 0: 65535 -12,11: 0: 65535 -11,8: 0: 65535 -11,9: - 0: 57343 - 1: 8192 + 0: 65535 -11,10: - 0: 64511 - 1: 1024 + 0: 65535 -11,11: 0: 65535 -10,8: 0: 65535 -10,9: - 0: 57343 - 1: 8192 + 0: 65535 -10,10: 0: 65535 -10,11: - 0: 64511 - 1: 1024 + 0: 65535 -9,8: 0: 65535 -9,9: @@ -5822,11 +5792,9 @@ entities: -14,6: 0: 65535 -14,7: - 0: 65279 - 1: 256 + 0: 65535 -13,4: - 0: 30591 - 1: 34944 + 0: 65535 -13,5: 0: 65535 -13,6: @@ -5838,36 +5806,29 @@ entities: -16,9: 0: 65518 -16,10: - 0: 65278 - 1: 256 + 0: 65534 -16,11: 0: 53247 -15,8: - 1: 1 - 0: 65534 + 0: 65535 -15,9: - 0: 65315 - 1: 16 + 0: 65331 -15,10: - 0: 65343 - 1: 192 + 0: 65535 -15,11: 0: 65535 -14,8: 0: 65535 -14,10: - 0: 65495 - 1: 40 + 0: 65535 -14,11: 0: 65535 -13,8: - 0: 65527 - 1: 8 + 0: 65535 -13,9: 0: 65535 -13,10: - 0: 63487 - 1: 2048 + 0: 65535 -13,11: 0: 65535 -14,12: @@ -5879,35 +5840,27 @@ entities: -14,15: 0: 52462 -13,12: - 0: 61439 - 1: 4096 + 0: 65535 -13,13: - 0: 65471 - 1: 64 + 0: 65535 -13,14: 0: 65535 -13,15: - 0: 65531 - 1: 4 + 0: 65535 -12,12: - 0: 32639 - 1: 32896 + 0: 65535 -12,13: - 0: 65399 - 1: 136 + 0: 65535 -12,14: - 0: 65527 - 1: 8 + 0: 65535 -12,15: - 0: 65531 - 1: 4 + 0: 65535 -11,12: 0: 65535 -11,13: 0: 65535 -11,14: - 0: 65527 - 1: 8 + 0: 65535 -11,15: 0: 16383 -10,12: @@ -5915,8 +5868,7 @@ entities: -10,13: 0: 65535 -10,14: - 0: 65533 - 1: 2 + 0: 65535 -10,15: 0: 49151 -9,12: @@ -5924,21 +5876,17 @@ entities: -9,13: 0: 65535 -9,14: - 0: 65533 - 1: 2 + 0: 65535 -9,15: - 0: 61937 - 1: 14 + 0: 61951 -8,12: 0: 65535 -8,13: 0: 65535 -8,14: - 0: 65533 - 1: 2 + 0: 65535 -8,15: - 1: 3 - 0: 61948 + 0: 61951 -7,12: 0: 65535 -7,13: @@ -5950,8 +5898,7 @@ entities: -6,12: 0: 65535 -6,13: - 0: 65471 - 1: 64 + 0: 65535 -5,12: 0: 4369 -5,13: @@ -5999,8 +5946,7 @@ entities: -5,7: 0: 65535 -5,8: - 0: 65531 - 1: 4 + 0: 65535 -5,9: 0: 65535 -5,10: @@ -6032,13 +5978,11 @@ entities: -2,11: 0: 65535 -1,8: - 0: 65471 - 1: 64 + 0: 65535 -1,9: 0: 65535 -1,10: - 0: 40955 - 1: 4 + 0: 40959 -1,11: 0: 35065 0,8: @@ -6046,8 +5990,7 @@ entities: 0,9: 0: 40723 0,10: - 0: 52605 - 1: 128 + 0: 52733 0,11: 0: 35068 1,8: @@ -6085,8 +6028,7 @@ entities: 4,6: 0: 65535 4,7: - 0: 45055 - 1: 20480 + 0: 65535 5,6: 0: 65535 5,7: @@ -6110,31 +6052,25 @@ entities: 5,9: 0: 65535 5,10: - 0: 63487 - 1: 2048 + 0: 65535 6,8: 0: 65535 6,9: 0: 65535 6,10: - 0: 63487 - 1: 2048 + 0: 65535 7,8: - 0: 61951 - 1: 3584 + 0: 65535 7,9: - 0: 57343 - 1: 8192 + 0: 65535 8,8: - 0: 65279 - 1: 256 + 0: 65535 8,6: 0: 65535 8,7: 0: 65535 3,2: - 1: 1 - 0: 65534 + 0: 65535 3,3: 0: 65535 -4,-4: @@ -6148,8 +6084,7 @@ entities: -3,-4: 0: 65535 -3,-3: - 0: 65531 - 1: 4 + 0: 65535 -3,-2: 0: 65535 -3,-1: @@ -6159,13 +6094,11 @@ entities: -2,-3: 0: 65535 -1,-4: - 1: 1 - 0: 65534 + 0: 65535 0,-4: 0: 65535 1,-4: - 0: 65023 - 1: 512 + 0: 65535 2,-4: 0: 65535 2,-3: @@ -6181,8 +6114,7 @@ entities: 3,4: 0: 65535 3,5: - 1: 1 - 0: 65534 + 0: 65535 -10,-4: 0: 65535 -10,-3: @@ -6196,30 +6128,25 @@ entities: -9,-2: 0: 65535 -8,-4: - 0: 65471 - 1: 64 + 0: 65535 -8,-3: 0: 65535 -8,-2: 0: 65535 -7,-4: - 1: 17 - 0: 65518 + 0: 65535 -7,-3: 0: 65535 -7,-2: - 0: 32767 - 1: 32768 + 0: 65535 -6,-4: 0: 65535 -6,-3: 0: 65535 -6,-2: - 0: 57343 - 6: 8192 + 0: 65535 -6,-1: - 0: 64989 - 6: 546 + 0: 65535 -5,-4: 0: 65535 -5,-3: @@ -6227,11 +6154,9 @@ entities: -5,-2: 0: 65535 -5,-1: - 0: 61167 - 1: 4368 + 0: 65535 4,4: - 0: 65529 - 1: 6 + 0: 65535 4,5: 0: 65535 5,4: @@ -6239,8 +6164,7 @@ entities: 5,5: 0: 65535 6,4: - 0: 65531 - 1: 4 + 0: 65535 6,5: 0: 65535 7,4: @@ -6258,8 +6182,7 @@ entities: 8,9: 0: 65535 8,10: - 0: 65375 - 1: 160 + 0: 65535 8,11: 0: 65535 4,0: @@ -6271,21 +6194,17 @@ entities: 4,3: 0: 65535 5,0: - 0: 65407 - 1: 128 + 0: 65535 5,1: - 0: 57343 - 1: 8192 + 0: 65535 5,2: - 0: 65501 - 1: 34 + 0: 65535 5,3: 0: 65535 6,0: 0: 65535 6,1: - 0: 65523 - 1: 12 + 0: 65535 6,2: 0: 65535 6,3: @@ -6301,8 +6220,7 @@ entities: 4,-4: 0: 65279 4,-3: - 0: 30717 - 1: 34818 + 0: 65535 4,-2: 0: 65535 4,-1: @@ -6318,8 +6236,7 @@ entities: 6,-4: 0: 65535 6,-3: - 0: 63487 - 1: 2048 + 0: 65535 6,-2: 0: 65535 6,-1: @@ -6327,22 +6244,19 @@ entities: 7,-4: 0: 63283 7,-3: - 0: 64767 - 1: 768 + 0: 65535 7,-2: 0: 65535 7,-1: 0: 65535 -4,-8: - 0: 61439 - 1: 4096 + 0: 65535 -4,-7: 0: 65535 -4,-6: 0: 65535 -4,-5: - 0: 61423 - 1: 4112 + 0: 65535 -3,-8: 0: 65535 -3,-7: @@ -6350,8 +6264,7 @@ entities: -3,-6: 0: 65535 -3,-5: - 0: 65519 - 1: 16 + 0: 65535 -2,-8: 0: 65535 -2,-7: @@ -6359,8 +6272,7 @@ entities: -2,-6: 0: 65535 -2,-5: - 1: 1 - 0: 65534 + 0: 65535 -1,-8: 0: 65535 -1,-7: @@ -6378,26 +6290,22 @@ entities: -8,-5: 0: 65535 -7,-8: - 0: 65519 - 1: 16 + 0: 65535 -7,-7: 0: 65535 -7,-6: 0: 65535 -7,-5: - 0: 45047 - 1: 20488 + 0: 65535 -6,-8: 0: 65535 -6,-7: - 0: 53247 - 1: 12288 + 0: 65535 -6,-6: 0: 63631 - 3: 1904 + 1: 1904 -6,-5: - 1: 1 - 0: 65534 + 0: 65535 -5,-8: 0: 65535 -5,-7: @@ -6411,16 +6319,13 @@ entities: -11,-5: 0: 65535 -11,-7: - 0: 65487 - 1: 48 + 0: 65535 -10,-8: - 0: 65533 - 1: 2 + 0: 65535 -10,-7: 0: 65535 -10,-6: - 0: 65471 - 1: 64 + 0: 65535 -10,-5: 0: 65535 -9,-8: @@ -6452,16 +6357,13 @@ entities: 2,-7: 0: 65535 2,-6: - 0: 65343 - 1: 192 + 0: 65535 2,-5: 0: 65535 3,-8: - 0: 61183 - 1: 4352 + 0: 65535 3,-7: - 1: 1 - 0: 65534 + 0: 65535 3,-6: 0: 65535 3,-5: @@ -6484,15 +6386,15 @@ entities: 0: 65535 6,-8: 0: 7967 - 7: 224 - 5: 57344 + 2: 224 + 3: 57344 6,-7: 0: 7967 - 5: 224 - 8: 57344 + 3: 224 + 4: 57344 6,-6: 0: 65311 - 9: 224 + 5: 224 6,-5: 0: 65535 7,-8: @@ -6508,16 +6410,13 @@ entities: 8,-1: 0: 65535 0,-12: - 0: 32752 - 1: 32768 + 0: 65520 0,-11: 0: 65535 0,-10: - 0: 64247 - 1: 1288 + 0: 65535 0,-9: - 0: 61439 - 1: 4096 + 0: 65535 1,-12: 0: 62257 1,-11: @@ -6544,7 +6443,7 @@ entities: 0: 65535 6,-9: 0: 7967 - 5: 57568 + 3: 57568 7,-9: 0: 13107 -4,-12: @@ -6560,48 +6459,39 @@ entities: -3,-11: 0: 65535 -3,-10: - 0: 49087 - 1: 16448 + 0: 65535 -3,-9: 0: 65535 -2,-12: 0: 65535 -2,-11: - 0: 65523 - 1: 12 + 0: 65535 -2,-10: - 0: 49151 - 1: 16384 + 0: 65535 -2,-9: 0: 65535 -1,-12: 0: 65535 -1,-11: - 1: 7 - 0: 65528 + 0: 65535 -1,-10: 0: 65535 -1,-9: - 0: 65467 - 1: 68 + 0: 65535 -7,-12: - 0: 49151 - 1: 16384 + 0: 65535 -7,-11: - 0: 65467 - 1: 68 + 0: 65535 -7,-10: 0: 65535 -7,-9: 0: 65535 -6,-12: - 0: 57343 - 1: 8192 + 0: 65535 -6,-11: 0: 65535 -6,-10: - 0: 65529 - 1: 6 + 0: 65535 -6,-9: 0: 65535 -5,-12: @@ -6611,8 +6501,7 @@ entities: -5,-10: 0: 65535 -5,-9: - 0: 16367 - 1: 49168 + 0: 65535 -7,-13: 0: 65535 -6,-13: @@ -6620,8 +6509,7 @@ entities: -5,-14: 0: 65263 -5,-13: - 0: 32765 - 1: 32770 + 0: 65535 -5,-16: 0: 65262 -5,-15: @@ -6837,11 +6725,9 @@ entities: -9,-25: 0: 17484 8,-4: - 0: 65023 - 1: 512 + 0: 65535 8,-3: - 0: 64511 - 1: 1024 + 0: 65535 9,-4: 0: 65535 9,-3: @@ -6933,11 +6819,9 @@ entities: 11,11: 0: 65535 8,4: - 0: 57343 - 1: 8192 + 0: 65535 8,5: - 0: 65533 - 1: 2 + 0: 65535 9,4: 0: 65535 9,5: @@ -6955,16 +6839,13 @@ entities: 10,7: 0: 65535 11,4: - 0: 65407 - 1: 128 + 0: 65535 11,5: - 0: 49151 - 1: 16384 + 0: 65535 11,6: 0: 65535 11,7: - 0: 65503 - 1: 32 + 0: 65535 10,-2: 0: 4369 10,-1: @@ -6976,8 +6857,7 @@ entities: 9,0: 0: 65535 9,1: - 0: 16383 - 1: 49152 + 0: 65535 9,2: 0: 65535 9,3: @@ -6985,16 +6865,13 @@ entities: 10,0: 0: 63249 10,1: - 0: 61439 - 1: 4096 + 0: 65535 10,2: 0: 65535 10,3: - 0: 65023 - 1: 512 + 0: 65535 11,1: - 1: 1 - 0: 48122 + 0: 48123 11,2: 0: 64447 11,3: @@ -7006,11 +6883,9 @@ entities: 4,14: 0: 65535 4,15: - 0: 63487 - 1: 2048 + 0: 65535 5,12: - 0: 12851 - 1: 256 + 0: 13107 5,13: 0: 32767 5,14: @@ -7032,11 +6907,9 @@ entities: 2,15: 0: 16126 3,12: - 0: 57343 - 1: 8192 + 0: 65535 3,13: - 0: 63487 - 1: 2048 + 0: 65535 3,14: 0: 65535 3,15: @@ -7068,16 +6941,13 @@ entities: 12,6: 0: 16383 12,7: - 0: 65439 - 1: 96 + 0: 65535 13,4: - 0: 22383 - 1: 8192 + 0: 30575 13,5: 0: 30583 13,6: - 1: 1 - 0: 3958 + 0: 3959 13,7: 0: 65521 14,4: @@ -7164,7 +7034,7 @@ entities: 0: 65280 -16,14: 0: 52862 - 7: 128 + 2: 128 -16,15: 0: 3976 -16,13: @@ -7190,8 +7060,7 @@ entities: -12,-5: 0: 65535 -8,-10: - 0: 65511 - 1: 24 + 0: 65535 -8,-9: 0: 65535 -8,-12: @@ -7223,8 +7092,7 @@ entities: -18,11: 0: 12 -17,10: - 0: 64480 - 1: 1024 + 0: 65504 -17,11: 0: 17647 -20,13: @@ -7294,8 +7162,7 @@ entities: -15,-7: 0: 65535 -15,-6: - 0: 63487 - 1: 2048 + 0: 65535 -15,-5: 0: 1 -14,-8: @@ -7325,8 +7192,7 @@ entities: -20,-11: 0: 65535 -20,-10: - 0: 61435 - 1: 4 + 0: 61439 -20,-9: 0: 140 -19,-12: @@ -7406,11 +7272,9 @@ entities: -14,-15: 0: 65535 -14,-14: - 0: 65531 - 1: 4 + 0: 65535 -14,-13: - 0: 49147 - 1: 16388 + 0: 65535 -13,-16: 0: 65399 -13,-15: @@ -7432,8 +7296,7 @@ entities: -10,-10: 0: 61695 -20,-13: - 1: 1 - 0: 65534 + 0: 65535 -19,-13: 0: 65535 -18,-13: @@ -7457,8 +7320,7 @@ entities: -21,-13: 0: 65263 -22,-12: - 0: 19660 - 1: 32768 + 0: 52428 -22,-11: 0: 140 -21,-12: @@ -7470,8 +7332,7 @@ entities: -18,-17: 0: 65532 -17,-17: - 0: 65279 - 1: 256 + 0: 65535 -16,-17: 0: 65535 -12,-8: @@ -7503,8 +7364,7 @@ entities: -9,-11: 0: 65484 -9,-10: - 0: 65503 - 1: 32 + 0: 65535 -9,-9: 0: 65535 -20,-16: @@ -7512,8 +7372,7 @@ entities: -20,-15: 0: 65535 -20,-14: - 0: 65279 - 1: 256 + 0: 65535 -19,-16: 0: 65535 -19,-15: @@ -7529,8 +7388,7 @@ entities: -21,-16: 0: 65535 -21,-15: - 0: 65471 - 1: 64 + 0: 65535 -21,-14: 0: 65535 -20,-17: @@ -7572,8 +7430,7 @@ entities: 0,14: 0: 47352 0,15: - 0: 64507 - 1: 1024 + 0: 65531 1,15: 0: 64224 0,16: @@ -7674,12 +7531,12 @@ entities: 0: 65535 9,-16: 0: 22399 - 5: 43136 + 3: 43136 9,-15: 0: 65277 - 5: 258 + 3: 258 10,-16: - 5: 32769 + 3: 32769 0: 32766 10,-15: 0: 65535 @@ -7693,17 +7550,17 @@ entities: 0: 65534 8,-17: 0: 63359 - 5: 2176 + 3: 2176 8,-19: 0: 60616 9,-19: 0: 64511 - 5: 1024 + 3: 1024 9,-18: 0: 49143 - 5: 16392 + 3: 16392 9,-17: - 5: 311 + 3: 311 0: 65224 9,-20: 0: 57344 @@ -7711,19 +7568,19 @@ entities: 0: 61440 10,-19: 0: 64703 - 5: 832 + 3: 832 10,-18: 0: 29695 - 5: 35840 + 3: 35840 10,-17: 0: 65535 11,-19: 0: 29489 11,-18: 0: 60655 - 5: 4880 + 3: 4880 11,-17: - 5: 8193 + 3: 8193 0: 57342 7,-17: 0: 34944 @@ -7738,8 +7595,7 @@ entities: -10,-12: 0: 61423 -9,-12: - 0: 65279 - 1: 256 + 0: 65535 -10,-13: 0: 61184 -7,-14: @@ -7829,11 +7685,9 @@ entities: -7,-16: 0: 65535 -7,-15: - 0: 64255 - 1: 1280 + 0: 65535 -6,-15: - 0: 65279 - 1: 256 + 0: 65535 -6,-17: 0: 3 -12,-17: @@ -7863,13 +7717,13 @@ entities: -9,-14: 0: 3908 -16,1: - 5: 34816 + 0: 34816 -16,2: - 5: 136 + 0: 136 -16,-2: - 5: 34944 + 0: 34944 -16,-1: - 5: 8 + 0: 8 uniqueMixes: - volume: 2500 temperature: 293.15 @@ -7886,36 +7740,6 @@ entities: - 0 - 0 - 0 - - volume: 2500 - temperature: 293.15 - moles: - - 20.078888 - - 75.53487 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - volume: 2500 - temperature: 235 - moles: - - 20.078888 - - 75.53487 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - volume: 2500 temperature: 235 moles: @@ -7934,25 +7758,10 @@ entities: - volume: 2500 temperature: 293.15 moles: - - 14.840918 - - 55.830124 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - volume: 2500 - temperature: 293.15 - moles: - - 0 - 0 - 0 - 0 + - 6666.982 - 0 - 0 - 0 @@ -7964,10 +7773,6 @@ entities: - volume: 2500 temperature: 293.15 moles: - - 18.472576 - - 69.49208 - - 0 - - 0 - 0 - 0 - 0 @@ -7976,17 +7781,6 @@ entities: - 0 - 0 - 0 - - volume: 2500 - temperature: 293.15 - moles: - - 0 - - 0 - - 0 - - 6666.982 - - 0 - - 0 - - 0 - - 0 - 0 - 0 - 0 @@ -8034,6 +7828,8 @@ entities: shakeTimes: 10 type: GravityShake - type: GasTileOverlay + - nextUpdate: 0 + type: SpreaderGrid - uid: 31 type: FirelockGlass components: @@ -13523,7 +13319,8 @@ entities: - pos: -10.5,6.5 parent: 30 type: Transform - - bodyType: Static + - canCollide: False + bodyType: Static type: Physics - uid: 837 type: ReinforcedWindow @@ -14139,7 +13936,8 @@ entities: - pos: 18.5,-1.5 parent: 30 type: Transform - - bodyType: Static + - canCollide: False + bodyType: Static type: Physics - uid: 935 type: GasPipeStraight @@ -36960,7 +36758,8 @@ entities: - pos: 5.5,29.5 parent: 30 type: Transform - - bodyType: Static + - canCollide: False + bodyType: Static type: Physics - uid: 3658 type: SpawnPointLatejoin @@ -41499,6 +41298,65 @@ entities: type: Transform - powerLoad: 0 type: ApcPowerReceiver +- uid: 4353 + type: AirlockExternalGlassShuttleLocked + components: + - rot: 3.141592653589793 rad + pos: -63.5,-18.5 + parent: 30 + type: Transform + - fixtures: + - shape: !type:PolygonShape + radius: 0.01 + vertices: + - 0.49,-0.49 + - 0.49,0.49 + - -0.49,0.49 + - -0.49,-0.49 + mask: + - Impassable + - MidImpassable + - HighImpassable + - LowImpassable + - InteractImpassable + layer: + - MidImpassable + - HighImpassable + - BulletImpassable + - InteractImpassable + - Opaque + density: 100 + hard: True + restitution: 0 + friction: 0.4 + id: null + - shape: !type:PhysShapeCircle + radius: 0.2 + position: 0,-0.5 + mask: [] + layer: [] + density: 1 + hard: False + restitution: 0 + friction: 0.4 + id: docking + type: Fixtures +- uid: 4354 + type: FireAlarm + components: + - pos: -44.5,9.5 + parent: 30 + type: Transform + - devices: + - 1099 + - 1100 + - 1101 + - 21865 + - 4882 + - 4881 + - 20359 + - 20360 + type: DeviceList - uid: 4355 type: ComputerStationRecords components: @@ -41817,6 +41675,12 @@ entities: type: Transform - powerLoad: 0 type: ApcPowerReceiver +- uid: 4393 + type: MaterialReclaimer + components: + - pos: 30.5,-7.5 + parent: 30 + type: Transform - uid: 4394 type: PoweredSmallLight components: @@ -41920,6 +41784,12 @@ entities: type: Transform - powerLoad: 0 type: ApcPowerReceiver +- uid: 4405 + type: SpawnMobShiva + components: + - pos: -24.5,52.5 + parent: 30 + type: Transform - uid: 4409 type: Poweredlight components: @@ -137699,12 +137569,6 @@ entities: - 0 - 0 type: EntityStorage -- uid: 17341 - type: AirlockExternalGlassLocked - components: - - pos: -63.5,-18.5 - parent: 30 - type: Transform - uid: 17342 type: AirlockExternalGlassLocked components: @@ -143684,12 +143548,6 @@ entities: - pos: -53.5,-18.5 parent: 30 type: Transform -- uid: 18276 - type: Grille - components: - - pos: -53.5,-17.5 - parent: 30 - type: Transform - uid: 18277 type: Grille components: @@ -170458,22 +170316,6 @@ entities: - 3136 - 3135 type: DeviceList -- uid: 21864 - type: FireAlarm - components: - - rot: 1.5707963267948966 rad - pos: -46.5,6.5 - parent: 30 - type: Transform - - devices: - - 4882 - - 4881 - - 1101 - - 1100 - - 1099 - - invalid - - 21865 - type: DeviceList - uid: 21865 type: AirSensor components: -- 2.51.2