From 1056b36d3325085ffebf147f750b5273754a36ae Mon Sep 17 00:00:00 2001 From: Ed Date: Sat, 23 Mar 2024 00:08:36 +0300 Subject: [PATCH] fixes --- .../Maps/Shuttles/arrivals_corvaxsilly.yml | 21 +- .../Maps/Shuttles/mining_corvaxsilly.yml | 117 ++++++---- Resources/Maps/corvax_silly.yml | 218 +++++++++++------- 3 files changed, 218 insertions(+), 138 deletions(-) diff --git a/Resources/Maps/Shuttles/arrivals_corvaxsilly.yml b/Resources/Maps/Shuttles/arrivals_corvaxsilly.yml index 0cb07a5b2fd..c42f09754a4 100644 --- a/Resources/Maps/Shuttles/arrivals_corvaxsilly.yml +++ b/Resources/Maps/Shuttles/arrivals_corvaxsilly.yml @@ -3,8 +3,8 @@ meta: postmapinit: false tilemap: 0: Space + 12: FloorAstroGrass 47: FloorGlass - 76: FloorPlanetGrass 123: FloorWoodLarge 132: TrainLattice entities: @@ -21,6 +21,7 @@ entities: - type: MovedGrids - type: Broadphase - type: OccluderTree + - type: LoadedMap - uid: 292 components: - type: MetaData @@ -31,7 +32,7 @@ entities: chunks: -1,-1: ind: -1,-1 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhAAAAAAAhAAAAAAAhAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAhAAAAAAAhAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALwAAAAAAewAAAAAAewAAAAAAewAAAAAATAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhAAAAAAAhAAAAAAAhAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAhAAAAAAAhAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALwAAAAAAewAAAAAAewAAAAAAewAAAAAADAAAAAAA version: 6 0,0: ind: 0,0 @@ -39,7 +40,7 @@ entities: version: 6 -1,0: ind: -1,0 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALwAAAAAAewAAAAAAewAAAAAAewAAAAAATAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALwAAAAAAewAAAAAAewAAAAAAewAAAAAATAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALwAAAAAAewAAAAAAewAAAAAAewAAAAAATAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAALwAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhAAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALwAAAAAAewAAAAAAewAAAAAAewAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALwAAAAAAewAAAAAAewAAAAAAewAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALwAAAAAAewAAAAAAewAAAAAAewAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAALwAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhAAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 0,-1: ind: 0,-1 @@ -1770,18 +1771,19 @@ entities: - type: Transform pos: 0.5,-3.5 parent: 292 -- proto: PoweredlightSodium +- proto: PoweredlightOrange entities: - uid: 22 components: - type: Transform - pos: -0.5,10.5 + rot: 1.5707963267948966 rad + pos: -3.5,-1.5 parent: 292 - uid: 60 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -3.5,-1.5 + rot: -1.5707963267948966 rad + pos: 2.5,-1.5 parent: 292 - uid: 61 components: @@ -1793,13 +1795,12 @@ entities: components: - type: Transform rot: -1.5707963267948966 rad - pos: 2.5,-1.5 + pos: 2.5,3.5 parent: 292 - uid: 361 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 2.5,3.5 + pos: -0.5,10.5 parent: 292 - proto: Rack entities: diff --git a/Resources/Maps/Shuttles/mining_corvaxsilly.yml b/Resources/Maps/Shuttles/mining_corvaxsilly.yml index 78dccdf149b..08a9035d3fa 100644 --- a/Resources/Maps/Shuttles/mining_corvaxsilly.yml +++ b/Resources/Maps/Shuttles/mining_corvaxsilly.yml @@ -61,75 +61,75 @@ entities: color: '#FFFFFFFF' id: Bot decals: - 134: -2,-2 - 135: -2,-4 - 136: 2,-2 - 137: 2,-4 - 144: 3,-3 - 145: -3,-3 + 21: -2,-2 + 22: -2,-4 + 23: 2,-2 + 24: 2,-4 + 31: 3,-3 + 32: -3,-3 - node: color: '#FFFFFFFF' id: Bot decals: - 114: -3,3 - 115: 3,3 + 1: -3,3 + 2: 3,3 - node: angle: -1.5707963267948966 rad color: '#FFFFFFFF' id: Box decals: - 138: -2,-2 - 139: -2,-4 - 140: 2,-4 - 141: 2,-2 - 142: 3,-3 - 143: -3,-3 + 25: -2,-2 + 26: -2,-4 + 27: 2,-4 + 28: 2,-2 + 29: 3,-3 + 30: -3,-3 - node: color: '#FFFFFFFF' id: Box decals: - 116: -3,3 - 117: 3,3 + 3: -3,3 + 4: 3,3 - node: color: '#FFFFFFFF' id: Delivery decals: - 118: -2,2 - 119: -1,2 - 120: -2,1 - 121: -1,1 - 122: -2,0 - 123: -1,0 - 124: 1,2 - 125: 2,2 - 126: 2,1 - 127: 1,1 - 128: 1,0 - 129: 2,0 + 5: -2,2 + 6: -1,2 + 7: -2,1 + 8: -1,1 + 9: -2,0 + 10: -1,0 + 11: 1,2 + 12: 2,2 + 13: 2,1 + 14: 1,1 + 15: 1,0 + 16: 2,0 - node: angle: -1.5707963267948966 rad color: '#FFFFFFFF' id: LoadingArea decals: - 131: 3,5 + 18: 3,5 - node: angle: 1.5707963267948966 rad color: '#FFFFFFFF' id: LoadingArea decals: - 130: -3,5 + 17: -3,5 - node: color: '#FFFFFFFF' id: OldConcreteTrimCornerSe decals: - 6: 1,9 + 0: 1,9 - node: angle: -1.5707963267948966 rad color: '#FFFFFF3F' id: WarnBox decals: - 132: -4,5 - 133: 4,5 + 19: -4,5 + 20: 4,5 - type: GridAtmosphere version: 2 data: @@ -144,6 +144,7 @@ entities: 1: 1028 0,3: 0: 55 + 3: 256 1,0: 0: 4369 1,1: @@ -167,14 +168,20 @@ entities: 0: 140 0,-2: 0: 12288 + 3: 49152 0,-1: 0: 65535 1,-1: 0: 273 + 3: 4096 -1,-1: 0: 61183 + 3: 4352 -1,-2: 0: 32768 + 3: 28672 + 1,-2: + 3: 4096 uniqueMixes: - volume: 2500 temperature: 293.15 @@ -221,6 +228,21 @@ entities: - 0 - 0 - 0 + - volume: 2500 + temperature: 293.15 + moles: + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 chunkSize: 4 - type: GasTileOverlay - type: RadiationGridResistance @@ -235,6 +257,7 @@ entities: - type: MovedGrids - type: Broadphase - type: OccluderTree + - type: LoadedMap - proto: AirAlarm entities: - uid: 4 @@ -617,6 +640,11 @@ entities: - type: Transform pos: -2.5,-2.5 parent: 1 + - uid: 335 + components: + - type: Transform + pos: -1.5,-3.5 + parent: 1 - proto: CableMV entities: - uid: 94 @@ -745,27 +773,27 @@ entities: - uid: 319 components: - type: Transform - pos: -0.5,-1.5 + pos: -0.5,-2.5 parent: 1 - uid: 320 components: - type: Transform - pos: -0.5,-2.5 + pos: -0.5,-1.5 parent: 1 - uid: 321 components: - type: Transform - pos: 0.5,-1.5 + pos: -0.5,-3.5 parent: 1 - uid: 322 components: - type: Transform - pos: 0.5,-2.5 + pos: 0.5,-3.5 parent: 1 - uid: 323 components: - type: Transform - pos: 0.5,-3.5 + pos: 0.5,-2.5 parent: 1 - uid: 324 components: @@ -785,7 +813,7 @@ entities: - uid: 327 components: - type: Transform - pos: -0.5,-3.5 + pos: 0.5,-1.5 parent: 1 - uid: 328 components: @@ -807,12 +835,6 @@ entities: - type: Transform pos: 1.5,8.5 parent: 1 - - uid: 335 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -1.5,-2.5 - parent: 1 - uid: 336 components: - type: Transform @@ -879,6 +901,11 @@ entities: rot: 1.5707963267948966 rad pos: 2.5,4.5 parent: 1 + - uid: 365 + components: + - type: Transform + pos: -1.5,-2.5 + parent: 1 - proto: Catwalk entities: - uid: 42 diff --git a/Resources/Maps/corvax_silly.yml b/Resources/Maps/corvax_silly.yml index f5fa7869938..7120b74f304 100644 --- a/Resources/Maps/corvax_silly.yml +++ b/Resources/Maps/corvax_silly.yml @@ -1675,7 +1675,7 @@ entities: decals: 505: 8.5266285,22.341934 545: 0.9276402,25.11112 - 887: 28.858246,-18.983908 + 886: 28.858246,-18.983908 - node: color: '#FFFFFFFF' id: Rock07 @@ -2089,8 +2089,10 @@ entities: 0: 65535 7,-4: 0: 29491 + 2: 35908 7,-3: 0: 30583 + 2: 34952 7,-2: 0: 65535 7,-1: @@ -2218,6 +2220,7 @@ entities: 0: 4369 8,0: 0: 30579 + 2: 34956 0,-7: 0: 12288 -4,-7: @@ -2282,8 +2285,10 @@ entities: 0: 65535 7,-6: 0: 4352 + 2: 8192 7,-5: 0: 13073 + 2: 17506 -8,7: 0: 65535 -6,6: @@ -2403,11 +2408,17 @@ entities: 7,3: 2: 65535 8,1: - 2: 4096 + 2: 4479 8,2: 2: 13105 8,3: 2: 307 + 8,-3: + 2: 13073 + 8,-2: + 2: 30583 + 8,-1: + 2: 30583 uniqueMixes: - volume: 2500 temperature: 293.15 @@ -5265,13 +5276,6 @@ entities: - type: Transform pos: 7.5,40.5 parent: 2 -- proto: AtmosFixBlockerMarker - entities: - - uid: 2935 - components: - - type: Transform - pos: 27.5,-6.5 - parent: 2 - proto: AtmosFixFreezerMarker entities: - uid: 153 @@ -5859,6 +5863,13 @@ entities: rot: 3.141592653589793 rad pos: 3.5,-14.5 parent: 2 +- proto: BorgCharger + entities: + - uid: 1501 + components: + - type: Transform + pos: 20.5,-4.5 + parent: 2 - proto: BoxBeaker entities: - uid: 4647 @@ -21491,24 +21502,24 @@ entities: joinedGrid: 2 - type: AtmosPipeColor color: '#0000FFFF' - - uid: 2120 + - uid: 2973 components: - type: Transform rot: 3.141592653589793 rad - pos: 27.5,-6.5 + pos: 26.5,-12.5 parent: 2 - type: AtmosDevice joinedGrid: 2 - - type: AtmosPipeColor - color: '#FF0000FF' - - uid: 2973 + - uid: 3460 components: - type: Transform rot: 3.141592653589793 rad - pos: 26.5,-12.5 + pos: 34.5,-7.5 parent: 2 - type: AtmosDevice joinedGrid: 2 + - type: AtmosPipeColor + color: '#FF0000FF' - uid: 3469 components: - type: Transform @@ -21746,6 +21757,14 @@ entities: parent: 2 - type: AtmosPipeColor color: '#FF0000FF' + - uid: 2418 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 27.5,-5.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF0000FF' - uid: 2500 components: - type: Transform @@ -21762,6 +21781,13 @@ entities: parent: 2 - type: AtmosPipeColor color: '#FF0000FF' + - uid: 3427 + components: + - type: Transform + pos: 34.5,-5.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF0000FF' - uid: 3548 components: - type: Transform @@ -21957,6 +21983,14 @@ entities: parent: 2 - type: AtmosPipeColor color: '#FF0000FF' + - uid: 2120 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 34.5,-6.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF0000FF' - uid: 2159 components: - type: Transform @@ -23934,13 +23968,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#FF0000FF' - - uid: 2418 - components: - - type: Transform - pos: 27.5,-5.5 - parent: 2 - - type: AtmosPipeColor - color: '#FF0000FF' - uid: 2419 components: - type: Transform @@ -24767,6 +24794,30 @@ entities: parent: 2 - type: AtmosPipeColor color: '#FF0000FF' + - uid: 3426 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 30.5,-5.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF0000FF' + - uid: 3458 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 32.5,-5.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF0000FF' + - uid: 3459 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 33.5,-5.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF0000FF' - uid: 3550 components: - type: Transform @@ -24775,6 +24826,14 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0000FFFF' + - uid: 3720 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 31.5,-5.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF0000FF' - uid: 4199 components: - type: Transform @@ -24812,6 +24871,22 @@ entities: parent: 2 - type: AtmosPipeColor color: '#FF0000FF' + - uid: 6365 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 29.5,-5.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF0000FF' + - uid: 6408 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 28.5,-5.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF0000FF' - uid: 6516 components: - type: Transform @@ -33758,6 +33833,13 @@ entities: - type: Transform pos: 3.5,-13.5 parent: 2 +- proto: SpawnPointBorg + entities: + - uid: 6536 + components: + - type: Transform + pos: 20.5,-5.5 + parent: 2 - proto: SpawnPointBotanist entities: - uid: 3423 @@ -33779,15 +33861,20 @@ entities: - type: Transform pos: 19.5,9.5 parent: 2 - - uid: 3426 + - uid: 6537 components: - type: Transform - pos: 24.5,8.5 + pos: 29.5,16.5 parent: 2 - - uid: 3427 + - uid: 6538 components: - type: Transform - pos: 24.5,11.5 + pos: 30.5,11.5 + parent: 2 + - uid: 6539 + components: + - type: Transform + pos: 29.5,6.5 parent: 2 - proto: SpawnPointChaplain entities: @@ -33990,20 +34077,20 @@ entities: parent: 2 - proto: SpawnPointSalvageSpecialist entities: - - uid: 3458 + - uid: 2935 components: - type: Transform - pos: 21.5,12.5 + pos: 16.5,16.5 parent: 2 - - uid: 3459 + - uid: 6333 components: - type: Transform - pos: 22.5,12.5 + pos: 21.5,26.5 parent: 2 - - uid: 3460 + - uid: 6540 components: - type: Transform - pos: 20.5,12.5 + pos: 23.5,15.5 parent: 2 - proto: SpawnPointScientist entities: @@ -36939,11 +37026,6 @@ entities: - type: Transform pos: 23.5,-3.5 parent: 2 - - uid: 1501 - components: - - type: Transform - pos: 28.5,-6.5 - parent: 2 - uid: 1611 components: - type: Transform @@ -37074,11 +37156,6 @@ entities: - type: Transform pos: 30.5,-5.5 parent: 2 - - uid: 3720 - components: - - type: Transform - pos: 27.5,-5.5 - parent: 2 - uid: 3722 components: - type: Transform @@ -38135,6 +38212,11 @@ entities: rot: 3.141592653589793 rad pos: 26.5,-8.5 parent: 2 + - uid: 6535 + components: + - type: Transform + pos: 27.5,-5.5 + parent: 2 - proto: WallReinforcedRust entities: - uid: 5720 @@ -43862,47 +43944,6 @@ entities: - type: Transform pos: 10.5,15.5 parent: 2 -- proto: WindowClockworkDirectional - entities: - - uid: 6333 - components: - - type: Transform - pos: 27.5,-6.5 - parent: 2 - - type: Godmode - oldDamage: {} - missingComponents: - - Destructible - - uid: 6365 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 27.5,-6.5 - parent: 2 - - type: Godmode - oldDamage: {} - missingComponents: - - Destructible - - uid: 6408 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 27.5,-6.5 - parent: 2 - - type: Godmode - oldDamage: {} - missingComponents: - - Destructible - - uid: 6414 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 27.5,-6.5 - parent: 2 - - type: Godmode - oldDamage: {} - missingComponents: - - Destructible - proto: WindowDirectional entities: - uid: 4563 @@ -44545,6 +44586,12 @@ entities: rot: 1.5707963267948966 rad pos: 11.5,43.5 parent: 2 + - uid: 6414 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 33.5,-7.5 + parent: 2 - uid: 6419 components: - type: Transform @@ -44568,6 +44615,11 @@ entities: rot: 1.5707963267948966 rad pos: 9.5,10.5 parent: 5016 + - uid: 6534 + components: + - type: Transform + pos: 34.5,-6.5 + parent: 2 - proto: WoodDoor entities: - uid: 177