From fdf17021d4977d89fcd91672896ac0d5a602cc15 Mon Sep 17 00:00:00 2001 From: Vigers Ray Date: Fri, 10 Jan 2025 22:12:54 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=20=D0=B4=D0=B5=D0=BA?= =?UTF-8?q?=D0=B0=D0=BB=D0=B5=D0=B9=20=D0=B3=D1=80=D1=8F=D0=B7=D0=B8=20?= =?UTF-8?q?=D0=BD=D0=B0=20=D0=B1=D0=B0=D0=B3=D0=B5=D0=BB=D0=B5,=20=D0=B1?= =?UTF-8?q?=D0=BE=D0=BA=D1=81=D0=B5=20=D0=B8=20=D0=B4=D0=B5=D0=BB=D1=8C?= =?UTF-8?q?=D1=82=D0=B5.=20=D0=9E=D1=81=D1=82=D0=B0=D0=BB=D1=8C=D0=BD?= =?UTF-8?q?=D0=BE=D0=B5=20=D0=BC=D0=BD=D0=B5=20=D0=BB=D0=B5=D0=BD=D1=8C=20?= =?UTF-8?q?+=20=D0=BE=D0=BD=D0=BE=20=D0=BD=D0=B5=20=D0=BF=D0=B8=D0=BA?= =?UTF-8?q?=D0=B0=D0=B5=D1=82=D1=81=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Maps/_Sunrise/Station/bagel.yml | 167 ++++++++-------------- Resources/Maps/_Sunrise/Station/box.yml | 68 +-------- Resources/Maps/_Sunrise/Station/delta.yml | 35 ++--- 3 files changed, 72 insertions(+), 198 deletions(-) diff --git a/Resources/Maps/_Sunrise/Station/bagel.yml b/Resources/Maps/_Sunrise/Station/bagel.yml index 6ef0fc2c3c6..9bb5738ce9c 100644 --- a/Resources/Maps/_Sunrise/Station/bagel.yml +++ b/Resources/Maps/_Sunrise/Station/bagel.yml @@ -3026,6 +3026,7 @@ entities: 3189: -70,17 - node: cleanable: True + zIndex: 1 color: '#FFFFFFFF' id: Dirt decals: @@ -3217,11 +3218,6 @@ entities: 3864: -10,-12 3951: 12,-11 3952: 11,-12 - - node: - angle: 3.141592653589793 rad - color: '#FFFFFFFF' - id: Dirt - decals: 126: -15,-43 127: -16,-43 128: -14,-43 @@ -3230,16 +3226,13 @@ entities: 131: -15,-40 132: -12,-42 - node: + cleanable: True + zIndex: 1 color: '#FFFFFFFF' id: DirtHeavy decals: 3062: 37,-2 3063: 37,2 - - node: - cleanable: True - color: '#FFFFFFFF' - id: DirtHeavy - decals: 64: 53,-38 65: 60,-28 86: 13,11 @@ -3281,18 +3274,16 @@ entities: 3811: -12,-16 3813: -12,-15 3854: -13,-16 - - node: - angle: 3.141592653589793 rad - color: '#FFFFFFFF' - id: DirtHeavy - decals: 112: -16,-43 113: -14,-43 114: -14,-44 115: -16,-42 116: -16,-40 + 36: 0,-3 + 37: 2,-2 - node: cleanable: True + zIndex: 1 color: '#FFFFFFFF' id: DirtHeavyMonotile decals: @@ -3305,6 +3296,8 @@ entities: 3856: -11,-14 3948: 12,-11 - node: + cleanable: True + zIndex: 1 color: '#FFFFFFFF' id: DirtLight decals: @@ -3332,11 +3325,6 @@ entities: 3072: 36,0 3073: 36,-1 3074: 40,0 - - node: - cleanable: True - color: '#FFFFFFFF' - id: DirtLight - decals: 55: -7,-24 56: 11,-29 58: 13,-28 @@ -3607,11 +3595,6 @@ entities: 3733: -37,8 3949: 10,-14 3950: 13,-12 - - node: - angle: 3.141592653589793 rad - color: '#FFFFFFFF' - id: DirtLight - decals: 107: 19,-13 108: 20,-11 109: 17,-12 @@ -3624,7 +3607,14 @@ entities: 123: -7,-43 124: -6,-42 125: -15,-40 + 31: -2,-3 + 38: 3,-2 + 39: 4,-2 + 40: -1,-3 + 41: 11,-4 - node: + cleanable: True + zIndex: 1 color: '#FFFFFFFF' id: DirtMedium decals: @@ -3641,11 +3631,6 @@ entities: 3066: 36,2 3067: 38,2 3068: 37,1 - - node: - cleanable: True - color: '#FFFFFFFF' - id: DirtMedium - decals: 57: 11,-28 66: 35,-12 78: -7,10 @@ -3693,13 +3678,15 @@ entities: 2700: -64,-10 2701: -62,-9 2702: -60,-12 - - node: - angle: 3.141592653589793 rad - color: '#FFFFFFFF' - id: DirtMedium - decals: 117: -16,-42 118: -12,-43 + 32: -2,-4 + 33: -3,-4 + 34: -6,-3 + 35: -4,-4 + 42: 11,-3 + 43: 5,-3 + 44: -4,-3 - node: cleanable: True color: '#FED83DFF' @@ -8747,7 +8734,7 @@ entities: 4: 49152 -12,8: 4: 12 - 6: 52224 + 5: 52224 -11,5: 0: 63351 -11,6: @@ -8759,7 +8746,7 @@ entities: -11,8: 4: 1 1: 17476 - 6: 4352 + 5: 4352 -10,5: 0: 62139 -10,6: @@ -8877,7 +8864,7 @@ entities: -6,11: 0: 4095 -6,12: - 5: 61166 + 6: 61166 -5,9: 0: 65535 -5,10: @@ -8885,7 +8872,7 @@ entities: -5,11: 0: 36863 -5,12: - 5: 30515 + 6: 30515 0: 12 -4,9: 0: 65535 @@ -8895,7 +8882,7 @@ entities: 0: 4095 -4,12: 0: 1 - 5: 65518 + 6: 65518 -4,13: 1: 61680 -5,13: @@ -8909,7 +8896,7 @@ entities: -5,15: 1: 17487 -3,12: - 5: 13107 + 6: 13107 1: 34944 -3,13: 1: 47792 @@ -8980,7 +8967,7 @@ entities: 1: 57617 -12,9: 0: 16 - 5: 3264 + 6: 3264 -13,9: 1: 39305 -13,10: @@ -8989,25 +8976,25 @@ entities: 1: 35033 0: 12288 -12,10: - 5: 204 + 6: 204 3: 49152 -12,11: 3: 12 - 5: 52224 + 6: 52224 -11,9: - 5: 272 + 6: 272 1: 17476 -11,10: - 5: 17 + 6: 17 3: 4096 1: 17476 -11,11: 3: 1 - 5: 4352 + 6: 4352 1: 17476 -11,12: 1: 1092 - 5: 272 + 6: 272 -10,9: 0: 65535 -10,10: @@ -9056,7 +9043,7 @@ entities: 1: 61158 -13,12: 1: 34952 - 6: 48 + 5: 48 4: 12288 -12,13: 1: 29767 @@ -9071,7 +9058,7 @@ entities: -13,15: 1: 32768 -12,12: - 5: 3264 + 6: 3264 -11,13: 0: 65535 -11,14: @@ -9082,10 +9069,10 @@ entities: 0: 65535 -10,14: 0: 4320 - 5: 60928 + 6: 60928 -10,15: 0: 61664 - 5: 14 + 6: 14 -9,13: 0: 65535 -9,15: @@ -9105,11 +9092,11 @@ entities: 1: 62671 -7,14: 1: 244 - 5: 57344 + 6: 57344 0: 1024 -7,15: 1: 61440 - 5: 238 + 6: 238 0: 1024 -7,16: 1: 65524 @@ -9176,7 +9163,7 @@ entities: -14,12: 0: 1 1: 8738 - 6: 128 + 5: 128 4: 32768 -17,12: 0: 52232 @@ -9307,34 +9294,34 @@ entities: 17,-1: 1: 49 0: 13056 - 5: 51336 + 6: 51336 17,-2: 1: 4369 17,0: 0: 34867 - 5: 12 + 6: 12 1: 768 18,-3: 1: 61713 18,-1: - 5: 65535 + 6: 65535 18,0: - 5: 15 + 6: 15 0: 65344 19,-3: 1: 12834 19,-1: - 5: 64307 + 6: 64307 1: 128 19,0: - 5: 143 + 6: 143 0: 13056 1: 2048 20,-4: 1: 65520 20,-1: 1: 528 - 5: 12544 + 6: 12544 21,-12: 1: 18244 21,-11: @@ -9344,7 +9331,7 @@ entities: 21,-10: 1: 17412 20,0: - 5: 19 + 6: 19 1: 288 21,-4: 1: 18244 @@ -9791,7 +9778,7 @@ entities: - volume: 2500 temperature: 293.15 moles: - - 0 + - 6666.982 - 0 - 0 - 0 @@ -9806,7 +9793,7 @@ entities: - volume: 2500 temperature: 293.15 moles: - - 6666.982 + - 0 - 0 - 0 - 0 @@ -9961,32 +9948,6 @@ entities: id: Caution decals: 0: -7,-3 - - node: - color: '#FFFFFFFF' - id: DirtHeavy - decals: - 36: 0,-3 - 37: 2,-2 - - node: - color: '#FFFFFFFF' - id: DirtLight - decals: - 31: -2,-3 - 38: 3,-2 - 39: 4,-2 - 40: -1,-3 - 41: 11,-4 - - node: - color: '#FFFFFFFF' - id: DirtMedium - decals: - 32: -2,-4 - 33: -3,-4 - 34: -6,-3 - 35: -4,-4 - 42: 11,-3 - 43: 5,-3 - 44: -4,-3 - node: color: '#DE3A3A66' id: HalfTileOverlayGreyscale180 @@ -11921,7 +11882,7 @@ entities: pos: -21.5,-20.5 parent: 2 - type: Door - secondsUntilStateChange: -45664.14 + secondsUntilStateChange: -45788.39 state: Opening - type: DeviceLinkSource lastSignals: @@ -11940,7 +11901,7 @@ entities: pos: -21.5,-18.5 parent: 2 - type: Door - secondsUntilStateChange: -45664.676 + secondsUntilStateChange: -45788.926 state: Opening - type: DeviceLinkSource lastSignals: @@ -13493,7 +13454,7 @@ entities: pos: 36.5,30.5 parent: 2 - type: Door - secondsUntilStateChange: -19939.387 + secondsUntilStateChange: -20063.635 state: Opening - type: DeviceLinkSource lastSignals: @@ -13876,7 +13837,7 @@ entities: pos: 44.5,27.5 parent: 2 - type: Door - secondsUntilStateChange: -38077.105 + secondsUntilStateChange: -38201.355 state: Opening - type: DeviceLinkSource lastSignals: @@ -77194,7 +77155,7 @@ entities: pos: 16.5,-8.5 parent: 2 - type: Door - secondsUntilStateChange: -41233.88 + secondsUntilStateChange: -41358.13 state: Closing - type: DeviceNetwork deviceLists: @@ -130055,24 +130016,12 @@ entities: rot: -1.5707963267948966 rad pos: -34.5,59.5 parent: 2 - - type: ContainerContainer - containers: - machine_board: !type:Container - ents: [] - machine_parts: !type:Container - ents: [] - uid: 19654 components: - type: Transform rot: -1.5707963267948966 rad pos: -33.5,59.5 parent: 2 - - type: ContainerContainer - containers: - machine_board: !type:Container - ents: [] - machine_parts: !type:Container - ents: [] - proto: ReinforcedGirder entities: - uid: 19655 @@ -167801,7 +167750,7 @@ entities: lastSignals: DoorStatus: True - type: Door - secondsUntilStateChange: -33950.035 + secondsUntilStateChange: -34074.285 state: Opening - type: Airlock autoClose: False diff --git a/Resources/Maps/_Sunrise/Station/box.yml b/Resources/Maps/_Sunrise/Station/box.yml index 0ef6383ac84..990e6a6a33c 100644 --- a/Resources/Maps/_Sunrise/Station/box.yml +++ b/Resources/Maps/_Sunrise/Station/box.yml @@ -7840,6 +7840,7 @@ entities: 7461: 18,44 - node: cleanable: True + zIndex: 1 color: '#474F52FF' id: Dirt decals: @@ -7847,28 +7848,12 @@ entities: 219: -32,-14 258: -6,-46 259: -3,-44 - - node: - cleanable: True - zIndex: 1 - color: '#474F52FF' - id: Dirt - decals: 242: -32,-18 - - node: - cleanable: True - color: '#D4D4D4A4' - id: Dirt - decals: 2527: -1,-57 2528: -2,-55 2531: -2,-53 2537: -1,-46 2538: -1,-45 - - node: - cleanable: True - color: '#FFFFFFFF' - id: Dirt - decals: 3483: 6,-54 3620: 55,-53 3621: 53,-55 @@ -7896,6 +7881,8 @@ entities: 3645: 57,-45 3646: 58,-46 - node: + cleanable: True + zIndex: 1 color: '#FFFFFFFF' id: DirtHeavy decals: @@ -8083,11 +8070,6 @@ entities: 13471: 65,21 13472: 65,21 13473: 65,23 - - node: - cleanable: True - color: '#FFFFFFFF' - id: DirtHeavy - decals: 2913: -7,-73 2914: -6,-73 3279: -32,-22 @@ -8118,6 +8100,8 @@ entities: 4739: 42,-34 4740: 42,-33 - node: + cleanable: True + zIndex: 1 color: '#FFFFFFFF' id: DirtHeavyMonotile decals: @@ -8155,20 +8139,10 @@ entities: 9987: -42,-24 9988: -42,-23 9989: -42,-24 - - node: - cleanable: True - color: '#FFFFFFFF' - id: DirtHeavyMonotile - decals: 3607: 51,-56 3608: 51,-48 4722: 39,-32 4723: 35,-30 - - node: - zIndex: 4 - color: '#FFFFFFFF' - id: DirtHeavyMonotile - decals: 12158: 5,-63 12159: 7,-63 12160: 7,-62 @@ -8186,10 +8160,6 @@ entities: id: DirtLight decals: 250: -32,-13 - - node: - color: '#FFFFFFFF' - id: DirtLight - decals: 450: -26,-27 452: -20,-24 457: -28,-23 @@ -8217,11 +8187,6 @@ entities: 12914: 32,36 12917: 32,34 12919: 32,36 - - node: - cleanable: True - color: '#FFFFFFFF' - id: DirtLight - decals: 1020: -62,-5 1021: -61,-5 1022: -55,-3 @@ -8282,11 +8247,6 @@ entities: 4731: 45,-28 4732: 44,-28 4733: 46,-34 - - node: - zIndex: 4 - color: '#FFFFFFFF' - id: DirtLight - decals: 12146: -7,-69 12147: -6,-69 12148: -6,-65 @@ -8305,10 +8265,6 @@ entities: id: DirtMedium decals: 241: -32,-18 - - node: - color: '#D4D4D4FF' - id: DirtMedium - decals: 13041: -37,42 13042: -38,42 13043: -38,43 @@ -8386,10 +8342,6 @@ entities: 13144: -33,44 13145: -33,44 13146: -32,43 - - node: - color: '#FFFFFFFF' - id: DirtMedium - decals: 453: -22,-25 465: -32,-24 8693: -5,27 @@ -8404,11 +8356,6 @@ entities: 12905: 31,36 12908: 31,34 12909: 32,34 - - node: - cleanable: True - color: '#FFFFFFFF' - id: DirtMedium - decals: 1428: -8,50 3288: -37,-26 3294: -41,-24 @@ -8459,11 +8406,6 @@ entities: 4759: 20,-23 4760: 18,-18 4761: 21,-18 - - node: - zIndex: 4 - color: '#FFFFFFFF' - id: DirtMedium - decals: 12151: -5,-63 12152: -6,-63 12153: -5,-65 diff --git a/Resources/Maps/_Sunrise/Station/delta.yml b/Resources/Maps/_Sunrise/Station/delta.yml index f2c0cc6d0bd..9c91ffe70d0 100644 --- a/Resources/Maps/_Sunrise/Station/delta.yml +++ b/Resources/Maps/_Sunrise/Station/delta.yml @@ -14664,6 +14664,7 @@ entities: 3884: -30,95 - node: cleanable: True + zIndex: 1 color: '#FFFFFFFF' id: Dirt decals: @@ -14744,6 +14745,8 @@ entities: 15136: 16,-15 17450: 58,-34 - node: + cleanable: True + zIndex: 1 color: '#FFFFFFFF' id: DirtHeavy decals: @@ -14823,11 +14826,6 @@ entities: 3570: 89,4 3571: 88,4 3572: 89,4 - - node: - cleanable: True - color: '#FFFFFFFF' - id: DirtHeavy - decals: 459: 42,-29 460: 44,-28 461: 46,-29 @@ -15435,6 +15433,8 @@ entities: 17491: -68,-27 17492: -69,-26 - node: + cleanable: True + zIndex: 1 color: '#FFFFFFFF' id: DirtHeavyMonotile decals: @@ -15452,11 +15452,6 @@ entities: 16874: -59,-33 16875: -56,-34 16876: -56,-33 - - node: - cleanable: True - color: '#FFFFFFFF' - id: DirtHeavyMonotile - decals: 1446: 73,14 1449: 38,21 1450: 14,29 @@ -15853,6 +15848,8 @@ entities: 17553: -60,-32 17554: -60,-32 - node: + cleanable: True + zIndex: 1 color: '#FFFFFFFF' id: DirtLight decals: @@ -15874,11 +15871,6 @@ entities: 16860: -57,-33 16861: -58,-33 16862: -59,-33 - - node: - cleanable: True - color: '#FFFFFFFF' - id: DirtLight - decals: 462: 43,-29 463: 50,-28 464: 53,-29 @@ -16127,6 +16119,8 @@ entities: 17388: -66,-35 17389: -66,-36 - node: + cleanable: True + zIndex: 1 color: '#FFFFFFFF' id: DirtMedium decals: @@ -16157,11 +16151,6 @@ entities: 3617: 60,-27 3618: 63,-26 3619: 63,-25 - - node: - cleanable: True - color: '#FFFFFFFF' - id: DirtMedium - decals: 472: 35,-56 473: 37,-54 485: 40,-42 @@ -16257,12 +16246,6 @@ entities: 17517: -72,-23 17518: -70,-23 17519: -70,-23 - - node: - cleanable: True - angle: 1.5707963267948966 rad - color: '#FFFFFFFF' - id: DirtMedium - decals: 1398: -43,-24 1399: -40,-29 1400: -41,-27