From b31b1225b4868e3bb2ea6a401a422ed9f0288f41 Mon Sep 17 00:00:00 2001 From: Dvir Date: Wed, 24 Jan 2024 00:40:26 +0200 Subject: [PATCH] McFixing --- Resources/Maps/_NF/Shuttles/mccargo.yml | 1890 ++++++++--------- Resources/Maps/_NF/Shuttles/mcdelivery.yml | 119 +- Resources/Prototypes/_NF/Shipyard/mccargo.yml | 1 + 3 files changed, 996 insertions(+), 1014 deletions(-) diff --git a/Resources/Maps/_NF/Shuttles/mccargo.yml b/Resources/Maps/_NF/Shuttles/mccargo.yml index 546ecb74b40..72a7ad24aa4 100644 --- a/Resources/Maps/_NF/Shuttles/mccargo.yml +++ b/Resources/Maps/_NF/Shuttles/mccargo.yml @@ -4,10 +4,9 @@ meta: tilemap: 0: Space 12: FloorBar - 43: FloorFreezer - 59: FloorKitchen 72: FloorRGlass 97: FloorTechMaint + 105: FloorWhiteMini 106: FloorWhiteMono 113: Lattice 114: Plating @@ -24,11 +23,11 @@ entities: - chunks: 0,0: ind: 0,0 - tiles: DAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAAcgAAAAAADAAAAAAADAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAYQAAAAAADAAAAAAADAAAAAAAYQAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAcgAAAAAAcgAAAAAAagAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAcgAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAcgAAAAAAagAAAAAAagAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAcgAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAcgAAAAAAagAAAAAAagAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAcgAAAAAAcgAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAKwAAAAAAKwAAAAAAKwAAAAAAcgAAAAAAYQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAKwAAAAAAKwAAAAAAKwAAAAAAcgAAAAAAYQAAAAAAYQAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAAAYQAAAAAAKwAAAAAAKwAAAAAAKwAAAAAAcgAAAAAAYQAAAAAAYQAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAYQAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAAAYQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: DAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAAcgAAAAAADAAAAAAADAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAYQAAAAAADAAAAAAADAAAAAAAYQAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAcgAAAAAAcgAAAAAAagAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAcgAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAcgAAAAAAagAAAAAAagAAAAAAcgAAAAAAagAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAcgAAAAAAagAAAAAAagAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAcgAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAcgAAAAAAcgAAAAAAagAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAcgAAAAAAYQAAAAAAYQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAcgAAAAAAYQAAAAAAYQAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAAAYQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAcgAAAAAAYQAAAAAAYQAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAYQAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAAAYQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 -1,0: ind: -1,0 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAcgAAAAAAagAAAAAAagAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAcgAAAAAAOwAAAAAAOwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAOwAAAAAAOwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAYQAAAAAAcgAAAAAAOwAAAAAAOwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAOwAAAAAAOwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAcgAAAAAAcgAAAAAAOwAAAAAAOwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAcgAAAAAAcgAAAAAAOwAAAAAAOwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAcgAAAAAAagAAAAAAagAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAcgAAAAAAaQAAAAAAaQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAaQAAAAAAaQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAYQAAAAAAcgAAAAAAaQAAAAAAaQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAaQAAAAAAaQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAcgAAAAAAcgAAAAAAaQAAAAAAaQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAcgAAAAAAcgAAAAAAaQAAAAAAaQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAA version: 6 -1,-1: ind: -1,-1 @@ -79,134 +78,268 @@ entities: 315: -7,14 316: -7,13 317: -7,12 + - node: + color: '#A46106FF' + id: BrickTileWhiteInnerNe + decals: + 581: -4,-3 + - node: + color: '#A46106FF' + id: BrickTileWhiteInnerNw + decals: + 582: 4,-3 + - node: + color: '#A46106FF' + id: BrickTileWhiteInnerSe + decals: + 578: 4,-1 + 579: -8,-1 + - node: + color: '#A46106FF' + id: BrickTileWhiteInnerSw + decals: + 580: -4,-1 + - node: + color: '#A46106FF' + id: BrickTileWhiteLineE + decals: + 541: -8,-3 + 542: -8,-2 + 555: 4,-2 + 556: 4,-3 + 557: 0,-1 + 558: 0,-2 + 559: -4,-1 + 560: -4,-2 + - node: + color: '#A46106FF' + id: BrickTileWhiteLineN + decals: + 538: -5,-4 + 539: -6,-4 + 540: -7,-4 + 569: 7,-4 + 570: 6,-4 + 571: 5,-4 + 572: 3,-3 + 573: 2,-3 + 574: 1,-3 + 575: -1,-3 + 576: -2,-3 + 577: -3,-3 + - node: + color: '#A46106FF' + id: BrickTileWhiteLineS + decals: + 543: -7,-1 + 544: -6,-1 + 545: -5,-1 + 546: -3,0 + 547: -2,0 + 548: -1,0 + 549: 1,0 + 550: 2,0 + 551: 3,0 + 552: 5,-1 + 553: 6,-1 + 554: 7,-1 + - node: + color: '#A46106FF' + id: BrickTileWhiteLineW + decals: + 561: -4,-2 + 562: -4,-3 + 563: 0,-1 + 564: 0,-2 + 565: 4,-1 + 566: 4,-2 + 567: 8,-2 + 568: 8,-3 - node: color: '#A4610696' id: CheckerNWSE decals: - 266: 6,9 - 267: 7,9 - 268: 9,9 269: 6,8 270: 7,8 271: 6,7 272: 7,7 - 273: 9,7 274: 6,6 275: 7,6 276: 6,5 277: 7,5 - 278: 9,5 - 279: 8,5 - 280: 7,4 - 281: 8,7 - 282: 8,9 + 354: 8,5 + 355: 9,5 + 356: 9,6 + 357: 8,8 + 358: 9,8 + 359: 9,9 + 360: 7,4 - node: cleanable: True color: '#FFFFFFFF' id: DirtHeavy decals: - 190: -4,3 - 191: -6,3 - 193: -8,3 - 196: -8,8 - 200: -6,8 - 203: -5,10 - 206: -5,12 - 209: -2,12 - 210: 0,12 - 263: 7,14 - 264: 6,11 - 265: -1,10 - 305: -5,3 - 306: -7,3 - 351: -1,11 + 583: -8,3 + 584: -5,5 + 585: -8,7 + 586: -5,9 + 587: -8,9 + 588: -6,8 + 589: -4,10 + 590: -1,11 + 591: -4,12 + 592: 0,13 + 593: -2,14 + 594: -3,15 + 595: -5,14 + 610: -5,3 + 618: -8,8 + 619: -2,10 + 645: 6,11 + 646: 7,10 + 647: 6,10 + 648: 7,13 + 649: 7,14 + 650: 6,14 + 651: 6,12 - node: cleanable: True color: '#FFFFFFFF' id: DirtHeavyMonotile decals: - 3: 7,13 - 4: 7,12 - 199: -7,8 - 205: -3,10 - 208: -3,12 - 212: 0,14 - 214: -3,14 - 218: 0,15 - 219: 0,13 - 259: 6,12 - 302: -5,4 - 304: -8,5 - 348: -4,6 - 349: -5,6 - 350: -4,5 - 353: -1,14 + 621: -1,10 + 622: -3,12 + 623: -1,14 + 624: 0,14 + 632: -1,12 + 633: 0,12 + 634: -2,12 + 635: -3,12 + 636: -4,6 + 641: 6,10 + 642: 7,11 + 643: 7,12 + 644: 6,13 - node: cleanable: True color: '#FFFFFFFF' id: DirtLight decals: - 0: -8,3 - 192: -4,4 - 194: -8,6 - 197: -8,9 - 211: 0,13 - 213: -2,14 - 215: -4,14 - 216: -1,15 - 307: -6,3 - 308: -5,4 - 347: -5,5 + 596: -4,15 + 597: -1,15 + 598: -4,14 + 599: -5,13 + 600: -8,8 + 601: -8,5 + 602: -6,3 + 603: -8,4 + 611: -6,3 + 612: -6,4 + 613: -4,6 + 614: -5,7 + 615: -5,6 + 616: -8,6 + 617: -5,8 + 620: -3,10 + 630: -5,10 + 631: -4,10 - node: cleanable: True color: '#FFFFFFFF' id: DirtMedium decals: - 1: 7,12 2: 9,11 - 195: -8,7 - 198: -7,9 - 201: -6,9 - 202: -5,9 - 204: -4,10 - 207: -4,12 - 217: -2,15 - 260: 6,14 - 261: 6,13 - 262: 7,11 - 303: -8,4 - 352: -1,12 + 604: -4,4 + 605: -8,4 + 606: -7,3 + 607: -4,3 + 608: -5,4 + 609: -5,3 + 625: 0,15 + 626: -1,15 + 627: -5,12 + 628: -3,14 + 629: -4,14 + 637: 6,11 + 638: 7,12 + 639: 6,13 + 640: 7,14 + - node: + color: '#1D1D21FF' + id: MiniTileCheckerBOverlay + decals: + 474: -2,3 + 475: -1,3 + 476: 0,3 + 477: 1,3 + 478: 2,3 + 479: 3,3 + 480: 4,3 + 481: 4,4 + 482: 3,4 + 483: 2,4 + 484: 1,4 + 485: 0,4 + 486: -1,4 + 487: -2,4 + 488: -2,5 + 489: -1,5 + 490: 0,5 + 491: 1,5 + 492: 2,5 + 493: 3,5 + 494: 4,5 + 495: 4,6 + 496: 3,6 + 497: 2,6 + 498: 1,6 + 499: 0,6 + 500: -1,6 + 501: -2,6 + 502: -2,7 + 503: -1,7 + 504: -1,8 + 505: -2,8 + 506: 0,7 + 507: 0,8 + 508: 1,8 + 509: 1,7 + 510: 2,7 + 511: 2,8 + 512: 3,8 + 513: 3,7 + 514: 4,7 + 515: 4,8 - node: color: '#A46106FF' id: MiniTileWhiteCornerNe decals: - 231: 4,8 243: 4,12 + 537: 4,8 - node: color: '#A46106FF' id: MiniTileWhiteCornerNw decals: - 232: -2,8 244: 2,12 + 536: -2,8 - node: color: '#A46106FF' id: MiniTileWhiteCornerSe decals: - 234: 4,3 245: 4,10 + 534: 4,3 - node: color: '#A46106FF' id: MiniTileWhiteCornerSw decals: - 233: -2,3 246: 2,10 + 535: -2,3 - node: color: '#A46106FF' id: MiniTileWhiteInnerNe decals: 178: 4,-4 179: 0,-3 - 180: -4,-3 181: -8,-4 - node: color: '#A46106FF' @@ -214,21 +347,17 @@ entities: decals: 182: -4,-4 183: 0,-3 - 184: 4,-3 185: 8,-4 - node: color: '#A46106FF' id: MiniTileWhiteInnerSe decals: - 186: 4,-1 187: 0,0 188: -4,0 - 189: -8,-1 - node: color: '#A46106FF' id: MiniTileWhiteInnerSw decals: - 174: -4,-1 175: 0,0 176: 4,0 177: 8,-1 @@ -236,199 +365,159 @@ entities: color: '#A46106FF' id: MiniTileWhiteLineE decals: - 146: 4,-3 - 147: 4,-2 - 148: 0,-1 - 149: 0,-2 - 150: -4,-1 - 151: -4,-2 - 152: -8,-2 - 153: -8,-3 - 235: 4,4 - 236: 4,5 - 237: 4,6 - 238: 4,7 250: 4,11 + 530: 4,7 + 531: 4,6 + 532: 4,5 + 533: 4,4 - node: color: '#A46106FF' id: MiniTileWhiteLineN decals: - 134: -5,-4 - 135: -6,-4 - 136: -7,-4 - 137: -3,-3 - 138: -2,-3 - 139: -1,-3 - 140: 1,-3 - 141: 2,-3 - 142: 3,-3 - 143: 5,-4 - 144: 6,-4 - 145: 7,-4 - 221: -1,8 - 222: 0,8 - 223: 1,8 - 224: 2,8 - 225: 3,8 249: 3,12 + 525: -1,8 + 526: 0,8 + 527: 1,8 + 528: 2,8 + 529: 3,8 - node: color: '#A46106FF' id: MiniTileWhiteLineS decals: - 154: -7,-1 - 155: -6,-1 - 156: -5,-1 - 157: -3,0 - 158: -2,0 - 159: -1,0 - 160: 1,0 - 161: 2,0 - 162: 3,0 - 163: 5,-1 - 164: 6,-1 - 165: 7,-1 - 226: -1,3 - 227: 0,3 - 228: 1,3 - 229: 2,3 - 230: 3,3 248: 3,10 + 516: -1,3 + 517: 0,3 + 518: 1,3 + 519: 2,3 + 520: 3,3 - node: color: '#A46106FF' id: MiniTileWhiteLineW decals: - 166: 8,-2 - 167: 8,-3 - 168: 4,-1 - 169: 4,-2 - 170: 0,-1 - 171: 0,-2 - 172: -4,-2 - 173: -4,-3 - 239: -2,4 - 240: -2,5 - 241: -2,6 - 242: -2,7 247: 2,11 + 521: -2,4 + 522: -2,5 + 523: -2,6 + 524: -2,7 - node: color: '#FFFFFFFF' id: StandClear decals: - 332: -3,15 + 363: -3,15 - node: - color: '#D381C996' + color: '#D381C9FF' id: WarnCornerGreyscaleNE decals: - 254: 7,14 + 466: 7,14 - node: - color: '#D381C996' + color: '#D381C9FF' id: WarnCornerGreyscaleNW decals: - 253: 6,14 + 465: 6,14 - node: - color: '#D381C996' + color: '#D381C9FF' id: WarnCornerGreyscaleSE decals: - 251: 7,11 + 464: 7,10 - node: - color: '#D381C996' + color: '#D381C9FF' id: WarnCornerGreyscaleSW decals: - 252: 6,11 + 473: 6,10 - node: - color: '#A4610696' + color: '#A46106FF' id: WarnCornerNE decals: - 130: 0,15 - 343: -4,6 + 412: 0,15 + 413: -4,6 - node: - color: '#A4610696' + color: '#A46106FF' id: WarnCornerNW decals: - 104: -8,9 - 328: -5,14 - 331: -4,15 + 414: -5,14 + 415: -8,9 + 416: -4,15 - node: - color: '#A4610696' + color: '#A46106FF' id: WarnCornerSE decals: - 94: -4,3 - 95: -1,10 - 96: 0,12 + 417: -1,10 + 418: -4,3 + 419: 0,12 - node: - color: '#9FED5896' + color: '#9FED58FF' id: WarnCornerSW decals: - 129: -8,3 + 440: -8,3 - node: - color: '#9FED5896' + color: '#9FED58FF' id: WarnCornerSmallNE decals: - 300: -8,4 + 445: -8,4 - node: - color: '#A4610696' + color: '#A46106FF' id: WarnCornerSmallNE decals: - 118: -5,10 - 119: -5,12 - 344: -5,6 + 424: -5,10 + 425: -5,12 + 426: -5,6 - node: - color: '#9FED5896' + color: '#9FED58FF' id: WarnCornerSmallNW decals: - 301: -5,4 + 446: -5,4 - node: - color: '#A4610696' + color: '#A46106FF' id: WarnCornerSmallNW decals: - 120: -1,10 - 125: -5,9 - 330: -4,14 - 335: 0,12 + 420: 0,12 + 421: -1,10 + 422: -5,9 + 423: -4,14 - node: - color: '#A4610696' + color: '#A46106FF' id: WarnCornerSmallSE decals: - 121: -8,8 - 122: -5,12 - 124: -5,10 - 329: -5,14 - 334: -1,12 + 430: -8,8 + 431: -5,10 + 432: -1,12 + 433: -5,14 + 434: -5,12 - node: - color: '#A4610696' + color: '#A46106FF' id: WarnCornerSmallSW decals: - 123: -5,8 - 333: -1,12 - 336: 0,14 + 427: 0,14 + 428: -1,12 + 429: -5,8 - node: color: '#B02E26FF' id: WarnFullGreyscale decals: 220: 4,12 - node: - color: '#9FED5896' + color: '#9FED58FF' id: WarnLineE decals: - 297: -8,5 + 437: -8,5 - node: - color: '#A4610696' + color: '#A46106FF' id: WarnLineE decals: - 69: -6,-8 - 70: 8,-8 - 86: -5,9 - 87: -5,8 - 88: -5,7 - 89: -4,4 - 90: -5,11 - 91: -5,13 - 92: 0,13 - 93: 0,14 - 105: -8,6 - 106: -8,7 - 116: -1,11 - 342: -4,5 + 364: -8,6 + 365: -8,7 + 377: -5,9 + 378: -5,8 + 379: -5,7 + 380: -4,5 + 381: -4,4 + 382: -1,11 + 383: 0,13 + 384: 0,14 + 385: -5,13 + 386: -5,11 + 453: 8,-8 + 454: -6,-8 - node: color: '#FFFFFFFF' id: WarnLineE @@ -448,48 +537,47 @@ entities: 64: 8,3 65: 5,14 66: 1,14 - 286: 8,5 - 287: 8,7 - 288: 8,9 292: -11,-3 341: -3,4 - node: - color: '#D381C996' + color: '#D381C9FF' id: WarnLineGreyscaleE decals: - 255: 7,13 - 256: 7,12 + 467: 7,13 + 468: 7,12 + 469: 7,11 - node: - color: '#D381C996' + color: '#D381C9FF' id: WarnLineGreyscaleW decals: - 257: 6,12 - 258: 6,13 + 470: 6,13 + 471: 6,12 + 472: 6,11 - node: - color: '#9FED5896' + color: '#9FED58FF' id: WarnLineN decals: - 128: -6,3 - 294: -7,3 - 296: -5,3 + 441: -7,3 + 442: -6,3 + 443: -5,3 - node: - color: '#A4610696' + color: '#A46106FF' id: WarnLineN decals: - 75: 12,-3 - 76: -12,-3 - 77: -4,14 - 78: -3,14 - 79: -2,14 - 80: -4,12 - 81: -3,12 - 82: -2,12 - 83: -4,10 - 84: -3,10 - 85: -2,10 - 107: -7,8 - 108: -6,8 - 338: -1,14 + 387: -6,8 + 389: -7,8 + 390: -4,10 + 391: -3,10 + 392: -2,10 + 393: -2,12 + 394: -3,12 + 395: -4,12 + 396: -4,14 + 397: -3,14 + 398: -2,14 + 399: -1,14 + 449: 12,-3 + 450: -12,-3 - node: color: '#FFFFFFFF' id: WarnLineN @@ -501,7 +589,6 @@ entities: 20: 7,-7 21: 8,-7 39: -4,2 - 40: 6,10 45: 6,15 50: 3,9 57: -8,-9 @@ -511,32 +598,32 @@ entities: 61: 7,-9 62: 8,-9 67: -1,9 - 290: 7,4 327: -3,16 + 362: 6,9 - node: - color: '#9FED5896' + color: '#9FED58FF' id: WarnLineS decals: - 298: -8,5 - 299: -8,4 - 346: -5,5 + 438: -8,5 + 439: -8,4 + 444: -5,5 - node: - color: '#A4610696' + color: '#A46106FF' id: WarnLineS decals: - 73: -8,-8 - 74: 6,-8 - 97: -8,6 - 98: -8,7 - 99: -8,8 - 100: -5,10 - 101: -5,11 - 102: -5,12 - 103: -5,13 - 109: -5,7 - 117: -1,11 - 337: 0,13 - 345: -5,6 + 366: -8,7 + 367: -8,6 + 368: -8,8 + 369: -5,10 + 370: -5,11 + 371: -5,12 + 372: -5,13 + 373: 0,13 + 374: -1,11 + 375: -5,6 + 376: -5,7 + 451: -8,-8 + 452: 6,-8 - node: color: '#FFFFFFFF' id: WarnLineS @@ -556,35 +643,32 @@ entities: 42: 8,3 43: 1,14 44: 5,14 - 283: 8,9 - 284: 8,7 - 285: 8,5 291: -11,-3 340: -3,4 - node: - color: '#9FED5896' + color: '#9FED58FF' id: WarnLineW decals: - 293: -6,4 - 295: -7,4 + 435: -6,4 + 436: -7,4 - node: - color: '#A4610696' + color: '#A46106FF' id: WarnLineW decals: - 71: -12,-1 - 72: 12,-1 - 110: -4,12 - 111: -3,12 - 112: -2,12 - 113: -2,10 - 114: -3,10 - 115: -4,10 - 126: -7,9 - 127: -6,9 - 131: -3,15 - 132: -2,15 - 133: -1,15 - 339: -1,12 + 400: -7,9 + 401: -6,9 + 402: -3,15 + 403: -2,15 + 404: -1,15 + 405: -1,12 + 406: -2,12 + 407: -3,12 + 408: -4,12 + 409: -4,10 + 410: -3,10 + 411: -2,10 + 447: -12,-1 + 448: 12,-1 - node: color: '#FFFFFFFF' id: WarnLineW @@ -597,7 +681,6 @@ entities: 15: -6,-7 46: 6,15 47: -4,2 - 48: 6,10 49: 3,9 51: 8,-9 52: 7,-9 @@ -606,30 +689,30 @@ entities: 55: -7,-9 56: -6,-9 68: -1,9 - 289: 7,4 326: -3,16 + 361: 6,9 - node: angle: -1.5707963267948966 rad - color: '#A4610696' + color: '#A46106FF' id: food decals: - 324: -12,-1 - 325: -12,-3 + 457: -12,-3 + 458: -12,-1 - node: - color: '#A4610696' + color: '#A46106FF' id: food decals: - 318: 6,-8 - 319: 8,-8 - 322: -8,-8 - 323: -6,-8 + 455: -8,-8 + 456: -6,-8 + 459: 6,-8 + 460: 8,-8 - node: angle: 1.5707963267948966 rad - color: '#A4610696' + color: '#A46106FF' id: food decals: - 320: 12,-1 - 321: 12,-3 + 461: 12,-3 + 462: 12,-1 type: DecalGrid - version: 2 data: @@ -973,28 +1056,19 @@ entities: type: Transform - proto: AirlockGlass entities: - - uid: 97 - components: - - rot: -1.5707963267948966 rad - pos: 8.5,9.5 - parent: 1 - type: Transform - - uid: 161 + - uid: 218 components: - - rot: -1.5707963267948966 rad - pos: 8.5,7.5 + - pos: 7.5,4.5 parent: 1 type: Transform - - uid: 163 + - uid: 358 components: - - rot: -1.5707963267948966 rad - pos: 8.5,5.5 + - pos: 8.5,8.5 parent: 1 type: Transform - - uid: 303 + - uid: 637 components: - - rot: -1.5707963267948966 rad - pos: 7.5,4.5 + - pos: 8.5,5.5 parent: 1 type: Transform - proto: AirlockGlassShuttle @@ -1073,6 +1147,12 @@ entities: type: Transform - proto: AirlockMaint entities: + - uid: 60 + components: + - rot: 1.5707963267948966 rad + pos: 6.5,9.5 + parent: 1 + type: Transform - uid: 210 components: - pos: 8.5,3.5 @@ -1084,11 +1164,6 @@ entities: pos: 5.5,14.5 parent: 1 type: Transform - - uid: 887 - components: - - pos: 6.5,10.5 - parent: 1 - type: Transform - proto: AmeController entities: - uid: 862 @@ -1181,6 +1256,12 @@ entities: type: Transform - proto: APCBasic entities: + - uid: 53 + components: + - rot: 1.5707963267948966 rad + pos: 5.5,8.5 + parent: 1 + type: Transform - uid: 123 components: - pos: 0.5,9.5 @@ -1192,12 +1273,6 @@ entities: pos: -2.5,9.5 parent: 1 type: Transform - - uid: 406 - components: - - rot: 1.5707963267948966 rad - pos: 5.5,9.5 - parent: 1 - type: Transform - uid: 578 components: - pos: 9.5,2.5 @@ -1699,6 +1774,11 @@ entities: - pos: -5.5,-3.5 parent: 1 type: Transform + - uid: 74 + components: + - pos: 2.5,7.5 + parent: 1 + type: Transform - uid: 80 components: - pos: -3.5,10.5 @@ -1724,16 +1804,56 @@ entities: - pos: -4.5,5.5 parent: 1 type: Transform + - uid: 155 + components: + - pos: -0.5,4.5 + parent: 1 + type: Transform + - uid: 161 + components: + - pos: -0.5,7.5 + parent: 1 + type: Transform + - uid: 163 + components: + - pos: 3.5,7.5 + parent: 1 + type: Transform - uid: 168 components: - pos: -5.5,9.5 parent: 1 type: Transform + - uid: 175 + components: + - pos: 6.5,8.5 + parent: 1 + type: Transform - uid: 185 components: - pos: -3.5,-3.5 parent: 1 type: Transform + - uid: 199 + components: + - pos: 0.5,7.5 + parent: 1 + type: Transform + - uid: 208 + components: + - pos: 5.5,8.5 + parent: 1 + type: Transform + - uid: 211 + components: + - pos: 8.5,11.5 + parent: 1 + type: Transform + - uid: 214 + components: + - pos: 7.5,11.5 + parent: 1 + type: Transform - uid: 216 components: - pos: -4.5,13.5 @@ -1859,26 +1979,11 @@ entities: - pos: 0.5,9.5 parent: 1 type: Transform - - uid: 468 - components: - - pos: 1.5,8.5 - parent: 1 - type: Transform - uid: 469 components: - pos: 0.5,8.5 parent: 1 type: Transform - - uid: 470 - components: - - pos: -0.5,8.5 - parent: 1 - type: Transform - - uid: 471 - components: - - pos: 2.5,8.5 - parent: 1 - type: Transform - uid: 472 components: - pos: 3.5,8.5 @@ -1924,41 +2029,6 @@ entities: - pos: 3.5,4.5 parent: 1 type: Transform - - uid: 484 - components: - - pos: -0.5,4.5 - parent: 1 - type: Transform - - uid: 485 - components: - - pos: -1.5,4.5 - parent: 1 - type: Transform - - uid: 486 - components: - - pos: 4.5,4.5 - parent: 1 - type: Transform - - uid: 487 - components: - - pos: 4.5,8.5 - parent: 1 - type: Transform - - uid: 488 - components: - - pos: -1.5,8.5 - parent: 1 - type: Transform - - uid: 489 - components: - - pos: 5.5,9.5 - parent: 1 - type: Transform - - uid: 490 - components: - - pos: 6.5,9.5 - parent: 1 - type: Transform - uid: 491 components: - pos: 7.5,9.5 @@ -2174,16 +2244,6 @@ entities: - pos: -4.5,4.5 parent: 1 type: Transform - - uid: 660 - components: - - pos: 8.5,10.5 - parent: 1 - type: Transform - - uid: 661 - components: - - pos: 9.5,10.5 - parent: 1 - type: Transform - uid: 719 components: - pos: -0.5,-3.5 @@ -2393,6 +2453,11 @@ entities: - pos: 0.5,9.5 parent: 1 type: Transform + - uid: 158 + components: + - pos: 5.5,8.5 + parent: 1 + type: Transform - uid: 169 components: - pos: -4.5,10.5 @@ -2428,11 +2493,6 @@ entities: - pos: 0.5,6.5 parent: 1 type: Transform - - uid: 410 - components: - - pos: 5.5,9.5 - parent: 1 - type: Transform - uid: 414 components: - pos: 2.5,6.5 @@ -2503,11 +2563,6 @@ entities: - pos: 4.5,8.5 parent: 1 type: Transform - - uid: 1030 - components: - - pos: 4.5,9.5 - parent: 1 - type: Transform - uid: 1031 components: - pos: -6.5,10.5 @@ -2828,31 +2883,6 @@ entities: type: Transform - canCollide: False type: Physics -- proto: ClosetJanitorFilled - entities: - - uid: 857 - components: - - pos: 8.5,12.5 - parent: 1 - type: Transform - - air: - volume: 200 - immutable: False - temperature: 293.1496 - moles: - - 1.7459903 - - 6.568249 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - type: EntityStorage - proto: ClothingBeltPlantFilled entities: - uid: 765 @@ -2917,18 +2947,6 @@ entities: type: Transform - proto: ComputerWallmountWithdrawBankATM entities: - - uid: 239 - components: - - rot: 1.5707963267948966 rad - pos: -2.5,2.5 - parent: 1 - type: Transform - - containers: - board: !type:Container - ents: [] - bank-ATM-cashSlot: !type:ContainerSlot {} - type: ContainerContainer - - type: ItemSlots - uid: 498 components: - pos: 5.5,2.5 @@ -2970,29 +2988,11 @@ entities: type: Transform - proto: CrateTrashCartJani entities: - - uid: 671 + - uid: 222 components: - pos: 8.5,13.5 parent: 1 type: Transform - - air: - volume: 200 - immutable: False - temperature: 293.1496 - moles: - - 1.7459903 - - 6.568249 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - type: EntityStorage - proto: DefibrillatorCabinetFilled entities: - uid: 766 @@ -3015,55 +3015,85 @@ entities: type: Transform - proto: DisposalBend entities: - - uid: 222 + - uid: 274 components: - rot: 1.5707963267948966 rad - pos: 7.5,2.5 + pos: 6.5,2.5 parent: 1 type: Transform - - uid: 223 + - uid: 283 components: - - rot: -1.5707963267948966 rad + - rot: 1.5707963267948966 rad + pos: 7.5,14.5 + parent: 1 + type: Transform + - uid: 310 + components: + - rot: 3.141592653589793 rad pos: 7.5,1.5 parent: 1 type: Transform - - uid: 931 + - uid: 331 components: - rot: 3.141592653589793 rad - pos: -3.5,7.5 + pos: -3.5,6.5 + parent: 1 + type: Transform + - uid: 333 + components: + - rot: -1.5707963267948966 rad + pos: 6.5,1.5 + parent: 1 + type: Transform + - uid: 336 + components: + - rot: -1.5707963267948966 rad + pos: 9.5,5.5 + parent: 1 + type: Transform + - uid: 339 + components: + - rot: -1.5707963267948966 rad + pos: 9.5,8.5 + parent: 1 + type: Transform + - uid: 714 + components: + - rot: 1.5707963267948966 rad + pos: 6.5,6.5 parent: 1 type: Transform - proto: DisposalJunction entities: - - uid: 286 + - uid: 272 components: - - rot: 3.141592653589793 rad - pos: 8.5,7.5 + - pos: -1.5,6.5 parent: 1 type: Transform - - uid: 357 + - uid: 291 components: - rot: 3.141592653589793 rad - pos: 8.5,5.5 + pos: 7.5,8.5 parent: 1 type: Transform - - uid: 359 + - uid: 749 components: - rot: 3.141592653589793 rad - pos: 8.5,9.5 + pos: 7.5,5.5 parent: 1 type: Transform - - uid: 928 +- proto: DisposalJunctionFlipped + entities: + - uid: 239 components: - - pos: -1.5,7.5 + - rot: 3.141592653589793 rad + pos: 7.5,2.5 parent: 1 type: Transform -- proto: DisposalJunctionFlipped - entities: - - uid: 211 + - uid: 275 components: - rot: 3.141592653589793 rad - pos: 8.5,2.5 + pos: 7.5,6.5 parent: 1 type: Transform - uid: 376 @@ -3074,50 +3104,72 @@ entities: type: Transform - proto: DisposalPipe entities: + - uid: 78 + components: + - rot: 1.5707963267948966 rad + pos: 8.5,5.5 + parent: 1 + type: Transform + - uid: 97 + components: + - rot: 1.5707963267948966 rad + pos: 8.5,8.5 + parent: 1 + type: Transform - uid: 219 + components: + - pos: 7.5,9.5 + parent: 1 + type: Transform + - uid: 251 components: - rot: 3.141592653589793 rad - pos: 8.5,3.5 + pos: -3.5,7.5 parent: 1 type: Transform - - uid: 353 + - uid: 253 components: - - pos: 8.5,13.5 + - rot: 3.141592653589793 rad + pos: 7.5,7.5 parent: 1 type: Transform - - uid: 354 + - uid: 254 components: - - pos: 8.5,12.5 + - rot: 3.141592653589793 rad + pos: 7.5,10.5 parent: 1 type: Transform - - uid: 355 + - uid: 260 components: - - pos: 8.5,11.5 + - rot: 3.141592653589793 rad + pos: 7.5,3.5 parent: 1 type: Transform - - uid: 356 + - uid: 280 components: - - pos: 8.5,10.5 + - pos: 7.5,11.5 parent: 1 type: Transform - - uid: 358 + - uid: 281 components: - - pos: 8.5,8.5 + - pos: 7.5,12.5 parent: 1 type: Transform - - uid: 360 + - uid: 282 components: - - pos: 8.5,6.5 + - pos: 7.5,13.5 parent: 1 type: Transform - - uid: 362 + - uid: 286 components: - - pos: 8.5,4.5 + - rot: 3.141592653589793 rad + pos: 7.5,4.5 parent: 1 type: Transform - - uid: 369 + - uid: 305 components: - - pos: -1.5,6.5 + - rot: 3.141592653589793 rad + pos: -1.5,7.5 parent: 1 type: Transform - uid: 370 @@ -3194,42 +3246,29 @@ entities: pos: 5.5,1.5 parent: 1 type: Transform - - uid: 385 - components: - - rot: 1.5707963267948966 rad - pos: 6.5,1.5 - parent: 1 - type: Transform - - uid: 932 - components: - - rot: 1.5707963267948966 rad - pos: -2.5,7.5 - parent: 1 - type: Transform - uid: 933 components: - rot: 3.141592653589793 rad pos: -3.5,8.5 parent: 1 type: Transform -- proto: DisposalTrunk - entities: - - uid: 218 + - uid: 991 components: - - rot: 3.141592653589793 rad - pos: 8.5,1.5 + - rot: -1.5707963267948966 rad + pos: -2.5,6.5 parent: 1 type: Transform - - uid: 280 +- proto: DisposalTrunk + entities: + - uid: 248 components: - rot: -1.5707963267948966 rad - pos: 9.5,7.5 + pos: 8.5,1.5 parent: 1 type: Transform - - uid: 361 + - uid: 303 components: - - rot: -1.5707963267948966 rad - pos: 9.5,5.5 + - pos: 9.5,9.5 parent: 1 type: Transform - uid: 366 @@ -3243,15 +3282,15 @@ entities: - pos: -1.5,8.5 parent: 1 type: Transform - - uid: 499 + - uid: 716 components: - - pos: 8.5,14.5 + - pos: 9.5,6.5 parent: 1 type: Transform - - uid: 650 + - uid: 887 components: - - rot: -1.5707963267948966 rad - pos: 9.5,9.5 + - rot: 3.141592653589793 rad + pos: 6.5,5.5 parent: 1 type: Transform - uid: 934 @@ -3281,6 +3320,11 @@ entities: - pos: -3.5,9.5 parent: 1 type: Transform + - uid: 931 + components: + - pos: 6.5,5.5 + parent: 1 + type: Transform - proto: DogBed entities: - uid: 844 @@ -3454,12 +3498,6 @@ entities: type: Physics - proto: EmergencyLight entities: - - uid: 208 - components: - - rot: 1.5707963267948966 rad - pos: 6.5,9.5 - parent: 1 - type: Transform - uid: 226 components: - rot: 1.5707963267948966 rad @@ -3476,6 +3514,12 @@ entities: - pos: 1.5,8.5 parent: 1 type: Transform + - uid: 338 + components: + - rot: 1.5707963267948966 rad + pos: 6.5,8.5 + parent: 1 + type: Transform - uid: 363 components: - pos: 5.5,1.5 @@ -3528,9 +3572,10 @@ entities: type: Transform - proto: ExtinguisherCabinetFilled entities: - - uid: 57 + - uid: 223 components: - - pos: 8.5,2.5 + - rot: 1.5707963267948966 rad + pos: -2.5,2.5 parent: 1 type: Transform - uid: 392 @@ -3544,12 +3589,6 @@ entities: - pos: 1.5,9.5 parent: 1 type: Transform - - uid: 714 - components: - - rot: 1.5707963267948966 rad - pos: -4.5,2.5 - parent: 1 - type: Transform - uid: 888 components: - rot: 3.141592653589793 rad @@ -3575,9 +3614,6 @@ entities: - 41 - 70 - 646 - - 647 - - 644 - - 645 type: DeviceList - uid: 978 components: @@ -3592,8 +3628,6 @@ entities: - 975 - 976 - 977 - - 647 - - 644 type: DeviceNetwork - devices: - 972 @@ -3602,8 +3636,6 @@ entities: - 975 - 976 - 977 - - 647 - - 644 type: DeviceList - uid: 979 components: @@ -3618,8 +3650,6 @@ entities: - 969 - 970 - 971 - - 647 - - 644 type: DeviceNetwork - devices: - 966 @@ -3628,8 +3658,6 @@ entities: - 969 - 970 - 971 - - 647 - - 644 type: DeviceList - proto: Firelock entities: @@ -3661,12 +3689,6 @@ entities: pos: -3.5,2.5 parent: 1 type: Transform - - uid: 291 - components: - - rot: -1.5707963267948966 rad - pos: 6.5,10.5 - parent: 1 - type: Transform - uid: 855 components: - pos: 1.5,14.5 @@ -3677,8 +3699,24 @@ entities: - pos: 5.5,14.5 parent: 1 type: Transform + - uid: 857 + components: + - rot: 3.141592653589793 rad + pos: 6.5,9.5 + parent: 1 + type: Transform - proto: FirelockGlass entities: + - uid: 57 + components: + - pos: 8.5,5.5 + parent: 1 + type: Transform + - uid: 340 + components: + - pos: 8.5,8.5 + parent: 1 + type: Transform - uid: 635 components: - pos: 7.5,4.5 @@ -3990,31 +4028,6 @@ entities: - pos: -6.9736867,1.5940995 parent: 1 type: Transform -- proto: GasDualPortVentPump - entities: - - uid: 253 - components: - - rot: -1.5707963267948966 rad - pos: 6.5,11.5 - parent: 1 - type: Transform - - color: '#0055CCFF' - type: AtmosPipeColor - - uid: 637 - components: - - pos: 4.5,7.5 - parent: 1 - type: Transform - - color: '#0055CCFF' - type: AtmosPipeColor - - uid: 757 - components: - - rot: -1.5707963267948966 rad - pos: 3.5,11.5 - parent: 1 - type: Transform - - color: '#0055CCFF' - type: AtmosPipeColor - proto: GasPassiveVent entities: - uid: 347 @@ -4027,81 +4040,37 @@ entities: type: AtmosPipeColor - proto: GasPipeBend entities: - - uid: 630 + - uid: 359 components: - rot: 3.141592653589793 rad - pos: 5.5,6.5 + pos: 0.5,8.5 parent: 1 type: Transform - color: '#990000FF' type: AtmosPipeColor - - uid: 657 - components: - - rot: 3.141592653589793 rad - pos: 4.5,5.5 - parent: 1 - type: Transform - - color: '#0055CCFF' - type: AtmosPipeColor - - uid: 663 + - uid: 468 components: - rot: 3.141592653589793 rad - pos: 0.5,9.5 - parent: 1 - type: Transform - - color: '#990000FF' - type: AtmosPipeColor - - uid: 993 - components: - - rot: 1.5707963267948966 rad - pos: 7.5,9.5 + pos: 1.5,10.5 parent: 1 type: Transform - color: '#0055CCFF' type: AtmosPipeColor - - uid: 998 - components: - - pos: 9.5,10.5 - parent: 1 - type: Transform - - color: '#990000FF' - type: AtmosPipeColor - - uid: 999 - components: - - pos: 9.5,8.5 - parent: 1 - type: Transform - - color: '#990000FF' - type: AtmosPipeColor - - uid: 1004 - components: - - pos: 9.5,6.5 - parent: 1 - type: Transform - - color: '#990000FF' - type: AtmosPipeColor - proto: GasPipeFourway entities: - - uid: 716 + - uid: 354 components: - - pos: 7.5,5.5 + - pos: 6.5,11.5 parent: 1 type: Transform - color: '#0055CCFF' type: AtmosPipeColor - - uid: 789 - components: - - pos: 5.5,8.5 - parent: 1 - type: Transform - - color: '#990000FF' - type: AtmosPipeColor - - uid: 790 + - uid: 385 components: - - pos: 5.5,10.5 + - pos: 6.5,5.5 parent: 1 type: Transform - - color: '#990000FF' + - color: '#0055CCFF' type: AtmosPipeColor - proto: GasPipeStraight entities: @@ -4112,36 +4081,37 @@ entities: type: Transform - color: '#990000FF' type: AtmosPipeColor - - uid: 199 + - uid: 266 components: - - pos: 4.5,10.5 + - rot: -1.5707963267948966 rad + pos: 5.5,11.5 parent: 1 type: Transform - color: '#0055CCFF' type: AtmosPipeColor - - uid: 248 + - uid: 355 components: - - rot: -1.5707963267948966 rad - pos: 2.5,11.5 + - rot: 1.5707963267948966 rad + pos: 4.5,8.5 parent: 1 type: Transform - - color: '#0055CCFF' + - color: '#990000FF' type: AtmosPipeColor - - uid: 254 + - uid: 360 components: - rot: -1.5707963267948966 rad - pos: 1.5,11.5 + pos: 8.5,8.5 parent: 1 type: Transform - color: '#0055CCFF' type: AtmosPipeColor - - uid: 266 + - uid: 406 components: - rot: -1.5707963267948966 rad - pos: 5.5,11.5 + pos: 7.5,9.5 parent: 1 type: Transform - - color: '#0055CCFF' + - color: '#990000FF' type: AtmosPipeColor - uid: 452 components: @@ -4151,206 +4121,180 @@ entities: type: Transform - color: '#990000FF' type: AtmosPipeColor - - uid: 573 - components: - - pos: 4.5,8.5 - parent: 1 - type: Transform - - color: '#0055CCFF' - type: AtmosPipeColor - - uid: 632 - components: - - rot: 3.141592653589793 rad - pos: 5.5,7.5 - parent: 1 - type: Transform - - color: '#990000FF' - type: AtmosPipeColor - - uid: 652 + - uid: 484 components: - - rot: 3.141592653589793 rad - pos: 7.5,4.5 + - pos: 6.5,4.5 parent: 1 type: Transform - color: '#0055CCFF' type: AtmosPipeColor - - uid: 655 + - uid: 485 components: - - rot: -1.5707963267948966 rad - pos: 5.5,5.5 + - pos: 6.5,9.5 parent: 1 type: Transform - color: '#0055CCFF' type: AtmosPipeColor - - uid: 656 + - uid: 486 components: - - rot: -1.5707963267948966 rad - pos: 6.5,5.5 + - pos: 6.5,10.5 parent: 1 type: Transform - color: '#0055CCFF' type: AtmosPipeColor - - uid: 662 + - uid: 487 components: - - pos: 4.5,6.5 + - rot: 1.5707963267948966 rad + pos: 2.5,11.5 parent: 1 type: Transform - color: '#0055CCFF' type: AtmosPipeColor - - uid: 664 + - uid: 488 components: - - rot: 1.5707963267948966 rad - pos: 1.5,9.5 + - rot: 3.141592653589793 rad + pos: 0.5,9.5 parent: 1 type: Transform - color: '#990000FF' type: AtmosPipeColor - - uid: 665 + - uid: 489 components: - rot: 1.5707963267948966 rad - pos: 2.5,9.5 + pos: 1.5,8.5 parent: 1 type: Transform - color: '#990000FF' type: AtmosPipeColor - - uid: 666 + - uid: 490 components: - rot: 1.5707963267948966 rad - pos: 3.5,9.5 + pos: 2.5,8.5 parent: 1 type: Transform - color: '#990000FF' type: AtmosPipeColor - - uid: 667 + - uid: 499 components: - rot: 1.5707963267948966 rad - pos: 4.5,9.5 + pos: 3.5,8.5 parent: 1 type: Transform - color: '#990000FF' type: AtmosPipeColor - - uid: 673 - components: - - rot: 3.141592653589793 rad - pos: 6.5,5.5 - parent: 1 - type: Transform - - color: '#990000FF' - type: AtmosPipeColor - - uid: 674 + - uid: 532 components: - - rot: 3.141592653589793 rad - pos: 6.5,4.5 + - pos: 7.5,5.5 parent: 1 type: Transform - color: '#990000FF' type: AtmosPipeColor - - uid: 779 + - uid: 543 components: - rot: 3.141592653589793 rad - pos: 4.5,9.5 + pos: 6.5,7.5 parent: 1 type: Transform - color: '#0055CCFF' type: AtmosPipeColor - - uid: 832 + - uid: 573 components: - rot: -1.5707963267948966 rad - pos: 9.5,12.5 + pos: 6.5,9.5 parent: 1 type: Transform - color: '#990000FF' type: AtmosPipeColor - - uid: 994 + - uid: 632 components: - - pos: 7.5,8.5 + - rot: 3.141592653589793 rad + pos: 5.5,7.5 parent: 1 type: Transform - - color: '#0055CCFF' + - color: '#990000FF' type: AtmosPipeColor - - uid: 995 + - uid: 645 components: - rot: -1.5707963267948966 rad - pos: 6.5,10.5 + pos: 8.5,6.5 parent: 1 type: Transform - color: '#990000FF' type: AtmosPipeColor - - uid: 996 + - uid: 647 components: - rot: -1.5707963267948966 rad - pos: 7.5,10.5 + pos: 8.5,9.5 parent: 1 type: Transform - color: '#990000FF' type: AtmosPipeColor - - uid: 997 + - uid: 652 components: - - rot: -1.5707963267948966 rad - pos: 8.5,10.5 + - rot: 1.5707963267948966 rad + pos: 7.5,5.5 parent: 1 type: Transform - - color: '#990000FF' + - color: '#0055CCFF' type: AtmosPipeColor - - uid: 1000 + - uid: 653 components: - - rot: -1.5707963267948966 rad - pos: 8.5,8.5 + - rot: 1.5707963267948966 rad + pos: 7.5,8.5 parent: 1 type: Transform - - color: '#990000FF' + - color: '#0055CCFF' type: AtmosPipeColor - - uid: 1001 + - uid: 660 components: - rot: -1.5707963267948966 rad - pos: 7.5,8.5 + pos: 4.5,11.5 parent: 1 type: Transform - - color: '#990000FF' + - color: '#0055CCFF' type: AtmosPipeColor - - uid: 1002 + - uid: 661 components: - - rot: -1.5707963267948966 rad - pos: 6.5,8.5 + - pos: 6.5,6.5 parent: 1 type: Transform - - color: '#990000FF' + - color: '#0055CCFF' type: AtmosPipeColor - - uid: 1003 + - uid: 663 components: - - rot: -1.5707963267948966 rad - pos: 8.5,6.5 + - rot: 1.5707963267948966 rad + pos: 6.5,6.5 parent: 1 type: Transform - color: '#990000FF' type: AtmosPipeColor - - uid: 1005 + - uid: 673 components: - - rot: -1.5707963267948966 rad - pos: 7.5,6.5 + - rot: 1.5707963267948966 rad + pos: 5.5,5.5 parent: 1 type: Transform - - color: '#990000FF' + - color: '#0055CCFF' type: AtmosPipeColor - - uid: 1006 + - uid: 674 components: - - pos: 7.5,6.5 + - pos: 7.5,4.5 parent: 1 type: Transform - - color: '#0055CCFF' + - color: '#990000FF' type: AtmosPipeColor - - uid: 1007 + - uid: 832 components: - rot: -1.5707963267948966 rad - pos: 8.5,7.5 + pos: 9.5,12.5 parent: 1 type: Transform - - color: '#0055CCFF' + - color: '#990000FF' type: AtmosPipeColor - - uid: 1008 + - uid: 865 components: - - rot: -1.5707963267948966 rad - pos: 8.5,9.5 + - rot: 1.5707963267948966 rad + pos: 3.5,11.5 parent: 1 type: Transform - color: '#0055CCFF' @@ -4372,40 +4316,64 @@ entities: type: Transform - color: '#990000FF' type: AtmosPipeColor - - uid: 155 + - uid: 357 + components: + - rot: 3.141592653589793 rad + pos: 5.5,6.5 + parent: 1 + type: Transform + - color: '#990000FF' + type: AtmosPipeColor + - uid: 387 + components: + - rot: 3.141592653589793 rad + pos: 6.5,12.5 + parent: 1 + type: Transform + - color: '#990000FF' + type: AtmosPipeColor + - uid: 389 + components: + - rot: -1.5707963267948966 rad + pos: 5.5,8.5 + parent: 1 + type: Transform + - color: '#990000FF' + type: AtmosPipeColor + - uid: 410 components: - rot: 1.5707963267948966 rad - pos: 7.5,7.5 + pos: 6.5,8.5 parent: 1 type: Transform - color: '#0055CCFF' type: AtmosPipeColor - - uid: 251 + - uid: 470 components: - - pos: 4.5,11.5 + - pos: 1.5,11.5 parent: 1 type: Transform - color: '#0055CCFF' type: AtmosPipeColor - - uid: 387 + - uid: 530 components: - - rot: 3.141592653589793 rad - pos: 6.5,12.5 + - pos: 7.5,6.5 parent: 1 type: Transform - color: '#990000FF' type: AtmosPipeColor - - uid: 784 + - uid: 630 components: - - pos: 6.5,6.5 + - rot: 1.5707963267948966 rad + pos: 5.5,9.5 parent: 1 type: Transform - color: '#990000FF' type: AtmosPipeColor - - uid: 788 + - uid: 662 components: - rot: -1.5707963267948966 rad - pos: 5.5,9.5 + pos: 5.5,10.5 parent: 1 type: Transform - color: '#990000FF' @@ -4448,6 +4416,22 @@ entities: type: AtmosPipeColor - proto: GasVentPump entities: + - uid: 356 + components: + - rot: -1.5707963267948966 rad + pos: 2.5,10.5 + parent: 1 + type: Transform + - color: '#0055CCFF' + type: AtmosPipeColor + - uid: 361 + components: + - rot: -1.5707963267948966 rad + pos: 9.5,8.5 + parent: 1 + type: Transform + - color: '#0055CCFF' + type: AtmosPipeColor - uid: 407 components: - rot: 1.5707963267948966 rad @@ -4456,72 +4440,59 @@ entities: type: Transform - color: '#0055CCFF' type: AtmosPipeColor - - uid: 644 + - uid: 471 components: - - rot: 3.141592653589793 rad - pos: 7.5,3.5 + - rot: 1.5707963267948966 rad + pos: 4.5,5.5 parent: 1 type: Transform - - ShutdownSubscribers: - - 979 - - 978 - type: DeviceNetwork - color: '#0055CCFF' type: AtmosPipeColor - - uid: 1010 + - uid: 657 components: - - rot: -1.5707963267948966 rad - pos: 9.5,5.5 + - rot: 3.141592653589793 rad + pos: 6.5,3.5 parent: 1 type: Transform - color: '#0055CCFF' type: AtmosPipeColor - - uid: 1011 + - uid: 928 components: - - rot: -1.5707963267948966 rad - pos: 9.5,7.5 + - pos: 6.5,12.5 parent: 1 type: Transform - color: '#0055CCFF' type: AtmosPipeColor - - uid: 1012 + - uid: 1010 components: - rot: -1.5707963267948966 rad - pos: 9.5,9.5 + pos: 9.5,5.5 parent: 1 type: Transform - color: '#0055CCFF' type: AtmosPipeColor - proto: GasVentScrubber entities: - - uid: 158 + - uid: 12 components: - - rot: 1.5707963267948966 rad - pos: 4.5,10.5 + - rot: -1.5707963267948966 rad + pos: 9.5,9.5 parent: 1 type: Transform - color: '#990000FF' type: AtmosPipeColor - - uid: 281 + - uid: 353 components: - - rot: 3.141592653589793 rad - pos: 9.5,5.5 + - rot: 1.5707963267948966 rad + pos: 4.5,6.5 parent: 1 type: Transform - color: '#990000FF' type: AtmosPipeColor - - uid: 530 + - uid: 541 components: - rot: 3.141592653589793 rad - pos: 9.5,7.5 - parent: 1 - type: Transform - - color: '#990000FF' - type: AtmosPipeColor - - uid: 645 - components: - - rot: 1.5707963267948966 rad - pos: 4.5,8.5 + pos: 7.5,3.5 parent: 1 type: Transform - color: '#990000FF' @@ -4533,22 +4504,18 @@ entities: type: Transform - color: '#990000FF' type: AtmosPipeColor - - uid: 647 + - uid: 650 components: - - rot: 3.141592653589793 rad - pos: 6.5,3.5 + - rot: -1.5707963267948966 rad + pos: 9.5,6.5 parent: 1 type: Transform - - ShutdownSubscribers: - - 979 - - 978 - type: DeviceNetwork - color: '#990000FF' type: AtmosPipeColor - - uid: 653 + - uid: 666 components: - - rot: 3.141592653589793 rad - pos: 9.5,9.5 + - rot: 1.5707963267948966 rad + pos: 4.5,10.5 parent: 1 type: Transform - color: '#990000FF' @@ -4575,12 +4542,6 @@ entities: pos: 5.5,-7.5 parent: 1 type: Transform - - uid: 310 - components: - - rot: 1.5707963267948966 rad - pos: 10.5,7.5 - parent: 1 - type: Transform - uid: 311 components: - rot: 1.5707963267948966 rad @@ -4678,6 +4639,16 @@ entities: - pos: 0.5,16.5 parent: 1 type: Transform + - uid: 751 + components: + - pos: 10.5,8.5 + parent: 1 + type: Transform + - uid: 757 + components: + - pos: 10.5,6.5 + parent: 1 + type: Transform - uid: 809 components: - pos: 8.5,15.5 @@ -4927,6 +4898,33 @@ entities: - pos: -6.071316,7.3206215 parent: 1 type: Transform + - uid: 999 + components: + - pos: -5.4959135,-1.4414308 + parent: 1 + type: Transform + - uid: 1000 + components: + - pos: -1.4959135,-0.4414308 + parent: 1 + type: Transform + - uid: 1001 + components: + - pos: 2.4964628,-0.4414308 + parent: 1 + type: Transform + - uid: 1002 + components: + - pos: 6.491911,-1.4101808 + parent: 1 + type: Transform +- proto: LockerJanitorFilled + entities: + - uid: 693 + components: + - pos: 8.5,12.5 + parent: 1 + type: Transform - proto: MaterialReclaimer entities: - uid: 830 @@ -4953,12 +4951,6 @@ entities: type: ContainerContainer - proto: Mirror entities: - - uid: 865 - components: - - rot: -1.5707963267948966 rad - pos: 5.5,5.5 - parent: 1 - type: Transform - uid: 989 components: - rot: -1.5707963267948966 rad @@ -4971,12 +4963,6 @@ entities: pos: 5.5,7.5 parent: 1 type: Transform - - uid: 991 - components: - - rot: -1.5707963267948966 rad - pos: 5.5,8.5 - parent: 1 - type: Transform - proto: NoticeBoardNF entities: - uid: 872 @@ -5043,9 +5029,18 @@ entities: type: Physics - proto: PosterContrabandEAT entities: - - uid: 1076 + - uid: 345 + components: + - rot: 1.5707963267948966 rad + pos: -4.5,2.5 + parent: 1 + type: Transform +- proto: PosterContrabandSmoke + entities: + - uid: 725 components: - - pos: -2.5,7.5 + - rot: 1.5707963267948966 rad + pos: -2.5,7.5 parent: 1 type: Transform - proto: PosterContrabandSpaceUp @@ -5055,6 +5050,14 @@ entities: - pos: -8.5,2.5 parent: 1 type: Transform +- proto: PosterContrabandSunkist + entities: + - uid: 346 + components: + - rot: 1.5707963267948966 rad + pos: 8.5,2.5 + parent: 1 + type: Transform - proto: PowerCellRecharger entities: - uid: 767 @@ -5196,27 +5199,25 @@ entities: type: Transform - proto: PoweredlightColoredBlack entities: - - uid: 60 - components: - - rot: 3.141592653589793 rad - pos: 9.5,9.5 - parent: 1 - type: Transform - uid: 200 components: - pos: 7.5,9.5 parent: 1 type: Transform - - uid: 333 + - uid: 445 components: - rot: 3.141592653589793 rad - pos: 9.5,7.5 + pos: 9.5,5.5 parent: 1 type: Transform - - uid: 445 + - uid: 779 components: - - rot: 3.141592653589793 rad - pos: 9.5,5.5 + - pos: 9.5,9.5 + parent: 1 + type: Transform + - uid: 788 + components: + - pos: 9.5,6.5 parent: 1 type: Transform - proto: Rack @@ -5355,36 +5356,21 @@ entities: type: Transform - uid: 829 components: - - pos: 6.5,-2.5 - parent: 1 - type: Transform -- proto: ReinforcedWindow - entities: - - uid: 28 - components: - - rot: -1.5707963267948966 rad - pos: 9.5,13.5 - parent: 1 - type: Transform - - uid: 330 - components: - - rot: -1.5707963267948966 rad - pos: 9.5,12.5 - parent: 1 - type: Transform - - uid: 338 - components: - - pos: 10.5,9.5 + - pos: 6.5,-2.5 parent: 1 type: Transform - - uid: 339 +- proto: ReinforcedWindow + entities: + - uid: 28 components: - - pos: 10.5,7.5 + - rot: -1.5707963267948966 rad + pos: 9.5,13.5 parent: 1 type: Transform - - uid: 340 + - uid: 330 components: - - pos: 10.5,5.5 + - rot: -1.5707963267948966 rad + pos: 9.5,12.5 parent: 1 type: Transform - uid: 582 @@ -5429,6 +5415,11 @@ entities: pos: -2.5,-5.5 parent: 1 type: Transform + - uid: 694 + components: + - pos: 10.5,5.5 + parent: 1 + type: Transform - uid: 701 components: - pos: -3.5,16.5 @@ -5439,6 +5430,11 @@ entities: - pos: -1.5,16.5 parent: 1 type: Transform + - uid: 752 + components: + - pos: 10.5,6.5 + parent: 1 + type: Transform - uid: 831 components: - rot: -1.5707963267948966 rad @@ -5515,6 +5511,16 @@ entities: - pos: -11.5,0.5 parent: 1 type: Transform + - uid: 993 + components: + - pos: 10.5,9.5 + parent: 1 + type: Transform + - uid: 998 + components: + - pos: 10.5,8.5 + parent: 1 + type: Transform - proto: SeedExtractor entities: - uid: 104 @@ -5538,7 +5544,7 @@ entities: parent: 1 type: Transform - links: - - 751 + - 671 type: DeviceLinkSink - uid: 151 components: @@ -5556,14 +5562,6 @@ entities: - links: - 455 type: DeviceLinkSink - - uid: 336 - components: - - pos: 10.5,7.5 - parent: 1 - type: Transform - - links: - - 331 - type: DeviceLinkSink - uid: 337 components: - pos: 10.5,5.5 @@ -5571,7 +5569,7 @@ entities: type: Transform - invokeCounter: 2 links: - - 150 + - 667 type: DeviceLinkSink - uid: 344 components: @@ -5580,24 +5578,8 @@ entities: type: Transform - invokeCounter: 2 links: - - 749 - type: DeviceLinkSink - - uid: 345 - components: - - pos: 8.5,7.5 - parent: 1 - type: Transform - - links: - 750 type: DeviceLinkSink - - uid: 346 - components: - - pos: 8.5,9.5 - parent: 1 - type: Transform - - links: - - 752 - type: DeviceLinkSink - uid: 364 components: - pos: 7.5,15.5 @@ -5798,6 +5780,30 @@ entities: - links: - 770 type: DeviceLinkSink + - uid: 784 + components: + - pos: 8.5,8.5 + parent: 1 + type: Transform + - links: + - 362 + type: DeviceLinkSink + - uid: 789 + components: + - pos: 10.5,8.5 + parent: 1 + type: Transform + - links: + - 671 + type: DeviceLinkSink + - uid: 790 + components: + - pos: 10.5,6.5 + parent: 1 + type: Transform + - links: + - 667 + type: DeviceLinkSink - uid: 808 components: - pos: 9.5,13.5 @@ -5886,15 +5892,6 @@ entities: type: DeviceLinkSink - proto: SignalButton entities: - - uid: 150 - components: - - pos: 9.5,6.5 - parent: 1 - type: Transform - - linkedPorts: - 337: - - Pressed: Toggle - type: DeviceLinkSource - uid: 173 components: - rot: -1.5707963267948966 rad @@ -5907,13 +5904,14 @@ entities: 193: - Pressed: DoorBolt type: DeviceLinkSource - - uid: 331 + - uid: 362 components: - - pos: 9.5,8.5 + - rot: 1.5707963267948966 rad + pos: 8.5,9.5 parent: 1 type: Transform - linkedPorts: - 336: + 784: - Pressed: Toggle type: DeviceLinkSource - uid: 455 @@ -5933,25 +5931,18 @@ entities: 170: - Pressed: Toggle type: DeviceLinkSource - - uid: 749 + - uid: 667 components: - - pos: 9.317261,6.5 + - pos: 9.5,7.5 parent: 1 type: Transform - linkedPorts: - 344: + 790: - Pressed: Toggle - type: DeviceLinkSource - - uid: 750 - components: - - pos: 9.317261,8.5 - parent: 1 - type: Transform - - linkedPorts: - 345: + 337: - Pressed: Toggle type: DeviceLinkSource - - uid: 751 + - uid: 671 components: - pos: 9.5,10.5 parent: 1 @@ -5959,14 +5950,17 @@ entities: - linkedPorts: 143: - Pressed: Toggle + 789: + - Pressed: Toggle type: DeviceLinkSource - - uid: 752 + - uid: 750 components: - - pos: 9.317261,10.5 + - rot: 1.5707963267948966 rad + pos: 8.5,6.5 parent: 1 type: Transform - linkedPorts: - 346: + 344: - Pressed: Toggle type: DeviceLinkSource - uid: 770 @@ -6168,10 +6162,10 @@ entities: type: Transform - proto: SignDirectionalJanitor entities: - - uid: 541 + - uid: 995 components: - rot: 3.141592653589793 rad - pos: 7.5,10.5 + pos: 7.5,9.5 parent: 1 type: Transform - proto: SignDirectionalSupply @@ -6198,24 +6192,12 @@ entities: pos: 6.4667277,6.32853 parent: 1 type: Transform - - uid: 1013 - components: - - rot: 1.5707963267948966 rad - pos: 6.487561,5.3289747 - parent: 1 - type: Transform - uid: 1036 components: - rot: 1.5707963267948966 rad pos: 6.4771442,7.3422375 parent: 1 type: Transform - - uid: 1037 - components: - - rot: 1.5707963267948966 rad - pos: 6.456311,8.332492 - parent: 1 - type: Transform - proto: SinkWide entities: - uid: 981 @@ -6299,6 +6281,13 @@ entities: - pos: 0.5,6.5 parent: 1 type: Transform +- proto: SpawnPointPilot + entities: + - uid: 997 + components: + - pos: -3.5,14.5 + parent: 1 + type: Transform - proto: SpawnPointQuartermaster entities: - uid: 177 @@ -6350,6 +6339,13 @@ entities: - pos: -8.5,11.5 parent: 1 type: Transform +- proto: SuitStorageWallmountEVAEmergency + entities: + - uid: 996 + components: + - pos: 3.5,15.5 + parent: 1 + type: Transform - proto: SurveillanceCameraRouterSupply entities: - uid: 308 @@ -6549,11 +6545,6 @@ entities: - pos: -7.5,10.5 parent: 1 type: Transform - - uid: 389 - components: - - pos: 6.5,5.5 - parent: 1 - type: Transform - uid: 399 components: - pos: -8.5,10.5 @@ -6616,12 +6607,6 @@ entities: pos: 6.5,7.5 parent: 1 type: Transform - - uid: 693 - components: - - rot: 3.141592653589793 rad - pos: 6.5,8.5 - parent: 1 - type: Transform - uid: 723 components: - rot: -1.5707963267948966 rad @@ -6769,22 +6754,14 @@ entities: type: Transform - proto: ToiletDirtyWater entities: - - uid: 260 - components: - - rot: -1.5707963267948966 rad - pos: 9.5,7.5 - parent: 1 - type: Transform - - uid: 275 + - uid: 932 components: - - rot: -1.5707963267948966 rad - pos: 9.5,5.5 + - pos: 9.5,9.5 parent: 1 type: Transform - - uid: 305 + - uid: 994 components: - - rot: -1.5707963267948966 rad - pos: 9.5,9.5 + - pos: 9.5,6.5 parent: 1 type: Transform - proto: ToyFigurineCargoTech @@ -6880,9 +6857,9 @@ entities: type: Transform - proto: VendingMachineJaniDrobe entities: - - uid: 725 + - uid: 150 components: - - pos: 7.5,14.5 + - pos: 7.5,10.5 parent: 1 type: Transform - proto: VendingMachineNutri @@ -7231,18 +7208,6 @@ entities: pos: 10.5,10.5 parent: 1 type: Transform - - uid: 532 - components: - - rot: 1.5707963267948966 rad - pos: 10.5,8.5 - parent: 1 - type: Transform - - uid: 543 - components: - - rot: 1.5707963267948966 rad - pos: 10.5,6.5 - parent: 1 - type: Transform - uid: 544 components: - rot: 1.5707963267948966 rad @@ -7345,6 +7310,12 @@ entities: - pos: -9.5,14.5 parent: 1 type: Transform + - uid: 655 + components: + - rot: 3.141592653589793 rad + pos: 10.5,7.5 + parent: 1 + type: Transform - uid: 709 components: - rot: 3.141592653589793 rad @@ -7531,36 +7502,12 @@ entities: pos: 9.5,10.5 parent: 1 type: Transform - - uid: 272 - components: - - rot: 1.5707963267948966 rad - pos: 9.5,8.5 - parent: 1 - type: Transform - - uid: 274 - components: - - rot: 1.5707963267948966 rad - pos: 9.5,6.5 - parent: 1 - type: Transform - uid: 279 components: - rot: -1.5707963267948966 rad pos: 8.5,10.5 parent: 1 type: Transform - - uid: 282 - components: - - rot: -1.5707963267948966 rad - pos: 8.5,8.5 - parent: 1 - type: Transform - - uid: 283 - components: - - rot: -1.5707963267948966 rad - pos: 8.5,6.5 - parent: 1 - type: Transform - uid: 284 components: - rot: -1.5707963267948966 rad @@ -7573,6 +7520,12 @@ entities: pos: 5.5,11.5 parent: 1 type: Transform + - uid: 369 + components: + - rot: 3.141592653589793 rad + pos: 8.5,9.5 + parent: 1 + type: Transform - uid: 384 components: - rot: 3.141592653589793 rad @@ -7624,16 +7577,34 @@ entities: - pos: 4.5,9.5 parent: 1 type: Transform - - uid: 688 + - uid: 644 components: - - rot: -1.5707963267948966 rad - pos: -2.5,5.5 + - rot: 3.141592653589793 rad + pos: 9.5,7.5 parent: 1 type: Transform - - uid: 694 + - uid: 656 components: - rot: 3.141592653589793 rad - pos: 7.5,10.5 + pos: 8.5,6.5 + parent: 1 + type: Transform + - uid: 664 + components: + - rot: 1.5707963267948966 rad + pos: 7.5,9.5 + parent: 1 + type: Transform + - uid: 665 + components: + - rot: 3.141592653589793 rad + pos: 8.5,7.5 + parent: 1 + type: Transform + - uid: 688 + components: + - rot: -1.5707963267948966 rad + pos: -2.5,5.5 parent: 1 type: Transform - uid: 810 @@ -7825,39 +7796,4 @@ entities: 141: - DoorStatus: Close type: DeviceLinkSource -- proto: WindowFrostedDirectional - entities: - - uid: 12 - components: - - pos: -6.5,12.5 - parent: 1 - type: Transform - - uid: 53 - components: - - rot: 1.5707963267948966 rad - pos: -6.5,12.5 - parent: 1 - type: Transform - - uid: 74 - components: - - pos: -8.5,12.5 - parent: 1 - type: Transform - - uid: 78 - components: - - pos: -7.5,12.5 - parent: 1 - type: Transform - - uid: 175 - components: - - rot: 1.5707963267948966 rad - pos: -6.5,14.5 - parent: 1 - type: Transform - - uid: 214 - components: - - rot: 1.5707963267948966 rad - pos: -6.5,13.5 - parent: 1 - type: Transform ... diff --git a/Resources/Maps/_NF/Shuttles/mcdelivery.yml b/Resources/Maps/_NF/Shuttles/mcdelivery.yml index 385ae8232c9..9ba76d7c952 100644 --- a/Resources/Maps/_NF/Shuttles/mcdelivery.yml +++ b/Resources/Maps/_NF/Shuttles/mcdelivery.yml @@ -64,47 +64,56 @@ entities: decals: 10: 1,1 - node: - angle: 3.141592653589793 rad color: '#FFFFFFFF' - id: LoadingArea + id: StandClear decals: - 0: 0,0 + 21: 0,0 - node: - color: '#A4610696' - id: WarnCornerNE - decals: - 8: 2,4 - - node: - color: '#A4610696' + color: '#A46106FF' id: WarnCornerNW decals: - 4: 0,4 + 19: 0,4 - node: - color: '#A4610696' + color: '#A46106FF' id: WarnCornerSmallNE decals: - 6: 1,4 + 16: 1,4 - node: - color: '#A4610696' + color: '#A46106FF' id: WarnCornerSmallNW decals: - 7: 1,4 - 9: 0,2 + 18: 1,4 + 20: 0,2 + - node: + color: '#A46106FF' + id: WarnCornerSmallSE + decals: + 15: 1,4 - node: - color: '#A4610696' + color: '#A46106FF' + id: WarnEndE + decals: + 13: 2,4 + - node: + color: '#A46106FF' id: WarnEndN decals: - 5: 1,5 + 17: 1,5 + - node: + color: '#A46106FF' + id: WarnLineE + decals: + 14: 1,3 - node: color: '#FFFFFFFF' id: WarnLineN decals: 2: 0,-1 - node: - color: '#A4610696' + color: '#A46106FF' id: WarnLineS decals: - 3: 0,3 + 12: 0,3 - node: color: '#FFFFFFFF' id: WarnLineW @@ -115,21 +124,23 @@ entities: data: tiles: 0,0: - 0: 30583 - 1: 34952 + 0: 22389 + 1: 2 + 2: 8192 + 3: 34952 0,-1: 0: 28672 - 1: 32768 + 3: 32768 -1,0: 0: 34952 -1,-1: 0: 32768 0,1: 0: 2047 - 1: 2048 + 3: 2048 -1,1: 0: 136 - 1: 2048 + 3: 2048 uniqueMixes: - volume: 2500 temperature: 293.15 @@ -146,6 +157,36 @@ entities: - 0 - 0 - 0 + - volume: 2500 + temperature: 293.15 + moles: + - 21.813705 + - 82.06108 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - volume: 2500 + temperature: 293.15 + moles: + - 21.6852 + - 81.57766 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 - volume: 2500 temperature: 293.15 moles: @@ -393,8 +434,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 1.8856695 - - 7.0937095 + - 1.8968438 + - 7.1357465 - 0 - 0 - 0 @@ -412,8 +453,9 @@ entities: occludes: True ents: - 91 - - 89 + - 108 - 67 + - 89 type: ContainerContainer - uid: 71 components: @@ -426,8 +468,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 1.7459903 - - 6.568249 + - 1.8856695 + - 7.0937095 - 0 - 0 - 0 @@ -501,14 +543,6 @@ entities: pos: 1.5,2.5 parent: 1 type: Transform -- proto: ExtinguisherCabinetFilled - entities: - - uid: 108 - components: - - rot: 1.5707963267948966 rad - pos: -0.5,0.5 - parent: 1 - type: Transform - proto: FaxMachineShip entities: - uid: 55 @@ -516,6 +550,17 @@ entities: - pos: 0.5,4.5 parent: 1 type: Transform +- proto: FireExtinguisher + entities: + - uid: 108 + components: + - flags: InContainer + type: MetaData + - parent: 23 + type: Transform + - canCollide: False + type: Physics + - type: InsideEntityStorage - proto: FirelockGlass entities: - uid: 9 diff --git a/Resources/Prototypes/_NF/Shipyard/mccargo.yml b/Resources/Prototypes/_NF/Shipyard/mccargo.yml index 87d35fe561b..2a0604b4256 100644 --- a/Resources/Prototypes/_NF/Shipyard/mccargo.yml +++ b/Resources/Prototypes/_NF/Shipyard/mccargo.yml @@ -33,6 +33,7 @@ availableJobs: Quartermaster: [ 0, 0 ] CargoTechnician: [ 0, 0 ] + Pilot: [ 0, 0 ] Chef: [ 0, 0 ] Botanist: [ 0, 0 ] Janitor: [ 0, 0 ]