From a3039102498b5969f1fabffcca0a78444d5780ed Mon Sep 17 00:00:00 2001 From: dustylens Date: Fri, 27 Dec 2024 12:10:12 -0800 Subject: [PATCH 01/14] Adds FSB Nightlight service shuttle --- .../Locale/en-US/_NF/guidebook/guides.ftl | 1 + Resources/Maps/_NF/Shuttles/nightlight.yml | 4690 +++++++++++++++++ .../Spawners/Random/Salvage/tables_loot.yml | 1 + .../Markers/Spawners/Random/posters.yml | 1 + .../_NF/Catalog/Fills/Boxes/general.yml | 32 + .../Catalog/Fills/Paper/Shipyard/manuals.yml | 9 + .../_NF/Entities/Objects/Power/lights.yml | 143 + .../Entities/Structures/Furniture/icebox.yml | 39 + .../Structures/Wallmounts/Signs/posters.yml | 14 + .../Prototypes/_NF/Guidebook/shipyard.yml | 6 + .../Prototypes/_NF/Guidebook/shuttle_maps.yml | 12 + .../Graphs/utilities/lighting.yml | 120 + .../_NF/Recipes/Construction/lighting.yml | 65 + .../Prototypes/_NF/Shipyard/nightlight.yml | 43 + .../_NF/Guidebook/Shipyard/Nightlight.xml | 103 + .../shuttle_maps/128x96.rsi/meta.json | 3 + .../shuttle_maps/128x96.rsi/nightlight.png | Bin 0 -> 2054 bytes .../Furniture/icebox.rsi/icebox.png | Bin 0 -> 1623 bytes .../Furniture/icebox.rsi/icebox_fill-1.png | Bin 0 -> 585 bytes .../Structures/Furniture/icebox.rsi/meta.json | 19 + .../Wallmounts/posters.rsi/meta.json | 5 +- .../posters.rsi/nf_poster16_contraband.png | Bin 0 -> 877 bytes 22 files changed, 5305 insertions(+), 1 deletion(-) create mode 100644 Resources/Maps/_NF/Shuttles/nightlight.yml create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Power/lights.yml create mode 100644 Resources/Prototypes/_NF/Entities/Structures/Furniture/icebox.yml create mode 100644 Resources/Prototypes/_NF/Recipes/Construction/Graphs/utilities/lighting.yml create mode 100644 Resources/Prototypes/_NF/Recipes/Construction/lighting.yml create mode 100644 Resources/Prototypes/_NF/Shipyard/nightlight.yml create mode 100644 Resources/ServerInfo/_NF/Guidebook/Shipyard/Nightlight.xml create mode 100644 Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/nightlight.png create mode 100644 Resources/Textures/_NF/Structures/Furniture/icebox.rsi/icebox.png create mode 100644 Resources/Textures/_NF/Structures/Furniture/icebox.rsi/icebox_fill-1.png create mode 100644 Resources/Textures/_NF/Structures/Furniture/icebox.rsi/meta.json create mode 100644 Resources/Textures/_NF/Structures/Wallmounts/posters.rsi/nf_poster16_contraband.png diff --git a/Resources/Locale/en-US/_NF/guidebook/guides.ftl b/Resources/Locale/en-US/_NF/guidebook/guides.ftl index 5a008481981..b8a08ee92ee 100644 --- a/Resources/Locale/en-US/_NF/guidebook/guides.ftl +++ b/Resources/Locale/en-US/_NF/guidebook/guides.ftl @@ -62,6 +62,7 @@ guide-entry-shipyard-liquidator = Liquidator guide-entry-shipyard-loader = Loader guide-entry-shipyard-mccargo = McCargo guide-entry-shipyard-mcdelivery = McDelivery +guide-entry-shipyard-nightlight = Nightlight guide-entry-shipyard-pathfinder = Pathfinder guide-entry-shipyard-phoenix = Phoenix guide-entry-shipyard-pioneer = Pioneer diff --git a/Resources/Maps/_NF/Shuttles/nightlight.yml b/Resources/Maps/_NF/Shuttles/nightlight.yml new file mode 100644 index 00000000000..c188bbbd0be --- /dev/null +++ b/Resources/Maps/_NF/Shuttles/nightlight.yml @@ -0,0 +1,4690 @@ +meta: + format: 6 + postmapinit: false +tilemap: + 0: Space + 4: FloorDark + 9: FloorDarkDiagonalMini + 10: FloorDarkMini + 7: FloorFreezer + 8: FloorRGlass + 13: FloorSteelMono + 6: FloorSteelOffset + 5: FloorTechMaint + 2: FloorWhite + 12: FloorWhiteDiagonal + 11: FloorWhiteOffset + 1: FloorWood + 131: Lattice + 3: Plating +entities: +- proto: "" + entities: + - uid: 1 + components: + - type: MetaData + name: grid + - type: Transform + pos: -0.4375,-0.5 + parent: invalid + - type: MapGrid + chunks: + 0,0: + ind: 0,0 + tiles: CAAAAAAACAAAAAAACAAAAAAABgAAAAAABgAAAAAABQAAAAAABQAAAAAABQAAAAAABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAwAAAAAABwAAAAAABwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAABQAAAAAABwAAAAAABwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAwAAAAAABwAAAAAABwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAABQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAACgAAAAAACgAAAAAACgAAAAAACgAAAAAAAwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAACgAAAAAACgAAAAAACgAAAAAACgAAAAAAAwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAACgAAAAAACgAAAAAACgAAAAAACgAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAACgAAAAAACgAAAAAAAwAAAAAAAwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + -1,0: + ind: -1,0 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAABQAAAAAABQAAAAAABQAAAAAABgAAAAAABgAAAAAACAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAADQAAAAAADQAAAAAAAwAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAADQAAAAAADQAAAAAABQAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAADQAAAAAADQAAAAAAAwAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAgwAAAAAAAwAAAAAABQAAAAAAAwAAAAAABAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAgwAAAAAAAwAAAAAABQAAAAAABQAAAAAABAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAABQAAAAAAAwAAAAAABAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAwAAAAAAAwAAAAAABAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + 0,-1: + ind: 0,-1 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAABQAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAABQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAABQAAAAAAAwAAAAAABgAAAAAABgAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABgAAAAAABgAAAAAABgAAAAAABgAAAAAABgAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABgAAAAAABgAAAAAABgAAAAAABgAAAAAABgAAAAAAAwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABgAAAAAABgAAAAAABgAAAAAABgAAAAAABgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABgAAAAAABgAAAAAABgAAAAAABgAAAAAABgAAAAAABQAAAAAABQAAAAAABQAAAAAABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + -1,-1: + ind: -1,-1 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAABgAAAAAABgAAAAAAAwAAAAAABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAABgAAAAAABgAAAAAABgAAAAAABgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAwAAAAAABgAAAAAABgAAAAAABgAAAAAABgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAABgAAAAAABgAAAAAABgAAAAAABgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAABQAAAAAABQAAAAAABQAAAAAABgAAAAAABgAAAAAABgAAAAAABgAAAAAA + version: 6 + - type: Broadphase + - type: Physics + bodyStatus: InAir + angularDamping: 0.05 + linearDamping: 0.05 + fixedRotation: False + bodyType: Dynamic + - type: Fixtures + fixtures: {} + - type: OccluderTree + - type: SpreaderGrid + - type: Shuttle + - type: GridPathfinding + - type: Gravity + gravityShakeSound: !type:SoundPathSpecifier + path: /Audio/Effects/alert.ogg + - type: DecalGrid + chunkCollection: + version: 2 + nodes: + - node: + color: '#FFFFFFFF' + id: Bot + decals: + 542: -4,8 + 543: -4,6 + - node: + color: '#FFFFFFFF' + id: BrickTileDarkCornerNe + decals: + 557: 2,9 + 565: 4,8 + - node: + color: '#FFFFFFFF' + id: BrickTileDarkCornerNw + decals: + 558: 1,9 + - node: + color: '#FFFFFFFF' + id: BrickTileDarkCornerSe + decals: + 564: 4,6 + - node: + color: '#FFFFFFFF' + id: BrickTileDarkCornerSw + decals: + 561: 1,6 + - node: + color: '#FFFFFFFF' + id: BrickTileDarkLineE + decals: + 567: 4,7 + - node: + color: '#FFFFFFFF' + id: BrickTileDarkLineN + decals: + 566: 3,8 + - node: + color: '#FFFFFFFF' + id: BrickTileDarkLineS + decals: + 562: 2,6 + 563: 3,6 + - node: + color: '#FFFFFFFF' + id: BrickTileDarkLineW + decals: + 559: 1,8 + 560: 1,7 + - node: + color: '#DE3A3AFF' + id: BrickTileSteelLineE + decals: + 161: 1,-6 + - node: + color: '#DE3A3AFF' + id: BrickTileSteelLineN + decals: + 164: -6,0 + 165: 6,0 + 511: 7,0 + 512: -7,0 + - node: + color: '#DE3A3AFF' + id: BrickTileSteelLineS + decals: + 162: -6,-1 + 163: 6,-1 + 509: -7,-1 + 510: 7,-1 + - node: + color: '#DE3A3AFF' + id: BrickTileSteelLineW + decals: + 160: -1,-6 + - node: + color: '#4B709CFF' + id: BrickTileWhiteCornerNe + decals: + 535: -1,9 + - node: + color: '#DDC3A1FF' + id: BrickTileWhiteCornerNe + decals: + 96: -3,0 + 123: 4,0 + - node: + color: '#FFFFFFFF' + id: BrickTileWhiteCornerNe + decals: + 403: 4,4 + - node: + color: '#4B709CFF' + id: BrickTileWhiteCornerNw + decals: + 534: -2,9 + - node: + color: '#DDC3A1FF' + id: BrickTileWhiteCornerNw + decals: + 95: -4,0 + 122: 3,0 + - node: + color: '#FFFFFFFF' + id: BrickTileWhiteCornerNw + decals: + 404: -4,4 + - node: + color: '#4B709CFF' + id: BrickTileWhiteCornerSe + decals: + 536: -1,6 + - node: + color: '#DDC3A1FF' + id: BrickTileWhiteCornerSe + decals: + 101: 4,-5 + 109: -3,-5 + - node: + color: '#FFFFFFFF' + id: BrickTileWhiteCornerSe + decals: + 407: 3,1 + 408: 4,2 + - node: + color: '#4B709CFF' + id: BrickTileWhiteCornerSw + decals: + 537: -2,6 + - node: + color: '#DDC3A1FF' + id: BrickTileWhiteCornerSw + decals: + 102: 3,-5 + 110: -4,-5 + - node: + color: '#FFFFFFFF' + id: BrickTileWhiteCornerSw + decals: + 405: -4,2 + 406: -3,1 + - node: + color: '#DDC3A1FF' + id: BrickTileWhiteInnerNe + decals: + 115: -3,-1 + - node: + color: '#DDC3A1FF' + id: BrickTileWhiteInnerNw + decals: + 116: 3,-1 + - node: + color: '#DDC3A1FF' + id: BrickTileWhiteInnerSe + decals: + 124: -3,-4 + - node: + color: '#FFFFFFFF' + id: BrickTileWhiteInnerSe + decals: + 419: 3,2 + - node: + color: '#DDC3A1FF' + id: BrickTileWhiteInnerSw + decals: + 103: 3,-4 + - node: + color: '#FFFFFFFF' + id: BrickTileWhiteInnerSw + decals: + 418: -3,2 + - node: + color: '#4B709CFF' + id: BrickTileWhiteLineE + decals: + 538: -1,7 + 539: -1,8 + - node: + color: '#DDC3A1FF' + id: BrickTileWhiteLineE + decals: + 97: 4,-1 + 98: 4,-2 + 99: 4,-3 + 100: 4,-4 + - node: + color: '#FFFFFFFF' + id: BrickTileWhiteLineE + decals: + 409: 4,3 + - node: + color: '#DDC3A1FF' + id: BrickTileWhiteLineN + decals: + 117: -2,-1 + 118: -1,-1 + 119: 0,-1 + 120: 1,-1 + 121: 2,-1 + - node: + color: '#FFFFFFFF' + id: BrickTileWhiteLineN + decals: + 410: 3,4 + 411: 2,4 + 412: 1,4 + 413: 0,4 + 414: -1,4 + 415: -2,4 + 416: -3,4 + - node: + color: '#DDC3A1FF' + id: BrickTileWhiteLineS + decals: + 104: 2,-4 + 105: 1,-4 + 106: 0,-4 + 107: -1,-4 + 108: -2,-4 + - node: + color: '#FFFFFFFF' + id: BrickTileWhiteLineS + decals: + 420: 2,1 + 421: 1,1 + 422: 0,1 + 423: -2,1 + 424: -1,1 + - node: + color: '#4B709CFF' + id: BrickTileWhiteLineW + decals: + 540: -2,7 + 541: -2,8 + - node: + color: '#DDC3A1FF' + id: BrickTileWhiteLineW + decals: + 111: -4,-4 + 112: -4,-3 + 113: -4,-2 + 114: -4,-1 + - node: + color: '#FFFFFFFF' + id: BrickTileWhiteLineW + decals: + 417: -4,3 + - node: + color: '#96DAFF3F' + id: CheckerNESW + decals: + 335: -4,4 + 336: -3,4 + 337: -2,4 + 338: -1,4 + 339: 0,4 + 340: 1,4 + 341: 2,4 + 342: 3,4 + 343: 4,4 + 344: 4,3 + 345: 3,3 + 346: 1,3 + 347: 2,3 + 348: 0,3 + 349: -1,3 + 350: -2,3 + 351: -3,3 + 352: -4,3 + 353: -4,2 + 354: -3,2 + 355: -2,2 + 356: -1,2 + 357: 0,2 + 358: 1,2 + 359: 2,2 + 360: 3,2 + 361: 4,2 + 362: 3,1 + 363: 2,1 + 364: 1,1 + 365: 0,1 + 366: -1,1 + 367: -2,1 + 368: -3,1 + - node: + color: '#4B709C3F' + id: CheckerNWSE + decals: + 369: -3,4 + 370: -2,4 + 371: -1,4 + 372: 0,4 + 373: 1,4 + 374: 2,4 + 375: 3,4 + 376: 4,4 + 377: 4,3 + 378: 3,3 + 379: 2,3 + 380: 1,3 + 381: 0,3 + 382: -1,3 + 383: -2,3 + 384: -3,3 + 385: 4,2 + 386: 3,2 + 387: 3,1 + 388: 2,1 + 389: 2,2 + 390: 1,2 + 391: 1,1 + 392: 0,1 + 393: 0,2 + 394: -1,2 + 395: -1,1 + 396: -2,1 + 397: -2,2 + 398: -3,2 + 399: -3,1 + 400: -4,2 + 401: -4,3 + 402: -4,4 + - node: + color: '#1861D5FF' + id: DeliveryGreyscale + decals: + 545: -1,6 + - node: + color: '#951710FF' + id: DeliveryGreyscale + decals: + 544: -2,6 + - node: + color: '#9FED587F' + id: MiniTileCheckerBOverlay + decals: + 483: 1,9 + 484: 1,8 + 485: 1,7 + 486: 1,6 + 487: 2,6 + 488: 2,7 + 489: 2,8 + 490: 2,9 + 491: 3,8 + 492: 3,7 + 493: 3,6 + 494: 4,6 + 495: 4,7 + 497: 4,8 + - node: + color: '#FFFFFFFF' + id: MiniTileDarkCornerNe + decals: + 546: 4,8 + 548: 2,9 + - node: + color: '#FFFFFFFF' + id: MiniTileDarkCornerNw + decals: + 547: 1,9 + - node: + color: '#FFFFFFFF' + id: MiniTileDarkCornerSe + decals: + 549: 4,6 + - node: + color: '#FFFFFFFF' + id: MiniTileDarkCornerSw + decals: + 550: 1,6 + - node: + color: '#FFFFFFFF' + id: MiniTileDarkLineE + decals: + 555: 4,7 + - node: + color: '#FFFFFFFF' + id: MiniTileDarkLineN + decals: + 556: 3,8 + - node: + color: '#FFFFFFFF' + id: MiniTileDarkLineS + decals: + 551: 3,6 + 552: 2,6 + - node: + color: '#FFFFFFFF' + id: MiniTileDarkLineW + decals: + 553: 1,8 + 554: 1,7 + - node: + color: '#DDC3A17F' + id: OffsetOverlay + decals: + 57: -4,0 + 58: -3,0 + 59: -4,-1 + 60: -3,-1 + 61: -1,-1 + 62: -2,-1 + 63: 0,-1 + 64: 1,-1 + 65: 2,-1 + 66: 3,-1 + 67: 3,0 + 68: 4,0 + 69: 4,-1 + 70: 4,-2 + 71: 3,-2 + 73: 2,-3 + 74: 3,-3 + 75: 4,-3 + 76: 4,-4 + 77: 4,-5 + 78: 3,-5 + 79: 3,-4 + 80: 2,-4 + 81: 1,-4 + 82: 0,-4 + 83: -1,-4 + 84: -2,-4 + 85: -3,-4 + 86: -4,-4 + 87: -4,-3 + 88: -4,-2 + 89: -3,-2 + 91: -2,-3 + 92: -3,-3 + 93: -3,-5 + 94: -4,-5 + 524: -1,-2 + 525: -1,-3 + 526: 0,-3 + 527: 0,-2 + 528: 1,-2 + 529: 1,-3 + - node: + color: '#FFFFFFFF' + id: WarnLineE + decals: + 498: 8,0 + 500: -8,0 + 501: -8,-1 + 507: 8,-1 + 569: -3,7 + - node: + color: '#FFFFFFFF' + id: WarnLineGreyscaleE + decals: + 13: 5,0 + 14: 5,-1 + 19: -5,0 + 20: -5,-1 + 232: -5,3 + 236: 5,3 + 533: 0,7 + - node: + color: '#FFFFFFFF' + id: WarnLineGreyscaleN + decals: + 35: -1,-5 + 428: 3,5 + - node: + color: '#FFFFFFFF' + id: WarnLineGreyscaleS + decals: + 38: -1,-5 + 426: 3,5 + - node: + color: '#FFFFFFFF' + id: WarnLineGreyscaleW + decals: + 3: -5,0 + 4: -5,-1 + 5: 5,0 + 6: 5,-1 + 231: -5,3 + 235: 5,3 + 532: 0,7 + - node: + color: '#FFFFFFFF' + id: WarnLineN + decals: + 32: -1,-7 + 43: 1,-7 + - node: + color: '#FFFFFFFF' + id: WarnLineS + decals: + 502: -8,0 + 503: -8,-1 + 504: 8,0 + 506: 8,-1 + 568: -3,7 + - node: + color: '#FFFFFFFF' + id: WarnLineW + decals: + 29: -1,-7 + 44: 1,-7 + - type: GridAtmosphere + version: 2 + data: + tiles: + 0,0: + 0: 65535 + 0,-1: + 0: 65535 + -1,0: + 0: 65519 + 0,1: + 0: 65167 + -1,1: + 0: 64783 + 0,2: + 0: 110 + 1: 2048 + -1,2: + 0: 205 + 1: 512 + 1,0: + 0: 12559 + 2: 52224 + 1,1: + 0: 4353 + 2: 12 + 1: 52224 + 1,2: + 0: 1 + 1: 32 + 1,-1: + 0: 61713 + 1: 192 + 2,0: + 0: 1 + 2,1: + 1: 16 + 2,-1: + 0: 4096 + 1: 16 + -2,0: + 0: 58895 + -2,-1: + 0: 61440 + 1: 112 + -2,1: + 1: 26128 + 0: 6 + -2,2: + 1: 128 + -1,-1: + 0: 65535 + 0,-2: + 0: 41760 + 1: 64 + -1,-2: + 0: 47232 + 1: 64 + 1,-2: + 0: 4096 + 1: 512 + -2,-2: + 1: 2048 + uniqueMixes: + - volume: 2500 + temperature: 293.15 + moles: + - 21.824879 + - 82.10312 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - volume: 2500 + immutable: True + moles: + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - volume: 2500 + temperature: 235 + moles: + - 21.824879 + - 82.10312 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + chunkSize: 4 + - type: GasTileOverlay + - type: RadiationGridResistance +- proto: AirAlarm + entities: + - uid: 354 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -4.5,2.5 + parent: 1 + - type: DeviceList + devices: + - 453 + - 456 + - 454 + - 457 + - 455 + - 452 + - 445 + - 446 + - 447 + - 575 + - 448 + - 449 + - 450 + - 451 + - 569 + - 568 + - 570 + - 571 + - 460 + - 461 + - 443 + - 444 + - 442 + - 441 + - 480 + - 482 + - 471 + - 470 + - 466 + - type: DeviceLinkSource + linkedPorts: + 305: + - AirDanger: Close + 306: + - AirDanger: Close + 307: + - AirDanger: Close + 314: + - AirDanger: Close + 313: + - AirDanger: Close + 312: + - AirDanger: Close + 311: + - AirDanger: Close + 310: + - AirDanger: Close + 309: + - AirDanger: Close + 308: + - AirDanger: Close + 576: + - AirDanger: Close + 577: + - AirDanger: Close + 578: + - AirDanger: Close + 579: + - AirDanger: Close + 580: + - AirDanger: Close +- proto: AirlockCommandGlass + entities: + - uid: 190 + components: + - type: Transform + pos: 0.5,7.5 + parent: 1 +- proto: AirlockExternalGlass + entities: + - uid: 42 + components: + - type: Transform + pos: 5.5,-0.5 + parent: 1 + - uid: 80 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,-4.5 + parent: 1 + - uid: 159 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,-4.5 + parent: 1 + - uid: 180 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 5.5,0.5 + parent: 1 + - uid: 182 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -4.5,0.5 + parent: 1 + - uid: 183 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -4.5,-0.5 + parent: 1 +- proto: AirlockFreezer + entities: + - uid: 347 + components: + - type: Transform + pos: 5.5,3.5 + parent: 1 +- proto: AirlockGlassShuttle + entities: + - uid: 13 + components: + - type: Transform + pos: -0.5,-6.5 + parent: 1 + - uid: 100 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 8.5,-0.5 + parent: 1 + - uid: 133 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -7.5,0.5 + parent: 1 + - uid: 218 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 8.5,0.5 + parent: 1 + - uid: 220 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -7.5,-0.5 + parent: 1 + - uid: 221 + components: + - type: Transform + pos: 1.5,-6.5 + parent: 1 +- proto: AirlockHydroponics + entities: + - uid: 248 + components: + - type: Transform + pos: 3.5,5.5 + parent: 1 +- proto: AirSensor + entities: + - uid: 575 + components: + - type: Transform + pos: 0.5,1.5 + parent: 1 + - type: DeviceNetwork + deviceLists: + - 354 +- proto: APCBasic + entities: + - uid: 234 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,6.5 + parent: 1 +- proto: AtmosDeviceFanDirectional + entities: + - uid: 9 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 5.5,3.5 + parent: 1 + - uid: 14 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 8.5,-0.5 + parent: 1 + - uid: 35 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 8.5,0.5 + parent: 1 + - uid: 36 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -7.5,-0.5 + parent: 1 + - uid: 222 + components: + - type: Transform + pos: 1.5,-6.5 + parent: 1 + - uid: 225 + components: + - type: Transform + pos: -0.5,-6.5 + parent: 1 + - uid: 231 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -7.5,0.5 + parent: 1 +- proto: AtmosFixBlockerMarker + entities: + - uid: 192 + components: + - type: Transform + pos: 7.5,-2.5 + parent: 1 + - uid: 258 + components: + - type: Transform + pos: -6.5,-2.5 + parent: 1 + - uid: 264 + components: + - type: Transform + pos: -4.5,-5.5 + parent: 1 + - uid: 267 + components: + - type: Transform + pos: 5.5,-5.5 + parent: 1 + - uid: 269 + components: + - type: Transform + pos: 6.5,-2.5 + parent: 1 + - uid: 270 + components: + - type: Transform + pos: -5.5,-2.5 + parent: 1 + - uid: 271 + components: + - type: Transform + pos: 7.5,6.5 + parent: 1 + - uid: 272 + components: + - type: Transform + pos: 7.5,7.5 + parent: 1 + - uid: 273 + components: + - type: Transform + pos: 6.5,7.5 + parent: 1 + - uid: 274 + components: + - type: Transform + pos: 6.5,6.5 + parent: 1 + - uid: 275 + components: + - type: Transform + pos: 3.5,10.5 + parent: 1 + - uid: 276 + components: + - type: Transform + pos: 5.5,9.5 + parent: 1 + - uid: 277 + components: + - type: Transform + pos: -2.5,10.5 + parent: 1 + - uid: 278 + components: + - type: Transform + pos: -4.5,9.5 + parent: 1 + - uid: 279 + components: + - type: Transform + pos: -5.5,7.5 + parent: 1 + - uid: 280 + components: + - type: Transform + pos: -5.5,6.5 + parent: 1 + - uid: 281 + components: + - type: Transform + pos: -6.5,6.5 + parent: 1 + - uid: 282 + components: + - type: Transform + pos: -6.5,7.5 + parent: 1 + - uid: 297 + components: + - type: Transform + pos: 8.5,5.5 + parent: 1 + - uid: 299 + components: + - type: Transform + pos: -7.5,5.5 + parent: 1 + - uid: 414 + components: + - type: Transform + pos: -7.5,-2.5 + parent: 1 + - uid: 415 + components: + - type: Transform + pos: 8.5,-2.5 + parent: 1 + - uid: 416 + components: + - type: Transform + pos: -1.5,-6.5 + parent: 1 + - uid: 417 + components: + - type: Transform + pos: 2.5,-6.5 + parent: 1 +- proto: AtmosFixFreezerMarker + entities: + - uid: 48 + components: + - type: Transform + pos: 6.5,2.5 + parent: 1 + - uid: 214 + components: + - type: Transform + pos: 6.5,3.5 + parent: 1 + - uid: 215 + components: + - type: Transform + pos: 7.5,4.5 + parent: 1 + - uid: 216 + components: + - type: Transform + pos: 6.5,4.5 + parent: 1 + - uid: 219 + components: + - type: Transform + pos: 7.5,2.5 + parent: 1 + - uid: 321 + components: + - type: Transform + pos: 7.5,3.5 + parent: 1 +- proto: BarSign + entities: + - uid: 97 + components: + - type: Transform + pos: 0.5,5.5 + parent: 1 +- proto: BenchSofaCorpCorner + entities: + - uid: 57 + components: + - type: Transform + pos: -1.5,-1.5 + parent: 1 +- proto: BenchSofaCorpLeft + entities: + - uid: 54 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,-2.5 + parent: 1 +- proto: BenchSofaCorpMiddle + entities: + - uid: 78 + components: + - type: Transform + pos: -2.5,-1.5 + parent: 1 +- proto: BenchSofaCorpRight + entities: + - uid: 60 + components: + - type: Transform + pos: -3.5,-1.5 + parent: 1 +- proto: Biogenerator + entities: + - uid: 49 + components: + - type: Transform + pos: -6.5,2.5 + parent: 1 +- proto: BoozeDispenser + entities: + - uid: 62 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 4.5,2.5 + parent: 1 +- proto: BoxColoredLightBulb + entities: + - uid: 434 + components: + - type: Transform + pos: -5.618571,4.7820187 + parent: 1 +- proto: BoxTrashbag + entities: + - uid: 520 + components: + - type: Transform + pos: -5.397615,4.5558963 + parent: 1 +- proto: Bucket + entities: + - uid: 229 + components: + - type: Transform + pos: 1.7740426,8.735085 + parent: 1 +- proto: ButtonFrameCaution + entities: + - uid: 232 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,6.75 + parent: 1 + - uid: 345 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,8.25 + parent: 1 + - uid: 484 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -4.5,7.5 + parent: 1 +- proto: ButtonFrameCautionSecurity + entities: + - uid: 120 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,8.75 + parent: 1 +- proto: ButtonFrameExit + entities: + - uid: 75 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 4.25,1.5 + parent: 1 +- proto: ButtonFrameGrey + entities: + - uid: 82 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 5.5,2.75 + parent: 1 + - uid: 581 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,6.75 + parent: 1 +- proto: ButtonFrameJanitor + entities: + - uid: 329 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 5.5,4.25 + parent: 1 +- proto: CableApcExtension + entities: + - uid: 83 + components: + - type: Transform + pos: 4.5,7.5 + parent: 1 + - uid: 88 + components: + - type: Transform + pos: -3.5,7.5 + parent: 1 + - uid: 89 + components: + - type: Transform + pos: -2.5,7.5 + parent: 1 + - uid: 91 + components: + - type: Transform + pos: 7.5,4.5 + parent: 1 + - uid: 92 + components: + - type: Transform + pos: -6.5,4.5 + parent: 1 + - uid: 114 + components: + - type: Transform + pos: 1.5,7.5 + parent: 1 + - uid: 116 + components: + - type: Transform + pos: 0.5,6.5 + parent: 1 + - uid: 138 + components: + - type: Transform + pos: -0.5,7.5 + parent: 1 + - uid: 175 + components: + - type: Transform + pos: 0.5,7.5 + parent: 1 + - uid: 349 + components: + - type: Transform + pos: 3.5,7.5 + parent: 1 + - uid: 351 + components: + - type: Transform + pos: -1.5,9.5 + parent: 1 + - uid: 352 + components: + - type: Transform + pos: -1.5,8.5 + parent: 1 + - uid: 353 + components: + - type: Transform + pos: -1.5,7.5 + parent: 1 + - uid: 357 + components: + - type: Transform + pos: 2.5,7.5 + parent: 1 + - uid: 360 + components: + - type: Transform + pos: 3.5,6.5 + parent: 1 + - uid: 366 + components: + - type: Transform + pos: -6.5,3.5 + parent: 1 + - uid: 367 + components: + - type: Transform + pos: -5.5,3.5 + parent: 1 + - uid: 368 + components: + - type: Transform + pos: -4.5,3.5 + parent: 1 + - uid: 369 + components: + - type: Transform + pos: -3.5,3.5 + parent: 1 + - uid: 370 + components: + - type: Transform + pos: -2.5,3.5 + parent: 1 + - uid: 371 + components: + - type: Transform + pos: -1.5,3.5 + parent: 1 + - uid: 372 + components: + - type: Transform + pos: -0.5,3.5 + parent: 1 + - uid: 373 + components: + - type: Transform + pos: 1.5,3.5 + parent: 1 + - uid: 374 + components: + - type: Transform + pos: 2.5,3.5 + parent: 1 + - uid: 375 + components: + - type: Transform + pos: 3.5,3.5 + parent: 1 + - uid: 376 + components: + - type: Transform + pos: 4.5,3.5 + parent: 1 + - uid: 377 + components: + - type: Transform + pos: 5.5,3.5 + parent: 1 + - uid: 378 + components: + - type: Transform + pos: 6.5,3.5 + parent: 1 + - uid: 379 + components: + - type: Transform + pos: 0.5,3.5 + parent: 1 + - uid: 380 + components: + - type: Transform + pos: 7.5,3.5 + parent: 1 + - uid: 381 + components: + - type: Transform + pos: -6.5,-0.5 + parent: 1 + - uid: 382 + components: + - type: Transform + pos: -5.5,-0.5 + parent: 1 + - uid: 383 + components: + - type: Transform + pos: -4.5,-0.5 + parent: 1 + - uid: 384 + components: + - type: Transform + pos: -3.5,-0.5 + parent: 1 + - uid: 385 + components: + - type: Transform + pos: -2.5,-0.5 + parent: 1 + - uid: 386 + components: + - type: Transform + pos: -1.5,-0.5 + parent: 1 + - uid: 387 + components: + - type: Transform + pos: -0.5,-0.5 + parent: 1 + - uid: 388 + components: + - type: Transform + pos: 0.5,-0.5 + parent: 1 + - uid: 389 + components: + - type: Transform + pos: 1.5,-0.5 + parent: 1 + - uid: 390 + components: + - type: Transform + pos: 2.5,-0.5 + parent: 1 + - uid: 391 + components: + - type: Transform + pos: 3.5,-0.5 + parent: 1 + - uid: 392 + components: + - type: Transform + pos: 5.5,-0.5 + parent: 1 + - uid: 393 + components: + - type: Transform + pos: 6.5,-0.5 + parent: 1 + - uid: 394 + components: + - type: Transform + pos: 7.5,-0.5 + parent: 1 + - uid: 395 + components: + - type: Transform + pos: 4.5,-0.5 + parent: 1 + - uid: 396 + components: + - type: Transform + pos: -3.5,-3.5 + parent: 1 + - uid: 397 + components: + - type: Transform + pos: -2.5,-3.5 + parent: 1 + - uid: 398 + components: + - type: Transform + pos: -1.5,-3.5 + parent: 1 + - uid: 399 + components: + - type: Transform + pos: -0.5,-3.5 + parent: 1 + - uid: 400 + components: + - type: Transform + pos: 0.5,-3.5 + parent: 1 + - uid: 401 + components: + - type: Transform + pos: 1.5,-3.5 + parent: 1 + - uid: 402 + components: + - type: Transform + pos: 2.5,-3.5 + parent: 1 + - uid: 403 + components: + - type: Transform + pos: 3.5,-3.5 + parent: 1 + - uid: 404 + components: + - type: Transform + pos: 4.5,-3.5 + parent: 1 + - uid: 405 + components: + - type: Transform + pos: -0.5,-5.5 + parent: 1 + - uid: 406 + components: + - type: Transform + pos: -0.5,-4.5 + parent: 1 + - uid: 407 + components: + - type: Transform + pos: 3.5,2.5 + parent: 1 + - uid: 408 + components: + - type: Transform + pos: 3.5,1.5 + parent: 1 + - uid: 409 + components: + - type: Transform + pos: 3.5,0.5 + parent: 1 + - uid: 410 + components: + - type: Transform + pos: 3.5,-1.5 + parent: 1 + - uid: 411 + components: + - type: Transform + pos: 3.5,-2.5 + parent: 1 + - uid: 412 + components: + - type: Transform + pos: 3.5,4.5 + parent: 1 + - uid: 413 + components: + - type: Transform + pos: 3.5,5.5 + parent: 1 +- proto: CableHV + entities: + - uid: 93 + components: + - type: Transform + pos: -3.5,6.5 + parent: 1 + - uid: 94 + components: + - type: Transform + pos: -3.5,7.5 + parent: 1 + - uid: 139 + components: + - type: Transform + pos: -3.5,8.5 + parent: 1 + - uid: 339 + components: + - type: Transform + pos: -2.5,6.5 + parent: 1 +- proto: CableMV + entities: + - uid: 74 + components: + - type: Transform + pos: 0.5,6.5 + parent: 1 + - uid: 109 + components: + - type: Transform + pos: -2.5,6.5 + parent: 1 + - uid: 362 + components: + - type: Transform + pos: -0.5,6.5 + parent: 1 + - uid: 427 + components: + - type: Transform + pos: -1.5,6.5 + parent: 1 +- proto: CableTerminal + entities: + - uid: 86 + components: + - type: Transform + pos: -3.5,7.5 + parent: 1 +- proto: Carpet + entities: + - uid: 207 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -3.5,-1.5 + parent: 1 + - uid: 208 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -3.5,-2.5 + parent: 1 + - uid: 209 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,-1.5 + parent: 1 + - uid: 210 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,-2.5 + parent: 1 + - uid: 211 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,-1.5 + parent: 1 + - uid: 212 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,-2.5 + parent: 1 +- proto: CarpetPurple + entities: + - uid: 12 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 3.5,-2.5 + parent: 1 + - uid: 63 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 2.5,-2.5 + parent: 1 + - uid: 70 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 2.5,-3.5 + parent: 1 + - uid: 71 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 2.5,-1.5 + parent: 1 + - uid: 196 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 3.5,-1.5 + parent: 1 + - uid: 201 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 3.5,-3.5 + parent: 1 + - uid: 202 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 4.5,-1.5 + parent: 1 + - uid: 203 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 4.5,-2.5 + parent: 1 + - uid: 204 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 4.5,-3.5 + parent: 1 + - uid: 205 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 4.5,-4.5 + parent: 1 + - uid: 206 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 3.5,-4.5 + parent: 1 +- proto: ChairPilotSeat + entities: + - uid: 255 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,8.5 + parent: 1 +- proto: ChairWood + entities: + - uid: 10 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,-4.5 + parent: 1 + - uid: 51 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,-3.5 + parent: 1 + - uid: 197 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,-2.5 + parent: 1 + - uid: 198 + components: + - type: Transform + pos: 3.5,-1.5 + parent: 1 + - uid: 199 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 2.5,-2.5 + parent: 1 + - uid: 200 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 2.5,-3.5 + parent: 1 +- proto: ClosetChefFilled + entities: + - uid: 233 + components: + - type: Transform + pos: -2.770659,2.522128 + parent: 1 +- proto: ClosetWallO2N2FilledRandom + entities: + - uid: 418 + components: + - type: Transform + pos: -6.5,1.5 + parent: 1 + - uid: 419 + components: + - type: Transform + pos: 7.5,1.5 + parent: 1 +- proto: ClothingOuterWinterChef + entities: + - uid: 213 + components: + - type: Transform + pos: 6.514557,4.497615 + parent: 1 +- proto: ComputerTabletopShuttle + entities: + - uid: 249 + components: + - type: Transform + pos: -1.5,9.5 + parent: 1 +- proto: ComputerTabletopStationRecords + entities: + - uid: 250 + components: + - type: Transform + pos: -0.5,9.5 + parent: 1 +- proto: ComputerWallmountWithdrawBankATM + entities: + - uid: 195 + components: + - type: Transform + pos: -3.5,1.5 + parent: 1 +- proto: CrateFreezer + entities: + - uid: 186 + components: + - type: Transform + pos: 6.5,4.5 + parent: 1 +- proto: DefibrillatorCabinetFilled + entities: + - uid: 435 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -4.5,-1.5 + parent: 1 +- proto: ExtinguisherCabinetFilled + entities: + - uid: 363 + components: + - type: Transform + pos: 5.5,-1.5 + parent: 1 +- proto: FaxMachineShip + entities: + - uid: 251 + components: + - type: Transform + pos: -0.5,8.5 + parent: 1 +- proto: FirelockGlass + entities: + - uid: 441 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 0.5,7.5 + parent: 1 + - type: DeviceNetwork + deviceLists: + - 354 + - uid: 442 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 3.5,5.5 + parent: 1 + - type: DeviceNetwork + deviceLists: + - 354 + - uid: 443 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -4.5,3.5 + parent: 1 + - type: DeviceNetwork + deviceLists: + - 354 + - uid: 444 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 5.5,3.5 + parent: 1 + - type: DeviceNetwork + deviceLists: + - 354 + - uid: 445 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 3.5,1.5 + parent: 1 + - type: DeviceNetwork + deviceLists: + - 354 + - uid: 446 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 2.5,1.5 + parent: 1 + - type: DeviceNetwork + deviceLists: + - 354 + - uid: 447 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,1.5 + parent: 1 + - type: DeviceNetwork + deviceLists: + - 354 + - uid: 448 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 0.5,1.5 + parent: 1 + - type: DeviceNetwork + deviceLists: + - 354 + - uid: 449 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,1.5 + parent: 1 + - type: DeviceNetwork + deviceLists: + - 354 + - uid: 450 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,1.5 + parent: 1 + - type: DeviceNetwork + deviceLists: + - 354 + - uid: 451 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,1.5 + parent: 1 + - type: DeviceNetwork + deviceLists: + - 354 +- proto: FloorDrain + entities: + - uid: 334 + components: + - type: Transform + pos: 6.5,3.5 + parent: 1 + - type: Fixtures + fixtures: {} +- proto: GasMixerOn + entities: + - uid: 122 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,7.5 + parent: 1 + - type: GasMixer + inletTwoConcentration: 0.20999998 + inletOneConcentration: 0.79 + - type: AtmosPipeColor + color: '#0055CCFF' +- proto: GasPassiveVent + entities: + - uid: 463 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -5.5,7.5 + parent: 1 +- proto: GasPipeBend + entities: + - uid: 330 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,7.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 467 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -2.5,7.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 473 + components: + - type: Transform + pos: 1.5,9.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 558 + components: + - type: Transform + pos: 2.5,7.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 559 + components: + - type: Transform + pos: 3.5,8.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 573 + components: + - type: Transform + pos: -2.5,4.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' +- proto: GasPipeFourway + entities: + - uid: 472 + components: + - type: Transform + pos: 1.5,7.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 507 + components: + - type: Transform + pos: 1.5,0.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 508 + components: + - type: Transform + pos: -0.5,-0.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' +- proto: GasPipeStraight + entities: + - uid: 226 + components: + - type: Transform + pos: -0.5,-3.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 428 + components: + - type: Transform + pos: 1.5,-2.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 465 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -4.5,7.5 + parent: 1 + - uid: 474 + components: + - type: Transform + pos: 1.5,8.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 475 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,9.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 476 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,8.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 477 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,8.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 478 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,7.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 479 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,8.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 483 + components: + - type: Transform + pos: 1.5,-4.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 485 + components: + - type: Transform + pos: 1.5,-3.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 486 + components: + - type: Transform + pos: 1.5,-1.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 487 + components: + - type: Transform + pos: -0.5,-4.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 489 + components: + - type: Transform + pos: -0.5,-2.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 490 + components: + - type: Transform + pos: -0.5,-1.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 491 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -5.5,-0.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 492 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -4.5,-0.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 493 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -3.5,-0.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 494 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -2.5,-0.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 495 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,-0.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 496 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -5.5,0.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 497 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -4.5,0.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 498 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -3.5,0.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 499 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -2.5,0.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 500 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,0.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 501 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 6.5,0.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 502 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 5.5,0.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 503 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,0.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 504 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 6.5,-0.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 505 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 5.5,-0.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 506 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,-0.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 509 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,0.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 510 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,0.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 511 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,0.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 512 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 3.5,0.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 513 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,-0.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 514 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 0.5,-0.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 515 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,-0.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 516 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 2.5,-0.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 517 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 3.5,-0.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 518 + components: + - type: Transform + pos: -0.5,0.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 531 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -5.5,3.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 532 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -4.5,3.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 534 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -2.5,3.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 535 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,3.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 536 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 6.5,3.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 537 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 5.5,3.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 540 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,3.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 541 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,3.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 542 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,3.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 543 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 6.5,2.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 544 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 5.5,2.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 545 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,2.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 546 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 3.5,2.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 548 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,2.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 549 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,2.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 550 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,2.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 552 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -3.5,2.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 553 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -4.5,2.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 554 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -5.5,2.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 555 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,2.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 556 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,1.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 557 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,1.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 560 + components: + - type: Transform + pos: 2.5,6.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 561 + components: + - type: Transform + pos: 2.5,5.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 563 + components: + - type: Transform + pos: 2.5,3.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 564 + components: + - type: Transform + pos: 3.5,4.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 565 + components: + - type: Transform + pos: 3.5,5.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 566 + components: + - type: Transform + pos: 3.5,6.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 567 + components: + - type: Transform + pos: 3.5,7.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 572 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 3.5,4.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 574 + components: + - type: Transform + pos: -2.5,3.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' +- proto: GasPipeTJunction + entities: + - uid: 468 + components: + - type: Transform + pos: -2.5,8.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 469 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,8.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 481 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,8.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 529 + components: + - type: Transform + pos: 1.5,2.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 530 + components: + - type: Transform + pos: -0.5,3.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 533 + components: + - type: Transform + pos: 4.5,3.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 538 + components: + - type: Transform + pos: -3.5,3.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 539 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,3.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 547 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,2.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 551 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -2.5,2.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 562 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 2.5,4.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' +- proto: GasPort + entities: + - uid: 156 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,6.5 + parent: 1 + - uid: 332 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,6.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' +- proto: GasPressurePumpOnMax + entities: + - uid: 462 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -3.5,7.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' +- proto: GasVentPump + entities: + - uid: 452 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -6.5,0.5 + parent: 1 + - type: DeviceNetwork + deviceLists: + - 354 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 453 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 7.5,0.5 + parent: 1 + - type: DeviceNetwork + deviceLists: + - 354 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 454 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,-5.5 + parent: 1 + - type: DeviceNetwork + deviceLists: + - 354 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 459 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 7.5,2.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 460 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -6.5,2.5 + parent: 1 + - type: DeviceNetwork + deviceLists: + - 354 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 471 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,9.5 + parent: 1 + - type: DeviceNetwork + deviceLists: + - 354 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 480 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,6.5 + parent: 1 + - type: DeviceNetwork + deviceLists: + - 354 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 570 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,4.5 + parent: 1 + - type: DeviceNetwork + deviceLists: + - 354 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 571 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -3.5,4.5 + parent: 1 + - type: DeviceNetwork + deviceLists: + - 354 + - type: AtmosPipeColor + color: '#0055CCFF' +- proto: GasVentScrubber + entities: + - uid: 455 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -6.5,-0.5 + parent: 1 + - type: DeviceNetwork + deviceLists: + - 354 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 456 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 7.5,-0.5 + parent: 1 + - type: DeviceNetwork + deviceLists: + - 354 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 457 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,-5.5 + parent: 1 + - type: DeviceNetwork + deviceLists: + - 354 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 458 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 7.5,3.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 461 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -6.5,3.5 + parent: 1 + - type: DeviceNetwork + deviceLists: + - 354 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 466 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -3.5,8.5 + parent: 1 + - type: DeviceNetwork + deviceLists: + - 354 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 470 + components: + - type: Transform + pos: -1.5,9.5 + parent: 1 + - type: DeviceNetwork + deviceLists: + - 354 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 482 + components: + - type: Transform + pos: 2.5,9.5 + parent: 1 + - type: DeviceNetwork + deviceLists: + - 354 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 568 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 4.5,2.5 + parent: 1 + - type: DeviceNetwork + deviceLists: + - 354 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 569 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -3.5,2.5 + parent: 1 + - type: DeviceNetwork + deviceLists: + - 354 + - type: AtmosPipeColor + color: '#990000FF' +- proto: GravityGeneratorMini + entities: + - uid: 184 + components: + - type: Transform + pos: -5.5,6.5 + parent: 1 +- proto: Grille + entities: + - uid: 121 + components: + - type: Transform + pos: 0.5,10.5 + parent: 1 + - uid: 150 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -4.5,-2.5 + parent: 1 + - uid: 151 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -4.5,-3.5 + parent: 1 + - uid: 152 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -4.5,-4.5 + parent: 1 + - uid: 153 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -3.5,-5.5 + parent: 1 + - uid: 154 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,-5.5 + parent: 1 + - uid: 160 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 3.5,-5.5 + parent: 1 + - uid: 161 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 4.5,-5.5 + parent: 1 + - uid: 162 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 5.5,-4.5 + parent: 1 + - uid: 163 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 5.5,-3.5 + parent: 1 + - uid: 164 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 5.5,-2.5 + parent: 1 + - uid: 169 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 2.5,10.5 + parent: 1 + - uid: 170 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,10.5 + parent: 1 + - uid: 172 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,10.5 + parent: 1 + - uid: 173 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,10.5 + parent: 1 + - uid: 227 + components: + - type: Transform + pos: 0.5,9.5 + parent: 1 + - uid: 346 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,8.5 + parent: 1 +- proto: GrilleDiagonal + entities: + - uid: 118 + components: + - type: Transform + pos: -2.5,10.5 + parent: 1 + - uid: 144 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 3.5,10.5 + parent: 1 + - uid: 146 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 5.5,-5.5 + parent: 1 + - uid: 149 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -4.5,-5.5 + parent: 1 +- proto: Gyroscope + entities: + - uid: 185 + components: + - type: Transform + pos: 6.5,6.5 + parent: 1 +- proto: HospitalCurtains + entities: + - uid: 244 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -4.5,3.5 + parent: 1 +- proto: hydroponicsTrayAnchored + entities: + - uid: 69 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,9.5 + parent: 1 + - uid: 228 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,8.5 + parent: 1 + - uid: 341 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,8.5 + parent: 1 + - uid: 356 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,9.5 + parent: 1 + - uid: 432 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,6.5 + parent: 1 + - uid: 433 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,7.5 + parent: 1 +- proto: Icebox + entities: + - uid: 429 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 6.5,2.5 + parent: 1 +- proto: JukeboxWallmountShip + entities: + - uid: 179 + components: + - type: Transform + pos: 4.5,1.5 + parent: 1 +- proto: KitchenAssembler + entities: + - uid: 324 + components: + - type: Transform + pos: 1.5,4.5 + parent: 1 +- proto: KitchenDeepFryer + entities: + - uid: 177 + components: + - type: Transform + pos: -3.5,4.5 + parent: 1 +- proto: KitchenElectricRange + entities: + - uid: 364 + components: + - type: Transform + pos: -0.5,4.5 + parent: 1 +- proto: KitchenMicrowave + entities: + - uid: 181 + components: + - type: Transform + pos: -2.5,4.5 + parent: 1 +- proto: KitchenReagentGrinder + entities: + - uid: 302 + components: + - type: Transform + pos: -1.5,4.5 + parent: 1 +- proto: KitchenSpike + entities: + - uid: 188 + components: + - type: Transform + pos: 7.5,4.5 + parent: 1 +- proto: LargeBeaker + entities: + - uid: 176 + components: + - type: Transform + pos: -1.6481404,4.494996 + parent: 1 + - uid: 303 + components: + - type: Transform + pos: -1.9398072,4.755413 + parent: 1 +- proto: LightBulbCrystalBlue + entities: + - uid: 265 + components: + - type: Transform + parent: 263 + - type: Physics + canCollide: False + - uid: 426 + components: + - type: Transform + parent: 425 + - type: Physics + canCollide: False +- proto: LightBulbCrystalCyan + entities: + - uid: 58 + components: + - type: Transform + parent: 50 + - type: Physics + canCollide: False + - uid: 423 + components: + - type: Transform + parent: 422 + - type: Physics + canCollide: False +- proto: LightBulbCrystalOrange + entities: + - uid: 295 + components: + - type: Transform + parent: 266 + - type: Physics + canCollide: False + - uid: 301 + components: + - type: Transform + parent: 300 + - type: Physics + canCollide: False +- proto: LockerBotanistFilled + entities: + - uid: 337 + components: + - type: Transform + pos: 3.5,8.5 + parent: 1 +- proto: LockerFreezer + entities: + - uid: 76 + components: + - type: Transform + pos: 0.74178886,4.5098968 + parent: 1 + - uid: 223 + components: + - type: Transform + pos: -2.2578402,2.48632 + parent: 1 + - uid: 298 + components: + - type: Transform + pos: 0.24178886,4.5098968 + parent: 1 +- proto: LockerWallEVAColorServiceWorkerFilled + entities: + - uid: 420 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,9.5 + parent: 1 +- proto: LockerWallMaterialsBasicFilled + entities: + - uid: 350 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -4.5,4.5 + parent: 1 +- proto: LockerWallMaterialsFuelUraniumFilled + entities: + - uid: 147 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -4.5,6.5 + parent: 1 +- proto: MaterialReclaimer + entities: + - uid: 61 + components: + - type: Transform + pos: -5.5,2.5 + parent: 1 +- proto: MopItem + entities: + - uid: 191 + components: + - type: Transform + pos: 7.471244,2.5494757 + parent: 1 +- proto: NFPosterContrabandFsbLogo + entities: + - uid: 328 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,5.5 + parent: 1 +- proto: NFPosterContrabandFsbNightlight + entities: + - uid: 342 + components: + - type: Transform + pos: -5.5,1.5 + parent: 1 + - uid: 343 + components: + - type: Transform + pos: 6.5,1.5 + parent: 1 + - uid: 344 + components: + - type: Transform + pos: 0.5,-4.5 + parent: 1 +- proto: NFSignDock + entities: + - uid: 340 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -7.5,1.5 + parent: 1 + - uid: 437 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 8.5,1.5 + parent: 1 +- proto: NitrogenCanister + entities: + - uid: 115 + components: + - type: Transform + anchored: True + pos: -1.5,6.5 + parent: 1 + - type: Physics + bodyType: Static +- proto: OxygenCanister + entities: + - uid: 59 + components: + - type: Transform + anchored: True + pos: -0.5,6.5 + parent: 1 + - type: Physics + bodyType: Static +- proto: PaperBin20 + entities: + - uid: 252 + components: + - type: Transform + pos: -0.20995831,8.876982 + parent: 1 +- proto: Pen + entities: + - uid: 254 + components: + - type: Transform + pos: -0.7255833,9.033232 + parent: 1 +- proto: PortableGeneratorSuperPacmanShuttle + entities: + - uid: 230 + components: + - type: Transform + pos: -3.5,8.5 + parent: 1 +- proto: PosterLegitSMFires + entities: + - uid: 464 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -3.5,5.5 + parent: 1 +- proto: PosterLegitSMPoisoning + entities: + - uid: 73 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -5.5,5.5 + parent: 1 +- proto: PottedPlantBioluminscent + entities: + - uid: 34 + components: + - type: Transform + pos: 0.5,-5.5 + parent: 1 +- proto: Poweredlight + entities: + - uid: 66 + components: + - type: Transform + pos: 4.5,8.5 + parent: 1 + - uid: 81 + components: + - type: Transform + pos: -5.5,-2.5 + parent: 1 + - uid: 189 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -3.5,7.5 + parent: 1 + - uid: 217 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -6.5,3.5 + parent: 1 + - uid: 259 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -3.5,-1.5 + parent: 1 + - uid: 260 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,-1.5 + parent: 1 + - uid: 261 + components: + - type: Transform + pos: -5.5,0.5 + parent: 1 + - uid: 262 + components: + - type: Transform + pos: 6.5,0.5 + parent: 1 + - uid: 315 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -3.5,4.5 + parent: 1 + - uid: 316 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,4.5 + parent: 1 + - uid: 318 + components: + - type: Transform + pos: 6.5,-2.5 + parent: 1 + - uid: 322 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 7.5,3.5 + parent: 1 + - uid: 333 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,6.5 + parent: 1 +- proto: PoweredlightGreen + entities: + - uid: 326 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -6.5,6.5 + parent: 1 +- proto: PoweredlightRed + entities: + - uid: 327 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 7.5,6.5 + parent: 1 +- proto: PoweredStrobeLightEmpty + entities: + - uid: 50 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -3.5,2.5 + parent: 1 + - type: ContainerContainer + containers: + light_bulb: !type:ContainerSlot + showEnts: False + occludes: True + ent: 58 + - type: ApcPowerReceiver + powerLoad: 0 + - type: DamageOnInteract + isDamageActive: False + - uid: 263 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,-3.5 + parent: 1 + - type: ContainerContainer + containers: + light_bulb: !type:ContainerSlot + showEnts: False + occludes: True + ent: 265 + - type: ApcPowerReceiver + powerLoad: 0 + - type: DamageOnInteract + isDamageActive: False + - uid: 266 + components: + - type: Transform + pos: -3.5,0.5 + parent: 1 + - type: ContainerContainer + containers: + light_bulb: !type:ContainerSlot + showEnts: False + occludes: True + ent: 295 + - type: ApcPowerReceiver + powerLoad: 0 + - type: DamageOnInteract + isDamageActive: False + - uid: 300 + components: + - type: Transform + pos: 4.5,0.5 + parent: 1 + - type: ContainerContainer + containers: + light_bulb: !type:ContainerSlot + showEnts: False + occludes: True + ent: 301 + - type: ApcPowerReceiver + powerLoad: 0 + - type: DamageOnInteract + isDamageActive: False + - uid: 422 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,2.5 + parent: 1 + - type: ContainerContainer + containers: + light_bulb: !type:ContainerSlot + showEnts: False + occludes: True + ent: 423 + - type: ApcPowerReceiver + powerLoad: 0 + - type: DamageOnInteract + isDamageActive: False + - uid: 425 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,-3.5 + parent: 1 + - type: ContainerContainer + containers: + light_bulb: !type:ContainerSlot + showEnts: False + occludes: True + ent: 426 + - type: ApcPowerReceiver + powerLoad: 0 + - type: DamageOnInteract + isDamageActive: False +- proto: SeedExtractor + entities: + - uid: 96 + components: + - type: Transform + pos: 2.5,6.5 + parent: 1 +- proto: ServiceTechFab + entities: + - uid: 325 + components: + - type: Transform + pos: -5.5,4.5 + parent: 1 +- proto: ShelfBar + entities: + - uid: 178 + components: + - type: Transform + pos: 4.5,5.5 + parent: 1 +- proto: ShelfKitchen + entities: + - uid: 239 + components: + - type: Transform + pos: 2.5,5.5 + parent: 1 +- proto: ShelfMetal + entities: + - uid: 105 + components: + - type: Transform + pos: 3.5,9.5 + parent: 1 +- proto: ShuttersNormalOpen + entities: + - uid: 305 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -4.5,-2.5 + parent: 1 + - type: DeviceLinkSink + invokeCounter: 1 + - uid: 306 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -4.5,-3.5 + parent: 1 + - type: DeviceLinkSink + invokeCounter: 1 + - uid: 307 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -4.5,-4.5 + parent: 1 + - type: DeviceLinkSink + invokeCounter: 1 + - uid: 308 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 5.5,-2.5 + parent: 1 + - type: DeviceLinkSink + invokeCounter: 1 + - uid: 309 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 5.5,-3.5 + parent: 1 + - type: DeviceLinkSink + invokeCounter: 1 + - uid: 310 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 5.5,-4.5 + parent: 1 + - type: DeviceLinkSink + invokeCounter: 1 + - uid: 311 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 4.5,-5.5 + parent: 1 + - type: DeviceLinkSink + invokeCounter: 1 + - uid: 312 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,-5.5 + parent: 1 + - type: DeviceLinkSink + invokeCounter: 1 + - uid: 313 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -2.5,-5.5 + parent: 1 + - type: DeviceLinkSink + invokeCounter: 1 + - uid: 314 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -3.5,-5.5 + parent: 1 + - type: DeviceLinkSink + invokeCounter: 1 + - uid: 576 + components: + - type: Transform + pos: -1.5,10.5 + parent: 1 + - type: DeviceLinkSink + invokeCounter: 1 + - uid: 577 + components: + - type: Transform + pos: -0.5,10.5 + parent: 1 + - type: DeviceLinkSink + invokeCounter: 1 + - uid: 578 + components: + - type: Transform + pos: 0.5,10.5 + parent: 1 + - type: DeviceLinkSink + invokeCounter: 1 + - uid: 579 + components: + - type: Transform + pos: 1.5,10.5 + parent: 1 + - type: DeviceLinkSink + invokeCounter: 1 + - uid: 580 + components: + - type: Transform + pos: 2.5,10.5 + parent: 1 + - type: DeviceLinkSink + invokeCounter: 1 +- proto: ShuttersRadiationOpen + entities: + - uid: 296 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,7.5 + parent: 1 +- proto: ShuttleWindow + entities: + - uid: 4 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -4.5,-2.5 + parent: 1 + - uid: 5 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -4.5,-3.5 + parent: 1 + - uid: 6 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -4.5,-4.5 + parent: 1 + - uid: 7 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,-5.5 + parent: 1 + - uid: 8 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -3.5,-5.5 + parent: 1 + - uid: 15 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 5.5,-4.5 + parent: 1 + - uid: 16 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 4.5,-5.5 + parent: 1 + - uid: 17 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 5.5,-3.5 + parent: 1 + - uid: 18 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 5.5,-2.5 + parent: 1 + - uid: 98 + components: + - type: Transform + pos: 0.5,10.5 + parent: 1 + - uid: 108 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,-5.5 + parent: 1 + - uid: 123 + components: + - type: Transform + pos: -1.5,10.5 + parent: 1 + - uid: 126 + components: + - type: Transform + pos: 1.5,10.5 + parent: 1 + - uid: 127 + components: + - type: Transform + pos: 2.5,10.5 + parent: 1 + - uid: 243 + components: + - type: Transform + pos: -0.5,10.5 + parent: 1 + - uid: 319 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,9.5 + parent: 1 + - uid: 359 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,8.5 + parent: 1 +- proto: ShuttleWindowDiagonal + entities: + - uid: 110 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 5.5,-5.5 + parent: 1 + - uid: 113 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -4.5,-5.5 + parent: 1 + - uid: 119 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 3.5,10.5 + parent: 1 + - uid: 143 + components: + - type: Transform + pos: -2.5,10.5 + parent: 1 +- proto: SignalButton + entities: + - uid: 335 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,6.75 + parent: 1 + - type: SignalSwitch + state: True + - type: DeviceLinkSource + linkedPorts: + 296: + - Pressed: Toggle + - uid: 336 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,8.75 + parent: 1 + - type: DeviceLinkSource + linkedPorts: + 183: + - Pressed: DoorBolt + 182: + - Pressed: DoorBolt + 80: + - Pressed: DoorBolt + 159: + - Pressed: DoorBolt + 180: + - Pressed: DoorBolt + 42: + - Pressed: DoorBolt + - uid: 355 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 4.25,1.5 + parent: 1 + - type: DeviceLinkSource + linkedPorts: + 338: + - Pressed: DoorBolt + - uid: 358 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 5.5,2.75 + parent: 1 + - type: DeviceLinkSource + linkedPorts: + 308: + - Pressed: Toggle + 309: + - Pressed: Toggle + 310: + - Pressed: Toggle + 311: + - Pressed: Toggle + 312: + - Pressed: Toggle + 313: + - Pressed: Toggle + 314: + - Pressed: Toggle + 307: + - Pressed: Toggle + 306: + - Pressed: Toggle + 305: + - Pressed: Toggle + - uid: 365 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,8.25 + parent: 1 + - type: DeviceLinkSource + linkedPorts: + 241: + - Pressed: Toggle + 140: + - Pressed: Toggle + 242: + - Pressed: Toggle + 141: + - Pressed: Toggle + 284: + - Pressed: Toggle + 137: + - Pressed: Toggle + 136: + - Pressed: Toggle + 285: + - Pressed: Toggle + - uid: 424 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 5.5,4.25 + parent: 1 + - type: DeviceLinkSource + linkedPorts: + 316: + - Pressed: Toggle + 315: + - Pressed: Toggle + 50: + - Pressed: Toggle + 422: + - Pressed: Toggle + 262: + - Pressed: Toggle + 261: + - Pressed: Toggle + 266: + - Pressed: Toggle + 300: + - Pressed: Toggle + 260: + - Pressed: Toggle + 259: + - Pressed: Toggle + 263: + - Pressed: Toggle + 425: + - Pressed: Toggle + 318: + - Pressed: Toggle + 81: + - Pressed: Toggle + - uid: 519 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -4.5,7.5 + parent: 1 + - type: DeviceLinkSource + linkedPorts: + 296: + - Pressed: Toggle + - uid: 582 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,6.75 + parent: 1 + - type: DeviceLinkSource + linkedPorts: + 576: + - Pressed: Toggle + 577: + - Pressed: Toggle + 578: + - Pressed: Toggle + 579: + - Pressed: Toggle + 580: + - Pressed: Toggle +- proto: SignKitchen + entities: + - uid: 438 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 0.5,-6.5 + parent: 1 + - uid: 439 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 8.5,-1.5 + parent: 1 + - uid: 440 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -7.5,-1.5 + parent: 1 +- proto: SinkWide + entities: + - uid: 436 + components: + - type: Transform + pos: 2.5,4.5 + parent: 1 +- proto: SMESBasic + entities: + - uid: 361 + components: + - type: Transform + pos: -3.5,6.5 + parent: 1 +- proto: SodaDispenser + entities: + - uid: 240 + components: + - type: Transform + pos: 4.5,4.5 + parent: 1 +- proto: SpawnPointLatejoin + entities: + - uid: 3 + components: + - type: Transform + pos: 0.5,-0.5 + parent: 1 +- proto: StoolBar + entities: + - uid: 41 + components: + - type: Transform + pos: -2.5,-3.5 + parent: 1 + - uid: 64 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,0.5 + parent: 1 + - uid: 65 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,0.5 + parent: 1 + - uid: 67 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,0.5 + parent: 1 + - uid: 68 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,0.5 + parent: 1 + - uid: 90 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,0.5 + parent: 1 + - uid: 107 + components: + - type: Transform + pos: -3.5,-3.5 + parent: 1 +- proto: SubstationWallBasic + entities: + - uid: 95 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,6.5 + parent: 1 +- proto: TableCarpet + entities: + - uid: 43 + components: + - type: Transform + pos: -3.5,-2.5 + parent: 1 + - uid: 157 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,-2.5 + parent: 1 +- proto: TableReinforced + entities: + - uid: 87 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 4.5,2.5 + parent: 1 + - uid: 102 + components: + - type: Transform + pos: -2.5,4.5 + parent: 1 + - uid: 103 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 4.5,4.5 + parent: 1 + - uid: 187 + components: + - type: Transform + pos: -1.5,9.5 + parent: 1 + - uid: 245 + components: + - type: Transform + pos: -0.5,9.5 + parent: 1 + - uid: 246 + components: + - type: Transform + pos: -0.5,8.5 + parent: 1 + - uid: 320 + components: + - type: Transform + pos: 1.5,4.5 + parent: 1 + - uid: 323 + components: + - type: Transform + pos: -1.5,4.5 + parent: 1 +- proto: TableWood + entities: + - uid: 79 + components: + - type: Transform + pos: 3.5,-3.5 + parent: 1 + - uid: 155 + components: + - type: Transform + pos: 3.5,-2.5 + parent: 1 +- proto: TableWoodReinforced + entities: + - uid: 26 + components: + - type: Transform + pos: -3.5,-4.5 + parent: 1 + - uid: 72 + components: + - type: Transform + pos: -2.5,-4.5 + parent: 1 + - uid: 171 + components: + - type: Transform + pos: 1.5,1.5 + parent: 1 + - uid: 174 + components: + - type: Transform + pos: 2.5,1.5 + parent: 1 + - uid: 235 + components: + - type: Transform + pos: -0.5,1.5 + parent: 1 + - uid: 236 + components: + - type: Transform + pos: -2.5,1.5 + parent: 1 + - uid: 237 + components: + - type: Transform + pos: 0.5,1.5 + parent: 1 + - uid: 238 + components: + - type: Transform + pos: -1.5,1.5 + parent: 1 +- proto: Thruster + entities: + - uid: 136 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -5.5,-2.5 + parent: 1 + - uid: 137 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 6.5,-2.5 + parent: 1 + - uid: 140 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -6.5,6.5 + parent: 1 + - uid: 141 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 7.5,6.5 + parent: 1 + - uid: 241 + components: + - type: Transform + pos: -5.5,7.5 + parent: 1 + - uid: 242 + components: + - type: Transform + pos: 6.5,7.5 + parent: 1 + - uid: 284 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 7.5,-2.5 + parent: 1 + - uid: 285 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -6.5,-2.5 + parent: 1 +- proto: ToolboxMechanicalFilled + entities: + - uid: 430 + components: + - type: Transform + pos: -3.5058122,6.955002 + parent: 1 +- proto: ToyFigurineChef + entities: + - uid: 253 + components: + - type: Transform + pos: -0.6943333,9.064482 + parent: 1 +- proto: VendingMachineBooze + entities: + - uid: 148 + components: + - type: Transform + pos: -6.5,4.5 + parent: 1 +- proto: VendingMachineChefvend + entities: + - uid: 421 + components: + - type: Transform + pos: -3.5,2.5 + parent: 1 +- proto: VendingMachineCondiments + entities: + - uid: 101 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -2.5,1.5 + parent: 1 +- proto: VendingMachineRestockBooze + entities: + - uid: 304 + components: + - type: Transform + pos: -5.337321,4.7195187 + parent: 1 +- proto: VendingMachineRestockChefvend + entities: + - uid: 317 + components: + - type: Transform + pos: -5.337321,4.834102 + parent: 1 +- proto: VendingMachineSeeds + entities: + - uid: 431 + components: + - type: Transform + pos: 1.5,6.5 + parent: 1 +- proto: WallShuttle + entities: + - uid: 11 + components: + - type: Transform + pos: -4.5,4.5 + parent: 1 + - uid: 19 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -4.5,-1.5 + parent: 1 + - uid: 20 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -5.5,-1.5 + parent: 1 + - uid: 21 + components: + - type: Transform + pos: -6.5,-1.5 + parent: 1 + - uid: 22 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -4.5,1.5 + parent: 1 + - uid: 23 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -5.5,1.5 + parent: 1 + - uid: 24 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -6.5,1.5 + parent: 1 + - uid: 25 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -3.5,1.5 + parent: 1 + - uid: 27 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 7.5,1.5 + parent: 1 + - uid: 28 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 6.5,1.5 + parent: 1 + - uid: 29 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 4.5,1.5 + parent: 1 + - uid: 30 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 5.5,1.5 + parent: 1 + - uid: 32 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 5.5,-1.5 + parent: 1 + - uid: 33 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 6.5,-1.5 + parent: 1 + - uid: 37 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 7.5,5.5 + parent: 1 + - uid: 38 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 6.5,5.5 + parent: 1 + - uid: 39 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 4.5,5.5 + parent: 1 + - uid: 40 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 5.5,5.5 + parent: 1 + - uid: 44 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -3.5,5.5 + parent: 1 + - uid: 45 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -4.5,5.5 + parent: 1 + - uid: 46 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -6.5,5.5 + parent: 1 + - uid: 47 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -5.5,5.5 + parent: 1 + - uid: 52 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 2.5,5.5 + parent: 1 + - uid: 53 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,5.5 + parent: 1 + - uid: 55 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,5.5 + parent: 1 + - uid: 56 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,5.5 + parent: 1 + - uid: 77 + components: + - type: Transform + pos: -1.5,-5.5 + parent: 1 + - uid: 85 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 7.5,-1.5 + parent: 1 + - uid: 99 + components: + - type: Transform + pos: -2.5,5.5 + parent: 1 + - uid: 104 + components: + - type: Transform + pos: 2.5,-4.5 + parent: 1 + - uid: 106 + components: + - type: Transform + pos: -1.5,-4.5 + parent: 1 + - uid: 111 + components: + - type: Transform + pos: 2.5,-5.5 + parent: 1 + - uid: 112 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -4.5,2.5 + parent: 1 + - uid: 124 + components: + - type: Transform + pos: -7.5,-1.5 + parent: 1 + - uid: 128 + components: + - type: Transform + pos: 5.5,8.5 + parent: 1 + - uid: 129 + components: + - type: Transform + pos: 3.5,9.5 + parent: 1 + - uid: 131 + components: + - type: Transform + pos: 4.5,9.5 + parent: 1 + - uid: 132 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 5.5,6.5 + parent: 1 + - uid: 134 + components: + - type: Transform + pos: 5.5,2.5 + parent: 1 + - uid: 135 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -4.5,6.5 + parent: 1 + - uid: 142 + components: + - type: Transform + pos: 5.5,4.5 + parent: 1 + - uid: 145 + components: + - type: Transform + pos: -3.5,9.5 + parent: 1 + - uid: 158 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 0.5,-4.5 + parent: 1 + - uid: 165 + components: + - type: Transform + pos: 5.5,7.5 + parent: 1 + - uid: 166 + components: + - type: Transform + pos: -4.5,7.5 + parent: 1 + - uid: 167 + components: + - type: Transform + pos: -4.5,8.5 + parent: 1 + - uid: 168 + components: + - type: Transform + pos: -2.5,9.5 + parent: 1 + - uid: 193 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 8.5,-1.5 + parent: 1 + - uid: 194 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,5.5 + parent: 1 + - uid: 224 + components: + - type: Transform + pos: 0.5,-6.5 + parent: 1 + - uid: 247 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,6.5 + parent: 1 + - uid: 287 + components: + - type: Transform + pos: -7.5,1.5 + parent: 1 + - uid: 288 + components: + - type: Transform + pos: 8.5,1.5 + parent: 1 + - uid: 289 + components: + - type: Transform + pos: 8.5,4.5 + parent: 1 + - uid: 290 + components: + - type: Transform + pos: 8.5,3.5 + parent: 1 + - uid: 291 + components: + - type: Transform + pos: 8.5,2.5 + parent: 1 + - uid: 292 + components: + - type: Transform + pos: -7.5,4.5 + parent: 1 + - uid: 293 + components: + - type: Transform + pos: -7.5,3.5 + parent: 1 + - uid: 294 + components: + - type: Transform + pos: -7.5,2.5 + parent: 1 + - uid: 331 + components: + - type: Transform + pos: -2.5,8.5 + parent: 1 + - uid: 348 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -2.5,6.5 + parent: 1 +- proto: WallShuttleDiagonal + entities: + - uid: 31 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 8.5,-2.5 + parent: 1 + - uid: 84 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,-6.5 + parent: 1 + - uid: 117 + components: + - type: Transform + pos: -4.5,9.5 + parent: 1 + - uid: 125 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,-6.5 + parent: 1 + - uid: 130 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 5.5,9.5 + parent: 1 + - uid: 256 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 7.5,7.5 + parent: 1 + - uid: 257 + components: + - type: Transform + pos: -6.5,7.5 + parent: 1 + - uid: 268 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -7.5,-2.5 + parent: 1 + - uid: 283 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 8.5,5.5 + parent: 1 + - uid: 286 + components: + - type: Transform + pos: -7.5,5.5 + parent: 1 +- proto: WarningWaste + entities: + - uid: 488 + components: + - type: Transform + pos: -4.5,8.5 + parent: 1 +- proto: WarpPoint + entities: + - uid: 2 + components: + - type: Transform + pos: 0.5,0.5 + parent: 1 +- proto: Windoor + entities: + - uid: 338 + components: + - type: Transform + pos: 3.5,1.5 + parent: 1 +... diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml index 71eda92b8e4..2ab93bf0b50 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml @@ -196,6 +196,7 @@ - id: BoxInflatable # Frontier - id: BoxLighttube # Frontier - id: BoxLightbulb # Frontier + - id: BoxColoredLightBulb # Frontier - type: entityTable id: SalvageEquipmentUncommon diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml index 6f46bfcaaf0..8879a9df483 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml @@ -105,6 +105,7 @@ - NFPosterContrabandKillerFashion # Frontier - NFPosterContrabandGoblinFront # Frontier - NFPosterContrabandGoblinate # Frontier + - NFPosterContrabandFsbNightlight # Frontier chance: 1 - type: entity diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Boxes/general.yml b/Resources/Prototypes/_NF/Catalog/Fills/Boxes/general.yml index d738dec2d9e..8b9f0d8043d 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Boxes/general.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Boxes/general.yml @@ -142,3 +142,35 @@ whitelist: components: - LightBulb + +- type: entity + name: colored bulbs box + parent: BoxLightbulb + id: BoxColoredLightBulb + description: This box is shaped on the inside so that only light tubes and bulbs fit. It's full of neat colored light bulbs! + components: + - type: StorageFill + contents: + - id: LightBulbCrystalCyan + amount: 2 + - id: LightBulbCrystalBlue + amount: 2 + - id: LightBulbCrystalPink + amount: 2 + - id: LightBulbCrystalOrange + amount: 2 + - id: LightBulbCrystalRed + amount: 2 + - id: LightBulbCrystalGreen + amount: 2 + - type: Sprite + layers: + - state: box + - state: light + color: "cyan" + - type: Storage + grid: + - 0,0,5,3 + whitelist: + components: + - LightBulb diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Paper/Shipyard/manuals.yml b/Resources/Prototypes/_NF/Catalog/Fills/Paper/Shipyard/manuals.yml index 9b4d61733e5..90d1579ab7d 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Paper/Shipyard/manuals.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Paper/Shipyard/manuals.yml @@ -136,6 +136,15 @@ guides: - ShipyardSearchlight +- type: entity + parent: ShipyardInfoBase + id: ShipyardNightlightInfo + name: Nightlight user manual + components: + - type: GuideHelp + guides: + - ShipyardNightlight + - type: entity parent: ShipyardInfoBase id: ShipyardCharonInfo diff --git a/Resources/Prototypes/_NF/Entities/Objects/Power/lights.yml b/Resources/Prototypes/_NF/Entities/Objects/Power/lights.yml new file mode 100644 index 00000000000..fb93d03be17 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Power/lights.yml @@ -0,0 +1,143 @@ +- type: entity + parent: BaseLightbulb + name: cyan crystal light bulb + id: LightBulbCrystalCyan + description: A colorful light bulb with a small colored crystal inside. + components: + - type: LightBulb + bulb: Bulb + color: "#47f8ff" + lightEnergy: 1.0 + lightRadius: 6 + lightSoftness: 1.1 + - type: Tag + tags: + - LightBulb + - Trash + - type: Construction + graph: CyanLight + node: icon + - type: ToolRefinable + refineResult: + - id: SheetGlass1 + - id: ShardCrystalCyan + +- type: entity + parent: BaseLightbulb + name: blue crystal light bulb + id: LightBulbCrystalBlue + description: A colorful light bulb with a small colored crystal inside. + components: + - type: LightBulb + bulb: Bulb + color: "#39a1ff" + lightEnergy: 1.0 + lightRadius: 6 + lightSoftness: 1.1 + - type: Tag + tags: + - LightBulb + - Trash + - type: Construction + graph: BlueLight + node: icon + - type: ToolRefinable + refineResult: + - id: SheetGlass1 + - id: ShardCrystalBlue + +- type: entity + parent: BaseLightbulb + name: pink crystal light bulb + id: LightBulbCrystalPink + description: A colorful light bulb with a small colored crystal inside. + components: + - type: LightBulb + bulb: Bulb + color: "#ff66cc" + lightEnergy: 1.0 + lightRadius: 6 + lightSoftness: 1.1 + - type: Tag + tags: + - LightBulb + - Trash + - type: Construction + graph: PinkLight + node: icon + - type: ToolRefinable + refineResult: + - id: SheetGlass1 + - id: ShardCrystalPink + +- type: entity + parent: BaseLightbulb + name: orange crystal light bulb + id: LightBulbCrystalOrange + description: A colorful light bulb with a small colored crystal inside. + components: + - type: LightBulb + bulb: Bulb + color: "#ff8227" + lightEnergy: 1.0 + lightRadius: 6 + lightSoftness: 1.1 + - type: Tag + tags: + - LightBulb + - Trash + - type: Construction + graph: OrangeLight + node: icon + - type: ToolRefinable + refineResult: + - id: SheetGlass1 + - id: ShardCrystalOrange + +- type: entity + parent: BaseLightbulb + name: red crystal light bulb + id: LightBulbCrystalRed + description: A colorful light bulb with a small colored crystal inside. + components: + - type: LightBulb + bulb: Bulb + color: "#fb4747" + lightEnergy: 1.0 + lightRadius: 6 + lightSoftness: 1.1 + - type: Tag + tags: + - LightBulb + - Trash + - type: Construction + graph: RedLight + node: icon + - type: ToolRefinable + refineResult: + - id: SheetGlass1 + - id: ShardCrystalRed + +- type: entity + parent: BaseLightbulb + name: green crystal light bulb + id: LightBulbCrystalGreen + description: A colorful light bulb with a small colored crystal inside. + components: + - type: LightBulb + bulb: Bulb + color: "#52ff39" + lightEnergy: 1.0 + lightRadius: 6 + lightSoftness: 1.1 + - type: Tag + tags: + - LightBulb + - Trash + - type: Construction + graph: GreenLight + node: icon + - type: ToolRefinable + refineResult: + - id: SheetGlass1 + - id: ShardCrystalGreen diff --git a/Resources/Prototypes/_NF/Entities/Structures/Furniture/icebox.yml b/Resources/Prototypes/_NF/Entities/Structures/Furniture/icebox.yml new file mode 100644 index 00000000000..7cecd0fd444 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Structures/Furniture/icebox.yml @@ -0,0 +1,39 @@ +- type: entity + name: ice box + description: This delightful machine is slowly filling with ice! + id: IceboxEmpty + parent: SinkEmpty + components: + - type: Sprite + sprite: _NF/Structures/Furniture/icebox.rsi + layers: + - state: icebox + - map: [ "enum.SolutionContainerLayers.Fill" ] + state: icebox_fill-1 + visible: false + - type: Appearance + - type: SolutionContainerVisuals + maxFillLevels: 1 + fillBaseName: icebox_fill- + solutionName: drainBuffer + - type: SolutionRegeneration + solution: tank + generated: + reagents: + - ReagentId: Ice + Quantity: 1 + +- type: entity + name: ice box + id: Icebox + parent: IceboxEmpty + suffix: Ice + components: + - type: SolutionContainerManager + solutions: + drainBuffer: + maxVol: 100 + tank: + reagents: + - ReagentId: Ice + Quantity: 500 diff --git a/Resources/Prototypes/_NF/Entities/Structures/Wallmounts/Signs/posters.yml b/Resources/Prototypes/_NF/Entities/Structures/Wallmounts/Signs/posters.yml index 7a8a5c36a22..bb8194f25dd 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Wallmounts/Signs/posters.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Wallmounts/Signs/posters.yml @@ -191,3 +191,17 @@ - type: Sprite sprite: _NF/Structures/Wallmounts/posters.rsi state: nf_poster15_contraband + +- type: entity + parent: PosterBase + id: NFPosterContrabandFsbNightlight + name: "Far Star Biotech Nightlight" + description: "The FSB Nightlight, chasing the night away." + components: + - type: Sprite + sprite: _NF/Structures/Wallmounts/posters.rsi + state: nf_poster16_contraband + - type: PointLight + radius: 1.5 + energy: 2 + color: "#F8F6F0" diff --git a/Resources/Prototypes/_NF/Guidebook/shipyard.yml b/Resources/Prototypes/_NF/Guidebook/shipyard.yml index 5dec78ace72..9056b726bd1 100644 --- a/Resources/Prototypes/_NF/Guidebook/shipyard.yml +++ b/Resources/Prototypes/_NF/Guidebook/shipyard.yml @@ -36,6 +36,7 @@ - ShipyardLoader - ShipyardMcCargo - ShipyardMcDelivery + - ShipyardNightlight - ShipyardPathfinder - ShipyardPhoenix - ShipyardPioneer @@ -208,6 +209,11 @@ name: guide-entry-shipyard-mcdelivery text: "/ServerInfo/_NF/Guidebook/Shipyard/McDelivery.xml" +- type: guideEntry + id: ShipyardNightlight + name: guide-entry-shipyard-nightlight + text: "/ServerInfo/_NF/Guidebook/Shipyard/Nightlight.xml" + - type: guideEntry id: ShipyardPathfinder name: guide-entry-shipyard-pathfinder diff --git a/Resources/Prototypes/_NF/Guidebook/shuttle_maps.yml b/Resources/Prototypes/_NF/Guidebook/shuttle_maps.yml index 16092d133df..563b1f21e00 100644 --- a/Resources/Prototypes/_NF/Guidebook/shuttle_maps.yml +++ b/Resources/Prototypes/_NF/Guidebook/shuttle_maps.yml @@ -298,6 +298,18 @@ state: loader scale: 1.2, 1.2 +- type: entity + parent: PosterBase + id: ShuttleMapNightlight + name: "FSB Nightlight" + description: "Detailed map of a Nightlight shuttle." + categories: [ HideSpawnMenu ] + components: + - type: Sprite + sprite: _NF/Guidebook/shuttle_maps/128x96.rsi + state: nightlight + scale: 1.2, 1.2 + - type: entity parent: PosterBase id: ShuttleMapPathfinder diff --git a/Resources/Prototypes/_NF/Recipes/Construction/Graphs/utilities/lighting.yml b/Resources/Prototypes/_NF/Recipes/Construction/Graphs/utilities/lighting.yml new file mode 100644 index 00000000000..8deb0b4871f --- /dev/null +++ b/Resources/Prototypes/_NF/Recipes/Construction/Graphs/utilities/lighting.yml @@ -0,0 +1,120 @@ +- type: constructionGraph + id: CyanLightBulb + start: start + graph: + - node: start + edges: + - to: icon + steps: + - material: Glass + amount: 1 + doAfter: 1 + - tag: CrystalCyan + name: cyan crystal shard + icon: + sprite: Objects/Materials/Shards/crystal.rsi + state: shard1 + color: #52ff39 + doAfter: 1 + - node: icon + entity: LightBulbCrystalCyan + +- type: constructionGraph + id: BlueLightBulb + start: start + graph: + - node: start + edges: + - to: icon + steps: + - material: Glass + amount: 2 + doAfter: 1 + - tag: CrystalBlue + name: blue crystal shard + icon: + sprite: Objects/Materials/Shards/crystal.rsi + state: shard1 + doAfter: 1 + - node: icon + entity: LightBulbCrystalBlue + +- type: constructionGraph + id: PinkLightBulb + start: start + graph: + - node: start + edges: + - to: icon + steps: + - material: Glass + amount: 2 + doAfter: 1 + - tag: CrystalPink + name: pink crystal shard + icon: + sprite: Objects/Materials/Shards/crystal.rsi + state: shard1 + doAfter: 1 + - node: icon + entity: LightBulbCrystalPink + +- type: constructionGraph + id: OrangeLightBulb + start: start + graph: + - node: start + edges: + - to: icon + steps: + - material: Glass + amount: 2 + doAfter: 1 + - tag: CrystalOrange + name: orange crystal shard + icon: + sprite: Objects/Materials/Shards/crystal.rsi + state: shard1 + doAfter: 1 + - node: icon + entity: LightBulbCrystalOrange + +- type: constructionGraph + id: RedLightBulb + start: start + graph: + - node: start + edges: + - to: icon + steps: + - material: Glass + amount: 2 + doAfter: 1 + - tag: CrystalRed + name: red crystal shard + icon: + sprite: Objects/Materials/Shards/crystal.rsi + state: shard1 + doAfter: 1 + - node: icon + entity: LightBulbCrystalRed + +- type: constructionGraph + id: GreenLightBulb + start: start + graph: + - node: start + edges: + - to: icon + steps: + - material: Glass + amount: 2 + doAfter: 1 + - tag: CrystalGreen + name: green crystal shard + icon: + sprite: Objects/Materials/Shards/crystal.rsi + state: shard1 + doAfter: 1 + - node: icon + entity: LightBulbCrystalGreen diff --git a/Resources/Prototypes/_NF/Recipes/Construction/lighting.yml b/Resources/Prototypes/_NF/Recipes/Construction/lighting.yml new file mode 100644 index 00000000000..74d4c74f130 --- /dev/null +++ b/Resources/Prototypes/_NF/Recipes/Construction/lighting.yml @@ -0,0 +1,65 @@ +- type: construction + name: cyan light bulb + id: CyanLightBulb + graph: CyanLightBulb + startNode: start + targetNode: icon + category: construction-category-utilities + description: A high powered light tube containing a cyan crystal + icon: { sprite: Objects/Power/light_bulb.rsi, state: normal } + objectType: Item + +- type: construction + name: blue light bulb + id: BlueLightBulb + graph: BlueLightBulb + startNode: start + targetNode: icon + category: construction-category-utilities + description: A high powered light tube containing a blue crystal + icon: { sprite: Objects/Power/light_bulb.rsi, state: normal } + objectType: Item + +- type: construction + name: pink light bulb + id: PinkLightBulb + graph: PinkLightBulb + startNode: start + targetNode: icon + category: construction-category-utilities + description: A high powered light tube containing a pink crystal + icon: { sprite: Objects/Power/light_bulb.rsi, state: normal } + objectType: Item + +- type: construction + name: orange light bulb + id: OrangeLightBulb + graph: OrangeLightBulb + startNode: start + targetNode: icon + category: construction-category-utilities + description: A high powered light tube containing an orange crystal + icon: { sprite: Objects/Power/light_bulb.rsi, state: normal } + objectType: Item + +- type: construction + name: red light bulb + id: RedLightBulb + graph: RedLightBulb + startNode: start + targetNode: icon + category: construction-category-utilities + description: A high powered light tube containing a red crystal + icon: { sprite: Objects/Power/light_bulb.rsi, state: normal } + objectType: Item + +- type: construction + name: green light bulb + id: GreenLightBulb + graph: GreenLightBulb + startNode: start + targetNode: icon + category: construction-category-utilities + description: A high powered light tube containing a green crystal + icon: { sprite: Objects/Power/light_bulb.rsi, state: normal } + objectType: Item diff --git a/Resources/Prototypes/_NF/Shipyard/nightlight.yml b/Resources/Prototypes/_NF/Shipyard/nightlight.yml new file mode 100644 index 00000000000..821a1cef849 --- /dev/null +++ b/Resources/Prototypes/_NF/Shipyard/nightlight.yml @@ -0,0 +1,43 @@ +# Author Info +# GitHub: dustylens (https://github.com/dustylens) +# Discord: dustylens + +# Maintainer Info +# GitHub: dustylens (https://github.com/dustylens) +# Discord: dustylens + +# Shuttle Notes: +# +- type: vessel + id: Nightlight + name: FSB Nightlight + description: The Far Star Biotech company is please to present the most forward facing testbed for the effects of bioregenerative nutrient on humanoid physiology to date! Bone Apple Teeth! + price: 1 # I'm tired of fighting you appraisal bot tell me what you want. + category: Medium + group: Shipyard + shuttlePath: /Maps/_NF/Shuttles/nightlight.yml + guidebookPage: ShipyardNightlight + class: + - Kitchen + engine: + - Uranium + +- type: gameMap + id: Nightlight + mapName: 'FSB Nightlight' + mapPath: /Maps/_NF/Shuttles/nightlight.yml + minPlayers: 0 + stations: + Nightlight: + stationProto: StandardFrontierVessel + components: + - type: StationNameSetup + mapNameTemplate: 'Nightlight {1}' + nameGenerator: + !type:NanotrasenNameGenerator + prefixCreator: '14' + - type: StationJobs + availableJobs: + Contractor: [ 0, 0 ] + Pilot: [ 0, 0 ] + Mercenary: [ 0, 0 ] diff --git a/Resources/ServerInfo/_NF/Guidebook/Shipyard/Nightlight.xml b/Resources/ServerInfo/_NF/Guidebook/Shipyard/Nightlight.xml new file mode 100644 index 00000000000..d79c222dcc4 --- /dev/null +++ b/Resources/ServerInfo/_NF/Guidebook/Shipyard/Nightlight.xml @@ -0,0 +1,103 @@ + + # NIGHTLIGHT-CLASS SERVICE SHUTTLE + + + + + + + + + + + [color=#a4885c]Ship Size:[/color] Medium + + [color=#a4885c]Recommended Crew:[/color] 1-4 + + [color=#a4885c]Power Gen Type:[/color] Uranium + + [color=#a4885c]Base Power Draw:[/color] 30kw + + [color=#a4885c]Expeditions:[/color] None + + [color=#a4885c]IFF Console:[/color] None + + "The Nightlight is the Far Star Biotech's flagship biomass biorecombination research vessel. Providing top of the line hospitality and nutritional preperation accomidations for Nanotrasen standard xenotypes; the Nightlight should provide any research teams investigating new strains of recombinant nutrition with a distraction free crop of eager bioforms." + + # Piloting + + + + After clicking the shuttle console, you should see a radar view of the shuttle. Here are the steps for piloting the shuttle back and forth: + + - First, disconnect any airlocks that are connected to the dock. + - Then, you actually get to pilot the shuttle. The controls are fairly simple, with [color=#028ed9]"W"[/color] and [color=#028ed9]"S"[/color] being forward and backward, [color=#028ed9]"A"[/color] and [color=#028ed9]"D"[/color] being left and right, and [color=#028ed9]"Q"[/color] and [color=#028ed9]"E"[/color] being rotating left and right; and [color=#028ed9]"spacebar"[/color] being the brake and moving precicely by holding the [color=#028ed9]"spacebar"[/color] while doing other inputs. + + # Hiring crew + + + + + + As a Captain of a Nanotrasen vessel, you have the authority to hire, fire, demote, or promote crew members at will. There are two ways you as a Captain can go about hiring crew: you can either use the [color=#a4885c]station records computer[/color] on your ship to open crew slots (jobs available vary from ship to ship) or invite through in-game communications other players to your crew. + + # PREFLIGHT CHECKLIST + + ## 1. Power supply + + ## 1.1. Battery units + + + + + + - Check if the APC unit's Main Breaker is toggled on. + - Check the APC unit's current Load* (W). + + ## 1.2. S.U.P.E.R.P.A.C.M.A.N. generator unit + + + + + + + - Check if the S.U.P.E.R.P.A.C.M.A.N. generator unit is anchored to the floor. + - Check if the S.U.P.E.R.P.A.C.M.A.N. generator unit has fuel. For extended flights make sure that you have enough fuel stockpiled to sustain prolonged power generation during flight. + - Check if the S.U.P.E.R.P.A.C.M.A.N. generator unit is set to HV output. + - Set Target Power for 30 [bold]k[/bold]W. + - Start the S.U.P.E.R.P.A.C.M.A.N. generator unit. + - Close radiation shielding. + + ## 2. Atmospherics + + ## 2.1. Distribution Loop + + + + + + + - Check if the air canister is anchored to connector port. + - Check if the distribution pump is set to normal pressure (101kPa). + - Enable the distribution pump. + + ## 2.2. Waste Loop + + + + + + - Enable waste loop pump. + - Disable Auto Mode on the Air Alarm in the Engine Room. + - Set the Air Alarm in the Engine Room to Filtering (Wide). + + ## 3. Other checks + + + + + + - Check if the gyroscope is anchored, powered, and enabled. + - Check if the mini gravity generator is anchored, powered, and enabled. + + diff --git a/Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/meta.json b/Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/meta.json index 14145fba669..b8f02587b2c 100644 --- a/Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/meta.json +++ b/Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/meta.json @@ -85,6 +85,9 @@ { "name": "loader" }, + { + "name": "nightlight" + }, { "name": "pathfinder" }, diff --git a/Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/nightlight.png b/Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/nightlight.png new file mode 100644 index 0000000000000000000000000000000000000000..735e5744c208f140dc26a94fa57246df5049be87 GIT binary patch literal 2054 zcmV+h2>JJkP)Px+z)3_wRCt{2onMGmMHs-pBdcVFr0m0DOOVn<*$M-x7sV_CgIu;X%vR7~Zz2Rm zcq5Et6Z=E7mq-W}y$d0!xuuCd6lmo_5D8)rUDmy&y=-!Wi+`5>h`VrlSkK)v-<`kb z&zw2u%AuYyJKJ?8iW9mjE4vP@xFnOK6MQU_jq)jXOC;5d%sPXNoZs1(@3N3{-u zynChvVBwGF6%bnvYXzb~^sX(I&^Q3uZnwjJF!xv?TqR9+Spz|S0U6iX7&6puH~ z56T>WV*arsZH!MFW6}zR!)3;t_#)&I&_)qznM- zcdRAk1vj4+k@{QEj z5Hj!UHv#Jj%sEC_fHbxL|7_i=6yG!breZBX&N0FQ@W8%!*0?+=XmbT=!difwV-+Ch zSOv&AiMOcO*DnJ5-oJcgEXv}vaR0;02>J2D^SJS&^!4k&T7aBm6~I7fKjq@d-Z||^ zyU%~kDuAK*r|A7Fu4uAqI>fAQTo1tFkJk%Cq0g@Vgd2bTkFOE(Q%@A4FH{J=J69uQ z)#rKO<627{1X+>?(7HZT=6)kBK(TiN6ni%$U5vv{0%pdi!wMk;`X|7Q_FS76cZ zGg1L6C%#R(2$7=tJh+|quCZj%3NG$SE~S!1fNUQiOHF`@5KF>L#QSP=bpkJUpN3_p zHY(p2M<-AxMm7N!eOLv^Iog|mmihBz2f6XT2Rz??JK6$;B>eN#sPS}REkMq(3XpTG z0_2>;hkzG&aSW_b6^)GiMHdF$-l!{zSN004oejZH}o=Tk(Wa-QI(53*p2D_Y&CGAkzTZdY$1}Cr0h4y+#i-a2$FX@~y7rOK7RrgMlJej8pTWV}R+ z{Kp`Gvv-a~FD{zTr{yOqLz>Xq2N)h}xYL{FLvf%3>Q@_3E>(>%|9M`3+A<2DeYrux zJ&WMU!($D%abpsC7EeK;P=Mk9KxJ_`E%CMc0WR&ULeJtU znBFu$RYSn6BHafFY7soS#Sc)c!O3egegHcZOb+V@$T=;20G0)ast@2j%&PtzvP7vUc^5*%3^%gBVRwv|F)q zsp`JbH|ma$kGrnxy5r;H?uS2Janq&*sv9xkefd~>_pxNxhd<1JREdwzwQ7Oi8I)E( zK#(SYx5XPRU6IKTa}4qfky0*I-O;|j)P4CLK`a11;xANW0ciL0!gPx*5lKWrRCt{2nq6oVR}{y8v(9FAlB~(b+S)?tRxnC^Fa#o6sYUu^LG&eIZ7H<{ zrBG2945c9bq92Gtx}|+6LTQC!Y9DG4^r=WHB*j$vQXdqeOY}hr$t2k%vmfK$KHQ!C zh&!`uSLu;y=VRk6%gr*2$bB30Q*=GAe7u5h2p;o0wH@bc=n7^ z#;j+cx?PO)Ma0o)w1j^plsHBK5MuD`pl6-n=zvIHMD$0GaO;J&jHxXE^jHf34Eb8v zot4MwY!-md+i^|~4CMdcm@xqO^3%^iK@9%lO(*!AFDW1t#?%%zr4#g63!FP12Vkd_ zU|49Rvsp$JohF|&W11$WX#z4@LhT`GN_dhx;Nk!U0ZQppS3caxk474RX1~hSwA>F1 z4FEHh1Yj}e1ep_{y20~g;5Y>A8@EFokYOKcVpwQ2%_rCz@bUM3i)OzxqX5ZN5={%_ z6QSZ^^57By6Y+6C;lhatE~-I{DT8655mq(c_QT#*ov^Br%sp)z0WE+6ghCzpH-@z3 zO*lq?9lpm7w7^tcHqOjG&~HD0IRz_&#EO!jjrq9*-pv4RLqLH;hY#{i?Aw}t;LzcN zc-aHa^8f+c_w-5vHQ=>3-{tq8f2hgE+x?#`69>un(xXASV{Rkf{Y4|;hT;64OEI>AP;Jw#&0pzUGXJp3kfnFy7_CiP$1 zJRAVd4k!-WTF5W8DtV>K!Cg zNd#aR)A@-;lh4PfqLa>M85SBlEx8gscRWsywZNuyBJT({c-{d4EkHmE(5&l-qLekJ zwy@GC9nq9B8C7I-?D-(fkWUidlunejSq#q(0UO21O`-6;0U&9bgj;pOt#*sXPZ=<# z3@)w;A-=js_W}1P@T>zS;^P=|vp6NecP8WVptL5-`}V=qEF5UTn45Ji%6irT07I89 zvwO!YHQR85ryY>->kM7GOvbO{&zKKftEMfyZasgv{DxCA8dTz?+MW8NQ70Ro*7&%g z!g5*+o*h(FTL^XHYx!y0Tr5l^lBuNB_|%~jZ1VqvRs-afEgSxv1jsLw3o}6h#>_OD zCKn&6oZO|}k3!K zyJd+N+k=d$lB#;&LhN`}>Y6BWz?o;l1auv1g=|{PSZoz0>u<;Z|2uw!=)4`Lv)qN1 zQoEpbtdiMLZ4F`}i37ZW)8CAHYV03EABg$U?H5|1k>K)yHMX!CTv zq$=3bT|21@pu?8%QZxhx&);Olu1>BQl`E#qqD0$}kAT#Ln<&7wEpjN>@6F`^`^ysKB)mmX0n%jI`;r{{%-zZD#K(yZ#7L7ZyTt}#o)$YhVIn@xsqar=%*~eFY+forxT~AkK&-5x za94L-IsoA5&J7iLsQ~Iz&k^n_?O;n^GyeKr6J-24;jZqIwxzsOfHuYAu7mWoSSea> zSSs~h%In_bT;VNX6D=owtw-FOlv%tIuaecElK`^b;l|51a%If5Q)0%z?o&?~zjYmO z=QV!ox{QE_k-pXws^R4Wl=pgfJ9g^dzYprOLRJ;8Vq#8<-+ClpjOEI!fd(E0{srlT Vxd6d&xRn3^002ovPDHLkV1iSP4lw`# literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Furniture/icebox.rsi/icebox_fill-1.png b/Resources/Textures/_NF/Structures/Furniture/icebox.rsi/icebox_fill-1.png new file mode 100644 index 0000000000000000000000000000000000000000..2cab252864c7eb49a268231eae3aee846607fde8 GIT binary patch literal 585 zcmV-P0=E5$P)Kp*j1NPt9;zQR=b!qRq#{`52?Cg z36BX+EL*z6o5Ia%I=(1;EF3W8g2LC1o^bie;griC4jZvZ7`zR_O6nIUezBT1vcmFm z+OwI0`g0%WCH`b?Ix1_M%vMYyj1od&oMFNQ>19xSkS_Y@mK|mCd%p9h$V;v&UZ;q` z5-HMH1Vk-J^`xwt=t&tFicbIk_SMw-``qgO5L7Q~|9yrdj}tUG0fZnraEw)cL#K3i*@ddAuA=>Ta8NC!x(F8}}l0O)h+h2_le7p?Uh zAqAuZ0000H$5{Dp?3}s&KR(~8ABGf=4vPx&CrLy>R9J=WmtROzQ5?rV#=N9r(OeW+B10uIYDC*?UdjR)iG&qoR8L_LJw?wM zVf4~N^w5*}7*P)vgeb$8iks;cG9(2vqGCqknz$iDlh(uCy?1vzyZ#&WP+vIQ-}(N2 z=ls6+{JHlW_}5Wn<*eIZohnqKj~~7WbJ?ttA8Ym!or!HYxnqYNASDtZ6rd%4bouFq zlWVxbd7+3+`5I_%-m_y_FRMXzoL0{_l6eJa=$J7EX*D7`W^5+Gne9ce_6kH4I^H@m zK9|>(YP17T^fqR)*9vO^^WqNUEj1)EVl+G6XlG0RrveIy&E`6RKQ zAHOS*0KpU_1TiA6Fal=3=TJG!>~|qo7y*JcaN@>2yv_(CpLgSRM({Fb;sCrAV*q;H z3fA9&_?%w6&In#-#2DW6b0l1*+nRqQT$a;5A1p_pXfmwZ!AbD6*Q%ULeFi7N+g?lX z*%Y|cr~aKy$LQFz4gsloLwTrI!F^T+;GzFM?rxb-uL6L(Th=)(R^tr;<-#1Ro&r-{ zvjKN=y>5qk6^PHNoT&Yp1uP_t0)z&~b(@6*ZeNv&bNi}H@!9P~5FQfh_E)Fs57hGF z$+ui*#~E|I=ed{zJf5utgYy8KzEH*Z*i_EJWQD&*k|xJbUPUVmYRk5q7!l|3?8NW) z0|A1;A9*ua3TSftL@sFsM<1`E>Dk(9&x)GM;k4xEZr(~Wf%OTHOIo?JubR#YRm4zy z5$;}P>A_1qMv{^&ZQo_oub(1g^AQLH2!}_htU11R0ZOuu&WTo(WFK#$5+DJv>Donp z_lE#jUMh#`I+bs6vy8gk#y6KjAi(?J6d>M$u);1FiZ7xh)i<|E3B4Tl)FQR*MQYoN zO-h(-o0OpB=t1m0neok~*rWvC;$PP%KobElFrdz(%XJ99-;c|6$P}mfiyLI@KAC;D z?_l@I6gS8?9og%~z^czqCr|qIVAM Date: Fri, 27 Dec 2024 12:38:58 -0800 Subject: [PATCH 02/14] Arbitrage homage --- Resources/Maps/_NF/Shuttles/nightlight.yml | 2 ++ Resources/Prototypes/_NF/Shipyard/nightlight.yml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Resources/Maps/_NF/Shuttles/nightlight.yml b/Resources/Maps/_NF/Shuttles/nightlight.yml index c188bbbd0be..4edd76be5b8 100644 --- a/Resources/Maps/_NF/Shuttles/nightlight.yml +++ b/Resources/Maps/_NF/Shuttles/nightlight.yml @@ -3299,6 +3299,8 @@ entities: - type: Transform pos: -3.5,8.5 parent: 1 + - type: FuelGenerator + targetPower: 23000 - proto: PosterLegitSMFires entities: - uid: 464 diff --git a/Resources/Prototypes/_NF/Shipyard/nightlight.yml b/Resources/Prototypes/_NF/Shipyard/nightlight.yml index 821a1cef849..4f43592c30d 100644 --- a/Resources/Prototypes/_NF/Shipyard/nightlight.yml +++ b/Resources/Prototypes/_NF/Shipyard/nightlight.yml @@ -12,7 +12,7 @@ id: Nightlight name: FSB Nightlight description: The Far Star Biotech company is please to present the most forward facing testbed for the effects of bioregenerative nutrient on humanoid physiology to date! Bone Apple Teeth! - price: 1 # I'm tired of fighting you appraisal bot tell me what you want. + price: 47000 # I'm tired of fighting you appraisal bot tell me what you want. category: Medium group: Shipyard shuttlePath: /Maps/_NF/Shuttles/nightlight.yml From a6abf2078c9a9f75134832f38c84987815cb045a Mon Sep 17 00:00:00 2001 From: dustylens Date: Fri, 27 Dec 2024 14:56:36 -0800 Subject: [PATCH 03/14] Revision 1 Add addition air alarm Shrink freezer to increase prep space Some lighting changes Additional emergency suit kit in rear airlock --- Resources/Maps/_NF/Shuttles/nightlight.yml | 904 +++++++++++------- .../shuttle_maps/128x96.rsi/nightlight.png | Bin 2054 -> 2053 bytes 2 files changed, 579 insertions(+), 325 deletions(-) diff --git a/Resources/Maps/_NF/Shuttles/nightlight.yml b/Resources/Maps/_NF/Shuttles/nightlight.yml index 4edd76be5b8..84fa776c1df 100644 --- a/Resources/Maps/_NF/Shuttles/nightlight.yml +++ b/Resources/Maps/_NF/Shuttles/nightlight.yml @@ -31,7 +31,7 @@ entities: chunks: 0,0: ind: 0,0 - tiles: CAAAAAAACAAAAAAACAAAAAAABgAAAAAABgAAAAAABQAAAAAABQAAAAAABQAAAAAABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAwAAAAAABwAAAAAABwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAABQAAAAAABwAAAAAABwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAwAAAAAABwAAAAAABwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAABQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAACgAAAAAACgAAAAAACgAAAAAACgAAAAAAAwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAACgAAAAAACgAAAAAACgAAAAAACgAAAAAAAwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAACgAAAAAACgAAAAAACgAAAAAACgAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAACgAAAAAACgAAAAAAAwAAAAAAAwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: CAAAAAAACAAAAAAACAAAAAAABgAAAAAABgAAAAAABQAAAAAABQAAAAAABQAAAAAABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAwAAAAAABwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAABQAAAAAABwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAwAAAAAABwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAABQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAACgAAAAAACgAAAAAACgAAAAAACgAAAAAAAwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAACgAAAAAACgAAAAAACgAAAAAACgAAAAAAAwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAACgAAAAAACgAAAAAACgAAAAAACgAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAACgAAAAAACgAAAAAAAwAAAAAAAwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 -1,0: ind: -1,0 @@ -155,7 +155,7 @@ entities: color: '#FFFFFFFF' id: BrickTileWhiteCornerNe decals: - 403: 4,4 + 584: 5,4 - node: color: '#4B709CFF' id: BrickTileWhiteCornerNw @@ -188,7 +188,7 @@ entities: id: BrickTileWhiteCornerSe decals: 407: 3,1 - 408: 4,2 + 587: 5,2 - node: color: '#4B709CFF' id: BrickTileWhiteCornerSw @@ -254,7 +254,7 @@ entities: color: '#FFFFFFFF' id: BrickTileWhiteLineE decals: - 409: 4,3 + 586: 5,3 - node: color: '#DDC3A1FF' id: BrickTileWhiteLineN @@ -275,6 +275,7 @@ entities: 414: -1,4 415: -2,4 416: -3,4 + 585: 4,4 - node: color: '#DDC3A1FF' id: BrickTileWhiteLineS @@ -293,6 +294,7 @@ entities: 422: 0,1 423: -2,1 424: -1,1 + 588: 4,2 - node: color: '#4B709CFF' id: BrickTileWhiteLineW @@ -324,8 +326,6 @@ entities: 340: 1,4 341: 2,4 342: 3,4 - 343: 4,4 - 344: 4,3 345: 3,3 346: 1,3 347: 2,3 @@ -342,7 +342,6 @@ entities: 358: 1,2 359: 2,2 360: 3,2 - 361: 4,2 362: 3,1 363: 2,1 364: 1,1 @@ -350,6 +349,12 @@ entities: 366: -1,1 367: -2,1 368: -3,1 + 572: 4,3 + 573: 5,3 + 574: 5,2 + 575: 4,2 + 576: 4,4 + 577: 5,4 - node: color: '#4B709C3F' id: CheckerNWSE @@ -361,8 +366,6 @@ entities: 373: 1,4 374: 2,4 375: 3,4 - 376: 4,4 - 377: 4,3 378: 3,3 379: 2,3 380: 1,3 @@ -370,7 +373,6 @@ entities: 382: -1,3 383: -2,3 384: -3,3 - 385: 4,2 386: 3,2 387: 3,1 388: 2,1 @@ -388,6 +390,12 @@ entities: 400: -4,2 401: -4,3 402: -4,4 + 578: 4,3 + 579: 5,3 + 580: 5,2 + 581: 4,2 + 582: 4,4 + 583: 5,4 - node: color: '#1861D5FF' id: DeliveryGreyscale @@ -523,8 +531,8 @@ entities: 19: -5,0 20: -5,-1 232: -5,3 - 236: 5,3 533: 0,7 + 570: 6,3 - node: color: '#FFFFFFFF' id: WarnLineGreyscaleN @@ -546,8 +554,8 @@ entities: 5: 5,0 6: 5,-1 231: -5,3 - 235: 5,3 532: 0,7 + 571: 6,3 - node: color: '#FFFFFFFF' id: WarnLineN @@ -590,12 +598,12 @@ entities: 0: 205 1: 512 1,0: - 0: 12559 - 2: 52224 + 0: 29455 + 2: 34816 1,1: - 0: 4353 - 2: 12 + 0: 4355 1: 52224 + 2: 8 1,2: 0: 1 1: 32 @@ -683,43 +691,91 @@ entities: - type: RadiationGridResistance - proto: AirAlarm entities: - - uid: 354 + - uid: 240 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -4.5,2.5 + pos: 5.5,5.5 parent: 1 - type: DeviceList devices: - - 453 - - 456 - - 454 - - 457 - - 455 - - 452 - - 445 + - 441 + - 442 + - 9 - 446 - 447 - - 575 - 448 - 449 - 450 - 451 - - 569 - 568 - - 570 + - 326 - 571 + - 569 - 460 - 461 - - 443 - - 444 - - 442 - - 441 - 480 + - 602 - 482 + - 466 - 471 - 470 - - 466 + - 445 + - type: DeviceLinkSource + linkedPorts: + 576: + - AirDanger: Toggle + 577: + - AirDanger: Close + 578: + - AirDanger: Close + 579: + - AirDanger: Close + 580: + - AirDanger: Close + 308: + - AirDanger: Close + 309: + - AirDanger: Close + 310: + - AirDanger: Close + 311: + - AirDanger: Close + 312: + - AirDanger: Close + 313: + - AirDanger: Close + 314: + - AirDanger: Close + 307: + - AirDanger: Close + 306: + - AirDanger: Close + 305: + - AirDanger: Close + - uid: 603 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -4.5,2.5 + parent: 1 + - type: DeviceList + devices: + - 452 + - 455 + - 575 + - 428 + - 593 + - 454 + - 457 + - 453 + - 456 + - 451 + - 450 + - 449 + - 448 + - 447 + - 446 + - 445 - type: DeviceLinkSource linkedPorts: 305: @@ -736,21 +792,11 @@ entities: - AirDanger: Close 311: - AirDanger: Close - 310: - - AirDanger: Close - 309: - - AirDanger: Close 308: - AirDanger: Close - 576: - - AirDanger: Close - 577: - - AirDanger: Close - 578: - - AirDanger: Close - 579: + 309: - AirDanger: Close - 580: + 310: - AirDanger: Close - proto: AirlockCommandGlass entities: @@ -798,10 +844,11 @@ entities: parent: 1 - proto: AirlockFreezer entities: - - uid: 347 + - uid: 30 components: - type: Transform - pos: 5.5,3.5 + rot: 1.5707963267948966 rad + pos: 6.5,3.5 parent: 1 - proto: AirlockGlassShuttle entities: @@ -848,14 +895,24 @@ entities: parent: 1 - proto: AirSensor entities: - - uid: 575 + - uid: 593 components: - type: Transform - pos: 0.5,1.5 + rot: 3.141592653589793 rad + pos: -3.5,-2.5 + parent: 1 + - type: DeviceNetwork + deviceLists: + - 603 + - uid: 602 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,8.5 parent: 1 - type: DeviceNetwork deviceLists: - - 354 + - 240 - proto: APCBasic entities: - uid: 234 @@ -866,12 +923,6 @@ entities: parent: 1 - proto: AtmosDeviceFanDirectional entities: - - uid: 9 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 5.5,3.5 - parent: 1 - uid: 14 components: - type: Transform @@ -890,6 +941,12 @@ entities: rot: -1.5707963267948966 rad pos: -7.5,-0.5 parent: 1 + - uid: 76 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 6.5,3.5 + parent: 1 - uid: 222 components: - type: Transform @@ -1030,26 +1087,11 @@ entities: parent: 1 - proto: AtmosFixFreezerMarker entities: - - uid: 48 - components: - - type: Transform - pos: 6.5,2.5 - parent: 1 - - uid: 214 - components: - - type: Transform - pos: 6.5,3.5 - parent: 1 - uid: 215 components: - type: Transform pos: 7.5,4.5 parent: 1 - - uid: 216 - components: - - type: Transform - pos: 6.5,4.5 - parent: 1 - uid: 219 components: - type: Transform @@ -1067,6 +1109,13 @@ entities: - type: Transform pos: 0.5,5.5 parent: 1 +- proto: BarSpoon + entities: + - uid: 584 + components: + - type: Transform + pos: 4.4375,2.6025705 + parent: 1 - proto: BenchSofaCorpCorner entities: - uid: 57 @@ -1105,11 +1154,10 @@ entities: parent: 1 - proto: BoozeDispenser entities: - - uid: 62 + - uid: 87 components: - type: Transform - rot: 3.141592653589793 rad - pos: 4.5,2.5 + pos: 5.5,4.5 parent: 1 - proto: BoxColoredLightBulb entities: @@ -1170,11 +1218,11 @@ entities: parent: 1 - proto: ButtonFrameGrey entities: - - uid: 82 + - uid: 62 components: - type: Transform rot: -1.5707963267948966 rad - pos: 5.5,2.75 + pos: 6.5,2.75 parent: 1 - uid: 581 components: @@ -1184,11 +1232,11 @@ entities: parent: 1 - proto: ButtonFrameJanitor entities: - - uid: 329 + - uid: 103 components: - type: Transform rot: -1.5707963267948966 rad - pos: 5.5,4.25 + pos: 6.5,4.25 parent: 1 - proto: CableApcExtension entities: @@ -1711,10 +1759,10 @@ entities: parent: 1 - proto: ClosetChefFilled entities: - - uid: 233 + - uid: 303 components: - type: Transform - pos: -2.770659,2.522128 + pos: -3.7665334,2.4967659 parent: 1 - proto: ClosetWallO2N2FilledRandom entities: @@ -1730,10 +1778,10 @@ entities: parent: 1 - proto: ClothingOuterWinterChef entities: - - uid: 213 + - uid: 424 components: - type: Transform - pos: 6.514557,4.497615 + pos: 7.607233,2.4791915 parent: 1 - proto: ComputerTabletopShuttle entities: @@ -1758,10 +1806,10 @@ entities: parent: 1 - proto: CrateFreezer entities: - - uid: 186 + - uid: 316 components: - type: Transform - pos: 6.5,4.5 + pos: 7.5,2.5 parent: 1 - proto: DefibrillatorCabinetFilled entities: @@ -1771,6 +1819,69 @@ entities: rot: 1.5707963267948966 rad pos: -4.5,-1.5 parent: 1 +- proto: DeskBell + entities: + - uid: 589 + components: + - type: Transform + pos: -2.4479167,1.5713204 + parent: 1 +- proto: DrinkShaker + entities: + - uid: 583 + components: + - type: Transform + pos: 4.78125,2.5400705 + parent: 1 +- proto: EmergencyLight + entities: + - uid: 524 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -5.5,-0.5 + parent: 1 + - uid: 525 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 6.5,-0.5 + parent: 1 + - uid: 526 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,-3.5 + parent: 1 + - uid: 527 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -3.5,2.5 + parent: 1 + - uid: 528 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 4.5,2.5 + parent: 1 + - uid: 544 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,7.5 + parent: 1 + - uid: 562 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,9.5 + parent: 1 + - uid: 570 + components: + - type: Transform + pos: -3.5,8.5 + parent: 1 - proto: ExtinguisherCabinetFilled entities: - uid: 363 @@ -1787,6 +1898,15 @@ entities: parent: 1 - proto: FirelockGlass entities: + - uid: 9 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 6.5,3.5 + parent: 1 + - type: DeviceNetwork + deviceLists: + - 240 - uid: 441 components: - type: Transform @@ -1795,7 +1915,7 @@ entities: parent: 1 - type: DeviceNetwork deviceLists: - - 354 + - 240 - uid: 442 components: - type: Transform @@ -1804,7 +1924,7 @@ entities: parent: 1 - type: DeviceNetwork deviceLists: - - 354 + - 240 - uid: 443 components: - type: Transform @@ -1812,17 +1932,6 @@ entities: pos: -4.5,3.5 parent: 1 - type: DeviceNetwork - deviceLists: - - 354 - - uid: 444 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 5.5,3.5 - parent: 1 - - type: DeviceNetwork - deviceLists: - - 354 - uid: 445 components: - type: Transform @@ -1831,7 +1940,8 @@ entities: parent: 1 - type: DeviceNetwork deviceLists: - - 354 + - 603 + - 240 - uid: 446 components: - type: Transform @@ -1840,7 +1950,8 @@ entities: parent: 1 - type: DeviceNetwork deviceLists: - - 354 + - 603 + - 240 - uid: 447 components: - type: Transform @@ -1849,7 +1960,8 @@ entities: parent: 1 - type: DeviceNetwork deviceLists: - - 354 + - 603 + - 240 - uid: 448 components: - type: Transform @@ -1858,7 +1970,8 @@ entities: parent: 1 - type: DeviceNetwork deviceLists: - - 354 + - 603 + - 240 - uid: 449 components: - type: Transform @@ -1867,7 +1980,8 @@ entities: parent: 1 - type: DeviceNetwork deviceLists: - - 354 + - 603 + - 240 - uid: 450 components: - type: Transform @@ -1876,7 +1990,8 @@ entities: parent: 1 - type: DeviceNetwork deviceLists: - - 354 + - 603 + - 240 - uid: 451 components: - type: Transform @@ -1885,16 +2000,42 @@ entities: parent: 1 - type: DeviceNetwork deviceLists: - - 354 + - 603 + - 240 - proto: FloorDrain entities: - - uid: 334 + - uid: 523 components: - type: Transform - pos: 6.5,3.5 + rot: -1.5707963267948966 rad + pos: 7.5,3.5 parent: 1 - type: Fixtures fixtures: {} +- proto: FoodShakerPepper + entities: + - uid: 585 + components: + - type: Transform + pos: 2.4270835,4.737987 + parent: 1 + - uid: 586 + components: + - type: Transform + pos: 2.625,4.6025705 + parent: 1 +- proto: FoodShakerSalt + entities: + - uid: 587 + components: + - type: Transform + pos: 2.2708335,4.6546535 + parent: 1 + - uid: 588 + components: + - type: Transform + pos: 2.4479167,4.4984035 + parent: 1 - proto: GasMixerOn entities: - uid: 122 @@ -1918,6 +2059,14 @@ entities: parent: 1 - proto: GasPipeBend entities: + - uid: 186 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 7.5,3.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' - uid: 330 components: - type: Transform @@ -1962,6 +2111,22 @@ entities: parent: 1 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 594 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,-3.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 595 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -3.5,-2.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' - proto: GasPipeFourway entities: - uid: 472 @@ -1987,17 +2152,17 @@ entities: color: '#990000FF' - proto: GasPipeStraight entities: - - uid: 226 + - uid: 176 components: - type: Transform - pos: -0.5,-3.5 + pos: 2.5,4.5 parent: 1 - type: AtmosPipeColor - color: '#990000FF' - - uid: 428 + color: '#0055CCFF' + - uid: 177 components: - type: Transform - pos: 1.5,-2.5 + pos: 5.5,3.5 parent: 1 - type: AtmosPipeColor color: '#0055CCFF' @@ -2383,14 +2548,6 @@ entities: parent: 1 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 544 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 5.5,2.5 - parent: 1 - - type: AtmosPipeColor - color: '#0055CCFF' - uid: 545 components: - type: Transform @@ -2528,23 +2685,86 @@ entities: parent: 1 - type: AtmosPipeColor color: '#990000FF' - - uid: 572 + - uid: 574 + components: + - type: Transform + pos: -2.5,3.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 596 components: - type: Transform rot: 1.5707963267948966 rad - pos: 3.5,4.5 + pos: 0.5,-2.5 parent: 1 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 574 + - uid: 597 components: - type: Transform - pos: -2.5,3.5 + rot: 1.5707963267948966 rad + pos: -0.5,-2.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 598 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,-2.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 599 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,-2.5 parent: 1 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 600 + components: + - type: Transform + pos: -3.5,-3.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 601 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,-3.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' - proto: GasPipeTJunction entities: + - uid: 142 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 5.5,2.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 226 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,-3.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 354 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,-2.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 468 components: - type: Transform @@ -2620,14 +2840,6 @@ entities: parent: 1 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 562 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 2.5,4.5 - parent: 1 - - type: AtmosPipeColor - color: '#0055CCFF' - proto: GasPort entities: - uid: 156 @@ -2656,6 +2868,16 @@ entities: color: '#990000FF' - proto: GasVentPump entities: + - uid: 326 + components: + - type: Transform + pos: 5.5,4.5 + parent: 1 + - type: DeviceNetwork + deviceLists: + - 240 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 452 components: - type: Transform @@ -2664,7 +2886,7 @@ entities: parent: 1 - type: DeviceNetwork deviceLists: - - 354 + - 603 - type: AtmosPipeColor color: '#0055CCFF' - uid: 453 @@ -2675,7 +2897,7 @@ entities: parent: 1 - type: DeviceNetwork deviceLists: - - 354 + - 603 - type: AtmosPipeColor color: '#0055CCFF' - uid: 454 @@ -2686,7 +2908,7 @@ entities: parent: 1 - type: DeviceNetwork deviceLists: - - 354 + - 603 - type: AtmosPipeColor color: '#0055CCFF' - uid: 459 @@ -2705,7 +2927,7 @@ entities: parent: 1 - type: DeviceNetwork deviceLists: - - 354 + - 240 - type: AtmosPipeColor color: '#0055CCFF' - uid: 471 @@ -2716,7 +2938,7 @@ entities: parent: 1 - type: DeviceNetwork deviceLists: - - 354 + - 240 - type: AtmosPipeColor color: '#0055CCFF' - uid: 480 @@ -2727,33 +2949,44 @@ entities: parent: 1 - type: DeviceNetwork deviceLists: - - 354 + - 240 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 570 + - uid: 571 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 4.5,4.5 + rot: 1.5707963267948966 rad + pos: -3.5,4.5 parent: 1 - type: DeviceNetwork deviceLists: - - 354 + - 240 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 571 + - uid: 575 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -3.5,4.5 + rot: 3.141592653589793 rad + pos: -3.5,-4.5 parent: 1 - type: DeviceNetwork deviceLists: - - 354 + - 603 - type: AtmosPipeColor color: '#0055CCFF' - proto: GasVentScrubber entities: + - uid: 428 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -2.5,-4.5 + parent: 1 + - type: DeviceNetwork + deviceLists: + - 603 + - type: AtmosPipeColor + color: '#990000FF' - uid: 455 components: - type: Transform @@ -2762,7 +2995,7 @@ entities: parent: 1 - type: DeviceNetwork deviceLists: - - 354 + - 603 - type: AtmosPipeColor color: '#990000FF' - uid: 456 @@ -2773,7 +3006,7 @@ entities: parent: 1 - type: DeviceNetwork deviceLists: - - 354 + - 603 - type: AtmosPipeColor color: '#990000FF' - uid: 457 @@ -2784,15 +3017,7 @@ entities: parent: 1 - type: DeviceNetwork deviceLists: - - 354 - - type: AtmosPipeColor - color: '#990000FF' - - uid: 458 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 7.5,3.5 - parent: 1 + - 603 - type: AtmosPipeColor color: '#990000FF' - uid: 461 @@ -2803,7 +3028,7 @@ entities: parent: 1 - type: DeviceNetwork deviceLists: - - 354 + - 240 - type: AtmosPipeColor color: '#990000FF' - uid: 466 @@ -2814,7 +3039,7 @@ entities: parent: 1 - type: DeviceNetwork deviceLists: - - 354 + - 240 - type: AtmosPipeColor color: '#990000FF' - uid: 470 @@ -2824,7 +3049,7 @@ entities: parent: 1 - type: DeviceNetwork deviceLists: - - 354 + - 240 - type: AtmosPipeColor color: '#990000FF' - uid: 482 @@ -2834,7 +3059,14 @@ entities: parent: 1 - type: DeviceNetwork deviceLists: - - 354 + - 240 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 488 + components: + - type: Transform + pos: 7.5,4.5 + parent: 1 - type: AtmosPipeColor color: '#990000FF' - uid: 568 @@ -2845,7 +3077,7 @@ entities: parent: 1 - type: DeviceNetwork deviceLists: - - 354 + - 240 - type: AtmosPipeColor color: '#990000FF' - uid: 569 @@ -2856,7 +3088,7 @@ entities: parent: 1 - type: DeviceNetwork deviceLists: - - 354 + - 240 - type: AtmosPipeColor color: '#990000FF' - proto: GravityGeneratorMini @@ -3048,11 +3280,11 @@ entities: parent: 1 - proto: Icebox entities: - - uid: 429 + - uid: 522 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 6.5,2.5 + rot: -1.5707963267948966 rad + pos: 7.5,3.5 parent: 1 - proto: JukeboxWallmountShip entities: @@ -3063,14 +3295,14 @@ entities: parent: 1 - proto: KitchenAssembler entities: - - uid: 324 + - uid: 334 components: - type: Transform pos: 1.5,4.5 parent: 1 - proto: KitchenDeepFryer entities: - - uid: 177 + - uid: 223 components: - type: Transform pos: -3.5,4.5 @@ -3082,6 +3314,13 @@ entities: - type: Transform pos: -0.5,4.5 parent: 1 +- proto: KitchenKnife + entities: + - uid: 572 + components: + - type: Transform + pos: 0.375,4.5921535 + parent: 1 - proto: KitchenMicrowave entities: - uid: 181 @@ -3091,7 +3330,7 @@ entities: parent: 1 - proto: KitchenReagentGrinder entities: - - uid: 302 + - uid: 233 components: - type: Transform pos: -1.5,4.5 @@ -3105,15 +3344,15 @@ entities: parent: 1 - proto: LargeBeaker entities: - - uid: 176 + - uid: 236 components: - type: Transform - pos: -1.6481404,4.494996 + pos: -1.702338,4.5433125 parent: 1 - - uid: 303 + - uid: 444 components: - type: Transform - pos: -1.9398072,4.755413 + pos: -1.9419215,4.751646 parent: 1 - proto: LightBulbCrystalBlue entities: @@ -3137,10 +3376,10 @@ entities: parent: 50 - type: Physics canCollide: False - - uid: 423 + - uid: 216 components: - type: Transform - parent: 422 + parent: 214 - type: Physics canCollide: False - proto: LightBulbCrystalOrange @@ -3164,22 +3403,12 @@ entities: - type: Transform pos: 3.5,8.5 parent: 1 -- proto: LockerFreezer +- proto: LockerFreezerBase entities: - - uid: 76 - components: - - type: Transform - pos: 0.74178886,4.5098968 - parent: 1 - - uid: 223 - components: - - type: Transform - pos: -2.2578402,2.48632 - parent: 1 - - uid: 298 + - uid: 521 components: - type: Transform - pos: 0.24178886,4.5098968 + pos: -3.2665334,2.4759326 parent: 1 - proto: LockerWallEVAColorServiceWorkerFilled entities: @@ -3199,11 +3428,11 @@ entities: parent: 1 - proto: LockerWallMaterialsFuelUraniumFilled entities: - - uid: 147 + - uid: 458 components: - type: Transform rot: 1.5707963267948966 rad - pos: -4.5,6.5 + pos: -4.5,8.5 parent: 1 - proto: MaterialReclaimer entities: @@ -3217,7 +3446,24 @@ entities: - uid: 191 components: - type: Transform - pos: 7.471244,2.5494757 + pos: 7.389768,2.5641458 + parent: 1 +- proto: NapkinDrum5 + entities: + - uid: 590 + components: + - type: Transform + pos: -2.7395835,1.6650704 + parent: 1 + - uid: 591 + components: + - type: Transform + pos: 3.5104167,-3.5531197 + parent: 1 + - uid: 592 + components: + - type: Transform + pos: 2.71875,1.6569037 parent: 1 - proto: NFPosterContrabandFsbLogo entities: @@ -3299,8 +3545,6 @@ entities: - type: Transform pos: -3.5,8.5 parent: 1 - - type: FuelGenerator - targetPower: 23000 - proto: PosterLegitSMFires entities: - uid: 464 @@ -3336,6 +3580,12 @@ entities: - type: Transform pos: -5.5,-2.5 parent: 1 + - uid: 147 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 5.5,4.5 + parent: 1 - uid: 189 components: - type: Transform @@ -3376,36 +3626,30 @@ entities: rot: 1.5707963267948966 rad pos: -3.5,4.5 parent: 1 - - uid: 316 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 4.5,4.5 - parent: 1 - uid: 318 components: - type: Transform pos: 6.5,-2.5 parent: 1 - - uid: 322 + - uid: 333 components: - type: Transform rot: -1.5707963267948966 rad - pos: 7.5,3.5 + pos: -0.5,6.5 parent: 1 - - uid: 333 + - uid: 358 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -0.5,6.5 + rot: 1.5707963267948966 rad + pos: 7.5,2.5 parent: 1 - proto: PoweredlightGreen entities: - - uid: 326 + - uid: 329 components: - type: Transform rot: 3.141592653589793 rad - pos: -6.5,6.5 + pos: 7.5,6.5 parent: 1 - proto: PoweredlightRed entities: @@ -3413,7 +3657,7 @@ entities: components: - type: Transform rot: 3.141592653589793 rad - pos: 7.5,6.5 + pos: -6.5,6.5 parent: 1 - proto: PoweredStrobeLightEmpty entities: @@ -3433,64 +3677,64 @@ entities: powerLoad: 0 - type: DamageOnInteract isDamageActive: False - - uid: 263 + - uid: 214 components: - type: Transform - rot: 3.141592653589793 rad - pos: -1.5,-3.5 + rot: -1.5707963267948966 rad + pos: 5.5,2.5 parent: 1 - type: ContainerContainer containers: light_bulb: !type:ContainerSlot showEnts: False occludes: True - ent: 265 + ent: 216 - type: ApcPowerReceiver powerLoad: 0 - type: DamageOnInteract isDamageActive: False - - uid: 266 + - uid: 263 components: - type: Transform - pos: -3.5,0.5 + rot: 3.141592653589793 rad + pos: -1.5,-3.5 parent: 1 - type: ContainerContainer containers: light_bulb: !type:ContainerSlot showEnts: False occludes: True - ent: 295 + ent: 265 - type: ApcPowerReceiver powerLoad: 0 - type: DamageOnInteract isDamageActive: False - - uid: 300 + - uid: 266 components: - type: Transform - pos: 4.5,0.5 + pos: -3.5,0.5 parent: 1 - type: ContainerContainer containers: light_bulb: !type:ContainerSlot showEnts: False occludes: True - ent: 301 + ent: 295 - type: ApcPowerReceiver powerLoad: 0 - type: DamageOnInteract isDamageActive: False - - uid: 422 + - uid: 300 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 4.5,2.5 + pos: 4.5,0.5 parent: 1 - type: ContainerContainer containers: light_bulb: !type:ContainerSlot showEnts: False occludes: True - ent: 423 + ent: 301 - type: ApcPowerReceiver powerLoad: 0 - type: DamageOnInteract @@ -3555,7 +3799,7 @@ entities: pos: -4.5,-2.5 parent: 1 - type: DeviceLinkSink - invokeCounter: 1 + invokeCounter: 3 - uid: 306 components: - type: Transform @@ -3563,7 +3807,7 @@ entities: pos: -4.5,-3.5 parent: 1 - type: DeviceLinkSink - invokeCounter: 1 + invokeCounter: 3 - uid: 307 components: - type: Transform @@ -3571,7 +3815,7 @@ entities: pos: -4.5,-4.5 parent: 1 - type: DeviceLinkSink - invokeCounter: 1 + invokeCounter: 3 - uid: 308 components: - type: Transform @@ -3579,7 +3823,7 @@ entities: pos: 5.5,-2.5 parent: 1 - type: DeviceLinkSink - invokeCounter: 1 + invokeCounter: 3 - uid: 309 components: - type: Transform @@ -3587,7 +3831,7 @@ entities: pos: 5.5,-3.5 parent: 1 - type: DeviceLinkSink - invokeCounter: 1 + invokeCounter: 3 - uid: 310 components: - type: Transform @@ -3595,7 +3839,7 @@ entities: pos: 5.5,-4.5 parent: 1 - type: DeviceLinkSink - invokeCounter: 1 + invokeCounter: 3 - uid: 311 components: - type: Transform @@ -3603,7 +3847,7 @@ entities: pos: 4.5,-5.5 parent: 1 - type: DeviceLinkSink - invokeCounter: 1 + invokeCounter: 3 - uid: 312 components: - type: Transform @@ -3611,7 +3855,7 @@ entities: pos: 3.5,-5.5 parent: 1 - type: DeviceLinkSink - invokeCounter: 1 + invokeCounter: 3 - uid: 313 components: - type: Transform @@ -3619,7 +3863,7 @@ entities: pos: -2.5,-5.5 parent: 1 - type: DeviceLinkSink - invokeCounter: 1 + invokeCounter: 3 - uid: 314 components: - type: Transform @@ -3627,42 +3871,42 @@ entities: pos: -3.5,-5.5 parent: 1 - type: DeviceLinkSink - invokeCounter: 1 + invokeCounter: 3 - uid: 576 components: - type: Transform pos: -1.5,10.5 parent: 1 - type: DeviceLinkSink - invokeCounter: 1 + invokeCounter: 3 - uid: 577 components: - type: Transform pos: -0.5,10.5 parent: 1 - type: DeviceLinkSink - invokeCounter: 1 + invokeCounter: 2 - uid: 578 components: - type: Transform pos: 0.5,10.5 parent: 1 - type: DeviceLinkSink - invokeCounter: 1 + invokeCounter: 2 - uid: 579 components: - type: Transform pos: 1.5,10.5 parent: 1 - type: DeviceLinkSink - invokeCounter: 1 + invokeCounter: 2 - uid: 580 components: - type: Transform pos: 2.5,10.5 parent: 1 - type: DeviceLinkSink - invokeCounter: 1 + invokeCounter: 2 - proto: ShuttersRadiationOpen entities: - uid: 296 @@ -3797,6 +4041,40 @@ entities: parent: 1 - proto: SignalButton entities: + - uid: 298 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 6.5,4.25 + parent: 1 + - type: DeviceLinkSource + linkedPorts: + 147: + - Pressed: Toggle + 315: + - Pressed: Toggle + 50: + - Pressed: Toggle + 214: + - Pressed: Toggle + 300: + - Pressed: Toggle + 262: + - Pressed: Toggle + 318: + - Pressed: Toggle + 260: + - Pressed: Toggle + 425: + - Pressed: Toggle + 263: + - Pressed: Toggle + 259: + - Pressed: Toggle + 261: + - Pressed: Toggle + 266: + - Pressed: Toggle - uid: 335 components: - type: Transform @@ -3839,34 +4117,6 @@ entities: linkedPorts: 338: - Pressed: DoorBolt - - uid: 358 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 5.5,2.75 - parent: 1 - - type: DeviceLinkSource - linkedPorts: - 308: - - Pressed: Toggle - 309: - - Pressed: Toggle - 310: - - Pressed: Toggle - 311: - - Pressed: Toggle - 312: - - Pressed: Toggle - 313: - - Pressed: Toggle - 314: - - Pressed: Toggle - 307: - - Pressed: Toggle - 306: - - Pressed: Toggle - 305: - - Pressed: Toggle - uid: 365 components: - type: Transform @@ -3891,41 +4141,33 @@ entities: - Pressed: Toggle 285: - Pressed: Toggle - - uid: 424 + - uid: 421 components: - type: Transform rot: -1.5707963267948966 rad - pos: 5.5,4.25 + pos: 6.5,2.75 parent: 1 - type: DeviceLinkSource linkedPorts: - 316: - - Pressed: Toggle - 315: - - Pressed: Toggle - 50: - - Pressed: Toggle - 422: - - Pressed: Toggle - 262: + 308: - Pressed: Toggle - 261: + 309: - Pressed: Toggle - 266: + 310: - Pressed: Toggle - 300: + 311: - Pressed: Toggle - 260: + 312: - Pressed: Toggle - 259: + 313: - Pressed: Toggle - 263: + 314: - Pressed: Toggle - 425: + 307: - Pressed: Toggle - 318: + 306: - Pressed: Toggle - 81: + 305: - Pressed: Toggle - uid: 519 components: @@ -3977,10 +4219,10 @@ entities: parent: 1 - proto: SinkWide entities: - - uid: 436 + - uid: 422 components: - type: Transform - pos: 2.5,4.5 + pos: 4.5,4.5 parent: 1 - proto: SMESBasic entities: @@ -3991,10 +4233,11 @@ entities: parent: 1 - proto: SodaDispenser entities: - - uid: 240 + - uid: 324 components: - type: Transform - pos: 4.5,4.5 + rot: 3.141592653589793 rad + pos: 5.5,2.5 parent: 1 - proto: SpawnPointLatejoin entities: @@ -4068,22 +4311,21 @@ entities: parent: 1 - proto: TableReinforced entities: - - uid: 87 + - uid: 82 components: - type: Transform rot: 3.141592653589793 rad - pos: 4.5,2.5 + pos: 5.5,2.5 parent: 1 - uid: 102 components: - type: Transform pos: -2.5,4.5 parent: 1 - - uid: 103 + - uid: 134 components: - type: Transform - rot: 3.141592653589793 rad - pos: 4.5,4.5 + pos: 4.5,2.5 parent: 1 - uid: 187 components: @@ -4100,6 +4342,11 @@ entities: - type: Transform pos: -0.5,8.5 parent: 1 + - uid: 302 + components: + - type: Transform + pos: 0.5,4.5 + parent: 1 - uid: 320 components: - type: Transform @@ -4110,6 +4357,18 @@ entities: - type: Transform pos: -1.5,4.5 parent: 1 + - uid: 347 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,4.5 + parent: 1 + - uid: 436 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 5.5,4.5 + parent: 1 - proto: TableWood entities: - uid: 79 @@ -4149,11 +4408,6 @@ entities: - type: Transform pos: -0.5,1.5 parent: 1 - - uid: 236 - components: - - type: Transform - pos: -2.5,1.5 - parent: 1 - uid: 237 components: - type: Transform @@ -4164,6 +4418,11 @@ entities: - type: Transform pos: -1.5,1.5 parent: 1 + - uid: 423 + components: + - type: Transform + pos: -2.5,1.5 + parent: 1 - proto: Thruster entities: - uid: 136 @@ -4234,19 +4493,11 @@ entities: pos: -6.5,4.5 parent: 1 - proto: VendingMachineChefvend - entities: - - uid: 421 - components: - - type: Transform - pos: -3.5,2.5 - parent: 1 -- proto: VendingMachineCondiments entities: - uid: 101 components: - type: Transform - rot: 3.141592653589793 rad - pos: -2.5,1.5 + pos: -6.5,3.5 parent: 1 - proto: VendingMachineRestockBooze entities: @@ -4335,12 +4586,6 @@ entities: rot: 1.5707963267948966 rad pos: 4.5,1.5 parent: 1 - - uid: 30 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 5.5,1.5 - parent: 1 - uid: 32 components: - type: Transform @@ -4401,6 +4646,12 @@ entities: rot: 1.5707963267948966 rad pos: -5.5,5.5 parent: 1 + - uid: 48 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 6.5,2.5 + parent: 1 - uid: 52 components: - type: Transform @@ -4488,22 +4739,12 @@ entities: rot: -1.5707963267948966 rad pos: 5.5,6.5 parent: 1 - - uid: 134 - components: - - type: Transform - pos: 5.5,2.5 - parent: 1 - uid: 135 components: - type: Transform rot: -1.5707963267948966 rad pos: -4.5,6.5 parent: 1 - - uid: 142 - components: - - type: Transform - pos: 5.5,4.5 - parent: 1 - uid: 145 components: - type: Transform @@ -4547,6 +4788,12 @@ entities: rot: 3.141592653589793 rad pos: 0.5,5.5 parent: 1 + - uid: 213 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 6.5,4.5 + parent: 1 - uid: 224 components: - type: Transform @@ -4609,6 +4856,12 @@ entities: rot: -1.5707963267948966 rad pos: -2.5,6.5 parent: 1 + - uid: 429 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 5.5,1.5 + parent: 1 - proto: WallShuttleDiagonal entities: - uid: 31 @@ -4670,10 +4923,11 @@ entities: parent: 1 - proto: WarningWaste entities: - - uid: 488 + - uid: 322 components: - type: Transform - pos: -4.5,8.5 + rot: 1.5707963267948966 rad + pos: -4.5,6.5 parent: 1 - proto: WarpPoint entities: diff --git a/Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/nightlight.png b/Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/nightlight.png index 735e5744c208f140dc26a94fa57246df5049be87..89326979f40ff42b45a2698af6f19d5fcd6dff8d 100644 GIT binary patch delta 2026 zcmVtB1VwlwjARr0AlgeL1dHBXl^=bj5d5cX|EGJoqjzGl0KtL#~Y_pWg` ztDac*yX%OVS&$>E07NiU-npoPW$_*6xC1TAvUsveVR@Ml{?MrdC%$eTEd{VF%W@}x zWmR+vOo-8~13&McYXNw;<2ePymV>N7ILO{LK?KGE$acFO^oz;jyUC3e38V6|r~q!} z$fFQRz*0QXIDg+SbKHr!$BwKqK5LB0DijV^8M}(|BW62g6DvdDmRryH$P;h4;>m2xrBa?&XhuL<1!WPMChGzkSbm}~gpr8e0rNffRw5uWe z%7a!u0I~o8Y(>z~G@OnoT^{80;D1Q?7?graX1sG*p?_2#LY5y99R+}Nj&=K=+r+$n z_Q2?@Fx2mr0bu=(wH|rFji)6!U4Z8|_bI=hqa!C$rMOHBU=pmCf8^NlB#M$r$Ptut zNC6B*+Z<&T(t8tH|*Nb(#Z37gGWftxoFhH8;V<& zWswCi7=N9iFm|@#ba?lX0vL>r(+qnEaXP&FQmX)Wy?8O{A{c>+(@f-1OuP?(hk1vp z6Q1xFO5*$9yXRMry!v0Zf574G&mQ;4A8x!;RzxkPCLi%U&kLn4Pq?a|K*vd@;-uq+ zC$0c~`1{l4%5f)#`k`y*5nuUyvhITX`Z{qMM}LmB$;LR{EX%S|sQ@PM^7jt|K>H}5 z-GceE0CACN1@QajJ2;h`WfE5a{Kecnegnnm0ugWi`GEJrB5{5={vzOy@%@0yf2isW zKROa>c7aLlD1ZnDQh=O83XpT!+=tl5><(wS8+q}0=*+Dr0ro4j^)X;(I-0j0K^NYr zfPc02&p8)`>&mSKA*{-l9eMGCy%NGfG>O9t$LBH^F}Dd|O(@_5(zuc+O~~p%HtC}h zpQ`{o?bCY%A_%fN5Lp1$2g{OMOTus)BP$p-MSjiymX(vj@Xvo)=#dW=?$FIbkH1!- z{MgZW<#=iOrbixWcpVd)JFodK8-mv_P=A#HT#g`>2?f;&2_iVMNgS20TSYczRq(0z zpG>+4kup76WnNEuawzsy!FU+BW#uIF>^>7$_K8whTWV_plAat&d@jJDXZIPV6~Nm$-lAe(zYOea|Kg#sFpJa1y$>$)$d4YLr*(grzW*p7 z3y^b20StuoQ!bJ0oU@Ls``p(^0Sv`GMekm5#gcW?@yzN*^#DBnc&+Fu^x4%P3*)c< z@l}uf#AC(q3l)HGf2ez8-RHUQqkno^9r#(22hhGgQ{{dmEkLPn1C;tUBwdWqi0XOp z>L5SU`bH`MA^x)nzbmj<_Zg`G)f3+&U4&54eIDFSJJ)!!Yz3EaC6`voLO`_-kfkQT zL_ABvOvL$W;_3um>NyR|PHoh_FN#iJoEX^z5b;3@kaJ>h0@~)wj~x`o|9=kf{Q9kM z3lxyx&r@f{iwm*9-T!3llpdER8<%-q`PvtM~T_&9n!W1EyYTy-{jhySM}O#3p?KZCY~R0Dc+bq#E)M^B>+IaarJmCO0KTS;O(j+f zP$}2!#+4>?4h%r^`XmgGHB;5W%ObHUfK&OUfleqEi_p7xDs@Vbr7zzhHU-!<*ll$# z>456q2Gr|yIC*t0blkl#l4gKVr_~3TdWSvUp8M9!xD=?-|5Oo0UKL z0b+nvvA9BcyLzbX2qxP>jHM{CTd_*HX20G)YLAbP+qP}n%`y`{Zua)XP1mi~yl zaC%tJ-80{vzvs`KIp@sp<(%)#oS8XizVpq@H*@C#SS;=xcz-hOI=<%m&{g)V!g|*@ zoK{b?`~7u9%`D83Rsc&lWZpTif<^H?=J*30$8lJ)Okr7>Sc0Ka2VQ*DJemsNIF92_ z0L!wd6xhN?wGM*3d!_|o;g9DP5L*sw1)@Rpt}T|(H~`shx5IuhS$sFSu_94aUKSO= z&m3_SOA^o&kAFAL56T>WV*arsZH!MFW6}zR!)3;vyarnBiglF2yf zSmB8)KoI`^Y`JvYiJ?B|+<7EWKA*0;D89aqpMS=YV=b~VPB+JKoKz}+3B2;dqX5u4 z3TU-p!7P9-GOYkXzkCm`lCwq&t93N3vMn3;}dtw&IW zHGe9gt^M=PdEu&Zb3q8LvPDN${BWo)=G3CuZ0Sb#LO|Nm^=subTd{ib3qK+ZA30)Ozp zzIfKSJSk{%1!=-sfSh9$Am>;G$T^9(sMyyp0{h;-d}J)j;%dxooMRQhKxjYZ;>q4Q?MS=Nf6Xd@q4=lh{VT3$vT8cStZrNnz~YbB3q+yMuKt7@ zfBlcI5%N<{6rwLw2);X4BV^U*d4J&JT1y=SS&|3Px;|6pej_bFv3CO$dp9IqjL3-V zdGP9>Ak+FrDu9LmXAwbHVA1X~QUNL_zD>Fak)rxMxSjT{v1HK-F78S$rIJN}Y#$&? zO@N6IOTtXV`)YJ`0xx%;hGnNVD&H4JCr~FwHUSoWSOv&A+M9ru`SW83xqtD$2Rz?? zJK6$;B>eN#sPS}REkMq(3XpTG0_2>;hkfmJ&Z3^I3esQ1!3WWmnES^f85@hMi_t2&Qy9T?Q zjwS6-*;|KNtp+Er&4u=R7sk>ISmbH;0jA!ikGJQ(J+p35HQc-IXMfjVms2iP-OAoN zbS!Cy{=ucnmA|HQh#P(zUL|C_M2q~#Ab_)Xjzupnn$M@@Cn`gl(AozW9&5PMo907t zpabex8&ED)jWGXtUVz#%3ZQ+tLBc(Y;K{>d4YzS)5_%R-L7`B9;s8KpZym~|s=I5j z%QgcEp=}u0zoOk49)D}NC$CLHPpt-CGhjmHXYF?gDl}ids11*z4*)Q03EGbT7fa>i zjVPu40E}=vcagO%@wNK_F72yA&*CYV-ZVc|L%^&e-3JJ25j?rY4^XSY$!jxy06P>+ z4(kWVIW2tvmIa8a58zpX<$JnPS^2gP5CXp+;L^UTF@AtNqkm14u^*sj*icZGtXTl9 z58_vXG*&)9h85tsuj2XFkguO7Usl|HfVfdr0M`HZ(5~TaUhtkj{&T!h6y7t4mNqSa z>j%&PtzvP7vUc^5*%3^%gBVRwv|F)qsp`JbH|ma$kGrnxy5r;H?uS2Janq&*sv9xk zefd~>_pxNxhh#s@e^iN&&$ViS-x-uvKR}QsfVagPEnShx4|5Fi43SbURo&6PzSMpB z9ziSsKH@J_WC3XR^TK(@AkSd&k+qkXD)VasSyF&34QDL@`5*W650r`tZbSe8002ov JPDHLkV1l|&;m-g7 From 5777da8c5a56671e328d60f01cbd744fed4584ee Mon Sep 17 00:00:00 2001 From: dustylens Date: Fri, 27 Dec 2024 18:46:46 -0800 Subject: [PATCH 04/14] Power generation tweak. --- Resources/Maps/_NF/Shuttles/nightlight.yml | 167 ++++++++++++++------- 1 file changed, 109 insertions(+), 58 deletions(-) diff --git a/Resources/Maps/_NF/Shuttles/nightlight.yml b/Resources/Maps/_NF/Shuttles/nightlight.yml index 84fa776c1df..2499e593f4e 100644 --- a/Resources/Maps/_NF/Shuttles/nightlight.yml +++ b/Resources/Maps/_NF/Shuttles/nightlight.yml @@ -31,11 +31,11 @@ entities: chunks: 0,0: ind: 0,0 - tiles: CAAAAAAACAAAAAAACAAAAAAABgAAAAAABgAAAAAABQAAAAAABQAAAAAABQAAAAAABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAwAAAAAABwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAABQAAAAAABwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAwAAAAAABwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAABQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAACgAAAAAACgAAAAAACgAAAAAACgAAAAAAAwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAACgAAAAAACgAAAAAACgAAAAAACgAAAAAAAwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAACgAAAAAACgAAAAAACgAAAAAACgAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAACgAAAAAACgAAAAAAAwAAAAAAAwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: CAAAAAAACAAAAAAACAAAAAAABgAAAAAABgAAAAAABQAAAAAABQAAAAAABQAAAAAABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAwAAAAAABwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAABQAAAAAABwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAwAAAAAABwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAABQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAACgAAAAAACgAAAAAACgAAAAAACgAAAAAAAwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAACgAAAAAACgAAAAAACgAAAAAACgAAAAAAAwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAACgAAAAAACgAAAAAACgAAAAAACgAAAAAAAwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAACgAAAAAACgAAAAAAAwAAAAAAAwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 -1,0: ind: -1,0 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAABQAAAAAABQAAAAAABQAAAAAABgAAAAAABgAAAAAACAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAADQAAAAAADQAAAAAAAwAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAADQAAAAAADQAAAAAABQAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAADQAAAAAADQAAAAAAAwAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAgwAAAAAAAwAAAAAABQAAAAAAAwAAAAAABAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAgwAAAAAAAwAAAAAABQAAAAAABQAAAAAABAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAABQAAAAAAAwAAAAAABAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAwAAAAAAAwAAAAAABAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAABQAAAAAABQAAAAAABQAAAAAABgAAAAAABgAAAAAACAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAADQAAAAAADQAAAAAAAwAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAADQAAAAAADQAAAAAABQAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAADQAAAAAADQAAAAAAAwAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAgwAAAAAAAwAAAAAABQAAAAAAAwAAAAAABAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAgwAAAAAAAwAAAAAABQAAAAAABQAAAAAABAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAgwAAAAAAAwAAAAAABQAAAAAAAwAAAAAABAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAwAAAAAAAwAAAAAABAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 0,-1: ind: 0,-1 @@ -1085,6 +1085,26 @@ entities: - type: Transform pos: 2.5,-6.5 parent: 1 + - uid: 607 + components: + - type: Transform + pos: -6.5,8.5 + parent: 1 + - uid: 608 + components: + - type: Transform + pos: -5.5,8.5 + parent: 1 + - uid: 609 + components: + - type: Transform + pos: 7.5,8.5 + parent: 1 + - uid: 610 + components: + - type: Transform + pos: 6.5,8.5 + parent: 1 - proto: AtmosFixFreezerMarker entities: - uid: 215 @@ -1164,7 +1184,7 @@ entities: - uid: 434 components: - type: Transform - pos: -5.618571,4.7820187 + pos: -5.196141,4.6403866 parent: 1 - proto: BoxTrashbag entities: @@ -1178,7 +1198,7 @@ entities: - uid: 229 components: - type: Transform - pos: 1.7740426,8.735085 + pos: 2.978877,8.751599 parent: 1 - proto: ButtonFrameCaution entities: @@ -1776,6 +1796,12 @@ entities: - type: Transform pos: 7.5,1.5 parent: 1 + - uid: 604 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,-5.5 + parent: 1 - proto: ClothingOuterWinterChef entities: - uid: 424 @@ -1813,11 +1839,11 @@ entities: parent: 1 - proto: DefibrillatorCabinetFilled entities: - - uid: 435 + - uid: 105 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -4.5,-1.5 + rot: -1.5707963267948966 rad + pos: 5.5,-1.5 parent: 1 - proto: DeskBell entities: @@ -1853,12 +1879,6 @@ entities: rot: 3.141592653589793 rad pos: 0.5,-3.5 parent: 1 - - uid: 527 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -3.5,2.5 - parent: 1 - uid: 528 components: - type: Transform @@ -1887,7 +1907,12 @@ entities: - uid: 363 components: - type: Transform - pos: 5.5,-1.5 + pos: -6.5,-1.5 + parent: 1 + - uid: 585 + components: + - type: Transform + pos: 7.5,-1.5 parent: 1 - proto: FaxMachineShip entities: @@ -1931,7 +1956,6 @@ entities: rot: 1.5707963267948966 rad pos: -4.5,3.5 parent: 1 - - type: DeviceNetwork - uid: 445 components: - type: Transform @@ -2012,29 +2036,36 @@ entities: parent: 1 - type: Fixtures fixtures: {} +- proto: FoodContainerEgg + entities: + - uid: 605 + components: + - type: Transform + pos: 0.8370018,4.7102814 + parent: 1 - proto: FoodShakerPepper entities: - - uid: 585 + - uid: 256 components: - type: Transform - pos: 2.4270835,4.737987 + pos: 1.0526497,4.7931643 parent: 1 - uid: 586 components: - type: Transform - pos: 2.625,4.6025705 + pos: 1.9353927,4.525096 parent: 1 - proto: FoodShakerSalt entities: - - uid: 587 + - uid: 257 components: - type: Transform - pos: 2.2708335,4.6546535 + pos: 0.8165386,4.7931643 parent: 1 - - uid: 588 + - uid: 587 components: - type: Transform - pos: 2.4479167,4.4984035 + pos: 1.907615,4.793615 parent: 1 - proto: GasMixerOn entities: @@ -2057,6 +2088,8 @@ entities: rot: 1.5707963267948966 rad pos: -5.5,7.5 parent: 1 + - type: AtmosPipeColor + color: '#990000FF' - proto: GasPipeBend entities: - uid: 186 @@ -2172,6 +2205,8 @@ entities: rot: 1.5707963267948966 rad pos: -4.5,7.5 parent: 1 + - type: AtmosPipeColor + color: '#990000FF' - uid: 474 components: - type: Transform @@ -3379,7 +3414,7 @@ entities: - uid: 216 components: - type: Transform - parent: 214 + parent: 242 - type: Physics canCollide: False - proto: LightBulbCrystalOrange @@ -3446,7 +3481,7 @@ entities: - uid: 191 components: - type: Transform - pos: 7.389768,2.5641458 + pos: 2.9839418,8.712855 parent: 1 - proto: NapkinDrum5 entities: @@ -3514,6 +3549,27 @@ entities: parent: 1 - type: Physics bodyType: Static +- proto: OilJarCorn + entities: + - uid: 214 + components: + - type: Transform + pos: 2.6853929,4.913985 + parent: 1 +- proto: OilJarGhee + entities: + - uid: 241 + components: + - type: Transform + pos: 2.5187259,4.691763 + parent: 1 +- proto: OilJarOlive + entities: + - uid: 588 + components: + - type: Transform + pos: 2.2965038,4.876948 + parent: 1 - proto: OxygenCanister entities: - uid: 59 @@ -3545,6 +3601,8 @@ entities: - type: Transform pos: -3.5,8.5 parent: 1 + - type: FuelGenerator + targetPower: 23000 - proto: PosterLegitSMFires entities: - uid: 464 @@ -3664,7 +3722,7 @@ entities: - uid: 50 components: - type: Transform - rot: 1.5707963267948966 rad + rot: 3.141592653589793 rad pos: -3.5,2.5 parent: 1 - type: ContainerContainer @@ -3677,10 +3735,10 @@ entities: powerLoad: 0 - type: DamageOnInteract isDamageActive: False - - uid: 214 + - uid: 242 components: - type: Transform - rot: -1.5707963267948966 rad + rot: 3.141592653589793 rad pos: 5.5,2.5 parent: 1 - type: ContainerContainer @@ -3783,13 +3841,6 @@ entities: - type: Transform pos: 2.5,5.5 parent: 1 -- proto: ShelfMetal - entities: - - uid: 105 - components: - - type: Transform - pos: 3.5,9.5 - parent: 1 - proto: ShuttersNormalOpen entities: - uid: 305 @@ -4055,7 +4106,7 @@ entities: - Pressed: Toggle 50: - Pressed: Toggle - 214: + 242: - Pressed: Toggle 300: - Pressed: Toggle @@ -4125,11 +4176,11 @@ entities: parent: 1 - type: DeviceLinkSource linkedPorts: - 241: + 435: - Pressed: Toggle 140: - Pressed: Toggle - 242: + 527: - Pressed: Toggle 141: - Pressed: Toggle @@ -4449,16 +4500,6 @@ entities: rot: -1.5707963267948966 rad pos: 7.5,6.5 parent: 1 - - uid: 241 - components: - - type: Transform - pos: -5.5,7.5 - parent: 1 - - uid: 242 - components: - - type: Transform - pos: 6.5,7.5 - parent: 1 - uid: 284 components: - type: Transform @@ -4471,6 +4512,16 @@ entities: rot: 3.141592653589793 rad pos: -6.5,-2.5 parent: 1 + - uid: 435 + components: + - type: Transform + pos: -5.5,8.5 + parent: 1 + - uid: 527 + components: + - type: Transform + pos: 6.5,8.5 + parent: 1 - proto: ToolboxMechanicalFilled entities: - uid: 430 @@ -4893,17 +4944,6 @@ entities: rot: -1.5707963267948966 rad pos: 5.5,9.5 parent: 1 - - uid: 256 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 7.5,7.5 - parent: 1 - - uid: 257 - components: - - type: Transform - pos: -6.5,7.5 - parent: 1 - uid: 268 components: - type: Transform @@ -4921,6 +4961,17 @@ entities: - type: Transform pos: -7.5,5.5 parent: 1 + - uid: 606 + components: + - type: Transform + pos: -6.5,8.5 + parent: 1 + - uid: 611 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 7.5,8.5 + parent: 1 - proto: WarningWaste entities: - uid: 322 From 232f310c6829106202bc3843c65baa307b638529 Mon Sep 17 00:00:00 2001 From: dustylens Date: Sat, 28 Dec 2024 01:09:39 -0800 Subject: [PATCH 05/14] Hull update --- Resources/Maps/_NF/Shuttles/nightlight.yml | 1521 +++++++++-------- .../shuttle_maps/128x96.rsi/nightlight.png | Bin 2053 -> 2064 bytes 2 files changed, 776 insertions(+), 745 deletions(-) diff --git a/Resources/Maps/_NF/Shuttles/nightlight.yml b/Resources/Maps/_NF/Shuttles/nightlight.yml index 2499e593f4e..3dea26d6aa5 100644 --- a/Resources/Maps/_NF/Shuttles/nightlight.yml +++ b/Resources/Maps/_NF/Shuttles/nightlight.yml @@ -31,11 +31,11 @@ entities: chunks: 0,0: ind: 0,0 - tiles: CAAAAAAACAAAAAAACAAAAAAABgAAAAAABgAAAAAABQAAAAAABQAAAAAABQAAAAAABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAwAAAAAABwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAABQAAAAAABwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAwAAAAAABwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAABQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAACgAAAAAACgAAAAAACgAAAAAACgAAAAAAAwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAACgAAAAAACgAAAAAACgAAAAAACgAAAAAAAwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAACgAAAAAACgAAAAAACgAAAAAACgAAAAAAAwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAACgAAAAAACgAAAAAAAwAAAAAAAwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: CAAAAAAACAAAAAAACAAAAAAABgAAAAAABgAAAAAABQAAAAAABQAAAAAABQAAAAAABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAwAAAAAABwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAABQAAAAAABwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAwAAAAAABwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAABQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAACgAAAAAACgAAAAAACgAAAAAACgAAAAAACgAAAAAAAwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAACgAAAAAACgAAAAAACgAAAAAACgAAAAAACgAAAAAAAwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAACgAAAAAACgAAAAAACgAAAAAACgAAAAAACgAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAACgAAAAAACgAAAAAACgAAAAAAAwAAAAAAAwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAACgAAAAAACgAAAAAAAwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 -1,0: ind: -1,0 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAABQAAAAAABQAAAAAABQAAAAAABgAAAAAABgAAAAAACAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAADQAAAAAADQAAAAAAAwAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAADQAAAAAADQAAAAAABQAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAADQAAAAAADQAAAAAAAwAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAgwAAAAAAAwAAAAAABQAAAAAAAwAAAAAABAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAgwAAAAAAAwAAAAAABQAAAAAABQAAAAAABAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAgwAAAAAAAwAAAAAABQAAAAAAAwAAAAAABAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAwAAAAAAAwAAAAAABAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAABQAAAAAABQAAAAAABQAAAAAABgAAAAAABgAAAAAACAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAADQAAAAAADQAAAAAAAwAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAADQAAAAAADQAAAAAABQAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAADQAAAAAADQAAAAAAAwAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAwAAAAAABQAAAAAABQAAAAAAAwAAAAAABAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAwAAAAAABQAAAAAABQAAAAAABQAAAAAABAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAABQAAAAAABQAAAAAAAwAAAAAABAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAABAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 0,-1: ind: 0,-1 @@ -69,51 +69,59 @@ entities: color: '#FFFFFFFF' id: Bot decals: - 542: -4,8 - 543: -4,6 + 620: -5,6 + 621: -4,6 - node: color: '#FFFFFFFF' id: BrickTileDarkCornerNe decals: - 557: 2,9 - 565: 4,8 + 603: 2,10 + 604: 3,9 + 605: 5,8 - node: color: '#FFFFFFFF' id: BrickTileDarkCornerNw decals: - 558: 1,9 + 606: 1,10 - node: color: '#FFFFFFFF' id: BrickTileDarkCornerSe decals: - 564: 4,6 + 611: 5,6 - node: color: '#FFFFFFFF' id: BrickTileDarkCornerSw decals: 561: 1,6 + - node: + color: '#FFFFFFFF' + id: BrickTileDarkInnerNe + decals: + 608: 2,9 - node: color: '#FFFFFFFF' id: BrickTileDarkLineE decals: - 567: 4,7 + 610: 5,7 - node: color: '#FFFFFFFF' id: BrickTileDarkLineN decals: - 566: 3,8 + 609: 4,8 - node: color: '#FFFFFFFF' id: BrickTileDarkLineS decals: 562: 2,6 563: 3,6 + 612: 4,6 - node: color: '#FFFFFFFF' id: BrickTileDarkLineW decals: 559: 1,8 560: 1,7 + 607: 1,9 - node: color: '#DE3A3AFF' id: BrickTileSteelLineE @@ -144,7 +152,7 @@ entities: color: '#4B709CFF' id: BrickTileWhiteCornerNe decals: - 535: -1,9 + 613: -1,10 - node: color: '#DDC3A1FF' id: BrickTileWhiteCornerNe @@ -160,7 +168,7 @@ entities: color: '#4B709CFF' id: BrickTileWhiteCornerNw decals: - 534: -2,9 + 614: -2,10 - node: color: '#DDC3A1FF' id: BrickTileWhiteCornerNw @@ -176,7 +184,7 @@ entities: color: '#4B709CFF' id: BrickTileWhiteCornerSe decals: - 536: -1,6 + 589: -1,6 - node: color: '#DDC3A1FF' id: BrickTileWhiteCornerSe @@ -193,7 +201,7 @@ entities: color: '#4B709CFF' id: BrickTileWhiteCornerSw decals: - 537: -2,6 + 590: -2,6 - node: color: '#DDC3A1FF' id: BrickTileWhiteCornerSw @@ -242,6 +250,7 @@ entities: decals: 538: -1,7 539: -1,8 + 615: -1,9 - node: color: '#DDC3A1FF' id: BrickTileWhiteLineE @@ -301,6 +310,7 @@ entities: decals: 540: -2,7 541: -2,8 + 616: -2,9 - node: color: '#DDC3A1FF' id: BrickTileWhiteLineW @@ -400,61 +410,41 @@ entities: color: '#1861D5FF' id: DeliveryGreyscale decals: - 545: -1,6 + 619: -5,8 - node: color: '#951710FF' id: DeliveryGreyscale decals: - 544: -2,6 + 618: -4,8 - node: color: '#9FED587F' id: MiniTileCheckerBOverlay decals: - 483: 1,9 484: 1,8 485: 1,7 486: 1,6 487: 2,6 488: 2,7 489: 2,8 - 490: 2,9 - 491: 3,8 492: 3,7 493: 3,6 - 494: 4,6 - 495: 4,7 - 497: 4,8 - - node: - color: '#FFFFFFFF' - id: MiniTileDarkCornerNe - decals: - 546: 4,8 - 548: 2,9 - - node: - color: '#FFFFFFFF' - id: MiniTileDarkCornerNw - decals: - 547: 1,9 - - node: - color: '#FFFFFFFF' - id: MiniTileDarkCornerSe - decals: - 549: 4,6 + 591: 4,7 + 592: 4,6 + 593: 5,6 + 594: 5,7 + 595: 5,8 + 596: 4,8 + 597: 3,8 + 598: 3,9 + 599: 2,9 + 600: 1,9 + 601: 1,10 + 602: 2,10 - node: color: '#FFFFFFFF' id: MiniTileDarkCornerSw decals: 550: 1,6 - - node: - color: '#FFFFFFFF' - id: MiniTileDarkLineE - decals: - 555: 4,7 - - node: - color: '#FFFFFFFF' - id: MiniTileDarkLineN - decals: - 556: 3,8 - node: color: '#FFFFFFFF' id: MiniTileDarkLineS @@ -531,20 +521,22 @@ entities: 19: -5,0 20: -5,-1 232: -5,3 - 533: 0,7 570: 6,3 + 624: 0,8 - node: color: '#FFFFFFFF' id: WarnLineGreyscaleN decals: 35: -1,-5 428: 3,5 + 623: 1,-5 - node: color: '#FFFFFFFF' id: WarnLineGreyscaleS decals: 38: -1,-5 426: 3,5 + 622: 1,-5 - node: color: '#FFFFFFFF' id: WarnLineGreyscaleW @@ -554,8 +546,8 @@ entities: 5: 5,0 6: 5,-1 231: -5,3 - 532: 0,7 571: 6,3 + 625: 0,8 - node: color: '#FFFFFFFF' id: WarnLineN @@ -577,6 +569,11 @@ entities: decals: 29: -1,-7 44: 1,-7 + - node: + color: '#52B4E9FF' + id: corgi + decals: + 617: -1,10 - type: GridAtmosphere version: 2 data: @@ -588,25 +585,25 @@ entities: -1,0: 0: 65519 0,1: - 0: 65167 + 0: 61071 -1,1: 0: 64783 0,2: - 0: 110 - 1: 2048 + 0: 1775 + 1: 32768 -1,2: - 0: 205 - 1: 512 + 0: 3277 + 1: 8448 1,0: 0: 29455 2: 34816 1,1: - 0: 4355 - 1: 52224 + 0: 13059 2: 8 + 1: 34816 1,2: - 0: 1 - 1: 32 + 0: 3 + 1: 320 1,-1: 0: 61713 1: 192 @@ -623,10 +620,11 @@ entities: 0: 61440 1: 112 -2,1: - 1: 26128 - 0: 6 + 1: 8720 + 0: 34822 -2,2: - 1: 128 + 1: 64 + 0: 8 -1,-1: 0: 65535 0,-2: @@ -691,66 +689,43 @@ entities: - type: RadiationGridResistance - proto: AirAlarm entities: - - uid: 240 + - uid: 45 components: - type: Transform + rot: 3.141592653589793 rad pos: 5.5,5.5 parent: 1 - type: DeviceList devices: - - 441 - - 442 - - 9 - - 446 - - 447 - - 448 - - 449 - - 450 - - 451 - - 568 - - 326 - - 571 - - 569 - - 460 - 461 - - 480 + - 460 + - 569 + - 571 + - 326 + - 568 - 602 - - 482 - - 466 - - 471 + - 252 + - 619 + - 442 + - 59 - 470 - - 445 + - 273 + - 189 - type: DeviceLinkSource linkedPorts: - 576: - - AirDanger: Toggle - 577: - - AirDanger: Close - 578: - - AirDanger: Close - 579: + 143: - AirDanger: Close - 580: + 471: - AirDanger: Close - 308: - - AirDanger: Close - 309: - - AirDanger: Close - 310: - - AirDanger: Close - 311: - - AirDanger: Close - 312: - - AirDanger: Close - 313: + 476: - AirDanger: Close - 314: + 472: - AirDanger: Close - 307: + 469: - AirDanger: Close - 306: + 467: - AirDanger: Close - 305: + 617: - AirDanger: Close - uid: 603 components: @@ -760,22 +735,22 @@ entities: parent: 1 - type: DeviceList devices: - - 452 - - 455 - - 575 - - 428 - - 593 + - 445 + - 446 + - 447 + - 448 + - 449 + - 450 + - 451 + - 456 + - 453 - 454 - 457 - - 453 - - 456 - - 451 - - 450 - - 449 - - 448 - - 447 - - 446 - - 445 + - 593 + - 428 + - 575 + - 455 + - 452 - type: DeviceLinkSource linkedPorts: 305: @@ -800,10 +775,10 @@ entities: - AirDanger: Close - proto: AirlockCommandGlass entities: - - uid: 190 + - uid: 430 components: - type: Transform - pos: 0.5,7.5 + pos: 0.5,8.5 parent: 1 - proto: AirlockExternalGlass entities: @@ -912,14 +887,14 @@ entities: parent: 1 - type: DeviceNetwork deviceLists: - - 240 + - 45 - proto: APCBasic entities: - - uid: 234 + - uid: 348 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 0.5,6.5 + rot: 3.141592653589793 rad + pos: -2.5,6.5 parent: 1 - proto: AtmosDeviceFanDirectional entities: @@ -965,11 +940,26 @@ entities: parent: 1 - proto: AtmosFixBlockerMarker entities: + - uid: 117 + components: + - type: Transform + pos: -5.5,9.5 + parent: 1 + - uid: 123 + components: + - type: Transform + pos: 6.5,9.5 + parent: 1 - uid: 192 components: - type: Transform pos: 7.5,-2.5 parent: 1 + - uid: 253 + components: + - type: Transform + pos: -3.5,10.5 + parent: 1 - uid: 258 components: - type: Transform @@ -1005,46 +995,6 @@ entities: - type: Transform pos: 7.5,7.5 parent: 1 - - uid: 273 - components: - - type: Transform - pos: 6.5,7.5 - parent: 1 - - uid: 274 - components: - - type: Transform - pos: 6.5,6.5 - parent: 1 - - uid: 275 - components: - - type: Transform - pos: 3.5,10.5 - parent: 1 - - uid: 276 - components: - - type: Transform - pos: 5.5,9.5 - parent: 1 - - uid: 277 - components: - - type: Transform - pos: -2.5,10.5 - parent: 1 - - uid: 278 - components: - - type: Transform - pos: -4.5,9.5 - parent: 1 - - uid: 279 - components: - - type: Transform - pos: -5.5,7.5 - parent: 1 - - uid: 280 - components: - - type: Transform - pos: -5.5,6.5 - parent: 1 - uid: 281 components: - type: Transform @@ -1065,6 +1015,16 @@ entities: - type: Transform pos: -7.5,5.5 parent: 1 + - uid: 330 + components: + - type: Transform + pos: 3.5,11.5 + parent: 1 + - uid: 333 + components: + - type: Transform + pos: -2.5,11.5 + parent: 1 - uid: 414 components: - type: Transform @@ -1085,25 +1045,10 @@ entities: - type: Transform pos: 2.5,-6.5 parent: 1 - - uid: 607 - components: - - type: Transform - pos: -6.5,8.5 - parent: 1 - - uid: 608 - components: - - type: Transform - pos: -5.5,8.5 - parent: 1 - - uid: 609 - components: - - type: Transform - pos: 7.5,8.5 - parent: 1 - - uid: 610 + - uid: 475 components: - type: Transform - pos: 6.5,8.5 + pos: 4.5,10.5 parent: 1 - proto: AtmosFixFreezerMarker entities: @@ -1131,10 +1076,10 @@ entities: parent: 1 - proto: BarSpoon entities: - - uid: 584 + - uid: 355 components: - type: Transform - pos: 4.4375,2.6025705 + pos: 4.913182,4.684615 parent: 1 - proto: BenchSofaCorpCorner entities: @@ -1198,65 +1143,57 @@ entities: - uid: 229 components: - type: Transform - pos: 2.978877,8.751599 + pos: 4.384118,8.571932 parent: 1 - proto: ButtonFrameCaution entities: - - uid: 232 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -2.5,6.75 - parent: 1 - - uid: 345 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -2.5,8.25 - parent: 1 - - uid: 484 + - uid: 427 components: - type: Transform rot: 1.5707963267948966 rad - pos: -4.5,7.5 + pos: -5.5,7.75 parent: 1 - proto: ButtonFrameCautionSecurity entities: - uid: 120 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -2.5,8.75 + rot: -1.5707963267948966 rad + pos: 0.5,7.75 parent: 1 -- proto: ButtonFrameExit +- proto: ButtonFrameGrey entities: - - uid: 75 + - uid: 62 components: - type: Transform rot: 3.141592653589793 rad - pos: 4.25,1.5 + pos: 4.75,1.5 parent: 1 -- proto: ButtonFrameGrey - entities: - - uid: 62 + - uid: 581 components: - type: Transform rot: -1.5707963267948966 rad - pos: 6.5,2.75 + pos: 0.5,7.25 parent: 1 - - uid: 581 + - uid: 582 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 0.5,6.75 + rot: 1.5707963267948966 rad + pos: -5.5,7.25 + parent: 1 + - uid: 584 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 0.5,7.75 parent: 1 - proto: ButtonFrameJanitor entities: - - uid: 103 + - uid: 298 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 6.5,4.25 + rot: 3.141592653589793 rad + pos: 4.25,1.5 parent: 1 - proto: CableApcExtension entities: @@ -1305,6 +1242,11 @@ entities: - type: Transform pos: 0.5,7.5 parent: 1 + - uid: 345 + components: + - type: Transform + pos: -2.5,6.5 + parent: 1 - uid: 349 components: - type: Transform @@ -1577,54 +1519,50 @@ entities: parent: 1 - proto: CableHV entities: - - uid: 93 + - uid: 95 components: - type: Transform pos: -3.5,6.5 parent: 1 - - uid: 94 + - uid: 362 components: - type: Transform - pos: -3.5,7.5 + pos: -3.5,5.5 parent: 1 - - uid: 139 + - uid: 563 components: - type: Transform - pos: -3.5,8.5 + pos: -4.5,6.5 parent: 1 - - uid: 339 + - uid: 580 components: - type: Transform - pos: -2.5,6.5 + pos: -3.5,6.5 parent: 1 - proto: CableMV entities: - uid: 74 components: - type: Transform - pos: 0.5,6.5 + pos: -3.5,6.5 parent: 1 - uid: 109 components: - type: Transform pos: -2.5,6.5 parent: 1 - - uid: 362 - components: - - type: Transform - pos: -0.5,6.5 - parent: 1 - - uid: 427 + - uid: 464 components: - type: Transform - pos: -1.5,6.5 + pos: -3.5,5.5 parent: 1 - proto: CableTerminal entities: - - uid: 86 + - uid: 610 components: - type: Transform - pos: -3.5,7.5 + rot: 1.5707963267948966 rad + pos: -4.5,6.5 parent: 1 - proto: Carpet entities: @@ -1734,11 +1672,11 @@ entities: parent: 1 - proto: ChairPilotSeat entities: - - uid: 255 + - uid: 544 components: - type: Transform rot: 3.141592653589793 rad - pos: -1.5,8.5 + pos: -0.5,9.5 parent: 1 - proto: ChairWood entities: @@ -1811,17 +1749,17 @@ entities: parent: 1 - proto: ComputerTabletopShuttle entities: - - uid: 249 + - uid: 616 components: - type: Transform - pos: -1.5,9.5 + pos: -0.5,10.5 parent: 1 - proto: ComputerTabletopStationRecords entities: - - uid: 250 + - uid: 615 components: - type: Transform - pos: -0.5,9.5 + pos: -1.5,10.5 parent: 1 - proto: ComputerWallmountWithdrawBankATM entities: @@ -1852,12 +1790,34 @@ entities: - type: Transform pos: -2.4479167,1.5713204 parent: 1 +- proto: DrinkGlass + entities: + - uid: 620 + components: + - type: Transform + pos: 4.3343086,4.815199 + parent: 1 + - uid: 621 + components: + - type: Transform + pos: 4.9488916,4.794366 + parent: 1 + - uid: 622 + components: + - type: Transform + pos: 4.7301416,4.544366 + parent: 1 + - uid: 623 + components: + - type: Transform + pos: 4.3863916,4.450616 + parent: 1 - proto: DrinkShaker entities: - - uid: 583 + - uid: 338 components: - type: Transform - pos: 4.78125,2.5400705 + pos: 4.5798483,4.684615 parent: 1 - proto: EmergencyLight entities: @@ -1885,12 +1845,6 @@ entities: rot: 3.141592653589793 rad pos: 4.5,2.5 parent: 1 - - uid: 544 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 4.5,7.5 - parent: 1 - uid: 562 components: - type: Transform @@ -1902,6 +1856,12 @@ entities: - type: Transform pos: -3.5,8.5 parent: 1 + - uid: 608 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 5.5,7.5 + parent: 1 - proto: ExtinguisherCabinetFilled entities: - uid: 363 @@ -1916,10 +1876,10 @@ entities: parent: 1 - proto: FaxMachineShip entities: - - uid: 251 + - uid: 361 components: - type: Transform - pos: -0.5,8.5 + pos: -1.5,9.5 parent: 1 - proto: FirelockGlass entities: @@ -1929,18 +1889,14 @@ entities: rot: -1.5707963267948966 rad pos: 6.5,3.5 parent: 1 - - type: DeviceNetwork - deviceLists: - - 240 - - uid: 441 + - uid: 59 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 0.5,7.5 + pos: 0.5,8.5 parent: 1 - type: DeviceNetwork deviceLists: - - 240 + - 45 - uid: 442 components: - type: Transform @@ -1949,7 +1905,7 @@ entities: parent: 1 - type: DeviceNetwork deviceLists: - - 240 + - 45 - uid: 443 components: - type: Transform @@ -1965,7 +1921,6 @@ entities: - type: DeviceNetwork deviceLists: - 603 - - 240 - uid: 446 components: - type: Transform @@ -1975,7 +1930,6 @@ entities: - type: DeviceNetwork deviceLists: - 603 - - 240 - uid: 447 components: - type: Transform @@ -1985,7 +1939,6 @@ entities: - type: DeviceNetwork deviceLists: - 603 - - 240 - uid: 448 components: - type: Transform @@ -1995,7 +1948,6 @@ entities: - type: DeviceNetwork deviceLists: - 603 - - 240 - uid: 449 components: - type: Transform @@ -2005,7 +1957,6 @@ entities: - type: DeviceNetwork deviceLists: - 603 - - 240 - uid: 450 components: - type: Transform @@ -2015,7 +1966,6 @@ entities: - type: DeviceNetwork deviceLists: - 603 - - 240 - uid: 451 components: - type: Transform @@ -2025,7 +1975,6 @@ entities: - type: DeviceNetwork deviceLists: - 603 - - 240 - proto: FloorDrain entities: - uid: 523 @@ -2041,7 +1990,7 @@ entities: - uid: 605 components: - type: Transform - pos: 0.8370018,4.7102814 + pos: 0.7981141,4.6325316 parent: 1 - proto: FoodShakerPepper entities: @@ -2067,31 +2016,37 @@ entities: - type: Transform pos: 1.907615,4.793615 parent: 1 -- proto: GasMixerOn +- proto: GasMixerOnFlipped entities: - - uid: 122 + - uid: 275 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -0.5,7.5 + rot: -1.5707963267948966 rad + pos: -3.5,7.5 parent: 1 - type: GasMixer - inletTwoConcentration: 0.20999998 - inletOneConcentration: 0.79 + inletTwoConcentration: 0.79 + inletOneConcentration: 0.21 - type: AtmosPipeColor color: '#0055CCFF' - proto: GasPassiveVent entities: - - uid: 463 + - uid: 190 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -5.5,7.5 + rot: -1.5707963267948966 rad + pos: 7.5,6.5 parent: 1 - - type: AtmosPipeColor - color: '#990000FF' - proto: GasPipeBend entities: + - uid: 128 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -4.5,7.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 186 components: - type: Transform @@ -2100,95 +2055,135 @@ entities: parent: 1 - type: AtmosPipeColor color: '#990000FF' - - uid: 330 + - uid: 573 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -1.5,7.5 + pos: -2.5,4.5 parent: 1 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 467 + - uid: 594 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -2.5,7.5 + rot: 1.5707963267948966 rad + pos: -2.5,-3.5 parent: 1 - type: AtmosPipeColor color: '#990000FF' - - uid: 473 + - uid: 595 components: - type: Transform - pos: 1.5,9.5 + rot: 1.5707963267948966 rad + pos: -3.5,-2.5 parent: 1 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 558 +- proto: GasPipeFourway + entities: + - uid: 184 components: - type: Transform - pos: 2.5,7.5 + pos: 1.5,2.5 parent: 1 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 559 + - uid: 246 components: - type: Transform - pos: 3.5,8.5 + pos: 3.5,6.5 parent: 1 - type: AtmosPipeColor color: '#990000FF' - - uid: 573 + - uid: 507 components: - type: Transform - pos: -2.5,4.5 + pos: 1.5,0.5 parent: 1 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 594 + - uid: 508 + components: + - type: Transform + pos: -0.5,-0.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' +- proto: GasPipeStraight + entities: + - uid: 66 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,7.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 98 components: - type: Transform rot: 1.5707963267948966 rad - pos: -2.5,-3.5 + pos: 2.5,6.5 parent: 1 - type: AtmosPipeColor color: '#990000FF' - - uid: 595 + - uid: 119 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 6.5,6.5 + parent: 1 + - uid: 122 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,6.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 165 components: - type: Transform rot: 1.5707963267948966 rad - pos: -3.5,-2.5 + pos: -2.5,7.5 parent: 1 - type: AtmosPipeColor color: '#0055CCFF' -- proto: GasPipeFourway - entities: - - uid: 472 + - uid: 167 components: - type: Transform - pos: 1.5,7.5 + rot: 1.5707963267948966 rad + pos: -1.5,7.5 parent: 1 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 507 + - uid: 170 components: - type: Transform - pos: 1.5,0.5 + rot: 3.141592653589793 rad + pos: -1.5,8.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 172 + components: + - type: Transform + pos: 1.5,4.5 parent: 1 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 508 + - uid: 173 components: - type: Transform - pos: -0.5,-0.5 + rot: 1.5707963267948966 rad + pos: -0.5,6.5 parent: 1 - type: AtmosPipeColor color: '#990000FF' -- proto: GasPipeStraight - entities: - uid: 176 components: - type: Transform - pos: 2.5,4.5 + rot: 3.141592653589793 rad + pos: 1.5,8.5 parent: 1 - type: AtmosPipeColor color: '#0055CCFF' @@ -2199,61 +2194,99 @@ entities: parent: 1 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 465 + - uid: 230 components: - type: Transform rot: 1.5707963267948966 rad - pos: -4.5,7.5 + pos: 1.5,6.5 parent: 1 - type: AtmosPipeColor color: '#990000FF' - - uid: 474 + - uid: 234 components: - type: Transform - pos: 1.5,8.5 + pos: 1.5,3.5 parent: 1 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 475 + - uid: 240 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 0.5,9.5 + rot: 1.5707963267948966 rad + pos: 2.5,2.5 parent: 1 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 476 + - uid: 243 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -0.5,8.5 + pos: 1.5,5.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 245 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,6.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 249 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,7.5 parent: 1 - type: AtmosPipeColor color: '#990000FF' - - uid: 477 + - uid: 250 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 0.5,8.5 + pos: 3.5,8.5 parent: 1 - type: AtmosPipeColor color: '#990000FF' - - uid: 478 + - uid: 251 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 0.5,7.5 + rot: 3.141592653589793 rad + pos: 1.5,9.5 parent: 1 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 479 + - uid: 276 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 1.5,8.5 + rot: 1.5707963267948966 rad + pos: 0.5,6.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 346 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,6.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 462 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -3.5,6.5 parent: 1 - type: AtmosPipeColor color: '#990000FF' + - uid: 478 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,7.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 483 components: - type: Transform @@ -2671,63 +2704,28 @@ entities: parent: 1 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 560 + - uid: 564 components: - type: Transform - pos: 2.5,6.5 + pos: 3.5,4.5 parent: 1 - type: AtmosPipeColor - color: '#0055CCFF' - - uid: 561 + color: '#990000FF' + - uid: 565 components: - type: Transform - pos: 2.5,5.5 + pos: 3.5,5.5 parent: 1 - type: AtmosPipeColor - color: '#0055CCFF' - - uid: 563 + color: '#990000FF' + - uid: 574 components: - type: Transform - pos: 2.5,3.5 + pos: -2.5,3.5 parent: 1 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 564 - components: - - type: Transform - pos: 3.5,4.5 - parent: 1 - - type: AtmosPipeColor - color: '#990000FF' - - uid: 565 - components: - - type: Transform - pos: 3.5,5.5 - parent: 1 - - type: AtmosPipeColor - color: '#990000FF' - - uid: 566 - components: - - type: Transform - pos: 3.5,6.5 - parent: 1 - - type: AtmosPipeColor - color: '#990000FF' - - uid: 567 - components: - - type: Transform - pos: 3.5,7.5 - parent: 1 - - type: AtmosPipeColor - color: '#990000FF' - - uid: 574 - components: - - type: Transform - pos: -2.5,3.5 - parent: 1 - - type: AtmosPipeColor - color: '#0055CCFF' - - uid: 596 + - uid: 596 components: - type: Transform rot: 1.5707963267948966 rad @@ -2784,52 +2782,52 @@ entities: parent: 1 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 226 + - uid: 169 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -0.5,-3.5 + pos: -0.5,7.5 parent: 1 - type: AtmosPipeColor - color: '#990000FF' - - uid: 354 + color: '#0055CCFF' + - uid: 187 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 1.5,-2.5 + rot: 3.141592653589793 rad + pos: -1.5,6.5 parent: 1 - type: AtmosPipeColor - color: '#0055CCFF' - - uid: 468 + color: '#990000FF' + - uid: 226 components: - type: Transform - pos: -2.5,8.5 + rot: -1.5707963267948966 rad + pos: -0.5,-3.5 parent: 1 - type: AtmosPipeColor color: '#990000FF' - - uid: 469 + - uid: 274 components: - type: Transform - rot: 3.141592653589793 rad - pos: -1.5,8.5 + rot: -1.5707963267948966 rad + pos: 1.5,7.5 parent: 1 - type: AtmosPipeColor - color: '#990000FF' - - uid: 481 + color: '#0055CCFF' + - uid: 354 components: - type: Transform - rot: 3.141592653589793 rad - pos: 2.5,8.5 + rot: -1.5707963267948966 rad + pos: 1.5,-2.5 parent: 1 - type: AtmosPipeColor - color: '#990000FF' - - uid: 529 + color: '#0055CCFF' + - uid: 468 components: - type: Transform - pos: 1.5,2.5 + pos: -2.5,8.5 parent: 1 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#990000FF' - uid: 530 components: - type: Transform @@ -2859,14 +2857,6 @@ entities: parent: 1 - type: AtmosPipeColor color: '#990000FF' - - uid: 547 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 2.5,2.5 - parent: 1 - - type: AtmosPipeColor - color: '#0055CCFF' - uid: 551 components: - type: Transform @@ -2877,32 +2867,51 @@ entities: color: '#0055CCFF' - proto: GasPort entities: - - uid: 156 + - uid: 129 components: - type: Transform - rot: 3.141592653589793 rad - pos: -0.5,6.5 + pos: -4.5,8.5 parent: 1 - - uid: 332 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 255 components: - type: Transform - rot: 3.141592653589793 rad - pos: -1.5,6.5 + pos: -3.5,8.5 parent: 1 - - type: AtmosPipeColor - color: '#0055CCFF' - proto: GasPressurePumpOnMax entities: - - uid: 462 + - uid: 228 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -3.5,7.5 + rot: 1.5707963267948966 rad + pos: 5.5,6.5 parent: 1 - type: AtmosPipeColor color: '#990000FF' - proto: GasVentPump entities: + - uid: 252 + components: + - type: Transform + pos: 1.5,10.5 + parent: 1 + - type: DeviceNetwork + deviceLists: + - 45 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 273 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,6.5 + parent: 1 + - type: DeviceNetwork + deviceLists: + - 45 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 326 components: - type: Transform @@ -2910,7 +2919,7 @@ entities: parent: 1 - type: DeviceNetwork deviceLists: - - 240 + - 45 - type: AtmosPipeColor color: '#0055CCFF' - uid: 452 @@ -2962,29 +2971,7 @@ entities: parent: 1 - type: DeviceNetwork deviceLists: - - 240 - - type: AtmosPipeColor - color: '#0055CCFF' - - uid: 471 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -0.5,9.5 - parent: 1 - - type: DeviceNetwork - deviceLists: - - 240 - - type: AtmosPipeColor - color: '#0055CCFF' - - uid: 480 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 1.5,6.5 - parent: 1 - - type: DeviceNetwork - deviceLists: - - 240 + - 45 - type: AtmosPipeColor color: '#0055CCFF' - uid: 571 @@ -2995,7 +2982,7 @@ entities: parent: 1 - type: DeviceNetwork deviceLists: - - 240 + - 45 - type: AtmosPipeColor color: '#0055CCFF' - uid: 575 @@ -3011,6 +2998,17 @@ entities: color: '#0055CCFF' - proto: GasVentScrubber entities: + - uid: 189 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -4.5,6.5 + parent: 1 + - type: DeviceNetwork + deviceLists: + - 45 + - type: AtmosPipeColor + color: '#990000FF' - uid: 428 components: - type: Transform @@ -3063,18 +3061,7 @@ entities: parent: 1 - type: DeviceNetwork deviceLists: - - 240 - - type: AtmosPipeColor - color: '#990000FF' - - uid: 466 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -3.5,8.5 - parent: 1 - - type: DeviceNetwork - deviceLists: - - 240 + - 45 - type: AtmosPipeColor color: '#990000FF' - uid: 470 @@ -3084,17 +3071,7 @@ entities: parent: 1 - type: DeviceNetwork deviceLists: - - 240 - - type: AtmosPipeColor - color: '#990000FF' - - uid: 482 - components: - - type: Transform - pos: 2.5,9.5 - parent: 1 - - type: DeviceNetwork - deviceLists: - - 240 + - 45 - type: AtmosPipeColor color: '#990000FF' - uid: 488 @@ -3112,7 +3089,7 @@ entities: parent: 1 - type: DeviceNetwork deviceLists: - - 240 + - 45 - type: AtmosPipeColor color: '#990000FF' - uid: 569 @@ -3123,22 +3100,32 @@ entities: parent: 1 - type: DeviceNetwork deviceLists: - - 240 + - 45 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 619 + components: + - type: Transform + pos: 3.5,9.5 + parent: 1 + - type: DeviceNetwork + deviceLists: + - 45 - type: AtmosPipeColor color: '#990000FF' - proto: GravityGeneratorMini entities: - - uid: 184 + - uid: 529 components: - type: Transform - pos: -5.5,6.5 + pos: -0.5,6.5 parent: 1 - proto: Grille entities: - - uid: 121 + - uid: 126 components: - type: Transform - pos: 0.5,10.5 + pos: -1.5,11.5 parent: 1 - uid: 150 components: @@ -3200,53 +3187,55 @@ entities: rot: 1.5707963267948966 rad pos: 5.5,-2.5 parent: 1 - - uid: 169 + - uid: 227 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 2.5,10.5 + pos: 0.5,9.5 parent: 1 - - uid: 170 + - uid: 278 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 1.5,10.5 + pos: 2.5,11.5 parent: 1 - - uid: 172 + - uid: 466 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -0.5,10.5 + rot: -1.5707963267948966 rad + pos: 1.5,11.5 parent: 1 - - uid: 173 + - uid: 473 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -1.5,10.5 + pos: 3.5,10.5 parent: 1 - - uid: 227 + - uid: 474 components: - type: Transform - pos: 0.5,9.5 + pos: 0.5,10.5 parent: 1 - - uid: 346 + - uid: 477 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 0.5,8.5 + pos: -2.5,10.5 parent: 1 -- proto: GrilleDiagonal - entities: - - uid: 118 + - uid: 479 components: - type: Transform - pos: -2.5,10.5 + rot: -1.5707963267948966 rad + pos: -0.5,11.5 parent: 1 - - uid: 144 + - uid: 527 components: - type: Transform rot: -1.5707963267948966 rad - pos: 3.5,10.5 + pos: 0.5,11.5 + parent: 1 +- proto: GrilleDiagonal + entities: + - uid: 86 + components: + - type: Transform + pos: -3.5,10.5 parent: 1 - uid: 146 components: @@ -3260,12 +3249,30 @@ entities: rot: 1.5707963267948966 rad pos: -4.5,-5.5 parent: 1 + - uid: 337 + components: + - type: Transform + pos: -2.5,11.5 + parent: 1 + - uid: 420 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 3.5,11.5 + parent: 1 + - uid: 482 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,10.5 + parent: 1 - proto: Gyroscope entities: - - uid: 185 + - uid: 618 components: - type: Transform - pos: 6.5,6.5 + rot: 1.5707963267948966 rad + pos: -1.5,6.5 parent: 1 - proto: HospitalCurtains entities: @@ -3281,37 +3288,34 @@ entities: components: - type: Transform rot: -1.5707963267948966 rad - pos: 2.5,9.5 + pos: 5.5,6.5 parent: 1 - - uid: 228 + - uid: 332 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 1.5,8.5 + pos: 1.5,10.5 parent: 1 - uid: 341 components: - type: Transform rot: -1.5707963267948966 rad - pos: 4.5,8.5 + pos: 5.5,7.5 parent: 1 - - uid: 356 + - uid: 458 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 1.5,9.5 + pos: 3.5,9.5 parent: 1 - - uid: 432 + - uid: 480 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 4.5,6.5 + pos: 2.5,10.5 parent: 1 - - uid: 433 + - uid: 607 components: - type: Transform rot: -1.5707963267948966 rad - pos: 4.5,7.5 + pos: 5.5,8.5 parent: 1 - proto: Icebox entities: @@ -3433,10 +3437,10 @@ entities: canCollide: False - proto: LockerBotanistFilled entities: - - uid: 337 + - uid: 561 components: - type: Transform - pos: 3.5,8.5 + pos: 1.5,7.5 parent: 1 - proto: LockerFreezerBase entities: @@ -3447,11 +3451,11 @@ entities: parent: 1 - proto: LockerWallEVAColorServiceWorkerFilled entities: - - uid: 420 + - uid: 75 components: - type: Transform rot: 1.5707963267948966 rad - pos: -2.5,9.5 + pos: -2.5,8.5 parent: 1 - proto: LockerWallMaterialsBasicFilled entities: @@ -3463,11 +3467,11 @@ entities: parent: 1 - proto: LockerWallMaterialsFuelUraniumFilled entities: - - uid: 458 + - uid: 130 components: - type: Transform rot: 1.5707963267948966 rad - pos: -4.5,8.5 + pos: -5.5,6.5 parent: 1 - proto: MaterialReclaimer entities: @@ -3481,7 +3485,7 @@ entities: - uid: 191 components: - type: Transform - pos: 2.9839418,8.712855 + pos: 4.430993,8.650057 parent: 1 - proto: NapkinDrum5 entities: @@ -3541,14 +3545,22 @@ entities: parent: 1 - proto: NitrogenCanister entities: - - uid: 115 + - uid: 127 components: - type: Transform anchored: True - pos: -1.5,6.5 + pos: -3.5,8.5 parent: 1 - type: Physics bodyType: Static +- proto: NoticeBoardNF + entities: + - uid: 432 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,9.5 + parent: 1 - proto: OilJarCorn entities: - uid: 214 @@ -3572,45 +3584,37 @@ entities: parent: 1 - proto: OxygenCanister entities: - - uid: 59 + - uid: 463 components: - type: Transform anchored: True - pos: -0.5,6.5 + pos: -4.5,8.5 parent: 1 - type: Physics bodyType: Static - proto: PaperBin20 entities: - - uid: 252 + - uid: 356 components: - type: Transform - pos: -0.20995831,8.876982 + pos: -1.7588046,9.852005 parent: 1 - proto: Pen entities: - - uid: 254 + - uid: 144 components: - type: Transform - pos: -0.7255833,9.033232 + pos: -1.2588046,9.977005 parent: 1 - proto: PortableGeneratorSuperPacmanShuttle entities: - - uid: 230 + - uid: 121 components: - type: Transform - pos: -3.5,8.5 + pos: -4.5,6.5 parent: 1 - type: FuelGenerator targetPower: 23000 -- proto: PosterLegitSMFires - entities: - - uid: 464 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -3.5,5.5 - parent: 1 - proto: PosterLegitSMPoisoning entities: - uid: 73 @@ -3628,15 +3632,16 @@ entities: parent: 1 - proto: Poweredlight entities: - - uid: 66 + - uid: 81 components: - type: Transform - pos: 4.5,8.5 + pos: -5.5,-2.5 parent: 1 - - uid: 81 + - uid: 135 components: - type: Transform - pos: -5.5,-2.5 + rot: -1.5707963267948966 rad + pos: -0.5,7.5 parent: 1 - uid: 147 components: @@ -3644,11 +3649,11 @@ entities: rot: -1.5707963267948966 rad pos: 5.5,4.5 parent: 1 - - uid: 189 + - uid: 185 components: - type: Transform rot: 1.5707963267948966 rad - pos: -3.5,7.5 + pos: -4.5,7.5 parent: 1 - uid: 217 components: @@ -3689,11 +3694,11 @@ entities: - type: Transform pos: 6.5,-2.5 parent: 1 - - uid: 333 + - uid: 336 components: - type: Transform rot: -1.5707963267948966 rad - pos: -0.5,6.5 + pos: 3.5,9.5 parent: 1 - uid: 358 components: @@ -3701,6 +3706,11 @@ entities: rot: 1.5707963267948966 rad pos: 7.5,2.5 parent: 1 + - uid: 566 + components: + - type: Transform + pos: 4.5,8.5 + parent: 1 - proto: PoweredlightGreen entities: - uid: 329 @@ -3843,6 +3853,13 @@ entities: parent: 1 - proto: ShuttersNormalOpen entities: + - uid: 143 + components: + - type: Transform + pos: 3.5,10.5 + parent: 1 + - type: DeviceLinkSink + invokeCounter: 2 - uid: 305 components: - type: Transform @@ -3923,41 +3940,48 @@ entities: parent: 1 - type: DeviceLinkSink invokeCounter: 3 - - uid: 576 + - uid: 467 components: - type: Transform - pos: -1.5,10.5 + pos: -1.5,11.5 parent: 1 - type: DeviceLinkSink - invokeCounter: 3 - - uid: 577 + invokeCounter: 1 + - uid: 469 components: - type: Transform - pos: -0.5,10.5 + pos: -0.5,11.5 parent: 1 - type: DeviceLinkSink - invokeCounter: 2 - - uid: 578 + invokeCounter: 1 + - uid: 471 components: - type: Transform - pos: 0.5,10.5 + pos: 2.5,11.5 parent: 1 - type: DeviceLinkSink - invokeCounter: 2 - - uid: 579 + invokeCounter: 1 + - uid: 472 components: - type: Transform - pos: 1.5,10.5 + pos: 0.5,11.5 parent: 1 - type: DeviceLinkSink - invokeCounter: 2 - - uid: 580 + invokeCounter: 1 + - uid: 476 components: - type: Transform - pos: 2.5,10.5 + pos: 1.5,11.5 parent: 1 - type: DeviceLinkSink - invokeCounter: 2 + invokeCounter: 1 + - uid: 617 + components: + - type: Transform + pos: -2.5,10.5 + parent: 1 + - type: DeviceLinkSink + invokeCounter: 1 - proto: ShuttersRadiationOpen entities: - uid: 296 @@ -4022,7 +4046,7 @@ entities: rot: 1.5707963267948966 rad pos: 5.5,-2.5 parent: 1 - - uid: 98 + - uid: 93 components: - type: Transform pos: 0.5,10.5 @@ -4033,37 +4057,48 @@ entities: rot: 3.141592653589793 rad pos: 3.5,-5.5 parent: 1 - - uid: 123 + - uid: 279 components: - type: Transform - pos: -1.5,10.5 + pos: -1.5,11.5 parent: 1 - - uid: 126 + - uid: 280 components: - type: Transform - pos: 1.5,10.5 + pos: 0.5,11.5 parent: 1 - - uid: 127 + - uid: 319 components: - type: Transform - pos: 2.5,10.5 + rot: -1.5707963267948966 rad + pos: 0.5,9.5 parent: 1 - - uid: 243 + - uid: 322 components: - type: Transform - pos: -0.5,10.5 + rot: -1.5707963267948966 rad + pos: -0.5,11.5 parent: 1 - - uid: 319 + - uid: 422 components: - type: Transform rot: -1.5707963267948966 rad - pos: 0.5,9.5 + pos: 1.5,11.5 parent: 1 - - uid: 359 + - uid: 481 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 0.5,8.5 + pos: -2.5,10.5 + parent: 1 + - uid: 484 + components: + - type: Transform + pos: 2.5,11.5 + parent: 1 + - uid: 567 + components: + - type: Transform + pos: 3.5,10.5 parent: 1 - proto: ShuttleWindowDiagonal entities: @@ -4079,77 +4114,70 @@ entities: rot: 1.5707963267948966 rad pos: -4.5,-5.5 parent: 1 - - uid: 119 + - uid: 166 + components: + - type: Transform + pos: -3.5,10.5 + parent: 1 + - uid: 277 + components: + - type: Transform + pos: -2.5,11.5 + parent: 1 + - uid: 435 components: - type: Transform rot: -1.5707963267948966 rad - pos: 3.5,10.5 + pos: 4.5,10.5 parent: 1 - - uid: 143 + - uid: 441 components: - type: Transform - pos: -2.5,10.5 + rot: -1.5707963267948966 rad + pos: 3.5,11.5 parent: 1 - proto: SignalButton entities: - - uid: 298 + - uid: 103 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 6.5,4.25 + rot: 3.141592653589793 rad + pos: 4.75,1.5 parent: 1 - type: DeviceLinkSource linkedPorts: - 147: - - Pressed: Toggle - 315: - - Pressed: Toggle - 50: - - Pressed: Toggle - 242: - - Pressed: Toggle - 300: + 308: - Pressed: Toggle - 262: + 309: - Pressed: Toggle - 318: + 310: - Pressed: Toggle - 260: + 311: - Pressed: Toggle - 425: + 312: - Pressed: Toggle - 263: + 313: - Pressed: Toggle - 259: + 314: - Pressed: Toggle - 261: + 307: - Pressed: Toggle - 266: + 306: - Pressed: Toggle - - uid: 335 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -2.5,6.75 - parent: 1 - - type: SignalSwitch - state: True - - type: DeviceLinkSource - linkedPorts: - 296: + 305: - Pressed: Toggle - - uid: 336 + - uid: 134 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -2.5,8.75 + rot: -1.5707963267948966 rad + pos: 0.5,7.75 parent: 1 - type: DeviceLinkSource linkedPorts: - 183: - - Pressed: DoorBolt 182: - Pressed: DoorBolt + 183: + - Pressed: DoorBolt 80: - Pressed: DoorBolt 159: @@ -4158,29 +4186,33 @@ entities: - Pressed: DoorBolt 42: - Pressed: DoorBolt - - uid: 355 + - uid: 232 components: - type: Transform - rot: 3.141592653589793 rad - pos: 4.25,1.5 + rot: -1.5707963267948966 rad + pos: 0.5,7.25 parent: 1 - type: DeviceLinkSource linkedPorts: - 338: - - Pressed: DoorBolt - - uid: 365 + 296: + - Pressed: Toggle + - uid: 335 components: - type: Transform rot: 1.5707963267948966 rad - pos: -2.5,8.25 + pos: -5.5,7.75 parent: 1 - type: DeviceLinkSource linkedPorts: - 435: + 558: - Pressed: Toggle 140: - Pressed: Toggle - 527: + 285: + - Pressed: Toggle + 136: + - Pressed: Toggle + 254: - Pressed: Toggle 141: - Pressed: Toggle @@ -4188,65 +4220,75 @@ entities: - Pressed: Toggle 137: - Pressed: Toggle - 136: - - Pressed: Toggle - 285: + - uid: 365 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -5.5,7.25 + parent: 1 + - type: SignalSwitch + state: True + - type: DeviceLinkSource + linkedPorts: + 296: - Pressed: Toggle - uid: 421 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 6.5,2.75 + rot: 3.141592653589793 rad + pos: 4.25,1.5 parent: 1 - type: DeviceLinkSource linkedPorts: - 308: + 242: - Pressed: Toggle - 309: + 147: - Pressed: Toggle - 310: + 315: - Pressed: Toggle - 311: + 50: - Pressed: Toggle - 312: + 262: - Pressed: Toggle - 313: + 300: - Pressed: Toggle - 314: + 266: - Pressed: Toggle - 307: + 261: - Pressed: Toggle - 306: + 318: - Pressed: Toggle - 305: + 81: - Pressed: Toggle - - uid: 519 + 259: + - Pressed: Toggle + 263: + - Pressed: Toggle + 425: + - Pressed: Toggle + 260: + - Pressed: Toggle + - uid: 609 components: - type: Transform rot: 1.5707963267948966 rad - pos: -4.5,7.5 + pos: 0.5,7.75 parent: 1 - type: DeviceLinkSource linkedPorts: - 296: + 617: - Pressed: Toggle - - uid: 582 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 0.5,6.75 - parent: 1 - - type: DeviceLinkSource - linkedPorts: - 576: + 467: - Pressed: Toggle - 577: + 469: - Pressed: Toggle - 578: + 472: - Pressed: Toggle - 579: + 476: - Pressed: Toggle - 580: + 471: + - Pressed: Toggle + 143: - Pressed: Toggle - proto: SignKitchen entities: @@ -4270,14 +4312,15 @@ entities: parent: 1 - proto: SinkWide entities: - - uid: 422 + - uid: 465 components: - type: Transform - pos: 4.5,4.5 + rot: 3.141592653589793 rad + pos: 4.5,6.5 parent: 1 - proto: SMESBasic entities: - - uid: 361 + - uid: 560 components: - type: Transform pos: -3.5,6.5 @@ -4341,11 +4384,11 @@ entities: parent: 1 - proto: SubstationWallBasic entities: - - uid: 95 + - uid: 339 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -2.5,6.5 + rot: 3.141592653589793 rad + pos: -3.5,5.5 parent: 1 - proto: TableCarpet entities: @@ -4373,26 +4416,11 @@ entities: - type: Transform pos: -2.5,4.5 parent: 1 - - uid: 134 - components: - - type: Transform - pos: 4.5,2.5 - parent: 1 - - uid: 187 + - uid: 132 components: - type: Transform pos: -1.5,9.5 parent: 1 - - uid: 245 - components: - - type: Transform - pos: -0.5,9.5 - parent: 1 - - uid: 246 - components: - - type: Transform - pos: -0.5,8.5 - parent: 1 - uid: 302 components: - type: Transform @@ -4420,6 +4448,22 @@ entities: rot: -1.5707963267948966 rad pos: 5.5,4.5 parent: 1 + - uid: 519 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 4.5,4.5 + parent: 1 + - uid: 613 + components: + - type: Transform + pos: -1.5,10.5 + parent: 1 + - uid: 614 + components: + - type: Transform + pos: -0.5,10.5 + parent: 1 - proto: TableWood entities: - uid: 79 @@ -4500,6 +4544,11 @@ entities: rot: -1.5707963267948966 rad pos: 7.5,6.5 parent: 1 + - uid: 254 + components: + - type: Transform + pos: 7.5,7.5 + parent: 1 - uid: 284 components: - type: Transform @@ -4512,29 +4561,24 @@ entities: rot: 3.141592653589793 rad pos: -6.5,-2.5 parent: 1 - - uid: 435 - components: - - type: Transform - pos: -5.5,8.5 - parent: 1 - - uid: 527 + - uid: 558 components: - type: Transform - pos: 6.5,8.5 + pos: -6.5,7.5 parent: 1 - proto: ToolboxMechanicalFilled entities: - - uid: 430 + - uid: 359 components: - type: Transform - pos: -3.5058122,6.955002 + pos: -3.5073605,6.8587217 parent: 1 - proto: ToyFigurineChef entities: - - uid: 253 + - uid: 547 components: - type: Transform - pos: -0.6943333,9.064482 + pos: -1.2171379,10.029089 parent: 1 - proto: VendingMachineBooze entities: @@ -4679,12 +4723,6 @@ entities: rot: 1.5707963267948966 rad pos: -3.5,5.5 parent: 1 - - uid: 45 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -4.5,5.5 - parent: 1 - uid: 46 components: - type: Transform @@ -4738,6 +4776,12 @@ entities: rot: 3.141592653589793 rad pos: 7.5,-1.5 parent: 1 + - uid: 94 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 6.5,6.5 + parent: 1 - uid: 99 components: - type: Transform @@ -4764,42 +4808,36 @@ entities: rot: -1.5707963267948966 rad pos: -4.5,2.5 parent: 1 - - uid: 124 - components: - - type: Transform - pos: -7.5,-1.5 - parent: 1 - - uid: 128 + - uid: 115 components: - type: Transform - pos: 5.5,8.5 + pos: -5.5,8.5 parent: 1 - - uid: 129 + - uid: 124 components: - type: Transform - pos: 3.5,9.5 + pos: -7.5,-1.5 parent: 1 - uid: 131 components: - type: Transform pos: 4.5,9.5 parent: 1 - - uid: 132 + - uid: 139 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 5.5,6.5 + rot: 3.141592653589793 rad + pos: -2.5,6.5 parent: 1 - - uid: 135 + - uid: 145 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -4.5,6.5 + pos: -3.5,9.5 parent: 1 - - uid: 145 + - uid: 156 components: - type: Transform - pos: -3.5,9.5 + pos: 0.5,7.5 parent: 1 - uid: 158 components: @@ -4807,21 +4845,6 @@ entities: rot: 1.5707963267948966 rad pos: 0.5,-4.5 parent: 1 - - uid: 165 - components: - - type: Transform - pos: 5.5,7.5 - parent: 1 - - uid: 166 - components: - - type: Transform - pos: -4.5,7.5 - parent: 1 - - uid: 167 - components: - - type: Transform - pos: -4.5,8.5 - parent: 1 - uid: 168 components: - type: Transform @@ -4901,17 +4924,51 @@ entities: - type: Transform pos: -2.5,8.5 parent: 1 - - uid: 348 + - uid: 429 components: - type: Transform rot: -1.5707963267948966 rad - pos: -2.5,6.5 + pos: 5.5,1.5 parent: 1 - - uid: 429 + - uid: 433 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -4.5,9.5 + parent: 1 + - uid: 576 components: - type: Transform rot: -1.5707963267948966 rad - pos: 5.5,1.5 + pos: 6.5,8.5 + parent: 1 + - uid: 577 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -4.5,5.5 + parent: 1 + - uid: 578 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 5.5,9.5 + parent: 1 + - uid: 579 + components: + - type: Transform + pos: -5.5,6.5 + parent: 1 + - uid: 583 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 6.5,7.5 + parent: 1 + - uid: 606 + components: + - type: Transform + pos: -5.5,7.5 parent: 1 - proto: WallShuttleDiagonal entities: @@ -4927,10 +4984,10 @@ entities: rot: 3.141592653589793 rad pos: 2.5,-6.5 parent: 1 - - uid: 117 + - uid: 118 components: - type: Transform - pos: -4.5,9.5 + pos: -5.5,9.5 parent: 1 - uid: 125 components: @@ -4938,12 +4995,6 @@ entities: rot: 1.5707963267948966 rad pos: -1.5,-6.5 parent: 1 - - uid: 130 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 5.5,9.5 - parent: 1 - uid: 268 components: - type: Transform @@ -4961,24 +5012,11 @@ entities: - type: Transform pos: -7.5,5.5 parent: 1 - - uid: 606 - components: - - type: Transform - pos: -6.5,8.5 - parent: 1 - - uid: 611 + - uid: 559 components: - type: Transform rot: -1.5707963267948966 rad - pos: 7.5,8.5 - parent: 1 -- proto: WarningWaste - entities: - - uid: 322 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -4.5,6.5 + pos: 6.5,9.5 parent: 1 - proto: WarpPoint entities: @@ -4987,11 +5025,4 @@ entities: - type: Transform pos: 0.5,0.5 parent: 1 -- proto: Windoor - entities: - - uid: 338 - components: - - type: Transform - pos: 3.5,1.5 - parent: 1 ... diff --git a/Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/nightlight.png b/Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/nightlight.png index 89326979f40ff42b45a2698af6f19d5fcd6dff8d..962c993cf45d2eeb809e1e4ae0f758f53ec6e80b 100644 GIT binary patch delta 2037 zcmV?b<4!roPc{CKjaU6$C z0L!wd6xhN?wGM*3d!_|oLB{h6h%JY;0?{CP*A`1?9DsDU+hM<$G`<`1o#gO^q_Oq< zIJ1HdJ-CP)E`Q6mpRP2{KYFM$vG0n;EO8V|9MCKeZ=4^LS!815*pW8Ir;Rabg~H)7 zV^>~&mYEJ=6eBf~9GMsyK=wL$y-yrYONaIlLG#Npw2vh0duk|vOkzReh-B6LL~Z)n z10yrSV4q(GfVDeT`{a3lJ|!r{1)qfT*V!jvS%5G~;D2)jg)Ja09oCl~MP6w~)C@*$ z0RZTVprUCw9bURDY%{?AkXTJ^P^iN|S|+q}QK4iXLX@ASb>sk&>Fnrxb^|@2jd48$ zWIy5h;9_6ca~pfP@9yaE38NL+I7g7^g#rK^Id)t}Q8Iyb1Z5nn0ER+yx_L)g=Nc_O zzPB+7Fn^T;Pgc0scYN8Ul-?VkJm!<%TYtOK{cSrhbHi~TA!_glN!D4%O2b+JgHag@ zV`m#qhjpJ-0E1C+nqdziPKR}$Re*#e<22)W6l3oLOin!PE7+ET+Wl`Y`o$-&{Dq>oH|rUJ0EPwf#bVGz{;&jQdsSeo2e5{BCtQNge&3Tpm0EuY|qfBN%$pL{TP zn`#zn{ILS%M~}uT$MaMF`Q+i6-!ZYV<9~YavLRUg0$CY=@yj6Ago5mZge5$pNgSE4 zTShi!Rq&~Io`|~$EoEw?Ouc^OSiF-%+E)eRVc@3a6VSc;jIQisCAYfJ)C9!6Y}}Z+ zfbQLAs8#@v%W)g6n|X&1bHj0Yhij{tU%v@hPhiF|!U80z{r`LOX61Wws}+|yX@A68 zfQ(~=1>k{w@vL#VDbVH)OvYM(jAIob<5&gAII*{=*w-%t``SOde>BSCG;!B`OMLPp zhvz8WAEocV6<7<9ajXIu2<@j_JlQ*^9clNG*Q^2<3OPkjuDGJfs_FP_s59r) z{XV&TPcJwAmO^JMi=&LS02#+BK*q5Oka4v40q~C@j}G(WZ#{3$)~YgycLF`9ry!D8 z3y^WF0%RPk02xPnAD~pMxPL3Iz6HPS*$>;7wMRY`ir4Ln_Wf&wcTZ34;_x3g&&)ks z>OKts5NO)iRJ2-vQnBLJuGXQWzaQ#1CSYi^o~RC98quZzUga11J0PFWL(hWA#3@0V zzI+dD3b1RS%jsCy4&}Wys8*|R^4e@@zjJ;|ngNSEjXuESoAmMa?0?s%*A1$Md)G;J z4RkrBV#O`*twG1acGy0!Sh@07bq;dFZ^DZ{886ZD|7#$?*;~hg7Z=Uv)AAFQAxUWM z0}PGU-Kh<8q0rv}wX1a~6)Q%V|12*+Z5jp8zT6<;o<;EFq0zcqzcB$l3nn3-&qJXf zpuD#RrDDb1HPB_7fq$6LHVoXptlb$Jt-B|$O+Zhz3SKi{LglCJcL*vpUcRUekD?C% zFk=aF$Nz0f<>QSgrTqYma6EUBwk`3s`vETQt3c0!NtoI&H&H{tv?ARH2x<{LxycVu zt-{G`(|!Ou6pRn+2go>0eE^mPh^i0ZS%Rf|x)NFWwhs^j(ti(dabLw4KR}kzrpee3 zP&I5QC`;NbfYt{gl^}_g50GL7c>43!{ALIfum}mzvnxbg8Vx?lmeWh>29UB{SUDtKT#>U)t zf4J->O$k&tVs66w^0D^rW63T78Acve;^T9zT0lC3lIjNt(gg6fc%!8&GWlVSL7pK} zO2vvh($|-`FW)1G1;9uAg^DZy?S5W3?-=A6ECgwLd5JQ=CXgltNYilE5|IA^bmGu~ TbgR)@00000NkvXXu0mjfPDb2+ delta 2026 zcmVtB1VwlwjARr0AlgeL1dHBXl^=bj5d5cX|EGJoqjzGl0KtL#~Y_pWg` ztDac*yX%OVS&$>E07NiU-npoPW$_*6xC1TAvUsveVR@Ml{?MrdC%$eTEd{VF%W@}x zWmR+vOo-8~13&McYXNw;<2ePymV>N7ILO{LK?KGE$acFO^oz;jyUC3e38V6|r~q!} z$fFQRz*0QXIDg+SbKHr!$BwKqK5LB0DijV^8M}(|BW62g6DvdDmRryH$P;h4;>m2xrBa?&XhuL<1!WPMChGzkSbm}~gpr8e0rNffRw5uWe z%7a!u0I~o8Y(>z~G@OnoT^{80;D1Q?7?graX1sG*p?_2#LY5y99R+}Nj&=K=+r+$n z_Q2?@Fx2mr0bu=(wH|rFji)6!U4Z8|_bI=hqa!C$rMOHBU=pmCf8^NlB#M$r$Ptut zNC6B*+Z<&T(t8tH|*Nb(#Z37gGWftxoFhH8;V<& zWswCi7=N9iFm|@#ba?lX0vL>r(+qnEaXP&FQmX)Wy?8O{A{c>+(@f-1OuP?(hk1vp z6Q1xFO5*$9yXRMry!v0Zf574G&mQ;4A8x!;RzxkPCLi%U&kLn4Pq?a|K*vd@;-uq+ zC$0c~`1{l4%5f)#`k`y*5nuUyvhITX`Z{qMM}LmB$;LR{EX%S|sQ@PM^7jt|K>H}5 z-GceE0CACN1@QajJ2;h`WfE5a{Kecnegnnm0ugWi`GEJrB5{5={vzOy@%@0yf2isW zKROa>c7aLlD1ZnDQh=O83XpT!+=tl5><(wS8+q}0=*+Dr0ro4j^)X;(I-0j0K^NYr zfPc02&p8)`>&mSKA*{-l9eMGCy%NGfG>O9t$LBH^F}Dd|O(@_5(zuc+O~~p%HtC}h zpQ`{o?bCY%A_%fN5Lp1$2g{OMOTus)BP$p-MSjiymX(vj@Xvo)=#dW=?$FIbkH1!- z{MgZW<#=iOrbixWcpVd)JFodK8-mv_P=A#HT#g`>2?f;&2_iVMNgS20TSYczRq(0z zpG>+4kup76WnNEuawzsy!FU+BW#uIF>^>7$_K8whTWV_plAat&d@jJDXZIPV6~Nm$-lAe(zYOea|Kg#sFpJa1y$>$)$d4YLr*(grzW*p7 z3y^b20StuoQ!bJ0oU@Ls``p(^0Sv`GMekm5#gcW?@yzN*^#DBnc&+Fu^x4%P3*)c< z@l}uf#AC(q3l)HGf2ez8-RHUQqkno^9r#(22hhGgQ{{dmEkLPn1C;tUBwdWqi0XOp z>L5SU`bH`MA^x)nzbmj<_Zg`G)f3+&U4&54eIDFSJJ)!!Yz3EaC6`voLO`_-kfkQT zL_ABvOvL$W;_3um>NyR|PHoh_FN#iJoEX^z5b;3@kaJ>h0@~)wj~x`o|9=kf{Q9kM z3lxyx&r@f{iwm*9-T!3llpdER8<%-q`PvtM~T_&9n!W1EyYTy-{jhySM}O#3p?KZCY~R0Dc+bq#E)M^B>+IaarJmCO0KTS;O(j+f zP$}2!#+4>?4h%r^`XmgGHB;5W%ObHUfK&OUfleqEi_p7xDs@Vbr7zzhHU-!<*ll$# z>456q2Gr|yIC*t0blkl#l4gKVr_~3TdWSvUp8M9!xD=?-|5Oo0UKL z0b+nvvA9BcyLzbX2qxP>jHM{CTd_*HX20G)YLAbP+qP}nz5oCK From 69169f8011eea4c0d248e64c27e71157539e3635 Mon Sep 17 00:00:00 2001 From: dustylens Date: Sat, 28 Dec 2024 01:33:18 -0800 Subject: [PATCH 06/14] Canister swap. --- Resources/Maps/_NF/Shuttles/nightlight.yml | 373 ++++++++++++--------- 1 file changed, 215 insertions(+), 158 deletions(-) diff --git a/Resources/Maps/_NF/Shuttles/nightlight.yml b/Resources/Maps/_NF/Shuttles/nightlight.yml index 3dea26d6aa5..5b7a5518aa8 100644 --- a/Resources/Maps/_NF/Shuttles/nightlight.yml +++ b/Resources/Maps/_NF/Shuttles/nightlight.yml @@ -184,7 +184,7 @@ entities: color: '#4B709CFF' id: BrickTileWhiteCornerSe decals: - 589: -1,6 + 627: -1,7 - node: color: '#DDC3A1FF' id: BrickTileWhiteCornerSe @@ -201,7 +201,7 @@ entities: color: '#4B709CFF' id: BrickTileWhiteCornerSw decals: - 590: -2,6 + 626: -2,7 - node: color: '#DDC3A1FF' id: BrickTileWhiteCornerSw @@ -248,7 +248,6 @@ entities: color: '#4B709CFF' id: BrickTileWhiteLineE decals: - 538: -1,7 539: -1,8 615: -1,9 - node: @@ -308,7 +307,6 @@ entities: color: '#4B709CFF' id: BrickTileWhiteLineW decals: - 540: -2,7 541: -2,8 616: -2,9 - node: @@ -407,15 +405,15 @@ entities: 582: 4,4 583: 5,4 - node: - color: '#1861D5FF' + color: '#3C44AAFF' id: DeliveryGreyscale decals: - 619: -5,8 + 629: -1,6 - node: - color: '#951710FF' + color: '#B02E26FF' id: DeliveryGreyscale decals: - 618: -4,8 + 628: -2,6 - node: color: '#9FED587F' id: MiniTileCheckerBOverlay @@ -705,12 +703,12 @@ entities: - 568 - 602 - 252 - - 619 + - 529 - 442 - 59 - - 470 - - 273 - - 189 + - 540 + - 276 + - 128 - type: DeviceLinkSource linkedPorts: 143: @@ -1202,11 +1200,6 @@ entities: - type: Transform pos: 4.5,7.5 parent: 1 - - uid: 88 - components: - - type: Transform - pos: -3.5,7.5 - parent: 1 - uid: 89 components: - type: Transform @@ -2018,11 +2011,10 @@ entities: parent: 1 - proto: GasMixerOnFlipped entities: - - uid: 275 + - uid: 173 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -3.5,7.5 + pos: -0.5,7.5 parent: 1 - type: GasMixer inletTwoConcentration: 0.79 @@ -2031,22 +2023,23 @@ entities: color: '#0055CCFF' - proto: GasPassiveVent entities: - - uid: 190 + - uid: 165 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 7.5,6.5 + rot: 1.5707963267948966 rad + pos: -6.5,7.5 parent: 1 + - type: AtmosPipeColor + color: '#990000FF' - proto: GasPipeBend entities: - - uid: 128 + - uid: 66 components: - type: Transform - rot: 3.141592653589793 rad - pos: -4.5,7.5 + pos: 3.5,9.5 parent: 1 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#990000FF' - uid: 186 components: - type: Transform @@ -2055,6 +2048,22 @@ entities: parent: 1 - type: AtmosPipeColor color: '#990000FF' + - uid: 187 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,7.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 539 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,7.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' - uid: 573 components: - type: Transform @@ -2087,13 +2096,6 @@ entities: parent: 1 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 246 - components: - - type: Transform - pos: 3.5,6.5 - parent: 1 - - type: AtmosPipeColor - color: '#990000FF' - uid: 507 components: - type: Transform @@ -2110,49 +2112,35 @@ entities: color: '#990000FF' - proto: GasPipeStraight entities: - - uid: 66 + - uid: 122 components: - type: Transform rot: 3.141592653589793 rad - pos: 3.5,7.5 - parent: 1 - - type: AtmosPipeColor - color: '#990000FF' - - uid: 98 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 2.5,6.5 + pos: 1.5,7.5 parent: 1 - type: AtmosPipeColor - color: '#990000FF' - - uid: 119 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 6.5,6.5 - parent: 1 - - uid: 122 + color: '#0055CCFF' + - uid: 127 components: - type: Transform rot: -1.5707963267948966 rad - pos: 4.5,6.5 + pos: -5.5,7.5 parent: 1 - type: AtmosPipeColor color: '#990000FF' - - uid: 165 + - uid: 167 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -2.5,7.5 + rot: 3.141592653589793 rad + pos: -0.5,9.5 parent: 1 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 167 + - uid: 169 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -1.5,7.5 + rot: -1.5707963267948966 rad + pos: 0.5,8.5 parent: 1 - type: AtmosPipeColor color: '#0055CCFF' @@ -2171,34 +2159,34 @@ entities: parent: 1 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 173 + - uid: 177 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -0.5,6.5 + pos: 5.5,3.5 parent: 1 - type: AtmosPipeColor - color: '#990000FF' - - uid: 176 + color: '#0055CCFF' + - uid: 189 components: - type: Transform - rot: 3.141592653589793 rad - pos: 1.5,8.5 + rot: 1.5707963267948966 rad + pos: 1.5,9.5 parent: 1 - type: AtmosPipeColor - color: '#0055CCFF' - - uid: 177 + color: '#990000FF' + - uid: 190 components: - type: Transform - pos: 5.5,3.5 + rot: -1.5707963267948966 rad + pos: -2.5,7.5 parent: 1 - type: AtmosPipeColor - color: '#0055CCFF' - - uid: 230 + color: '#990000FF' + - uid: 228 components: - type: Transform rot: 1.5707963267948966 rad - pos: 1.5,6.5 + pos: -0.5,9.5 parent: 1 - type: AtmosPipeColor color: '#990000FF' @@ -2235,15 +2223,15 @@ entities: - uid: 249 components: - type: Transform - rot: 3.141592653589793 rad - pos: -1.5,7.5 + rot: 1.5707963267948966 rad + pos: 0.5,9.5 parent: 1 - type: AtmosPipeColor color: '#990000FF' - uid: 250 components: - type: Transform - pos: 3.5,8.5 + pos: 3.5,7.5 parent: 1 - type: AtmosPipeColor color: '#990000FF' @@ -2255,11 +2243,18 @@ entities: parent: 1 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 276 + - uid: 274 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 0.5,6.5 + pos: 3.5,8.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 275 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,3.5 parent: 1 - type: AtmosPipeColor color: '#990000FF' @@ -2279,6 +2274,13 @@ entities: parent: 1 - type: AtmosPipeColor color: '#990000FF' + - uid: 463 + components: + - type: Transform + pos: 3.5,6.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' - uid: 478 components: - type: Transform @@ -2584,14 +2586,6 @@ entities: parent: 1 - type: AtmosPipeColor color: '#990000FF' - - uid: 540 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 2.5,3.5 - parent: 1 - - type: AtmosPipeColor - color: '#990000FF' - uid: 541 components: - type: Transform @@ -2704,13 +2698,6 @@ entities: parent: 1 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 564 - components: - - type: Transform - pos: 3.5,4.5 - parent: 1 - - type: AtmosPipeColor - color: '#990000FF' - uid: 565 components: - type: Transform @@ -2772,31 +2759,30 @@ entities: parent: 1 - type: AtmosPipeColor color: '#990000FF' -- proto: GasPipeTJunction - entities: - - uid: 142 + - uid: 624 components: - type: Transform - rot: 3.141592653589793 rad - pos: 5.5,2.5 + pos: 3.5,4.5 parent: 1 - type: AtmosPipeColor - color: '#0055CCFF' - - uid: 169 + color: '#990000FF' +- proto: GasPipeTJunction + entities: + - uid: 129 components: - type: Transform - pos: -0.5,7.5 + pos: -3.5,7.5 parent: 1 - type: AtmosPipeColor - color: '#0055CCFF' - - uid: 187 + color: '#990000FF' + - uid: 142 components: - type: Transform rot: 3.141592653589793 rad - pos: -1.5,6.5 + pos: 5.5,2.5 parent: 1 - type: AtmosPipeColor - color: '#990000FF' + color: '#0055CCFF' - uid: 226 components: - type: Transform @@ -2805,14 +2791,22 @@ entities: parent: 1 - type: AtmosPipeColor color: '#990000FF' - - uid: 274 + - uid: 246 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 1.5,7.5 + rot: 3.141592653589793 rad + pos: 2.5,9.5 parent: 1 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#990000FF' + - uid: 273 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,9.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' - uid: 354 components: - type: Transform @@ -2849,43 +2843,61 @@ entities: parent: 1 - type: AtmosPipeColor color: '#990000FF' - - uid: 539 + - uid: 551 components: - type: Transform rot: 3.141592653589793 rad - pos: 3.5,3.5 + pos: -2.5,2.5 parent: 1 - type: AtmosPipeColor - color: '#990000FF' - - uid: 551 + color: '#0055CCFF' + - uid: 618 components: - type: Transform - rot: 3.141592653589793 rad - pos: -2.5,2.5 + rot: -1.5707963267948966 rad + pos: 1.5,8.5 parent: 1 - type: AtmosPipeColor color: '#0055CCFF' -- proto: GasPort - entities: - - uid: 129 + - uid: 619 components: - type: Transform - pos: -4.5,8.5 + rot: 1.5707963267948966 rad + pos: -0.5,8.5 parent: 1 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 255 + - uid: 625 components: - type: Transform - pos: -3.5,8.5 + rot: 3.141592653589793 rad + pos: 3.5,3.5 parent: 1 + - type: AtmosPipeColor + color: '#990000FF' +- proto: GasPort + entities: + - uid: 611 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,6.5 + parent: 1 + - uid: 612 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,6.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' - proto: GasPressurePumpOnMax entities: - - uid: 228 + - uid: 98 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 5.5,6.5 + rot: -1.5707963267948966 rad + pos: -4.5,7.5 parent: 1 - type: AtmosPipeColor color: '#990000FF' @@ -2901,17 +2913,6 @@ entities: - 45 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 273 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -0.5,6.5 - parent: 1 - - type: DeviceNetwork - deviceLists: - - 45 - - type: AtmosPipeColor - color: '#0055CCFF' - uid: 326 components: - type: Transform @@ -2974,6 +2975,16 @@ entities: - 45 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 540 + components: + - type: Transform + pos: -0.5,10.5 + parent: 1 + - type: DeviceNetwork + deviceLists: + - 45 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 571 components: - type: Transform @@ -2998,17 +3009,29 @@ entities: color: '#0055CCFF' - proto: GasVentScrubber entities: - - uid: 189 + - uid: 128 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -4.5,6.5 + pos: 2.5,10.5 parent: 1 - type: DeviceNetwork deviceLists: - 45 - type: AtmosPipeColor color: '#990000FF' + - uid: 276 + components: + - type: Transform + anchored: False + rot: 3.141592653589793 rad + pos: -3.5,6.5 + parent: 1 + - type: DeviceNetwork + deviceLists: + - 45 + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 428 components: - type: Transform @@ -3067,11 +3090,9 @@ entities: - uid: 470 components: - type: Transform - pos: -1.5,9.5 + rot: 3.141592653589793 rad + pos: -3.5,6.5 parent: 1 - - type: DeviceNetwork - deviceLists: - - 45 - type: AtmosPipeColor color: '#990000FF' - uid: 488 @@ -3081,32 +3102,32 @@ entities: parent: 1 - type: AtmosPipeColor color: '#990000FF' - - uid: 568 + - uid: 529 components: - type: Transform - rot: 3.141592653589793 rad - pos: 4.5,2.5 + pos: -1.5,10.5 parent: 1 - type: DeviceNetwork deviceLists: - 45 - type: AtmosPipeColor color: '#990000FF' - - uid: 569 + - uid: 568 components: - type: Transform rot: 3.141592653589793 rad - pos: -3.5,2.5 + pos: 4.5,2.5 parent: 1 - type: DeviceNetwork deviceLists: - 45 - type: AtmosPipeColor color: '#990000FF' - - uid: 619 + - uid: 569 components: - type: Transform - pos: 3.5,9.5 + rot: 3.141592653589793 rad + pos: -3.5,2.5 parent: 1 - type: DeviceNetwork deviceLists: @@ -3115,10 +3136,10 @@ entities: color: '#990000FF' - proto: GravityGeneratorMini entities: - - uid: 529 + - uid: 255 components: - type: Transform - pos: -0.5,6.5 + pos: -4.5,8.5 parent: 1 - proto: Grille entities: @@ -3268,11 +3289,10 @@ entities: parent: 1 - proto: Gyroscope entities: - - uid: 618 + - uid: 176 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -1.5,6.5 + pos: -3.5,8.5 parent: 1 - proto: HospitalCurtains entities: @@ -3545,11 +3565,11 @@ entities: parent: 1 - proto: NitrogenCanister entities: - - uid: 127 + - uid: 119 components: - type: Transform anchored: True - pos: -3.5,8.5 + pos: -1.5,6.5 parent: 1 - type: Physics bodyType: Static @@ -3584,11 +3604,11 @@ entities: parent: 1 - proto: OxygenCanister entities: - - uid: 463 + - uid: 88 components: - type: Transform anchored: True - pos: -4.5,8.5 + pos: -0.5,6.5 parent: 1 - type: Physics bodyType: Static @@ -3615,6 +3635,22 @@ entities: parent: 1 - type: FuelGenerator targetPower: 23000 +- proto: PosterLegitSMFires + entities: + - uid: 627 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -4.5,5.5 + parent: 1 +- proto: PosterLegitSMHardhats + entities: + - uid: 628 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -3.5,9.5 + parent: 1 - proto: PosterLegitSMPoisoning entities: - uid: 73 @@ -3851,6 +3887,13 @@ entities: - type: Transform pos: 2.5,5.5 parent: 1 +- proto: ShelfMetal + entities: + - uid: 629 + components: + - type: Transform + pos: 4.5,9.5 + parent: 1 - proto: ShuttersNormalOpen entities: - uid: 143 @@ -4318,6 +4361,12 @@ entities: rot: 3.141592653589793 rad pos: 4.5,6.5 parent: 1 + - uid: 626 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 4.5,2.5 + parent: 1 - proto: SMESBasic entities: - uid: 560 @@ -5018,6 +5067,14 @@ entities: rot: -1.5707963267948966 rad pos: 6.5,9.5 parent: 1 +- proto: WarningWaste + entities: + - uid: 230 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -5.5,8.5 + parent: 1 - proto: WarpPoint entities: - uid: 2 From fbc58f585ef648adb5547d04a9a0bcbdb1c92f02 Mon Sep 17 00:00:00 2001 From: dustylens Date: Sat, 28 Dec 2024 13:47:34 -0800 Subject: [PATCH 07/14] Feedback Adjustments --- Resources/Maps/_NF/Shuttles/nightlight.yml | 1171 +++++++++-------- .../_NF/Guidebook/Shipyard/Nightlight.xml | 13 +- .../shuttle_maps/128x96.rsi/nightlight.png | Bin 2064 -> 2065 bytes 3 files changed, 632 insertions(+), 552 deletions(-) diff --git a/Resources/Maps/_NF/Shuttles/nightlight.yml b/Resources/Maps/_NF/Shuttles/nightlight.yml index 5b7a5518aa8..9b84de87346 100644 --- a/Resources/Maps/_NF/Shuttles/nightlight.yml +++ b/Resources/Maps/_NF/Shuttles/nightlight.yml @@ -31,7 +31,7 @@ entities: chunks: 0,0: ind: 0,0 - tiles: CAAAAAAACAAAAAAACAAAAAAABgAAAAAABgAAAAAABQAAAAAABQAAAAAABQAAAAAABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAwAAAAAABwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAABQAAAAAABwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAwAAAAAABwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAABQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAACgAAAAAACgAAAAAACgAAAAAACgAAAAAACgAAAAAAAwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAACgAAAAAACgAAAAAACgAAAAAACgAAAAAACgAAAAAAAwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAACgAAAAAACgAAAAAACgAAAAAACgAAAAAACgAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAACgAAAAAACgAAAAAACgAAAAAAAwAAAAAAAwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAACgAAAAAACgAAAAAAAwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: CAAAAAAACAAAAAAACAAAAAAABgAAAAAABgAAAAAABQAAAAAABQAAAAAABQAAAAAABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAwAAAAAABwAAAAAABwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAABQAAAAAABwAAAAAABwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAwAAAAAABwAAAAAABwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAABQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAACgAAAAAACgAAAAAACgAAAAAACgAAAAAACgAAAAAAAwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAACgAAAAAACgAAAAAACgAAAAAACgAAAAAACgAAAAAAAwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAACgAAAAAACgAAAAAACgAAAAAACgAAAAAACgAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAACgAAAAAACgAAAAAACgAAAAAAAwAAAAAAAwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAACgAAAAAACgAAAAAAAwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 -1,0: ind: -1,0 @@ -163,7 +163,7 @@ entities: color: '#FFFFFFFF' id: BrickTileWhiteCornerNe decals: - 584: 5,4 + 630: 4,4 - node: color: '#4B709CFF' id: BrickTileWhiteCornerNw @@ -196,7 +196,7 @@ entities: id: BrickTileWhiteCornerSe decals: 407: 3,1 - 587: 5,2 + 631: 4,2 - node: color: '#4B709CFF' id: BrickTileWhiteCornerSw @@ -262,7 +262,7 @@ entities: color: '#FFFFFFFF' id: BrickTileWhiteLineE decals: - 586: 5,3 + 632: 4,3 - node: color: '#DDC3A1FF' id: BrickTileWhiteLineN @@ -358,11 +358,8 @@ entities: 367: -2,1 368: -3,1 572: 4,3 - 573: 5,3 - 574: 5,2 575: 4,2 576: 4,4 - 577: 5,4 - node: color: '#4B709C3F' id: CheckerNWSE @@ -399,11 +396,8 @@ entities: 401: -4,3 402: -4,4 578: 4,3 - 579: 5,3 - 580: 5,2 581: 4,2 582: 4,4 - 583: 5,4 - node: color: '#3C44AAFF' id: DeliveryGreyscale @@ -519,8 +513,8 @@ entities: 19: -5,0 20: -5,-1 232: -5,3 - 570: 6,3 624: 0,8 + 633: 5,3 - node: color: '#FFFFFFFF' id: WarnLineGreyscaleN @@ -544,8 +538,8 @@ entities: 5: 5,0 6: 5,-1 231: -5,3 - 571: 6,3 625: 0,8 + 634: 5,3 - node: color: '#FFFFFFFF' id: WarnLineN @@ -583,21 +577,21 @@ entities: -1,0: 0: 65519 0,1: - 0: 61071 + 0: 65167 -1,1: 0: 64783 0,2: - 0: 1775 + 0: 1774 1: 32768 -1,2: 0: 3277 1: 8448 1,0: - 0: 29455 - 2: 34816 + 0: 12559 + 2: 52224 1,1: - 0: 13059 - 2: 8 + 0: 13057 + 2: 12 1: 34816 1,2: 0: 3 @@ -687,52 +681,60 @@ entities: - type: RadiationGridResistance - proto: AirAlarm entities: - - uid: 45 + - uid: 636 components: - type: Transform rot: 3.141592653589793 rad - pos: 5.5,5.5 + pos: 4.5,5.5 parent: 1 - type: DeviceList devices: - - 461 - - 460 - - 569 - - 571 - - 326 - - 568 - - 602 - - 252 - - 529 - - 442 - - 59 + - 470 - 540 - - 276 + - 529 - 128 + - 252 + - 442 + - 34 + - 142 - type: DeviceLinkSource linkedPorts: - 143: + 617: - AirDanger: Close - 471: + 467: - AirDanger: Close - 476: + 469: - AirDanger: Close 472: - AirDanger: Close - 469: + 476: - AirDanger: Close - 467: + 471: - AirDanger: Close - 617: + 143: - AirDanger: Close - - uid: 603 + - uid: 637 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -4.5,2.5 + pos: 2.5,5.5 parent: 1 - type: DeviceList devices: + - 453 + - 456 + - 452 + - 455 + - 454 + - 457 + - 428 + - 575 + - 593 + - 461 + - 460 + - 569 + - 571 + - 584 + - 568 - 445 - 446 - 447 @@ -740,43 +742,43 @@ entities: - 449 - 450 - 451 - - 456 - - 453 - - 454 - - 457 - - 593 - - 428 - - 575 - - 455 - - 452 + - 45 - type: DeviceLinkSource linkedPorts: - 305: - - AirDanger: Close - 306: + 308: - AirDanger: Close - 307: + 309: - AirDanger: Close - 314: + 310: - AirDanger: Close - 313: + 311: - AirDanger: Close 312: - AirDanger: Close - 311: + 313: - AirDanger: Close - 308: + 314: - AirDanger: Close - 309: + 307: - AirDanger: Close - 310: + 306: + - AirDanger: Close + 305: - AirDanger: Close - proto: AirlockCommandGlass entities: - - uid: 430 + - uid: 621 components: - type: Transform - pos: 0.5,8.5 + rot: 3.141592653589793 rad + pos: 0.5,7.5 + parent: 1 +- proto: AirlockEngineering + entities: + - uid: 326 + components: + - type: Transform + pos: -2.5,7.5 parent: 1 - proto: AirlockExternalGlass entities: @@ -817,11 +819,10 @@ entities: parent: 1 - proto: AirlockFreezer entities: - - uid: 30 + - uid: 626 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 6.5,3.5 + pos: 5.5,3.5 parent: 1 - proto: AirlockGlassShuttle entities: @@ -868,31 +869,31 @@ entities: parent: 1 - proto: AirSensor entities: - - uid: 593 + - uid: 142 components: - type: Transform - rot: 3.141592653589793 rad - pos: -3.5,-2.5 + rot: -1.5707963267948966 rad + pos: -0.5,8.5 parent: 1 - type: DeviceNetwork deviceLists: - - 603 - - uid: 602 + - 636 + - uid: 593 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 2.5,8.5 + rot: 3.141592653589793 rad + pos: -3.5,-2.5 parent: 1 - type: DeviceNetwork deviceLists: - - 45 + - 637 - proto: APCBasic entities: - - uid: 348 + - uid: 332 components: - type: Transform - rot: 3.141592653589793 rad - pos: -2.5,6.5 + rot: 1.5707963267948966 rad + pos: -2.5,8.5 parent: 1 - proto: AtmosDeviceFanDirectional entities: @@ -914,12 +915,6 @@ entities: rot: -1.5707963267948966 rad pos: -7.5,-0.5 parent: 1 - - uid: 76 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 6.5,3.5 - parent: 1 - uid: 222 components: - type: Transform @@ -936,6 +931,12 @@ entities: rot: -1.5707963267948966 rad pos: -7.5,0.5 parent: 1 + - uid: 602 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 5.5,3.5 + parent: 1 - proto: AtmosFixBlockerMarker entities: - uid: 117 @@ -1050,11 +1051,21 @@ entities: parent: 1 - proto: AtmosFixFreezerMarker entities: - - uid: 215 + - uid: 59 components: - type: Transform pos: 7.5,4.5 parent: 1 + - uid: 61 + components: + - type: Transform + pos: 6.5,4.5 + parent: 1 + - uid: 191 + components: + - type: Transform + pos: 6.5,2.5 + parent: 1 - uid: 219 components: - type: Transform @@ -1065,6 +1076,11 @@ entities: - type: Transform pos: 7.5,3.5 parent: 1 + - uid: 619 + components: + - type: Transform + pos: 6.5,3.5 + parent: 1 - proto: BarSign entities: - uid: 97 @@ -1077,7 +1093,7 @@ entities: - uid: 355 components: - type: Transform - pos: 4.913182,4.684615 + pos: 2.5234096,3.7957337 parent: 1 - proto: BenchSofaCorpCorner entities: @@ -1110,88 +1126,82 @@ entities: parent: 1 - proto: Biogenerator entities: - - uid: 49 + - uid: 114 components: - type: Transform - pos: -6.5,2.5 + pos: 7.5,2.5 parent: 1 - proto: BoozeDispenser entities: - - uid: 87 + - uid: 581 components: - type: Transform - pos: 5.5,4.5 + pos: 4.5,4.5 parent: 1 - proto: BoxColoredLightBulb entities: - uid: 434 components: - type: Transform - pos: -5.196141,4.6403866 + pos: -5.269492,2.421494 parent: 1 - proto: BoxTrashbag entities: - uid: 520 components: - type: Transform - pos: -5.397615,4.5558963 + pos: -5.5611587,2.3694105 parent: 1 - proto: Bucket entities: - - uid: 229 + - uid: 566 components: - type: Transform - pos: 4.384118,8.571932 + pos: 3.2296934,8.701155 parent: 1 - proto: ButtonFrameCaution entities: - - uid: 427 + - uid: 178 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -5.5,7.75 + rot: -1.5707963267948966 rad + pos: 0.5,8.25 parent: 1 - proto: ButtonFrameCautionSecurity entities: - - uid: 120 + - uid: 547 components: - type: Transform rot: -1.5707963267948966 rad - pos: 0.5,7.75 + pos: 0.5,8.75 parent: 1 - proto: ButtonFrameGrey entities: - - uid: 62 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 4.75,1.5 - parent: 1 - - uid: 581 + - uid: 87 components: - type: Transform rot: -1.5707963267948966 rad - pos: 0.5,7.25 + pos: 5.5,2.75 parent: 1 - - uid: 582 + - uid: 103 components: - type: Transform rot: 1.5707963267948966 rad - pos: -5.5,7.25 + pos: 0.5,6.75 parent: 1 - - uid: 584 + - uid: 175 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 0.5,7.75 + rot: 3.141592653589793 rad + pos: -3.25,1.5 parent: 1 - proto: ButtonFrameJanitor entities: - - uid: 298 + - uid: 156 components: - type: Transform rot: 3.141592653589793 rad - pos: 4.25,1.5 + pos: -3.75,1.5 parent: 1 - proto: CableApcExtension entities: @@ -1215,55 +1225,60 @@ entities: - type: Transform pos: -6.5,4.5 parent: 1 - - uid: 114 + - uid: 116 components: - type: Transform - pos: 1.5,7.5 + pos: 0.5,6.5 parent: 1 - - uid: 116 + - uid: 122 components: - type: Transform - pos: 0.5,6.5 + pos: 2.5,8.5 + parent: 1 + - uid: 135 + components: + - type: Transform + pos: 5.5,7.5 parent: 1 - uid: 138 components: - type: Transform - pos: -0.5,7.5 + pos: -3.5,7.5 parent: 1 - - uid: 175 + - uid: 147 components: - type: Transform - pos: 0.5,7.5 + pos: 3.5,8.5 parent: 1 - - uid: 345 + - uid: 148 components: - type: Transform - pos: -2.5,6.5 + pos: 0.5,8.5 parent: 1 - - uid: 349 + - uid: 232 components: - type: Transform - pos: 3.5,7.5 + pos: 1.5,8.5 parent: 1 - - uid: 351 + - uid: 348 components: - type: Transform - pos: -1.5,9.5 + pos: -0.5,8.5 parent: 1 - - uid: 352 + - uid: 349 components: - type: Transform - pos: -1.5,8.5 + pos: 3.5,7.5 parent: 1 - - uid: 353 + - uid: 352 components: - type: Transform - pos: -1.5,7.5 + pos: -0.5,7.5 parent: 1 - - uid: 357 + - uid: 353 components: - type: Transform - pos: 2.5,7.5 + pos: -2.5,8.5 parent: 1 - uid: 360 components: @@ -1510,6 +1525,16 @@ entities: - type: Transform pos: 3.5,5.5 parent: 1 + - uid: 603 + components: + - type: Transform + pos: -4.5,7.5 + parent: 1 + - uid: 641 + components: + - type: Transform + pos: -1.5,7.5 + parent: 1 - proto: CableHV entities: - uid: 95 @@ -1527,11 +1552,6 @@ entities: - type: Transform pos: -4.5,6.5 parent: 1 - - uid: 580 - components: - - type: Transform - pos: -3.5,6.5 - parent: 1 - proto: CableMV entities: - uid: 74 @@ -1544,6 +1564,16 @@ entities: - type: Transform pos: -2.5,6.5 parent: 1 + - uid: 120 + components: + - type: Transform + pos: -2.5,7.5 + parent: 1 + - uid: 144 + components: + - type: Transform + pos: -2.5,8.5 + parent: 1 - uid: 464 components: - type: Transform @@ -1663,6 +1693,14 @@ entities: rot: 1.5707963267948966 rad pos: 3.5,-4.5 parent: 1 +- proto: ChairFolding + entities: + - uid: 236 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 2.5018516,10.611803 + parent: 1 - proto: ChairPilotSeat entities: - uid: 544 @@ -1710,10 +1748,10 @@ entities: parent: 1 - proto: ClosetChefFilled entities: - - uid: 303 + - uid: 629 components: - type: Transform - pos: -3.7665334,2.4967659 + pos: 6.5,2.5 parent: 1 - proto: ClosetWallO2N2FilledRandom entities: @@ -1727,18 +1765,12 @@ entities: - type: Transform pos: 7.5,1.5 parent: 1 - - uid: 604 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 2.5,-5.5 - parent: 1 - proto: ClothingOuterWinterChef entities: - - uid: 424 + - uid: 177 components: - type: Transform - pos: 7.607233,2.4791915 + pos: 6.522383,4.5488315 parent: 1 - proto: ComputerTabletopShuttle entities: @@ -1756,17 +1788,17 @@ entities: parent: 1 - proto: ComputerWallmountWithdrawBankATM entities: - - uid: 195 + - uid: 431 components: - type: Transform - pos: -3.5,1.5 + pos: 4.5,1.5 parent: 1 - proto: CrateFreezer entities: - - uid: 316 + - uid: 298 components: - type: Transform - pos: 7.5,2.5 + pos: 6.5,4.5 parent: 1 - proto: DefibrillatorCabinetFilled entities: @@ -1788,29 +1820,24 @@ entities: - uid: 620 components: - type: Transform - pos: 4.3343086,4.815199 - parent: 1 - - uid: 621 - components: - - type: Transform - pos: 4.9488916,4.794366 + pos: 2.3984098,4.066567 parent: 1 - uid: 622 components: - type: Transform - pos: 4.7301416,4.544366 + pos: 2.3671598,3.7332337 parent: 1 - uid: 623 components: - type: Transform - pos: 4.3863916,4.450616 + pos: 2.7317429,4.004067 parent: 1 - proto: DrinkShaker entities: - uid: 338 components: - type: Transform - pos: 4.5798483,4.684615 + pos: 2.5859096,3.7957337 parent: 1 - proto: EmergencyLight entities: @@ -1832,28 +1859,21 @@ entities: rot: 3.141592653589793 rad pos: 0.5,-3.5 parent: 1 - - uid: 528 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 4.5,2.5 - parent: 1 - uid: 562 components: - type: Transform rot: 1.5707963267948966 rad pos: -1.5,9.5 parent: 1 - - uid: 570 + - uid: 564 components: - type: Transform - pos: -3.5,8.5 + pos: 4.5,8.5 parent: 1 - - uid: 608 + - uid: 570 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 5.5,7.5 + pos: -3.5,8.5 parent: 1 - proto: ExtinguisherCabinetFilled entities: @@ -1876,20 +1896,24 @@ entities: parent: 1 - proto: FirelockGlass entities: - - uid: 9 + - uid: 34 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 6.5,3.5 + rot: 3.141592653589793 rad + pos: 0.5,7.5 parent: 1 - - uid: 59 + - type: DeviceNetwork + deviceLists: + - 636 + - uid: 45 components: - type: Transform - pos: 0.5,8.5 + rot: 1.5707963267948966 rad + pos: 5.5,3.5 parent: 1 - type: DeviceNetwork deviceLists: - - 45 + - 637 - uid: 442 components: - type: Transform @@ -1898,7 +1922,7 @@ entities: parent: 1 - type: DeviceNetwork deviceLists: - - 45 + - 636 - uid: 443 components: - type: Transform @@ -1913,7 +1937,7 @@ entities: parent: 1 - type: DeviceNetwork deviceLists: - - 603 + - 637 - uid: 446 components: - type: Transform @@ -1922,7 +1946,7 @@ entities: parent: 1 - type: DeviceNetwork deviceLists: - - 603 + - 637 - uid: 447 components: - type: Transform @@ -1931,7 +1955,7 @@ entities: parent: 1 - type: DeviceNetwork deviceLists: - - 603 + - 637 - uid: 448 components: - type: Transform @@ -1940,7 +1964,7 @@ entities: parent: 1 - type: DeviceNetwork deviceLists: - - 603 + - 637 - uid: 449 components: - type: Transform @@ -1949,7 +1973,7 @@ entities: parent: 1 - type: DeviceNetwork deviceLists: - - 603 + - 637 - uid: 450 components: - type: Transform @@ -1958,7 +1982,7 @@ entities: parent: 1 - type: DeviceNetwork deviceLists: - - 603 + - 637 - uid: 451 components: - type: Transform @@ -1967,7 +1991,7 @@ entities: parent: 1 - type: DeviceNetwork deviceLists: - - 603 + - 637 - proto: FloorDrain entities: - uid: 523 @@ -1983,42 +2007,43 @@ entities: - uid: 605 components: - type: Transform - pos: 0.7981141,4.6325316 + pos: -1.4738168,4.2156887 parent: 1 - proto: FoodShakerPepper entities: - uid: 256 components: - type: Transform - pos: 1.0526497,4.7931643 + pos: -1.4529834,3.6607575 parent: 1 - uid: 586 components: - type: Transform - pos: 1.9353927,4.525096 + pos: -1.3071501,3.5357575 parent: 1 - proto: FoodShakerSalt entities: - uid: 257 components: - type: Transform - pos: 0.8165386,4.7931643 + pos: -1.7446501,3.6607575 parent: 1 - uid: 587 components: - type: Transform - pos: 1.907615,4.793615 + pos: -1.6300669,3.462841 parent: 1 -- proto: GasMixerOnFlipped +- proto: GasMixerOn entities: - - uid: 173 + - uid: 229 components: - type: Transform + rot: 1.5707963267948966 rad pos: -0.5,7.5 parent: 1 - type: GasMixer - inletTwoConcentration: 0.79 - inletOneConcentration: 0.21 + inletTwoConcentration: 0.20999998 + inletOneConcentration: 0.79 - type: AtmosPipeColor color: '#0055CCFF' - proto: GasPassiveVent @@ -2056,6 +2081,14 @@ entities: parent: 1 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 213 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,8.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 539 components: - type: Transform @@ -2112,14 +2145,6 @@ entities: color: '#990000FF' - proto: GasPipeStraight entities: - - uid: 122 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 1.5,7.5 - parent: 1 - - type: AtmosPipeColor - color: '#0055CCFF' - uid: 127 components: - type: Transform @@ -2152,20 +2177,6 @@ entities: parent: 1 - type: AtmosPipeColor color: '#990000FF' - - uid: 172 - components: - - type: Transform - pos: 1.5,4.5 - parent: 1 - - type: AtmosPipeColor - color: '#0055CCFF' - - uid: 177 - components: - - type: Transform - pos: 5.5,3.5 - parent: 1 - - type: AtmosPipeColor - color: '#0055CCFF' - uid: 189 components: - type: Transform @@ -2182,6 +2193,14 @@ entities: parent: 1 - type: AtmosPipeColor color: '#990000FF' + - uid: 217 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 5.5,2.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 228 components: - type: Transform @@ -2775,11 +2794,19 @@ entities: parent: 1 - type: AtmosPipeColor color: '#990000FF' - - uid: 142 + - uid: 214 components: - type: Transform - rot: 3.141592653589793 rad - pos: 5.5,2.5 + rot: -1.5707963267948966 rad + pos: 1.5,7.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 215 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,4.5 parent: 1 - type: AtmosPipeColor color: '#0055CCFF' @@ -2859,14 +2886,6 @@ entities: parent: 1 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 619 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -0.5,8.5 - parent: 1 - - type: AtmosPipeColor - color: '#0055CCFF' - uid: 625 components: - type: Transform @@ -2910,17 +2929,7 @@ entities: parent: 1 - type: DeviceNetwork deviceLists: - - 45 - - type: AtmosPipeColor - color: '#0055CCFF' - - uid: 326 - components: - - type: Transform - pos: 5.5,4.5 - parent: 1 - - type: DeviceNetwork - deviceLists: - - 45 + - 636 - type: AtmosPipeColor color: '#0055CCFF' - uid: 452 @@ -2931,7 +2940,7 @@ entities: parent: 1 - type: DeviceNetwork deviceLists: - - 603 + - 637 - type: AtmosPipeColor color: '#0055CCFF' - uid: 453 @@ -2942,7 +2951,7 @@ entities: parent: 1 - type: DeviceNetwork deviceLists: - - 603 + - 637 - type: AtmosPipeColor color: '#0055CCFF' - uid: 454 @@ -2953,7 +2962,7 @@ entities: parent: 1 - type: DeviceNetwork deviceLists: - - 603 + - 637 - type: AtmosPipeColor color: '#0055CCFF' - uid: 459 @@ -2972,7 +2981,7 @@ entities: parent: 1 - type: DeviceNetwork deviceLists: - - 45 + - 637 - type: AtmosPipeColor color: '#0055CCFF' - uid: 540 @@ -2982,7 +2991,7 @@ entities: parent: 1 - type: DeviceNetwork deviceLists: - - 45 + - 636 - type: AtmosPipeColor color: '#0055CCFF' - uid: 571 @@ -2993,7 +3002,7 @@ entities: parent: 1 - type: DeviceNetwork deviceLists: - - 45 + - 637 - type: AtmosPipeColor color: '#0055CCFF' - uid: 575 @@ -3004,34 +3013,32 @@ entities: parent: 1 - type: DeviceNetwork deviceLists: - - 603 + - 637 - type: AtmosPipeColor color: '#0055CCFF' -- proto: GasVentScrubber - entities: - - uid: 128 + - uid: 584 components: - type: Transform - pos: 2.5,10.5 + rot: -1.5707963267948966 rad + pos: 2.5,4.5 parent: 1 - type: DeviceNetwork deviceLists: - - 45 + - 637 - type: AtmosPipeColor - color: '#990000FF' - - uid: 276 + color: '#0055CCFF' +- proto: GasVentScrubber + entities: + - uid: 128 components: - type: Transform - anchored: False - rot: 3.141592653589793 rad - pos: -3.5,6.5 + pos: 2.5,10.5 parent: 1 - type: DeviceNetwork deviceLists: - - 45 - - type: Physics - canCollide: True - bodyType: Dynamic + - 636 + - type: AtmosPipeColor + color: '#990000FF' - uid: 428 components: - type: Transform @@ -3040,7 +3047,7 @@ entities: parent: 1 - type: DeviceNetwork deviceLists: - - 603 + - 637 - type: AtmosPipeColor color: '#990000FF' - uid: 455 @@ -3051,7 +3058,7 @@ entities: parent: 1 - type: DeviceNetwork deviceLists: - - 603 + - 637 - type: AtmosPipeColor color: '#990000FF' - uid: 456 @@ -3062,7 +3069,7 @@ entities: parent: 1 - type: DeviceNetwork deviceLists: - - 603 + - 637 - type: AtmosPipeColor color: '#990000FF' - uid: 457 @@ -3073,7 +3080,7 @@ entities: parent: 1 - type: DeviceNetwork deviceLists: - - 603 + - 637 - type: AtmosPipeColor color: '#990000FF' - uid: 461 @@ -3084,7 +3091,7 @@ entities: parent: 1 - type: DeviceNetwork deviceLists: - - 45 + - 637 - type: AtmosPipeColor color: '#990000FF' - uid: 470 @@ -3093,6 +3100,9 @@ entities: rot: 3.141592653589793 rad pos: -3.5,6.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 636 - type: AtmosPipeColor color: '#990000FF' - uid: 488 @@ -3109,7 +3119,7 @@ entities: parent: 1 - type: DeviceNetwork deviceLists: - - 45 + - 636 - type: AtmosPipeColor color: '#990000FF' - uid: 568 @@ -3120,7 +3130,7 @@ entities: parent: 1 - type: DeviceNetwork deviceLists: - - 45 + - 637 - type: AtmosPipeColor color: '#990000FF' - uid: 569 @@ -3131,7 +3141,7 @@ entities: parent: 1 - type: DeviceNetwork deviceLists: - - 45 + - 637 - type: AtmosPipeColor color: '#990000FF' - proto: GravityGeneratorMini @@ -3294,12 +3304,11 @@ entities: - type: Transform pos: -3.5,8.5 parent: 1 -- proto: HospitalCurtains +- proto: HospitalCurtainsOpen entities: - - uid: 244 + - uid: 233 components: - type: Transform - rot: 1.5707963267948966 rad pos: -4.5,3.5 parent: 1 - proto: hydroponicsTrayAnchored @@ -3310,26 +3319,23 @@ entities: rot: -1.5707963267948966 rad pos: 5.5,6.5 parent: 1 - - uid: 332 - components: - - type: Transform - pos: 1.5,10.5 - parent: 1 - - uid: 341 + - uid: 358 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 5.5,7.5 + rot: 3.141592653589793 rad + pos: 1.5,8.5 parent: 1 - uid: 458 components: - type: Transform - pos: 3.5,9.5 + rot: 1.5707963267948966 rad + pos: 1.5,6.5 parent: 1 - - uid: 480 + - uid: 580 components: - type: Transform - pos: 2.5,10.5 + rot: 1.5707963267948966 rad + pos: 4.5,6.5 parent: 1 - uid: 607 components: @@ -3337,6 +3343,12 @@ entities: rot: -1.5707963267948966 rad pos: 5.5,8.5 parent: 1 + - uid: 609 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 4.5,8.5 + parent: 1 - proto: Icebox entities: - uid: 522 @@ -3345,19 +3357,19 @@ entities: rot: -1.5707963267948966 rad pos: 7.5,3.5 parent: 1 -- proto: JukeboxWallmountShip +- proto: JukeboxShip entities: - - uid: 179 + - uid: 357 components: - type: Transform - pos: 4.5,1.5 + pos: 0.5,-3.5 parent: 1 - proto: KitchenAssembler entities: - - uid: 334 + - uid: 303 components: - type: Transform - pos: 1.5,4.5 + pos: -1.5,4.5 parent: 1 - proto: KitchenDeepFryer entities: @@ -3378,21 +3390,21 @@ entities: - uid: 572 components: - type: Transform - pos: 0.375,4.5921535 + pos: 0.5762385,4.596018 parent: 1 - proto: KitchenMicrowave entities: - - uid: 181 + - uid: 296 components: - type: Transform - pos: -2.5,4.5 + pos: 1.5,4.5 parent: 1 - proto: KitchenReagentGrinder entities: - - uid: 233 + - uid: 324 components: - type: Transform - pos: -1.5,4.5 + pos: 2.5,4.5 parent: 1 - proto: KitchenSpike entities: @@ -3403,15 +3415,15 @@ entities: parent: 1 - proto: LargeBeaker entities: - - uid: 236 + - uid: 173 components: - type: Transform - pos: -1.702338,4.5433125 + pos: 2.1278298,4.6454825 parent: 1 - - uid: 444 + - uid: 316 components: - type: Transform - pos: -1.9419215,4.751646 + pos: 2.0722742,4.8468714 parent: 1 - proto: LightBulbCrystalBlue entities: @@ -3435,10 +3447,10 @@ entities: parent: 50 - type: Physics canCollide: False - - uid: 216 + - uid: 437 components: - type: Transform - parent: 242 + parent: 436 - type: Physics canCollide: False - proto: LightBulbCrystalOrange @@ -3457,33 +3469,26 @@ entities: canCollide: False - proto: LockerBotanistFilled entities: - - uid: 561 - components: - - type: Transform - pos: 1.5,7.5 - parent: 1 -- proto: LockerFreezerBase - entities: - - uid: 521 + - uid: 427 components: - type: Transform - pos: -3.2665334,2.4759326 + pos: 2.5,6.5 parent: 1 - proto: LockerWallEVAColorServiceWorkerFilled entities: - - uid: 75 + - uid: 49 components: - type: Transform rot: 1.5707963267948966 rad - pos: -2.5,8.5 + pos: -2.5,6.5 parent: 1 - proto: LockerWallMaterialsBasicFilled entities: - - uid: 350 + - uid: 325 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -4.5,4.5 + rot: 1.5707963267948966 rad + pos: -7.5,4.5 parent: 1 - proto: LockerWallMaterialsFuelUraniumFilled entities: @@ -3495,17 +3500,17 @@ entities: parent: 1 - proto: MaterialReclaimer entities: - - uid: 61 + - uid: 244 components: - type: Transform - pos: -5.5,2.5 + pos: 1.5,10.5 parent: 1 - proto: MopItem entities: - - uid: 191 + - uid: 638 components: - type: Transform - pos: 4.430993,8.650057 + pos: -5.5815744,2.4666877 parent: 1 - proto: NapkinDrum5 entities: @@ -3526,11 +3531,11 @@ entities: parent: 1 - proto: NFPosterContrabandFsbLogo entities: - - uid: 328 + - uid: 627 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -2.5,5.5 + rot: -1.5707963267948966 rad + pos: -2.5,9.5 parent: 1 - proto: NFPosterContrabandFsbNightlight entities: @@ -3549,20 +3554,6 @@ entities: - type: Transform pos: 0.5,-4.5 parent: 1 -- proto: NFSignDock - entities: - - uid: 340 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -7.5,1.5 - parent: 1 - - uid: 437 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 8.5,1.5 - parent: 1 - proto: NitrogenCanister entities: - uid: 119 @@ -3573,34 +3564,26 @@ entities: parent: 1 - type: Physics bodyType: Static -- proto: NoticeBoardNF - entities: - - uid: 432 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -2.5,9.5 - parent: 1 - proto: OilJarCorn entities: - - uid: 214 + - uid: 350 components: - type: Transform - pos: 2.6853929,4.913985 + pos: -2.7093272,4.923832 parent: 1 - proto: OilJarGhee entities: - uid: 241 components: - type: Transform - pos: 2.5187259,4.691763 + pos: -2.2926605,4.8300815 parent: 1 - proto: OilJarOlive entities: - uid: 588 components: - type: Transform - pos: 2.2965038,4.876948 + pos: -2.5947437,4.496748 parent: 1 - proto: OxygenCanister entities: @@ -3614,17 +3597,17 @@ entities: bodyType: Static - proto: PaperBin20 entities: - - uid: 356 + - uid: 9 components: - type: Transform - pos: -1.7588046,9.852005 + pos: -1.3183904,8.486803 parent: 1 - proto: Pen entities: - - uid: 144 + - uid: 276 components: - type: Transform - pos: -1.2588046,9.977005 + pos: -1.6933904,8.783678 parent: 1 - proto: PortableGeneratorSuperPacmanShuttle entities: @@ -3634,14 +3617,14 @@ entities: pos: -4.5,6.5 parent: 1 - type: FuelGenerator - targetPower: 23000 + targetPower: 25000 - proto: PosterLegitSMFires entities: - - uid: 627 + - uid: 340 components: - type: Transform - rot: 3.141592653589793 rad - pos: -4.5,5.5 + rot: 1.5707963267948966 rad + pos: -2.5,5.5 parent: 1 - proto: PosterLegitSMHardhats entities: @@ -3661,7 +3644,7 @@ entities: parent: 1 - proto: PottedPlantBioluminscent entities: - - uid: 34 + - uid: 640 components: - type: Transform pos: 0.5,-5.5 @@ -3673,17 +3656,10 @@ entities: - type: Transform pos: -5.5,-2.5 parent: 1 - - uid: 135 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -0.5,7.5 - parent: 1 - - uid: 147 + - uid: 172 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 5.5,4.5 + pos: 6.5,4.5 parent: 1 - uid: 185 components: @@ -3691,12 +3667,6 @@ entities: rot: 1.5707963267948966 rad pos: -4.5,7.5 parent: 1 - - uid: 217 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -6.5,3.5 - parent: 1 - uid: 259 components: - type: Transform @@ -3730,22 +3700,41 @@ entities: - type: Transform pos: 6.5,-2.5 parent: 1 - - uid: 336 + - uid: 334 components: - type: Transform rot: -1.5707963267948966 rad - pos: 3.5,9.5 + pos: 5.5,8.5 parent: 1 - - uid: 358 + - uid: 430 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,4.5 + parent: 1 + - uid: 480 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,-5.5 + parent: 1 + - uid: 521 components: - type: Transform rot: 1.5707963267948966 rad - pos: 7.5,2.5 + pos: -1.5,8.5 parent: 1 - - uid: 566 + - uid: 561 components: - type: Transform - pos: 4.5,8.5 + rot: 1.5707963267948966 rad + pos: 1.5,8.5 + parent: 1 + - uid: 608 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -6.5,3.5 parent: 1 - proto: PoweredlightGreen entities: @@ -3781,22 +3770,6 @@ entities: powerLoad: 0 - type: DamageOnInteract isDamageActive: False - - uid: 242 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 5.5,2.5 - parent: 1 - - type: ContainerContainer - containers: - light_bulb: !type:ContainerSlot - showEnts: False - occludes: True - ent: 216 - - type: ApcPowerReceiver - powerLoad: 0 - - type: DamageOnInteract - isDamageActive: False - uid: 263 components: - type: Transform @@ -3859,40 +3832,67 @@ entities: powerLoad: 0 - type: DamageOnInteract isDamageActive: False + - uid: 436 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 4.5,2.5 + parent: 1 + - type: ContainerContainer + containers: + light_bulb: !type:ContainerSlot + showEnts: False + occludes: True + ent: 437 + - type: ApcPowerReceiver + powerLoad: 0 + - type: DamageOnInteract + isDamageActive: False - proto: SeedExtractor entities: - - uid: 96 + - uid: 242 components: - type: Transform - pos: 2.5,6.5 + pos: 3.5,9.5 parent: 1 - proto: ServiceTechFab entities: - - uid: 325 + - uid: 604 components: - type: Transform - pos: -5.5,4.5 + pos: -6.5,4.5 parent: 1 - proto: ShelfBar entities: - - uid: 178 + - uid: 444 components: - type: Transform - pos: 4.5,5.5 + rot: -1.5707963267948966 rad + pos: 5.5,4.5 parent: 1 - proto: ShelfKitchen entities: - - uid: 239 + - uid: 75 components: - type: Transform - pos: 2.5,5.5 + rot: 1.5707963267948966 rad + pos: -4.5,4.5 parent: 1 - proto: ShelfMetal entities: - - uid: 629 + - uid: 181 components: - type: Transform - pos: 4.5,9.5 + rot: -1.5707963267948966 rad + pos: 6.5,7.5 + parent: 1 +- proto: ShelfWallFreezerWhite + entities: + - uid: 365 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -4.5,2.5 parent: 1 - proto: ShuttersNormalOpen entities: @@ -3902,7 +3902,7 @@ entities: pos: 3.5,10.5 parent: 1 - type: DeviceLinkSink - invokeCounter: 2 + invokeCounter: 5 - uid: 305 components: - type: Transform @@ -3910,7 +3910,7 @@ entities: pos: -4.5,-2.5 parent: 1 - type: DeviceLinkSink - invokeCounter: 3 + invokeCounter: 4 - uid: 306 components: - type: Transform @@ -3918,7 +3918,7 @@ entities: pos: -4.5,-3.5 parent: 1 - type: DeviceLinkSink - invokeCounter: 3 + invokeCounter: 4 - uid: 307 components: - type: Transform @@ -3926,7 +3926,7 @@ entities: pos: -4.5,-4.5 parent: 1 - type: DeviceLinkSink - invokeCounter: 3 + invokeCounter: 4 - uid: 308 components: - type: Transform @@ -3934,7 +3934,7 @@ entities: pos: 5.5,-2.5 parent: 1 - type: DeviceLinkSink - invokeCounter: 3 + invokeCounter: 4 - uid: 309 components: - type: Transform @@ -3942,7 +3942,7 @@ entities: pos: 5.5,-3.5 parent: 1 - type: DeviceLinkSink - invokeCounter: 3 + invokeCounter: 4 - uid: 310 components: - type: Transform @@ -3950,7 +3950,7 @@ entities: pos: 5.5,-4.5 parent: 1 - type: DeviceLinkSink - invokeCounter: 3 + invokeCounter: 4 - uid: 311 components: - type: Transform @@ -3958,7 +3958,7 @@ entities: pos: 4.5,-5.5 parent: 1 - type: DeviceLinkSink - invokeCounter: 3 + invokeCounter: 4 - uid: 312 components: - type: Transform @@ -3966,7 +3966,7 @@ entities: pos: 3.5,-5.5 parent: 1 - type: DeviceLinkSink - invokeCounter: 3 + invokeCounter: 4 - uid: 313 components: - type: Transform @@ -3974,7 +3974,7 @@ entities: pos: -2.5,-5.5 parent: 1 - type: DeviceLinkSink - invokeCounter: 3 + invokeCounter: 4 - uid: 314 components: - type: Transform @@ -3982,56 +3982,83 @@ entities: pos: -3.5,-5.5 parent: 1 - type: DeviceLinkSink - invokeCounter: 3 + invokeCounter: 4 + - uid: 356 + components: + - type: Transform + pos: -2.5,1.5 + parent: 1 - uid: 467 components: - type: Transform pos: -1.5,11.5 parent: 1 - type: DeviceLinkSink - invokeCounter: 1 + invokeCounter: 4 - uid: 469 components: - type: Transform - pos: -0.5,11.5 + pos: -0.5,11.5 + parent: 1 + - type: DeviceLinkSink + invokeCounter: 4 + - uid: 471 + components: + - type: Transform + pos: 2.5,11.5 + parent: 1 + - type: DeviceLinkSink + invokeCounter: 4 + - uid: 472 + components: + - type: Transform + pos: 0.5,11.5 + parent: 1 + - type: DeviceLinkSink + invokeCounter: 4 + - uid: 476 + components: + - type: Transform + pos: 1.5,11.5 + parent: 1 + - type: DeviceLinkSink + invokeCounter: 4 + - uid: 617 + components: + - type: Transform + pos: -2.5,10.5 + parent: 1 + - type: DeviceLinkSink + invokeCounter: 7 + - uid: 630 + components: + - type: Transform + pos: -1.5,1.5 parent: 1 - - type: DeviceLinkSink - invokeCounter: 1 - - uid: 471 + - uid: 631 components: - type: Transform - pos: 2.5,11.5 + pos: -0.5,1.5 parent: 1 - - type: DeviceLinkSink - invokeCounter: 1 - - uid: 472 + - uid: 632 components: - type: Transform - pos: 0.5,11.5 + pos: 1.5,1.5 parent: 1 - - type: DeviceLinkSink - invokeCounter: 1 - - uid: 476 + - uid: 633 components: - type: Transform - pos: 1.5,11.5 + pos: 2.5,1.5 parent: 1 - - type: DeviceLinkSink - invokeCounter: 1 - - uid: 617 + - uid: 634 components: - type: Transform - pos: -2.5,10.5 + pos: 3.5,1.5 parent: 1 - - type: DeviceLinkSink - invokeCounter: 1 -- proto: ShuttersRadiationOpen - entities: - - uid: 296 + - uid: 635 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -2.5,7.5 + pos: 0.5,1.5 parent: 1 - proto: ShuttleWindow entities: @@ -4181,39 +4208,11 @@ entities: parent: 1 - proto: SignalButton entities: - - uid: 103 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 4.75,1.5 - parent: 1 - - type: DeviceLinkSource - linkedPorts: - 308: - - Pressed: Toggle - 309: - - Pressed: Toggle - 310: - - Pressed: Toggle - 311: - - Pressed: Toggle - 312: - - Pressed: Toggle - 313: - - Pressed: Toggle - 314: - - Pressed: Toggle - 307: - - Pressed: Toggle - 306: - - Pressed: Toggle - 305: - - Pressed: Toggle - - uid: 134 + - uid: 96 components: - type: Transform rot: -1.5707963267948966 rad - pos: 0.5,7.75 + pos: 0.5,8.75 parent: 1 - type: DeviceLinkSource linkedPorts: @@ -4225,25 +4224,15 @@ entities: - Pressed: DoorBolt 159: - Pressed: DoorBolt - 180: - - Pressed: DoorBolt 42: - Pressed: DoorBolt - - uid: 232 + 180: + - Pressed: DoorBolt + - uid: 351 components: - type: Transform rot: -1.5707963267948966 rad - pos: 0.5,7.25 - parent: 1 - - type: DeviceLinkSource - linkedPorts: - 296: - - Pressed: Toggle - - uid: 335 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -5.5,7.75 + pos: 0.5,8.25 parent: 1 - type: DeviceLinkSource linkedPorts: @@ -4255,83 +4244,119 @@ entities: - Pressed: Toggle 136: - Pressed: Toggle + 137: + - Pressed: Toggle 254: - Pressed: Toggle 141: - Pressed: Toggle 284: - Pressed: Toggle - 137: - - Pressed: Toggle - - uid: 365 + - uid: 465 components: - type: Transform rot: 1.5707963267948966 rad - pos: -5.5,7.25 + pos: 0.5,6.75 parent: 1 - - type: SignalSwitch - state: True - type: DeviceLinkSource linkedPorts: - 296: + 617: - Pressed: Toggle - - uid: 421 + 467: + - Pressed: Toggle + 469: + - Pressed: Toggle + 472: + - Pressed: Toggle + 476: + - Pressed: Toggle + 471: + - Pressed: Toggle + 143: + - Pressed: Toggle + - uid: 528 components: - type: Transform rot: 3.141592653589793 rad - pos: 4.25,1.5 + pos: -3.25,1.5 parent: 1 - type: DeviceLinkSource linkedPorts: - 242: + 356: - Pressed: Toggle - 147: + 630: - Pressed: Toggle - 315: + 631: - Pressed: Toggle - 50: + 635: - Pressed: Toggle - 262: + 632: - Pressed: Toggle - 300: + 633: - Pressed: Toggle - 266: + 634: - Pressed: Toggle + - uid: 582 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -3.75,1.5 + parent: 1 + - type: DeviceLinkSource + linkedPorts: 261: - Pressed: Toggle - 318: - - Pressed: Toggle 81: - Pressed: Toggle - 259: + 266: - Pressed: Toggle - 263: + 315: + - Pressed: Toggle + 50: + - Pressed: Toggle + 436: + - Pressed: Toggle + 430: + - Pressed: Toggle + 300: + - Pressed: Toggle + 262: + - Pressed: Toggle + 318: - Pressed: Toggle 425: - Pressed: Toggle - 260: + 480: - Pressed: Toggle - - uid: 609 + 263: + - Pressed: Toggle + - uid: 639 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 0.5,7.75 + rot: -1.5707963267948966 rad + pos: 5.5,2.75 parent: 1 - type: DeviceLinkSource linkedPorts: - 617: + 308: - Pressed: Toggle - 467: + 309: - Pressed: Toggle - 469: + 310: - Pressed: Toggle - 472: + 311: - Pressed: Toggle - 476: + 312: - Pressed: Toggle - 471: + 313: - Pressed: Toggle - 143: + 314: + - Pressed: Toggle + 307: + - Pressed: Toggle + 306: + - Pressed: Toggle + 305: - Pressed: Toggle - proto: SignKitchen entities: @@ -4353,19 +4378,33 @@ entities: rot: 1.5707963267948966 rad pos: -7.5,-1.5 parent: 1 +- proto: SignSpace + entities: + - uid: 341 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -7.5,1.5 + parent: 1 + - uid: 345 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 8.5,1.5 + parent: 1 - proto: SinkWide entities: - - uid: 465 + - uid: 76 components: - type: Transform - rot: 3.141592653589793 rad - pos: 4.5,6.5 + rot: -1.5707963267948966 rad + pos: 5.5,7.5 parent: 1 - - uid: 626 + - uid: 328 components: - type: Transform - rot: 3.141592653589793 rad - pos: 4.5,2.5 + rot: 1.5707963267948966 rad + pos: -3.5,2.5 parent: 1 - proto: SMESBasic entities: @@ -4376,11 +4415,11 @@ entities: parent: 1 - proto: SodaDispenser entities: - - uid: 324 + - uid: 101 components: - type: Transform rot: 3.141592653589793 rad - pos: 5.5,2.5 + pos: 4.5,2.5 parent: 1 - proto: SpawnPointLatejoin entities: @@ -4439,6 +4478,13 @@ entities: rot: 3.141592653589793 rad pos: -3.5,5.5 parent: 1 +- proto: Table + entities: + - uid: 421 + components: + - type: Transform + pos: 3.5,8.5 + parent: 1 - proto: TableCarpet entities: - uid: 43 @@ -4454,11 +4500,10 @@ entities: parent: 1 - proto: TableReinforced entities: - - uid: 82 + - uid: 48 components: - type: Transform - rot: 3.141592653589793 rad - pos: 5.5,2.5 + pos: 4.5,2.5 parent: 1 - uid: 102 components: @@ -4470,6 +4515,11 @@ entities: - type: Transform pos: -1.5,9.5 parent: 1 + - uid: 134 + components: + - type: Transform + pos: -1.5,3.5 + parent: 1 - uid: 302 components: - type: Transform @@ -4485,17 +4535,28 @@ entities: - type: Transform pos: -1.5,4.5 parent: 1 + - uid: 335 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -5.5,2.5 + parent: 1 + - uid: 336 + components: + - type: Transform + pos: 2.5,3.5 + parent: 1 - uid: 347 components: - type: Transform rot: 3.141592653589793 rad pos: 2.5,4.5 parent: 1 - - uid: 436 + - uid: 424 components: - type: Transform rot: -1.5707963267948966 rad - pos: 5.5,4.5 + pos: -1.5,8.5 parent: 1 - uid: 519 components: @@ -4587,6 +4648,8 @@ entities: rot: 1.5707963267948966 rad pos: -6.5,6.5 parent: 1 + - type: ApcPowerReceiver + powerLoad: 1 - uid: 141 components: - type: Transform @@ -4624,45 +4687,45 @@ entities: parent: 1 - proto: ToyFigurineChef entities: - - uid: 547 + - uid: 30 components: - type: Transform - pos: -1.2171379,10.029089 + pos: -1.6777654,8.877428 parent: 1 - proto: VendingMachineBooze entities: - - uid: 148 + - uid: 432 components: - type: Transform - pos: -6.5,4.5 + pos: -5.5,4.5 parent: 1 - proto: VendingMachineChefvend entities: - - uid: 101 + - uid: 62 components: - type: Transform - pos: -6.5,3.5 + pos: -6.5,2.5 parent: 1 - proto: VendingMachineRestockBooze entities: - uid: 304 components: - type: Transform - pos: -5.337321,4.7195187 + pos: -5.706992,2.5881605 parent: 1 - proto: VendingMachineRestockChefvend entities: - uid: 317 components: - type: Transform - pos: -5.337321,4.834102 + pos: -5.331992,2.7235773 parent: 1 - proto: VendingMachineSeeds entities: - - uid: 431 + - uid: 239 components: - type: Transform - pos: 1.5,6.5 + pos: 1.5,9.5 parent: 1 - proto: WallShuttle entities: @@ -4784,12 +4847,6 @@ entities: rot: 1.5707963267948966 rad pos: -5.5,5.5 parent: 1 - - uid: 48 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 6.5,2.5 - parent: 1 - uid: 52 components: - type: Transform @@ -4883,11 +4940,6 @@ entities: - type: Transform pos: -3.5,9.5 parent: 1 - - uid: 156 - components: - - type: Transform - pos: 0.5,7.5 - parent: 1 - uid: 158 components: - type: Transform @@ -4911,17 +4963,29 @@ entities: rot: 3.141592653589793 rad pos: 0.5,5.5 parent: 1 - - uid: 213 + - uid: 195 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 6.5,4.5 + rot: 3.141592653589793 rad + pos: 0.5,8.5 + parent: 1 + - uid: 216 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 5.5,2.5 parent: 1 - uid: 224 components: - type: Transform pos: 0.5,-6.5 parent: 1 + - uid: 230 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 5.5,4.5 + parent: 1 - uid: 247 components: - type: Transform @@ -5069,11 +5133,11 @@ entities: parent: 1 - proto: WarningWaste entities: - - uid: 230 + - uid: 82 components: - type: Transform - rot: 3.141592653589793 rad - pos: -5.5,8.5 + rot: -1.5707963267948966 rad + pos: -5.5,7.5 parent: 1 - proto: WarpPoint entities: @@ -5082,4 +5146,11 @@ entities: - type: Transform pos: 0.5,0.5 parent: 1 +- proto: Windoor + entities: + - uid: 179 + components: + - type: Transform + pos: 3.5,1.5 + parent: 1 ... diff --git a/Resources/ServerInfo/_NF/Guidebook/Shipyard/Nightlight.xml b/Resources/ServerInfo/_NF/Guidebook/Shipyard/Nightlight.xml index d79c222dcc4..4e0902f68a9 100644 --- a/Resources/ServerInfo/_NF/Guidebook/Shipyard/Nightlight.xml +++ b/Resources/ServerInfo/_NF/Guidebook/Shipyard/Nightlight.xml @@ -3,7 +3,7 @@ - + @@ -16,7 +16,7 @@ [color=#a4885c]Power Gen Type:[/color] Uranium - [color=#a4885c]Base Power Draw:[/color] 30kw + [color=#a4885c]Base Power Draw:[/color] 25kw [color=#a4885c]Expeditions:[/color] None @@ -24,6 +24,15 @@ "The Nightlight is the Far Star Biotech's flagship biomass biorecombination research vessel. Providing top of the line hospitality and nutritional preperation accomidations for Nanotrasen standard xenotypes; the Nightlight should provide any research teams investigating new strains of recombinant nutrition with a distraction free crop of eager bioforms." + # Ship Functions + + + + + + + + # Piloting diff --git a/Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/nightlight.png b/Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/nightlight.png index 962c993cf45d2eeb809e1e4ae0f758f53ec6e80b..35af6a4c598ec167157e7ecc893821320fcb0dc0 100644 GIT binary patch delta 1163 zcmV;61a$k55Rnj&F#*f5GHC;U=9T05ssDV}hiiOC#Kw;6!OMnV^$TQW0LCwaSQ84e z6B3s2h$eAlzHS-Wm{q~2-gzSKBD9pLkuvrAkz?^r4ryN%jE8}nmQO(U?lZcwkCoi& zLQ@kE_p)(g<^sBRpP^a-JTAv=v~K1dKJ1fm`G#w&n(kqJ{U%^Nff>ht2n&#;_W$qA zo0ad$tyWy-q!DWYGL8`zfCu))v&Q9dL7OW`64nA_9IF5s$0|U^iM>U|zJ3wd_x{=a zqfr*8iM#Gw;*%daJck=UN?*SYtOdw8Rsjrz_ERpN?48q&wEM_wRsjr!oT4XJT+w9J zbbPbAt$F|!zrURK75eOd$`82l*M9$!Pk#K-eDsA1!PnnaeX{EF-2HyFsSbiH$pdI! zpDA;{krtrPyABGy>*6j(WVGse@amu-)A~j#fQA2O5kXgA(e5)+0m>)7in|DrqWV0z zo%XJ=WYG#P?n*ADl0|@QA0SOlfQk5)gqeu<)#&O3Ug|y#OHQqSSH7-I(a{x!n8 zr>Ayt_>Y@s<{mC}p9TO3G;M4uS}j1SSaEAt>(J5P5A_=pFf>|ER0l7OXj1^M@(cYP zkk99#XTfCRlpsxCzK1pi*fr4QbS!L#^4=O$t5rC8Z8o%j-#Nb}&45LoMjv4EP5O9y z_UqH@235no>m<7dx|~w6;+FT;pkrY>Y#&&xT=}ay2f5)l;YFW}muUI_H4xzJtz*H9 zi{|rb`H9MqB((MchDPh|)P}iG=`r}|F)#^@kW%=egH-|p1VlfmiXHJ02lXFpl87(Ol_E(s3Bll zk?sQowFsWvw}O=ki^OdNU;Ju{dsHtHROwD{4cB3et=e^ssOD2 z?V(-6+q~dCf5>yZQ54=Yh?X`jf9nU(0Igzig|c?_kl7JTw1XH;QM6mJQnBK`(l_Fc zjg7f}uIsvEV`J{SKU{W`rUa@RG2wmrSbO)eWS4*pBabTa@wrwlAe});^#cTH0(e`z z(b5%}{4mEL&k!l4V#OWl>r331?-9fT;3NJ*MHYZ|KQEkj4Dt*Xg0#K7M44X`NRtAj dX*g>M$p05{(1DygMu7kT002ovPDHLkV1n6HOuhgB delta 1162 zcmV;51axU1cbYf=xq$B7XQ);HkIQizt($p=4|BtDd53GOm|wpMSWjTaF~S0WB&q%Xd-G=H zdvdE4mpN&~T7ZmWgazP%eetYuxhc@*4ot>cfQ(}mAmdmC$T+dLsMyyp0{hxOyMHvw z;xuvBeM@}uBZucG-5;gzzZF;uka4U67zpjBTs+x3ryXhck=LvO7z#N>Pp-J4$*Sr2 zW_4Tj04#ogIqxg<*_9uEaO1E2{w1IM_@nvg3l)N|zpMIW)#thU{c2Mk1X+>?(7ZlV z=6)kBK%sXX6nfXiU5v&|IZ?VuE3(*XQTp@Pka@35h6wPd2l=J zU1Q0j6#D~qFywE!8%DnQ1u3XpNM_W|&aA&(C8<8M80&ep0j zh<5@#r>7v2SPPJUajXJl9IF5sM|&TjRIIowuD%7o?b#38m$gSe6^hsGi}w9%gm+I* z?c(qsH_yyHT z&qL3G$;2r^n!bDwZ3?h!pv&o4*be2rHK1M4nExy@ zJqsowpU*>op&y{Uw+5wR#oaZ~Wt)MR&^8R*zO3CD8m+r0uT4NtwF+J{U_#}m?RN+& zG+w@_4UeJ^05D?-a>xH|N#)~>D5d=XjBq@6k+v=Iwfg}s?yEr0f=QU#FgH;{z_cRW z2MB5rJh{maP_4qrYtw!JI~0r$>j%gGY#eJo3#2p(O zb6wYcb;riW+;@Mt>?TbKR5xP6`|`2&?qkU=0U1UfRpR4wty(}jgOch82+{=bws@nZ zD>C_EjzOLwQcA^&JJQ#exG&!$hy}n${Dq1v0PTKWIPVzb87u^8dwGd6zb23-1xV9y c))J8a0d(Tffpn|UTL1t607*qoM6N<$f~dPcZvX%Q From 008b5bf63852b267a41af882958ffcceb3a9aa2d Mon Sep 17 00:00:00 2001 From: dustylens Date: Sat, 28 Dec 2024 14:11:54 -0800 Subject: [PATCH 08/14] Whoops, lingering wire. Also some arbitragiogiogiogio --- Resources/Maps/_NF/Shuttles/nightlight.yml | 35 +++++++--------------- 1 file changed, 11 insertions(+), 24 deletions(-) diff --git a/Resources/Maps/_NF/Shuttles/nightlight.yml b/Resources/Maps/_NF/Shuttles/nightlight.yml index 9b84de87346..e7f51edc317 100644 --- a/Resources/Maps/_NF/Shuttles/nightlight.yml +++ b/Resources/Maps/_NF/Shuttles/nightlight.yml @@ -1225,11 +1225,6 @@ entities: - type: Transform pos: -6.5,4.5 parent: 1 - - uid: 116 - components: - - type: Transform - pos: 0.5,6.5 - parent: 1 - uid: 122 components: - type: Transform @@ -1758,12 +1753,8 @@ entities: - uid: 418 components: - type: Transform - pos: -6.5,1.5 - parent: 1 - - uid: 419 - components: - - type: Transform - pos: 7.5,1.5 + rot: -1.5707963267948966 rad + pos: 2.5,-5.5 parent: 1 - proto: ClothingOuterWinterChef entities: @@ -1880,12 +1871,8 @@ entities: - uid: 363 components: - type: Transform - pos: -6.5,-1.5 - parent: 1 - - uid: 585 - components: - - type: Transform - pos: 7.5,-1.5 + rot: -1.5707963267948966 rad + pos: -7.5,3.5 parent: 1 - proto: FaxMachineShip entities: @@ -3617,7 +3604,7 @@ entities: pos: -4.5,6.5 parent: 1 - type: FuelGenerator - targetPower: 25000 + targetPower: 23000 - proto: PosterLegitSMFires entities: - uid: 340 @@ -3656,6 +3643,12 @@ entities: - type: Transform pos: -5.5,-2.5 parent: 1 + - uid: 116 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,6.5 + parent: 1 - uid: 172 components: - type: Transform @@ -3718,12 +3711,6 @@ entities: rot: 3.141592653589793 rad pos: 0.5,-5.5 parent: 1 - - uid: 521 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -1.5,8.5 - parent: 1 - uid: 561 components: - type: Transform From 83a4490241c4301dcb5c9813755f300476fe67a3 Mon Sep 17 00:00:00 2001 From: dustylens Date: Sat, 28 Dec 2024 23:54:54 -0800 Subject: [PATCH 09/14] Condiment Dispenser Update. Omnissiah be praised. Adds a new condiment dispenser machine, condiment cup and condiment cup dispenser. --- Resources/Maps/_NF/Shuttles/nightlight.yml | 157 ++++++++++-------- .../Entities/Structures/Machines/lathe.yml | 1 + .../Catalog/ReagentDispensers/condiments.yml | 11 ++ .../Consumable/Drinks/condiments_bottles.yml | 127 ++++++++++++++ .../Objects/Consumable/Drinks/drinks.yml | 31 ++++ .../Entities/Objects/Devices/production.yml | 19 +++ .../Objects/Specific/Service/condimentcup.yml | 53 ++++++ .../Structures/Dispensers/condiments.yml | 46 +++++ .../Entities/Structures/Machines/lathe.yml | 2 + .../_NF/Recipes/Lathes/electronics.yml | 11 +- .../Prototypes/_NF/Recipes/Lathes/service.yml | 15 ++ Resources/Prototypes/_NF/tags.yml | 5 +- .../Drinks/condiment_cup.rsi/icon-0.png | Bin 0 -> 282 bytes .../Drinks/condiment_cup.rsi/icon-1.png | Bin 0 -> 127 bytes .../Drinks/condiment_cup.rsi/meta.json | 17 ++ .../dispenser0.png | Bin 0 -> 303 bytes .../dispenser1.png | Bin 0 -> 319 bytes .../condiment_cup_dispenser.rsi/meta.json | 17 ++ .../Structures/smalldispensers.rsi/icon.png | Bin 0 -> 828 bytes .../Structures/smalldispensers.rsi/meta.json | 14 ++ 20 files changed, 453 insertions(+), 73 deletions(-) create mode 100644 Resources/Prototypes/_NF/Catalog/ReagentDispensers/condiments.yml create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/condiments_bottles.yml create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Specific/Service/condimentcup.yml create mode 100644 Resources/Prototypes/_NF/Entities/Structures/Dispensers/condiments.yml create mode 100644 Resources/Textures/_NF/Objects/Consumable/Drinks/condiment_cup.rsi/icon-0.png create mode 100644 Resources/Textures/_NF/Objects/Consumable/Drinks/condiment_cup.rsi/icon-1.png create mode 100644 Resources/Textures/_NF/Objects/Consumable/Drinks/condiment_cup.rsi/meta.json create mode 100644 Resources/Textures/_NF/Objects/Specific/Service/condiment_cup_dispenser.rsi/dispenser0.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Service/condiment_cup_dispenser.rsi/dispenser1.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Service/condiment_cup_dispenser.rsi/meta.json create mode 100644 Resources/Textures/_NF/Structures/smalldispensers.rsi/icon.png create mode 100644 Resources/Textures/_NF/Structures/smalldispensers.rsi/meta.json diff --git a/Resources/Maps/_NF/Shuttles/nightlight.yml b/Resources/Maps/_NF/Shuttles/nightlight.yml index e7f51edc317..f50fb66c1af 100644 --- a/Resources/Maps/_NF/Shuttles/nightlight.yml +++ b/Resources/Maps/_NF/Shuttles/nightlight.yml @@ -31,7 +31,7 @@ entities: chunks: 0,0: ind: 0,0 - tiles: CAAAAAAACAAAAAAACAAAAAAABgAAAAAABgAAAAAABQAAAAAABQAAAAAABQAAAAAABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAwAAAAAABwAAAAAABwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAABQAAAAAABwAAAAAABwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAwAAAAAABwAAAAAABwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAABQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAACgAAAAAACgAAAAAACgAAAAAACgAAAAAACgAAAAAAAwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAACgAAAAAACgAAAAAACgAAAAAACgAAAAAACgAAAAAAAwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAACgAAAAAACgAAAAAACgAAAAAACgAAAAAACgAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAACgAAAAAACgAAAAAACgAAAAAAAwAAAAAAAwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAACgAAAAAACgAAAAAAAwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: CAAAAAAACAAAAAAACAAAAAAABgAAAAAABgAAAAAABQAAAAAABQAAAAAABQAAAAAABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAwAAAAAABwAAAAAABwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAABQAAAAAABwAAAAAABwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAwAAAAAABwAAAAAABwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAABQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAACgAAAAAACgAAAAAACgAAAAAACgAAAAAACgAAAAAAAwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAACgAAAAAACgAAAAAACgAAAAAACgAAAAAACgAAAAAAAwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAACgAAAAAACgAAAAAACgAAAAAACgAAAAAACgAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAACgAAAAAACgAAAAAACgAAAAAAAwAAAAAAAwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAACgAAAAAACgAAAAAAAwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 -1,0: ind: -1,0 @@ -513,8 +513,8 @@ entities: 19: -5,0 20: -5,-1 232: -5,3 - 624: 0,8 633: 5,3 + 636: 0,7 - node: color: '#FFFFFFFF' id: WarnLineGreyscaleN @@ -538,8 +538,8 @@ entities: 5: 5,0 6: 5,-1 231: -5,3 - 625: 0,8 634: 5,3 + 635: 0,7 - node: color: '#FFFFFFFF' id: WarnLineN @@ -1157,7 +1157,7 @@ entities: - uid: 566 components: - type: Transform - pos: 3.2296934,8.701155 + pos: 3.5613427,9.06107 parent: 1 - proto: ButtonFrameCaution entities: @@ -1228,7 +1228,7 @@ entities: - uid: 122 components: - type: Transform - pos: 2.5,8.5 + pos: 1.5,7.5 parent: 1 - uid: 135 components: @@ -1243,17 +1243,17 @@ entities: - uid: 147 components: - type: Transform - pos: 3.5,8.5 + pos: 0.5,7.5 parent: 1 - uid: 148 components: - type: Transform - pos: 0.5,8.5 + pos: 2.5,8.5 parent: 1 - uid: 232 components: - type: Transform - pos: 1.5,8.5 + pos: 2.5,7.5 parent: 1 - uid: 348 components: @@ -1784,6 +1784,20 @@ entities: - type: Transform pos: 4.5,1.5 parent: 1 +- proto: CondimentCupDispenser20 + entities: + - uid: 627 + components: + - type: Transform + pos: -1.985923,1.4784412 + parent: 1 +- proto: CondimentDispenser + entities: + - uid: 590 + components: + - type: Transform + pos: -2.5,1.5 + parent: 1 - proto: CrateFreezer entities: - uid: 298 @@ -1801,10 +1815,10 @@ entities: parent: 1 - proto: DeskBell entities: - - uid: 589 + - uid: 585 components: - type: Transform - pos: -2.4479167,1.5713204 + pos: -1.7157099,1.7737031 parent: 1 - proto: DrinkGlass entities: @@ -1832,6 +1846,17 @@ entities: parent: 1 - proto: EmergencyLight entities: + - uid: 9 + components: + - type: Transform + pos: 0.5,4.5 + parent: 1 + - uid: 344 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 3.5,9.5 + parent: 1 - uid: 524 components: - type: Transform @@ -1856,11 +1881,6 @@ entities: rot: 1.5707963267948966 rad pos: -1.5,9.5 parent: 1 - - uid: 564 - components: - - type: Transform - pos: 4.5,8.5 - parent: 1 - uid: 570 components: - type: Transform @@ -3344,12 +3364,13 @@ entities: rot: -1.5707963267948966 rad pos: 7.5,3.5 parent: 1 -- proto: JukeboxShip +- proto: JukeboxWallmountShip entities: - - uid: 357 + - uid: 30 components: - type: Transform - pos: 0.5,-3.5 + rot: 3.141592653589793 rad + pos: 0.5,-4.5 parent: 1 - proto: KitchenAssembler entities: @@ -3501,11 +3522,6 @@ entities: parent: 1 - proto: NapkinDrum5 entities: - - uid: 590 - components: - - type: Transform - pos: -2.7395835,1.6650704 - parent: 1 - uid: 591 components: - type: Transform @@ -3516,14 +3532,20 @@ entities: - type: Transform pos: 2.71875,1.6569037 parent: 1 -- proto: NFPosterContrabandFsbLogo +- proto: NFPosterContrabandEmsCoords entities: - - uid: 627 + - uid: 589 components: - type: Transform - rot: -1.5707963267948966 rad pos: -2.5,9.5 parent: 1 +- proto: NFPosterContrabandFsbLogo + entities: + - uid: 564 + components: + - type: Transform + pos: -1.5,5.5 + parent: 1 - proto: NFPosterContrabandFsbNightlight entities: - uid: 342 @@ -3536,10 +3558,17 @@ entities: - type: Transform pos: 6.5,1.5 parent: 1 - - uid: 344 + - uid: 357 components: - type: Transform - pos: 0.5,-4.5 + rot: 1.5707963267948966 rad + pos: 2.5,-4.5 + parent: 1 + - uid: 438 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,-4.5 parent: 1 - proto: NitrogenCanister entities: @@ -3584,17 +3613,18 @@ entities: bodyType: Static - proto: PaperBin20 entities: - - uid: 9 + - uid: 521 components: - type: Transform - pos: -1.3183904,8.486803 + rot: -1.5707963267948966 rad + pos: -1.5205934,8.934247 parent: 1 -- proto: Pen +- proto: PlantBox entities: - - uid: 276 + - uid: 421 components: - type: Transform - pos: -1.6933904,8.783678 + pos: 3.5,8.5 parent: 1 - proto: PortableGeneratorSuperPacmanShuttle entities: @@ -3604,7 +3634,7 @@ entities: pos: -4.5,6.5 parent: 1 - type: FuelGenerator - targetPower: 23000 + targetPower: 25000 - proto: PosterLegitSMFires entities: - uid: 340 @@ -3629,13 +3659,6 @@ entities: rot: 3.141592653589793 rad pos: -5.5,5.5 parent: 1 -- proto: PottedPlantBioluminscent - entities: - - uid: 640 - components: - - type: Transform - pos: 0.5,-5.5 - parent: 1 - proto: Poweredlight entities: - uid: 81 @@ -3643,12 +3666,6 @@ entities: - type: Transform pos: -5.5,-2.5 parent: 1 - - uid: 116 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -0.5,6.5 - parent: 1 - uid: 172 components: - type: Transform @@ -3682,6 +3699,12 @@ entities: - type: Transform pos: 6.5,0.5 parent: 1 + - uid: 276 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,8.5 + parent: 1 - uid: 315 components: - type: Transform @@ -4347,12 +4370,6 @@ entities: - Pressed: Toggle - proto: SignKitchen entities: - - uid: 438 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 0.5,-6.5 - parent: 1 - uid: 439 components: - type: Transform @@ -4379,6 +4396,12 @@ entities: rot: -1.5707963267948966 rad pos: 8.5,1.5 parent: 1 + - uid: 419 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 0.5,-6.5 + parent: 1 - proto: SinkWide entities: - uid: 76 @@ -4465,13 +4488,6 @@ entities: rot: 3.141592653589793 rad pos: -3.5,5.5 parent: 1 -- proto: Table - entities: - - uid: 421 - components: - - type: Transform - pos: 3.5,8.5 - parent: 1 - proto: TableCarpet entities: - uid: 43 @@ -4672,13 +4688,6 @@ entities: - type: Transform pos: -3.5073605,6.8587217 parent: 1 -- proto: ToyFigurineChef - entities: - - uid: 30 - components: - - type: Transform - pos: -1.6777654,8.877428 - parent: 1 - proto: VendingMachineBooze entities: - uid: 432 @@ -4953,8 +4962,7 @@ entities: - uid: 195 components: - type: Transform - rot: 3.141592653589793 rad - pos: 0.5,8.5 + pos: 0.5,6.5 parent: 1 - uid: 216 components: @@ -4976,8 +4984,7 @@ entities: - uid: 247 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 0.5,6.5 + pos: 0.5,8.5 parent: 1 - uid: 287 components: @@ -5133,6 +5140,14 @@ entities: - type: Transform pos: 0.5,0.5 parent: 1 +- proto: WeaponCapacitorRecharger + entities: + - uid: 116 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,8.5 + parent: 1 - proto: Windoor entities: - uid: 179 diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index b88f4904de5..8149faaec5f 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -515,6 +515,7 @@ - SalvageTechFabCircuitboardNF # Frontier - NFScrapProcessorCircuitboard # Frontier - BlueprintLithographMachineCircuitboard # Frontier + - CondimentDispenserCircuitboard # Frontier dynamicRecipes: - ThermomachineFreezerMachineCircuitBoard - HellfireFreezerMachineCircuitBoard diff --git a/Resources/Prototypes/_NF/Catalog/ReagentDispensers/condiments.yml b/Resources/Prototypes/_NF/Catalog/ReagentDispensers/condiments.yml new file mode 100644 index 00000000000..366a7b6c185 --- /dev/null +++ b/Resources/Prototypes/_NF/Catalog/ReagentDispensers/condiments.yml @@ -0,0 +1,11 @@ +- type: reagentDispenserInventory + id: CondimentDispenserInventory + inventory: + - DrinkAstrotameJug + - DrinkBbqSauceJug + - DrinkColdsauceJug + - DrinkHorseradishSauceJug + - DrinkHotsauceJug + - DrinkKetchupJug + - DrinkMustardJug + - DrinkSoysauceJug diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/condiments_bottles.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/condiments_bottles.yml new file mode 100644 index 00000000000..81b457aaae6 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/condiments_bottles.yml @@ -0,0 +1,127 @@ +- type: entity + parent: DrinkBottlePlasticBaseFull + id: DrinkAstrotameJug + name: astrotame jug + suffix: For Drinks, Full + description: The sweetness of a thousand sugars but none of the calories. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 300 + reagents: + - ReagentId: Astrotame + Quantity: 100 + - type: Drink + +- type: entity + parent: DrinkBottlePlasticBaseFull + id: DrinkBbqSauceJug + name: bbq sauce jug + suffix: For Drinks, Full + description: Hand wipes not included. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 300 + reagents: + - ReagentId: BbqSauce + Quantity: 100 + - type: Drink + +- type: entity + parent: DrinkBottlePlasticBaseFull + id: DrinkColdsauceJug + name: coldsauce jug + suffix: For Drinks, Full + description: Some people put this in their coffee... + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 300 + reagents: + - ReagentId: Frostoil + Quantity: 100 + - type: Drink + +- type: entity + parent: DrinkBottlePlasticBaseFull + id: DrinkHorseradishSauceJug + name: horseradish sauce jug + suffix: For Drinks, Full + description: A jug of smelly horseradish sauce. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 300 + reagents: + - ReagentId: HorseradishSauce + Quantity: 100 + - type: Drink + +- type: entity + parent: DrinkBottlePlasticBaseFull + id: DrinkHotsauceJug + name: hotsauce jug + suffix: For Drinks, Full + description: You can almost TASTE the stomach ulcers now! + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 300 + reagents: + - ReagentId: Hotsauce + Quantity: 100 + - type: Drink + +- type: entity + parent: DrinkBottlePlasticBaseFull + id: DrinkKetchupJug + name: ketchup jug + suffix: For Drinks, Full + description: You feel more American already. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 300 + reagents: + - ReagentId: Ketchup + Quantity: 100 + - type: Drink + +- type: entity + parent: DrinkBottlePlasticBaseFull + id: DrinkMustardJug + name: mustard jug + suffix: For Drinks, Full + description: You feel more American already. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 300 + reagents: + - ReagentId: Mustard + Quantity: 100 + - type: Drink + +- type: entity + parent: DrinkBottlePlasticBaseFull + id: DrinkSoysauceJug + name: soy sauce jug + suffix: For Drinks, Full + description: A salty soy-based flavoring. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 300 + reagents: + - ReagentId: Soysauce + Quantity: 100 + - type: Drink diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/drinks.yml index 761d49039ee..28a9678afbf 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/drinks.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/drinks.yml @@ -95,3 +95,34 @@ - type: Icon sprite: _NF/Objects/Consumable/Drinks/beesknees.rsi state: icon + +# condiment cup + +- type: entity + parent: DrinkBaseCup + id: CondimentCup + name: condiment cup + description: A flimsy cup that can be filled with condiments. + components: + - type: Drink + - type: Sprite + sprite: _NF/Objects/Consumable/Drinks/condiment_cup.rsi + layers: + - state: icon-0 + - map: ["enum.SolutionContainerLayers.Fill"] + state: icon-1 + - type: Appearance + - type: SolutionContainerVisuals + maxFillLevels: 1 + fillBaseName: icon- + - type: Tag + tags: + - Trash + - WhitelistChameleon + - CondimentCup + - type: TrashOnSolutionEmpty + solution: drink + - type: SolutionContainerManager + solutions: + drink: + maxVol: 5 diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/production.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/production.yml index bfd5c43d1db..182d5c2add6 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Devices/production.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Devices/production.yml @@ -348,3 +348,22 @@ stackRequirements: Steel: 5 Plastic: 5 + +- type: entity + id: CondimentDispenserCircuitboard + parent: BaseMachineCircuitboard + name: condiment dispenser machine board + description: A machine printed circuit board for a condiment dispenser. + components: + - type: Sprite + state: service + - type: MachineBoard + prototype: CondimentDispenserEmpty + requirements: # Frontier + MatterBin: 1 # Frontier + stackRequirements: + Steel: 5 + tagRequirements: + GlassBeaker: + amount: 1 + defaultPrototype: Beaker diff --git a/Resources/Prototypes/_NF/Entities/Objects/Specific/Service/condimentcup.yml b/Resources/Prototypes/_NF/Entities/Objects/Specific/Service/condimentcup.yml new file mode 100644 index 00000000000..26ee9aaaf52 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Specific/Service/condimentcup.yml @@ -0,0 +1,53 @@ +- type: entity + name: condiment cup dispenser + description: It holds little condiment cups. They claim to be recyled. + id: CondimentCupDispenser + parent: [BaseItem, PaperBin] + components: + - type: Sprite + sprite: _NF/Objects/Specific/Service/condiment_cup_dispenser.rsi + state: dispenser0 + - type: ItemMapper + sprite: _NF/Objects/Specific/Service/condiment_cup_dispenser.rsi + mapLayers: + dispenser1: + whitelist: + tags: + - CondimentCup + - type: Bin + whitelist: + tags: + - CondimentCup + +- type: entity + name: condiment cup dispenser + suffix: 20 + description: It holds little condiment cups. They claim to be recyled. + id: CondimentCupDispenser20 + parent: CondimentCupDispenser + components: + - type: Bin + initialContents: + - CondimentCup + - CondimentCup + - CondimentCup + - CondimentCup + - CondimentCup + - CondimentCup + - CondimentCup + - CondimentCup + - CondimentCup + - CondimentCup + - CondimentCup + - CondimentCup + - CondimentCup + - CondimentCup + - CondimentCup + - CondimentCup + - CondimentCup + - CondimentCup + - CondimentCup + - CondimentCup + whitelist: + tags: + - CondimentCup diff --git a/Resources/Prototypes/_NF/Entities/Structures/Dispensers/condiments.yml b/Resources/Prototypes/_NF/Entities/Structures/Dispensers/condiments.yml new file mode 100644 index 00000000000..388b88a5375 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Structures/Dispensers/condiments.yml @@ -0,0 +1,46 @@ +- type: entity + id: CondimentDispenser + name: condiment dispenser + suffix: Filled + description: A condiment dispenser with a single slot for a container to be filled. + parent: ReagentDispenserBase + components: + - type: Rotatable + - type: Sprite + sprite: _NF/Structures/smalldispensers.rsi + drawdepth: SmallObjects + state: icon + - type: ReagentDispenser + storageWhitelist: + tags: + - DrinkBottle + - Hotsauce + - Ketchup + - BBQsauce + - Coldsauce + - Mustard + pack: CondimentDispenserInventory + - type: Transform + noRot: false + - type: Machine + board: CondimentDispenserCircuitboard + - type: GuideHelp + guides: + - Bartender + - Drinks + +- type: entity + id: CondimentDispenserEmpty + suffix: Empty + parent: CondimentDispenser + components: + - type: ReagentDispenser + storageWhitelist: + tags: + - DrinkBottle + - Hotsauce + - Ketchup + - BBQsauce + - Coldsauce + - Mustard + pack: EmptyInventory diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml index b3f1f62616b..28c772d41a5 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml @@ -134,6 +134,8 @@ - FoodPlateSmallPlastic - NapkinDrum - Napkin + - CondimentCupDispenser + - CondimentCup ## EVA - ClothingOuterEVASuitHydro - ClothingOuterEVASuitJanitor diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/electronics.yml b/Resources/Prototypes/_NF/Recipes/Lathes/electronics.yml index 96cd0950d1c..b9a86898387 100644 --- a/Resources/Prototypes/_NF/Recipes/Lathes/electronics.yml +++ b/Resources/Prototypes/_NF/Recipes/Lathes/electronics.yml @@ -46,6 +46,15 @@ Steel: 800 Glass: 900 +- type: latheRecipe + parent: BaseCircuitboardRecipe + id: CondimentDispenserCircuitboard + result: CondimentDispenserCircuitboard + materials: + Steel: 600 + Glass: 750 + + # Thrusters - type: latheRecipe id: ThrusterSecurityMachineCircuitboard @@ -105,4 +114,4 @@ result: PortableGeneratorHyperPacmanMachineCircuitboard materials: Steel: 350 - Glass: 350 \ No newline at end of file + Glass: 350 diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/service.yml b/Resources/Prototypes/_NF/Recipes/Lathes/service.yml index 738e97e152d..626fabe379f 100644 --- a/Resources/Prototypes/_NF/Recipes/Lathes/service.yml +++ b/Resources/Prototypes/_NF/Recipes/Lathes/service.yml @@ -57,3 +57,18 @@ Glass: 200 Plastic: 100 Steel: 100 + +- type: latheRecipe + id: CondimentCupDispenser + result: CondimentCupDispenser + parent: BaseServiceItemsRecipe + applyMaterialDiscount: false + +- type: latheRecipe + id: CondimentCup + result: CondimentCup + parent: BaseServiceItemsRecipe + completetime: 0.1 + applyMaterialDiscount: false + materials: + Paper: 10 diff --git a/Resources/Prototypes/_NF/tags.yml b/Resources/Prototypes/_NF/tags.yml index aee1f4b7654..490975ac47f 100644 --- a/Resources/Prototypes/_NF/tags.yml +++ b/Resources/Prototypes/_NF/tags.yml @@ -155,4 +155,7 @@ id: NFVGRoidInterior - type: Tag - id: NFFoamRPG \ No newline at end of file + id: NFFoamRPG + +- type: Tag + id: CondimentCup diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/condiment_cup.rsi/icon-0.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/condiment_cup.rsi/icon-0.png new file mode 100644 index 0000000000000000000000000000000000000000..2dce3135e72b957ad5d469aebb32f86a5c36748c GIT binary patch literal 282 zcmV+#0pPx#)Ja4^R9J=W)4dA9Fcbygqr~FSLW$zwP{g65PvGQ3_>g^s4i23=xz(XaK_`C- zEkzpBIEYK_kaQ8@eq(a);U*yfA%u`08}w;9?{}(eeZJZl=NUDmaj3=?!{IjU-1m87 zJcxE-8iy(?Ev;IgH`+rm-2p_E!{<{x>L&o8J&b490D!T@z+|NxYxV?56evDhpeXas zeaCiDT#i_-x7xYdH}D~31IKnDWYY?gP*Rx2ng4<$3Y0VPzSbEe%KORa^zXhNife{Z g_eUUv5JLXX3w7T-4143hU;qFB07*qoM6N<$f-p&V+W-In literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/condiment_cup.rsi/icon-1.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/condiment_cup.rsi/icon-1.png new file mode 100644 index 0000000000000000000000000000000000000000..d9b5f7ab4b2f3b5f30bec7adbcf766c6d0eec95a GIT binary patch literal 127 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}mYyz-ArY-_ zFKiTKFyL?syjh>IsX_CITKUiQ?iaNf4!obzlCxV@t@n8^)ApmYl`gXHGCKJcsL$VG Xh9(b7{WGRDKn{batDnm{r-UW|zkeu; literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/condiment_cup.rsi/meta.json b/Resources/Textures/_NF/Objects/Consumable/Drinks/condiment_cup.rsi/meta.json new file mode 100644 index 00000000000..68ad375fb26 --- /dev/null +++ b/Resources/Textures/_NF/Objects/Consumable/Drinks/condiment_cup.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "icon-0/1 by dustylens.", + "states": [ + { + "name": "icon-0" + }, + { + "name": "icon-1" + } + ] +} diff --git a/Resources/Textures/_NF/Objects/Specific/Service/condiment_cup_dispenser.rsi/dispenser0.png b/Resources/Textures/_NF/Objects/Specific/Service/condiment_cup_dispenser.rsi/dispenser0.png new file mode 100644 index 0000000000000000000000000000000000000000..c6d594488b7a9bb33c39fb1da076394b11b35c28 GIT binary patch literal 303 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}FFjoxLn2y} z6C_v{Cy4Zv9Pn6oY`6ctzwz5s^_hXdc|yN&^QInw$h3(|Gf)0v{(n9HPM1_`Z+&OFH@$BEXNAV`3j>_wVgoGPAi`AXOy;TqIb6ze10(0J+k$83{{?GyieRp|w10Z;F zv%KTs9aoPD|9^jOj!E|DXUb|0WS{V+;mZyNH)-u+oPx#`AI}UR9J=Wlub(lVHAZQYbJt1XqgLV=uZUV(jPD@mu~${E|pfU+zvQJ5(EW; zNY7wAMkyj#4Ql?(**rAiCf_HsV$K*Z(vRHx<$LQ zs{DH%N@ZjX>=F%N9H3nCQu*BFues}FDVIFsYbZX&m0IJ+(UF)dilQhAz!LM_M_b(L RAr1fl002ovPDHLkV1ibghm-&S literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Specific/Service/condiment_cup_dispenser.rsi/meta.json b/Resources/Textures/_NF/Objects/Specific/Service/condiment_cup_dispenser.rsi/meta.json new file mode 100644 index 00000000000..6c27c69df8f --- /dev/null +++ b/Resources/Textures/_NF/Objects/Specific/Service/condiment_cup_dispenser.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by dustylens", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "dispenser0" + }, + { + "name": "dispenser1" + } + ] +} diff --git a/Resources/Textures/_NF/Structures/smalldispensers.rsi/icon.png b/Resources/Textures/_NF/Structures/smalldispensers.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..c9150acea0899aabf1e7a8c45c52b81ab2a1d5fe GIT binary patch literal 828 zcmV-C1H=4@P)Px%_DMuRR9J=WmQ6?$VHn4MR^XZ|x~oXpGR#IqOkyN{bl9|e5bh!SFwzc2Mqq{p zQC>7UL{J{hLq(d12Y0)O(8*g727N5-v^0zCW(c~5YrAGT9hMz;oY^glJ`Vdo{@&+( z|Nr;pd60M03dc_Yu(BLC^++3_ySp1nl8_{ce0ML=uWOu~nV}3Q z1Fl*u#Mf2FQ!5C9A;31XR7FKa00aU7 zd_JF!4LcmnS}agot1*CZ%?W(57*rH!{Qa}TM3gVUK3#3b0DixpXf#SV9LDGKAxV;s z)mSW)#^V|T61B@^NO^g>+K8fJb8g4qzs`Q@1(NFN=`pa!X>M{Y_am(7*~R`GAePC( zJb=sP0>JHd128r=rmZ>p`Tz*Ex9j$t9(@VGljBtyYdH860MDyq0E~=`7`#l!u&%By zW9nbkA3Ku`|o_CKD@WiC9eV;hxm3Mw3N1e=A?Hz|{`q1z!b1)>~4+`ET~l>OD=X^M9V zx-)+mAXTHG0to4uS+@gB)L$^L!PcXhj!z#TIRy^iAOIohjJ9Uh?EpphS^-$NJfN{1 z%{Kt}^yntAi7EJ-A0yLWGN;p-_8;zdw9!1Ptg^}~D}e95VRI(Fi#oCZ0000 Date: Sun, 29 Dec 2024 11:14:01 -0800 Subject: [PATCH 10/14] Trimming and condiment update. Prep for segregating some PRs. --- Resources/Maps/_NF/Shuttles/nightlight.yml | 46 ++++++++----------- .../Consumable/Drinks/condiments_bottles.yml | 16 +++---- 2 files changed, 26 insertions(+), 36 deletions(-) diff --git a/Resources/Maps/_NF/Shuttles/nightlight.yml b/Resources/Maps/_NF/Shuttles/nightlight.yml index f50fb66c1af..3e5dbb43098 100644 --- a/Resources/Maps/_NF/Shuttles/nightlight.yml +++ b/Resources/Maps/_NF/Shuttles/nightlight.yml @@ -6,7 +6,9 @@ tilemap: 4: FloorDark 9: FloorDarkDiagonalMini 10: FloorDarkMini + 14: FloorDarkMono 7: FloorFreezer + 15: FloorMetalDiamond 8: FloorRGlass 13: FloorSteelMono 6: FloorSteelOffset @@ -35,7 +37,7 @@ entities: version: 6 -1,0: ind: -1,0 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAABQAAAAAABQAAAAAABQAAAAAABgAAAAAABgAAAAAACAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAADQAAAAAADQAAAAAAAwAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAADQAAAAAADQAAAAAABQAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAADQAAAAAADQAAAAAAAwAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAwAAAAAABQAAAAAABQAAAAAAAwAAAAAABAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAwAAAAAABQAAAAAABQAAAAAABQAAAAAABAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAABQAAAAAABQAAAAAAAwAAAAAABAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAABAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAABQAAAAAABQAAAAAABQAAAAAABgAAAAAABgAAAAAACAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAADQAAAAAADQAAAAAAAwAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAADQAAAAAADQAAAAAABQAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAADQAAAAAADQAAAAAAAwAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAwAAAAAADgAAAAAADgAAAAAAAwAAAAAABAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAwAAAAAADwAAAAAADwAAAAAABQAAAAAABAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAADgAAAAAADgAAAAAAAwAAAAAABAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAABAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 0,-1: ind: 0,-1 @@ -71,6 +73,8 @@ entities: decals: 620: -5,6 621: -4,6 + 637: -4,8 + 638: -5,8 - node: color: '#FFFFFFFF' id: BrickTileDarkCornerNe @@ -696,7 +700,7 @@ entities: - 252 - 442 - 34 - - 142 + - 304 - type: DeviceLinkSource linkedPorts: 617: @@ -869,11 +873,11 @@ entities: parent: 1 - proto: AirSensor entities: - - uid: 142 + - uid: 304 components: - type: Transform rot: -1.5707963267948966 rad - pos: -0.5,8.5 + pos: -1.5,8.5 parent: 1 - type: DeviceNetwork deviceLists: @@ -1150,14 +1154,14 @@ entities: - uid: 520 components: - type: Transform - pos: -5.5611587,2.3694105 + pos: -5.1977873,2.4574437 parent: 1 - proto: Bucket entities: - uid: 566 components: - type: Transform - pos: 3.5613427,9.06107 + pos: 3.52073,8.5978565 parent: 1 - proto: ButtonFrameCaution entities: @@ -3513,13 +3517,6 @@ entities: - type: Transform pos: 1.5,10.5 parent: 1 -- proto: MopItem - entities: - - uid: 638 - components: - - type: Transform - pos: -5.5815744,2.4666877 - parent: 1 - proto: NapkinDrum5 entities: - uid: 591 @@ -3619,13 +3616,6 @@ entities: rot: -1.5707963267948966 rad pos: -1.5205934,8.934247 parent: 1 -- proto: PlantBox - entities: - - uid: 421 - components: - - type: Transform - pos: 3.5,8.5 - parent: 1 - proto: PortableGeneratorSuperPacmanShuttle entities: - uid: 121 @@ -4501,6 +4491,13 @@ entities: rot: 1.5707963267948966 rad pos: -2.5,-2.5 parent: 1 +- proto: TableCounterMetal + entities: + - uid: 142 + components: + - type: Transform + pos: 3.5,8.5 + parent: 1 - proto: TableReinforced entities: - uid: 48 @@ -4702,19 +4699,12 @@ entities: - type: Transform pos: -6.5,2.5 parent: 1 -- proto: VendingMachineRestockBooze - entities: - - uid: 304 - components: - - type: Transform - pos: -5.706992,2.5881605 - parent: 1 - proto: VendingMachineRestockChefvend entities: - uid: 317 components: - type: Transform - pos: -5.331992,2.7235773 + pos: -5.3540373,2.6345272 parent: 1 - proto: VendingMachineSeeds entities: diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/condiments_bottles.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/condiments_bottles.yml index 81b457aaae6..d42274f1c69 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/condiments_bottles.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/condiments_bottles.yml @@ -11,7 +11,7 @@ maxVol: 300 reagents: - ReagentId: Astrotame - Quantity: 100 + Quantity: 200 - type: Drink - type: entity @@ -27,7 +27,7 @@ maxVol: 300 reagents: - ReagentId: BbqSauce - Quantity: 100 + Quantity: 200 - type: Drink - type: entity @@ -43,7 +43,7 @@ maxVol: 300 reagents: - ReagentId: Frostoil - Quantity: 100 + Quantity: 200 - type: Drink - type: entity @@ -59,7 +59,7 @@ maxVol: 300 reagents: - ReagentId: HorseradishSauce - Quantity: 100 + Quantity: 200 - type: Drink - type: entity @@ -75,7 +75,7 @@ maxVol: 300 reagents: - ReagentId: Hotsauce - Quantity: 100 + Quantity: 200 - type: Drink - type: entity @@ -91,7 +91,7 @@ maxVol: 300 reagents: - ReagentId: Ketchup - Quantity: 100 + Quantity: 200 - type: Drink - type: entity @@ -107,7 +107,7 @@ maxVol: 300 reagents: - ReagentId: Mustard - Quantity: 100 + Quantity: 200 - type: Drink - type: entity @@ -123,5 +123,5 @@ maxVol: 300 reagents: - ReagentId: Soysauce - Quantity: 100 + Quantity: 200 - type: Drink From bc48fccc518ae0b00d2f7173a51eaa645ae78b14 Mon Sep 17 00:00:00 2001 From: dustylens Date: Sun, 29 Dec 2024 11:38:48 -0800 Subject: [PATCH 11/14] Small description update. --- .../Entities/Objects/Consumable/Drinks/condiments_bottles.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/condiments_bottles.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/condiments_bottles.yml index d42274f1c69..9da9fc6bbfb 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/condiments_bottles.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/condiments_bottles.yml @@ -35,7 +35,7 @@ id: DrinkColdsauceJug name: coldsauce jug suffix: For Drinks, Full - description: Some people put this in their coffee... + description: As if eating burgers for every meal wasn't cool enough. components: - type: SolutionContainerManager solutions: From 8d525b28e795c2d846ba62b04915e3dc0697e2b7 Mon Sep 17 00:00:00 2001 From: dustylens Date: Mon, 30 Dec 2024 19:24:04 -0800 Subject: [PATCH 12/14] Nukes all attached PRs. Or nukes this PR too. Maybe just everything. Good lord. --- Resources/Maps/_NF/Shuttles/nightlight.yml | 135 ++--------------- .../Spawners/Random/Salvage/tables_loot.yml | 3 +- .../Entities/Structures/Machines/lathe.yml | 1 - .../_NF/Catalog/Fills/Boxes/general.yml | 32 ---- .../Catalog/ReagentDispensers/condiments.yml | 11 -- .../Consumable/Drinks/condiments_bottles.yml | 127 ---------------- .../Objects/Consumable/Drinks/drinks.yml | 31 ---- .../Entities/Objects/Devices/production.yml | 19 --- .../_NF/Entities/Objects/Power/lights.yml | 143 ------------------ .../Objects/Specific/Service/condimentcup.yml | 53 ------- .../Structures/Dispensers/condiments.yml | 46 ------ .../Entities/Structures/Furniture/icebox.yml | 39 ----- .../Entities/Structures/Machines/lathe.yml | 2 - .../Graphs/utilities/lighting.yml | 120 --------------- .../_NF/Recipes/Construction/lighting.yml | 65 -------- .../_NF/Recipes/Lathes/electronics.yml | 9 -- .../Prototypes/_NF/Recipes/Lathes/service.yml | 15 -- Resources/Prototypes/_NF/tags.yml | 3 - .../Drinks/condiment_cup.rsi/icon-0.png | Bin 282 -> 0 bytes .../Drinks/condiment_cup.rsi/icon-1.png | Bin 127 -> 0 bytes .../Drinks/condiment_cup.rsi/meta.json | 17 --- .../dispenser0.png | Bin 303 -> 0 bytes .../dispenser1.png | Bin 319 -> 0 bytes .../condiment_cup_dispenser.rsi/meta.json | 17 --- .../Furniture/icebox.rsi/icebox.png | Bin 1623 -> 0 bytes .../Furniture/icebox.rsi/icebox_fill-1.png | Bin 585 -> 0 bytes .../Structures/Furniture/icebox.rsi/meta.json | 19 --- .../Structures/smalldispensers.rsi/icon.png | Bin 828 -> 0 bytes .../Structures/smalldispensers.rsi/meta.json | 14 -- 29 files changed, 14 insertions(+), 907 deletions(-) delete mode 100644 Resources/Prototypes/_NF/Catalog/ReagentDispensers/condiments.yml delete mode 100644 Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/condiments_bottles.yml delete mode 100644 Resources/Prototypes/_NF/Entities/Objects/Power/lights.yml delete mode 100644 Resources/Prototypes/_NF/Entities/Objects/Specific/Service/condimentcup.yml delete mode 100644 Resources/Prototypes/_NF/Entities/Structures/Dispensers/condiments.yml delete mode 100644 Resources/Prototypes/_NF/Entities/Structures/Furniture/icebox.yml delete mode 100644 Resources/Prototypes/_NF/Recipes/Construction/Graphs/utilities/lighting.yml delete mode 100644 Resources/Prototypes/_NF/Recipes/Construction/lighting.yml delete mode 100644 Resources/Textures/_NF/Objects/Consumable/Drinks/condiment_cup.rsi/icon-0.png delete mode 100644 Resources/Textures/_NF/Objects/Consumable/Drinks/condiment_cup.rsi/icon-1.png delete mode 100644 Resources/Textures/_NF/Objects/Consumable/Drinks/condiment_cup.rsi/meta.json delete mode 100644 Resources/Textures/_NF/Objects/Specific/Service/condiment_cup_dispenser.rsi/dispenser0.png delete mode 100644 Resources/Textures/_NF/Objects/Specific/Service/condiment_cup_dispenser.rsi/dispenser1.png delete mode 100644 Resources/Textures/_NF/Objects/Specific/Service/condiment_cup_dispenser.rsi/meta.json delete mode 100644 Resources/Textures/_NF/Structures/Furniture/icebox.rsi/icebox.png delete mode 100644 Resources/Textures/_NF/Structures/Furniture/icebox.rsi/icebox_fill-1.png delete mode 100644 Resources/Textures/_NF/Structures/Furniture/icebox.rsi/meta.json delete mode 100644 Resources/Textures/_NF/Structures/smalldispensers.rsi/icon.png delete mode 100644 Resources/Textures/_NF/Structures/smalldispensers.rsi/meta.json diff --git a/Resources/Maps/_NF/Shuttles/nightlight.yml b/Resources/Maps/_NF/Shuttles/nightlight.yml index 3e5dbb43098..64b2bc8cf7f 100644 --- a/Resources/Maps/_NF/Shuttles/nightlight.yml +++ b/Resources/Maps/_NF/Shuttles/nightlight.yml @@ -1142,12 +1142,12 @@ entities: - type: Transform pos: 4.5,4.5 parent: 1 -- proto: BoxColoredLightBulb +- proto: BoxAgrichem entities: - - uid: 434 + - uid: 564 components: - type: Transform - pos: -5.269492,2.421494 + pos: 2.4442196,6.7073812 parent: 1 - proto: BoxTrashbag entities: @@ -1161,7 +1161,7 @@ entities: - uid: 566 components: - type: Transform - pos: 3.52073,8.5978565 + pos: 2.5171363,6.624048 parent: 1 - proto: ButtonFrameCaution entities: @@ -1788,20 +1788,6 @@ entities: - type: Transform pos: 4.5,1.5 parent: 1 -- proto: CondimentCupDispenser20 - entities: - - uid: 627 - components: - - type: Transform - pos: -1.985923,1.4784412 - parent: 1 -- proto: CondimentDispenser - entities: - - uid: 590 - components: - - type: Transform - pos: -2.5,1.5 - parent: 1 - proto: CrateFreezer entities: - uid: 298 @@ -3360,14 +3346,6 @@ entities: rot: 1.5707963267948966 rad pos: 4.5,8.5 parent: 1 -- proto: Icebox - entities: - - uid: 522 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 7.5,3.5 - parent: 1 - proto: JukeboxWallmountShip entities: - uid: 30 @@ -3437,54 +3415,12 @@ entities: - type: Transform pos: 2.0722742,4.8468714 parent: 1 -- proto: LightBulbCrystalBlue - entities: - - uid: 265 - components: - - type: Transform - parent: 263 - - type: Physics - canCollide: False - - uid: 426 - components: - - type: Transform - parent: 425 - - type: Physics - canCollide: False -- proto: LightBulbCrystalCyan - entities: - - uid: 58 - components: - - type: Transform - parent: 50 - - type: Physics - canCollide: False - - uid: 437 - components: - - type: Transform - parent: 436 - - type: Physics - canCollide: False -- proto: LightBulbCrystalOrange - entities: - - uid: 295 - components: - - type: Transform - parent: 266 - - type: Physics - canCollide: False - - uid: 301 - components: - - type: Transform - parent: 300 - - type: Physics - canCollide: False - proto: LockerBotanistFilled entities: - uid: 427 components: - type: Transform - pos: 2.5,6.5 + pos: 3.5,8.5 parent: 1 - proto: LockerWallEVAColorServiceWorkerFilled entities: @@ -3529,19 +3465,12 @@ entities: - type: Transform pos: 2.71875,1.6569037 parent: 1 -- proto: NFPosterContrabandEmsCoords - entities: - - uid: 589 - components: - - type: Transform - pos: -2.5,9.5 - parent: 1 - proto: NFPosterContrabandFsbLogo entities: - - uid: 564 + - uid: 142 components: - type: Transform - pos: -1.5,5.5 + pos: -2.5,9.5 parent: 1 - proto: NFPosterContrabandFsbNightlight entities: @@ -3627,11 +3556,10 @@ entities: targetPower: 25000 - proto: PosterLegitSMFires entities: - - uid: 340 + - uid: 421 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -2.5,5.5 + pos: -5.5,5.5 parent: 1 - proto: PosterLegitSMHardhats entities: @@ -3643,11 +3571,10 @@ entities: parent: 1 - proto: PosterLegitSMPoisoning entities: - - uid: 73 + - uid: 340 components: - type: Transform - rot: 3.141592653589793 rad - pos: -5.5,5.5 + pos: -2.5,5.5 parent: 1 - proto: Poweredlight entities: @@ -3760,12 +3687,6 @@ entities: rot: 3.141592653589793 rad pos: -3.5,2.5 parent: 1 - - type: ContainerContainer - containers: - light_bulb: !type:ContainerSlot - showEnts: False - occludes: True - ent: 58 - type: ApcPowerReceiver powerLoad: 0 - type: DamageOnInteract @@ -3776,12 +3697,6 @@ entities: rot: 3.141592653589793 rad pos: -1.5,-3.5 parent: 1 - - type: ContainerContainer - containers: - light_bulb: !type:ContainerSlot - showEnts: False - occludes: True - ent: 265 - type: ApcPowerReceiver powerLoad: 0 - type: DamageOnInteract @@ -3791,12 +3706,6 @@ entities: - type: Transform pos: -3.5,0.5 parent: 1 - - type: ContainerContainer - containers: - light_bulb: !type:ContainerSlot - showEnts: False - occludes: True - ent: 295 - type: ApcPowerReceiver powerLoad: 0 - type: DamageOnInteract @@ -3806,12 +3715,6 @@ entities: - type: Transform pos: 4.5,0.5 parent: 1 - - type: ContainerContainer - containers: - light_bulb: !type:ContainerSlot - showEnts: False - occludes: True - ent: 301 - type: ApcPowerReceiver powerLoad: 0 - type: DamageOnInteract @@ -3822,12 +3725,6 @@ entities: rot: 3.141592653589793 rad pos: 2.5,-3.5 parent: 1 - - type: ContainerContainer - containers: - light_bulb: !type:ContainerSlot - showEnts: False - occludes: True - ent: 426 - type: ApcPowerReceiver powerLoad: 0 - type: DamageOnInteract @@ -3838,12 +3735,6 @@ entities: rot: 3.141592653589793 rad pos: 4.5,2.5 parent: 1 - - type: ContainerContainer - containers: - light_bulb: !type:ContainerSlot - showEnts: False - occludes: True - ent: 437 - type: ApcPowerReceiver powerLoad: 0 - type: DamageOnInteract @@ -4493,10 +4384,10 @@ entities: parent: 1 - proto: TableCounterMetal entities: - - uid: 142 + - uid: 73 components: - type: Transform - pos: 3.5,8.5 + pos: 2.5,6.5 parent: 1 - proto: TableReinforced entities: diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml index 2ab93bf0b50..102a2765e74 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml @@ -195,8 +195,7 @@ children: # Frontier - id: BoxInflatable # Frontier - id: BoxLighttube # Frontier - - id: BoxLightbulb # Frontier - - id: BoxColoredLightBulb # Frontier + - id: BoxLightbulb # Frontier - type: entityTable id: SalvageEquipmentUncommon diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 8149faaec5f..b88f4904de5 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -515,7 +515,6 @@ - SalvageTechFabCircuitboardNF # Frontier - NFScrapProcessorCircuitboard # Frontier - BlueprintLithographMachineCircuitboard # Frontier - - CondimentDispenserCircuitboard # Frontier dynamicRecipes: - ThermomachineFreezerMachineCircuitBoard - HellfireFreezerMachineCircuitBoard diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Boxes/general.yml b/Resources/Prototypes/_NF/Catalog/Fills/Boxes/general.yml index 8b9f0d8043d..d738dec2d9e 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Boxes/general.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Boxes/general.yml @@ -142,35 +142,3 @@ whitelist: components: - LightBulb - -- type: entity - name: colored bulbs box - parent: BoxLightbulb - id: BoxColoredLightBulb - description: This box is shaped on the inside so that only light tubes and bulbs fit. It's full of neat colored light bulbs! - components: - - type: StorageFill - contents: - - id: LightBulbCrystalCyan - amount: 2 - - id: LightBulbCrystalBlue - amount: 2 - - id: LightBulbCrystalPink - amount: 2 - - id: LightBulbCrystalOrange - amount: 2 - - id: LightBulbCrystalRed - amount: 2 - - id: LightBulbCrystalGreen - amount: 2 - - type: Sprite - layers: - - state: box - - state: light - color: "cyan" - - type: Storage - grid: - - 0,0,5,3 - whitelist: - components: - - LightBulb diff --git a/Resources/Prototypes/_NF/Catalog/ReagentDispensers/condiments.yml b/Resources/Prototypes/_NF/Catalog/ReagentDispensers/condiments.yml deleted file mode 100644 index 366a7b6c185..00000000000 --- a/Resources/Prototypes/_NF/Catalog/ReagentDispensers/condiments.yml +++ /dev/null @@ -1,11 +0,0 @@ -- type: reagentDispenserInventory - id: CondimentDispenserInventory - inventory: - - DrinkAstrotameJug - - DrinkBbqSauceJug - - DrinkColdsauceJug - - DrinkHorseradishSauceJug - - DrinkHotsauceJug - - DrinkKetchupJug - - DrinkMustardJug - - DrinkSoysauceJug diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/condiments_bottles.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/condiments_bottles.yml deleted file mode 100644 index 9da9fc6bbfb..00000000000 --- a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/condiments_bottles.yml +++ /dev/null @@ -1,127 +0,0 @@ -- type: entity - parent: DrinkBottlePlasticBaseFull - id: DrinkAstrotameJug - name: astrotame jug - suffix: For Drinks, Full - description: The sweetness of a thousand sugars but none of the calories. - components: - - type: SolutionContainerManager - solutions: - drink: - maxVol: 300 - reagents: - - ReagentId: Astrotame - Quantity: 200 - - type: Drink - -- type: entity - parent: DrinkBottlePlasticBaseFull - id: DrinkBbqSauceJug - name: bbq sauce jug - suffix: For Drinks, Full - description: Hand wipes not included. - components: - - type: SolutionContainerManager - solutions: - drink: - maxVol: 300 - reagents: - - ReagentId: BbqSauce - Quantity: 200 - - type: Drink - -- type: entity - parent: DrinkBottlePlasticBaseFull - id: DrinkColdsauceJug - name: coldsauce jug - suffix: For Drinks, Full - description: As if eating burgers for every meal wasn't cool enough. - components: - - type: SolutionContainerManager - solutions: - drink: - maxVol: 300 - reagents: - - ReagentId: Frostoil - Quantity: 200 - - type: Drink - -- type: entity - parent: DrinkBottlePlasticBaseFull - id: DrinkHorseradishSauceJug - name: horseradish sauce jug - suffix: For Drinks, Full - description: A jug of smelly horseradish sauce. - components: - - type: SolutionContainerManager - solutions: - drink: - maxVol: 300 - reagents: - - ReagentId: HorseradishSauce - Quantity: 200 - - type: Drink - -- type: entity - parent: DrinkBottlePlasticBaseFull - id: DrinkHotsauceJug - name: hotsauce jug - suffix: For Drinks, Full - description: You can almost TASTE the stomach ulcers now! - components: - - type: SolutionContainerManager - solutions: - drink: - maxVol: 300 - reagents: - - ReagentId: Hotsauce - Quantity: 200 - - type: Drink - -- type: entity - parent: DrinkBottlePlasticBaseFull - id: DrinkKetchupJug - name: ketchup jug - suffix: For Drinks, Full - description: You feel more American already. - components: - - type: SolutionContainerManager - solutions: - drink: - maxVol: 300 - reagents: - - ReagentId: Ketchup - Quantity: 200 - - type: Drink - -- type: entity - parent: DrinkBottlePlasticBaseFull - id: DrinkMustardJug - name: mustard jug - suffix: For Drinks, Full - description: You feel more American already. - components: - - type: SolutionContainerManager - solutions: - drink: - maxVol: 300 - reagents: - - ReagentId: Mustard - Quantity: 200 - - type: Drink - -- type: entity - parent: DrinkBottlePlasticBaseFull - id: DrinkSoysauceJug - name: soy sauce jug - suffix: For Drinks, Full - description: A salty soy-based flavoring. - components: - - type: SolutionContainerManager - solutions: - drink: - maxVol: 300 - reagents: - - ReagentId: Soysauce - Quantity: 200 - - type: Drink diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/drinks.yml index 28a9678afbf..761d49039ee 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/drinks.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/drinks.yml @@ -95,34 +95,3 @@ - type: Icon sprite: _NF/Objects/Consumable/Drinks/beesknees.rsi state: icon - -# condiment cup - -- type: entity - parent: DrinkBaseCup - id: CondimentCup - name: condiment cup - description: A flimsy cup that can be filled with condiments. - components: - - type: Drink - - type: Sprite - sprite: _NF/Objects/Consumable/Drinks/condiment_cup.rsi - layers: - - state: icon-0 - - map: ["enum.SolutionContainerLayers.Fill"] - state: icon-1 - - type: Appearance - - type: SolutionContainerVisuals - maxFillLevels: 1 - fillBaseName: icon- - - type: Tag - tags: - - Trash - - WhitelistChameleon - - CondimentCup - - type: TrashOnSolutionEmpty - solution: drink - - type: SolutionContainerManager - solutions: - drink: - maxVol: 5 diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/production.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/production.yml index 182d5c2add6..bfd5c43d1db 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Devices/production.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Devices/production.yml @@ -348,22 +348,3 @@ stackRequirements: Steel: 5 Plastic: 5 - -- type: entity - id: CondimentDispenserCircuitboard - parent: BaseMachineCircuitboard - name: condiment dispenser machine board - description: A machine printed circuit board for a condiment dispenser. - components: - - type: Sprite - state: service - - type: MachineBoard - prototype: CondimentDispenserEmpty - requirements: # Frontier - MatterBin: 1 # Frontier - stackRequirements: - Steel: 5 - tagRequirements: - GlassBeaker: - amount: 1 - defaultPrototype: Beaker diff --git a/Resources/Prototypes/_NF/Entities/Objects/Power/lights.yml b/Resources/Prototypes/_NF/Entities/Objects/Power/lights.yml deleted file mode 100644 index fb93d03be17..00000000000 --- a/Resources/Prototypes/_NF/Entities/Objects/Power/lights.yml +++ /dev/null @@ -1,143 +0,0 @@ -- type: entity - parent: BaseLightbulb - name: cyan crystal light bulb - id: LightBulbCrystalCyan - description: A colorful light bulb with a small colored crystal inside. - components: - - type: LightBulb - bulb: Bulb - color: "#47f8ff" - lightEnergy: 1.0 - lightRadius: 6 - lightSoftness: 1.1 - - type: Tag - tags: - - LightBulb - - Trash - - type: Construction - graph: CyanLight - node: icon - - type: ToolRefinable - refineResult: - - id: SheetGlass1 - - id: ShardCrystalCyan - -- type: entity - parent: BaseLightbulb - name: blue crystal light bulb - id: LightBulbCrystalBlue - description: A colorful light bulb with a small colored crystal inside. - components: - - type: LightBulb - bulb: Bulb - color: "#39a1ff" - lightEnergy: 1.0 - lightRadius: 6 - lightSoftness: 1.1 - - type: Tag - tags: - - LightBulb - - Trash - - type: Construction - graph: BlueLight - node: icon - - type: ToolRefinable - refineResult: - - id: SheetGlass1 - - id: ShardCrystalBlue - -- type: entity - parent: BaseLightbulb - name: pink crystal light bulb - id: LightBulbCrystalPink - description: A colorful light bulb with a small colored crystal inside. - components: - - type: LightBulb - bulb: Bulb - color: "#ff66cc" - lightEnergy: 1.0 - lightRadius: 6 - lightSoftness: 1.1 - - type: Tag - tags: - - LightBulb - - Trash - - type: Construction - graph: PinkLight - node: icon - - type: ToolRefinable - refineResult: - - id: SheetGlass1 - - id: ShardCrystalPink - -- type: entity - parent: BaseLightbulb - name: orange crystal light bulb - id: LightBulbCrystalOrange - description: A colorful light bulb with a small colored crystal inside. - components: - - type: LightBulb - bulb: Bulb - color: "#ff8227" - lightEnergy: 1.0 - lightRadius: 6 - lightSoftness: 1.1 - - type: Tag - tags: - - LightBulb - - Trash - - type: Construction - graph: OrangeLight - node: icon - - type: ToolRefinable - refineResult: - - id: SheetGlass1 - - id: ShardCrystalOrange - -- type: entity - parent: BaseLightbulb - name: red crystal light bulb - id: LightBulbCrystalRed - description: A colorful light bulb with a small colored crystal inside. - components: - - type: LightBulb - bulb: Bulb - color: "#fb4747" - lightEnergy: 1.0 - lightRadius: 6 - lightSoftness: 1.1 - - type: Tag - tags: - - LightBulb - - Trash - - type: Construction - graph: RedLight - node: icon - - type: ToolRefinable - refineResult: - - id: SheetGlass1 - - id: ShardCrystalRed - -- type: entity - parent: BaseLightbulb - name: green crystal light bulb - id: LightBulbCrystalGreen - description: A colorful light bulb with a small colored crystal inside. - components: - - type: LightBulb - bulb: Bulb - color: "#52ff39" - lightEnergy: 1.0 - lightRadius: 6 - lightSoftness: 1.1 - - type: Tag - tags: - - LightBulb - - Trash - - type: Construction - graph: GreenLight - node: icon - - type: ToolRefinable - refineResult: - - id: SheetGlass1 - - id: ShardCrystalGreen diff --git a/Resources/Prototypes/_NF/Entities/Objects/Specific/Service/condimentcup.yml b/Resources/Prototypes/_NF/Entities/Objects/Specific/Service/condimentcup.yml deleted file mode 100644 index 26ee9aaaf52..00000000000 --- a/Resources/Prototypes/_NF/Entities/Objects/Specific/Service/condimentcup.yml +++ /dev/null @@ -1,53 +0,0 @@ -- type: entity - name: condiment cup dispenser - description: It holds little condiment cups. They claim to be recyled. - id: CondimentCupDispenser - parent: [BaseItem, PaperBin] - components: - - type: Sprite - sprite: _NF/Objects/Specific/Service/condiment_cup_dispenser.rsi - state: dispenser0 - - type: ItemMapper - sprite: _NF/Objects/Specific/Service/condiment_cup_dispenser.rsi - mapLayers: - dispenser1: - whitelist: - tags: - - CondimentCup - - type: Bin - whitelist: - tags: - - CondimentCup - -- type: entity - name: condiment cup dispenser - suffix: 20 - description: It holds little condiment cups. They claim to be recyled. - id: CondimentCupDispenser20 - parent: CondimentCupDispenser - components: - - type: Bin - initialContents: - - CondimentCup - - CondimentCup - - CondimentCup - - CondimentCup - - CondimentCup - - CondimentCup - - CondimentCup - - CondimentCup - - CondimentCup - - CondimentCup - - CondimentCup - - CondimentCup - - CondimentCup - - CondimentCup - - CondimentCup - - CondimentCup - - CondimentCup - - CondimentCup - - CondimentCup - - CondimentCup - whitelist: - tags: - - CondimentCup diff --git a/Resources/Prototypes/_NF/Entities/Structures/Dispensers/condiments.yml b/Resources/Prototypes/_NF/Entities/Structures/Dispensers/condiments.yml deleted file mode 100644 index 388b88a5375..00000000000 --- a/Resources/Prototypes/_NF/Entities/Structures/Dispensers/condiments.yml +++ /dev/null @@ -1,46 +0,0 @@ -- type: entity - id: CondimentDispenser - name: condiment dispenser - suffix: Filled - description: A condiment dispenser with a single slot for a container to be filled. - parent: ReagentDispenserBase - components: - - type: Rotatable - - type: Sprite - sprite: _NF/Structures/smalldispensers.rsi - drawdepth: SmallObjects - state: icon - - type: ReagentDispenser - storageWhitelist: - tags: - - DrinkBottle - - Hotsauce - - Ketchup - - BBQsauce - - Coldsauce - - Mustard - pack: CondimentDispenserInventory - - type: Transform - noRot: false - - type: Machine - board: CondimentDispenserCircuitboard - - type: GuideHelp - guides: - - Bartender - - Drinks - -- type: entity - id: CondimentDispenserEmpty - suffix: Empty - parent: CondimentDispenser - components: - - type: ReagentDispenser - storageWhitelist: - tags: - - DrinkBottle - - Hotsauce - - Ketchup - - BBQsauce - - Coldsauce - - Mustard - pack: EmptyInventory diff --git a/Resources/Prototypes/_NF/Entities/Structures/Furniture/icebox.yml b/Resources/Prototypes/_NF/Entities/Structures/Furniture/icebox.yml deleted file mode 100644 index 7cecd0fd444..00000000000 --- a/Resources/Prototypes/_NF/Entities/Structures/Furniture/icebox.yml +++ /dev/null @@ -1,39 +0,0 @@ -- type: entity - name: ice box - description: This delightful machine is slowly filling with ice! - id: IceboxEmpty - parent: SinkEmpty - components: - - type: Sprite - sprite: _NF/Structures/Furniture/icebox.rsi - layers: - - state: icebox - - map: [ "enum.SolutionContainerLayers.Fill" ] - state: icebox_fill-1 - visible: false - - type: Appearance - - type: SolutionContainerVisuals - maxFillLevels: 1 - fillBaseName: icebox_fill- - solutionName: drainBuffer - - type: SolutionRegeneration - solution: tank - generated: - reagents: - - ReagentId: Ice - Quantity: 1 - -- type: entity - name: ice box - id: Icebox - parent: IceboxEmpty - suffix: Ice - components: - - type: SolutionContainerManager - solutions: - drainBuffer: - maxVol: 100 - tank: - reagents: - - ReagentId: Ice - Quantity: 500 diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml index 28c772d41a5..b3f1f62616b 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml @@ -134,8 +134,6 @@ - FoodPlateSmallPlastic - NapkinDrum - Napkin - - CondimentCupDispenser - - CondimentCup ## EVA - ClothingOuterEVASuitHydro - ClothingOuterEVASuitJanitor diff --git a/Resources/Prototypes/_NF/Recipes/Construction/Graphs/utilities/lighting.yml b/Resources/Prototypes/_NF/Recipes/Construction/Graphs/utilities/lighting.yml deleted file mode 100644 index 8deb0b4871f..00000000000 --- a/Resources/Prototypes/_NF/Recipes/Construction/Graphs/utilities/lighting.yml +++ /dev/null @@ -1,120 +0,0 @@ -- type: constructionGraph - id: CyanLightBulb - start: start - graph: - - node: start - edges: - - to: icon - steps: - - material: Glass - amount: 1 - doAfter: 1 - - tag: CrystalCyan - name: cyan crystal shard - icon: - sprite: Objects/Materials/Shards/crystal.rsi - state: shard1 - color: #52ff39 - doAfter: 1 - - node: icon - entity: LightBulbCrystalCyan - -- type: constructionGraph - id: BlueLightBulb - start: start - graph: - - node: start - edges: - - to: icon - steps: - - material: Glass - amount: 2 - doAfter: 1 - - tag: CrystalBlue - name: blue crystal shard - icon: - sprite: Objects/Materials/Shards/crystal.rsi - state: shard1 - doAfter: 1 - - node: icon - entity: LightBulbCrystalBlue - -- type: constructionGraph - id: PinkLightBulb - start: start - graph: - - node: start - edges: - - to: icon - steps: - - material: Glass - amount: 2 - doAfter: 1 - - tag: CrystalPink - name: pink crystal shard - icon: - sprite: Objects/Materials/Shards/crystal.rsi - state: shard1 - doAfter: 1 - - node: icon - entity: LightBulbCrystalPink - -- type: constructionGraph - id: OrangeLightBulb - start: start - graph: - - node: start - edges: - - to: icon - steps: - - material: Glass - amount: 2 - doAfter: 1 - - tag: CrystalOrange - name: orange crystal shard - icon: - sprite: Objects/Materials/Shards/crystal.rsi - state: shard1 - doAfter: 1 - - node: icon - entity: LightBulbCrystalOrange - -- type: constructionGraph - id: RedLightBulb - start: start - graph: - - node: start - edges: - - to: icon - steps: - - material: Glass - amount: 2 - doAfter: 1 - - tag: CrystalRed - name: red crystal shard - icon: - sprite: Objects/Materials/Shards/crystal.rsi - state: shard1 - doAfter: 1 - - node: icon - entity: LightBulbCrystalRed - -- type: constructionGraph - id: GreenLightBulb - start: start - graph: - - node: start - edges: - - to: icon - steps: - - material: Glass - amount: 2 - doAfter: 1 - - tag: CrystalGreen - name: green crystal shard - icon: - sprite: Objects/Materials/Shards/crystal.rsi - state: shard1 - doAfter: 1 - - node: icon - entity: LightBulbCrystalGreen diff --git a/Resources/Prototypes/_NF/Recipes/Construction/lighting.yml b/Resources/Prototypes/_NF/Recipes/Construction/lighting.yml deleted file mode 100644 index 74d4c74f130..00000000000 --- a/Resources/Prototypes/_NF/Recipes/Construction/lighting.yml +++ /dev/null @@ -1,65 +0,0 @@ -- type: construction - name: cyan light bulb - id: CyanLightBulb - graph: CyanLightBulb - startNode: start - targetNode: icon - category: construction-category-utilities - description: A high powered light tube containing a cyan crystal - icon: { sprite: Objects/Power/light_bulb.rsi, state: normal } - objectType: Item - -- type: construction - name: blue light bulb - id: BlueLightBulb - graph: BlueLightBulb - startNode: start - targetNode: icon - category: construction-category-utilities - description: A high powered light tube containing a blue crystal - icon: { sprite: Objects/Power/light_bulb.rsi, state: normal } - objectType: Item - -- type: construction - name: pink light bulb - id: PinkLightBulb - graph: PinkLightBulb - startNode: start - targetNode: icon - category: construction-category-utilities - description: A high powered light tube containing a pink crystal - icon: { sprite: Objects/Power/light_bulb.rsi, state: normal } - objectType: Item - -- type: construction - name: orange light bulb - id: OrangeLightBulb - graph: OrangeLightBulb - startNode: start - targetNode: icon - category: construction-category-utilities - description: A high powered light tube containing an orange crystal - icon: { sprite: Objects/Power/light_bulb.rsi, state: normal } - objectType: Item - -- type: construction - name: red light bulb - id: RedLightBulb - graph: RedLightBulb - startNode: start - targetNode: icon - category: construction-category-utilities - description: A high powered light tube containing a red crystal - icon: { sprite: Objects/Power/light_bulb.rsi, state: normal } - objectType: Item - -- type: construction - name: green light bulb - id: GreenLightBulb - graph: GreenLightBulb - startNode: start - targetNode: icon - category: construction-category-utilities - description: A high powered light tube containing a green crystal - icon: { sprite: Objects/Power/light_bulb.rsi, state: normal } - objectType: Item diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/electronics.yml b/Resources/Prototypes/_NF/Recipes/Lathes/electronics.yml index b9a86898387..5fccb1009fa 100644 --- a/Resources/Prototypes/_NF/Recipes/Lathes/electronics.yml +++ b/Resources/Prototypes/_NF/Recipes/Lathes/electronics.yml @@ -46,15 +46,6 @@ Steel: 800 Glass: 900 -- type: latheRecipe - parent: BaseCircuitboardRecipe - id: CondimentDispenserCircuitboard - result: CondimentDispenserCircuitboard - materials: - Steel: 600 - Glass: 750 - - # Thrusters - type: latheRecipe id: ThrusterSecurityMachineCircuitboard diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/service.yml b/Resources/Prototypes/_NF/Recipes/Lathes/service.yml index 626fabe379f..738e97e152d 100644 --- a/Resources/Prototypes/_NF/Recipes/Lathes/service.yml +++ b/Resources/Prototypes/_NF/Recipes/Lathes/service.yml @@ -57,18 +57,3 @@ Glass: 200 Plastic: 100 Steel: 100 - -- type: latheRecipe - id: CondimentCupDispenser - result: CondimentCupDispenser - parent: BaseServiceItemsRecipe - applyMaterialDiscount: false - -- type: latheRecipe - id: CondimentCup - result: CondimentCup - parent: BaseServiceItemsRecipe - completetime: 0.1 - applyMaterialDiscount: false - materials: - Paper: 10 diff --git a/Resources/Prototypes/_NF/tags.yml b/Resources/Prototypes/_NF/tags.yml index 490975ac47f..dc4debdbcfd 100644 --- a/Resources/Prototypes/_NF/tags.yml +++ b/Resources/Prototypes/_NF/tags.yml @@ -156,6 +156,3 @@ - type: Tag id: NFFoamRPG - -- type: Tag - id: CondimentCup diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/condiment_cup.rsi/icon-0.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/condiment_cup.rsi/icon-0.png deleted file mode 100644 index 2dce3135e72b957ad5d469aebb32f86a5c36748c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 282 zcmV+#0pPx#)Ja4^R9J=W)4dA9Fcbygqr~FSLW$zwP{g65PvGQ3_>g^s4i23=xz(XaK_`C- zEkzpBIEYK_kaQ8@eq(a);U*yfA%u`08}w;9?{}(eeZJZl=NUDmaj3=?!{IjU-1m87 zJcxE-8iy(?Ev;IgH`+rm-2p_E!{<{x>L&o8J&b490D!T@z+|NxYxV?56evDhpeXas zeaCiDT#i_-x7xYdH}D~31IKnDWYY?gP*Rx2ng4<$3Y0VPzSbEe%KORa^zXhNife{Z g_eUUv5JLXX3w7T-4143hU;qFB07*qoM6N<$f-p&V+W-In diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/condiment_cup.rsi/icon-1.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/condiment_cup.rsi/icon-1.png deleted file mode 100644 index d9b5f7ab4b2f3b5f30bec7adbcf766c6d0eec95a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 127 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}mYyz-ArY-_ zFKiTKFyL?syjh>IsX_CITKUiQ?iaNf4!obzlCxV@t@n8^)ApmYl`gXHGCKJcsL$VG Xh9(b7{WGRDKn{batDnm{r-UW|zkeu; diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/condiment_cup.rsi/meta.json b/Resources/Textures/_NF/Objects/Consumable/Drinks/condiment_cup.rsi/meta.json deleted file mode 100644 index 68ad375fb26..00000000000 --- a/Resources/Textures/_NF/Objects/Consumable/Drinks/condiment_cup.rsi/meta.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "icon-0/1 by dustylens.", - "states": [ - { - "name": "icon-0" - }, - { - "name": "icon-1" - } - ] -} diff --git a/Resources/Textures/_NF/Objects/Specific/Service/condiment_cup_dispenser.rsi/dispenser0.png b/Resources/Textures/_NF/Objects/Specific/Service/condiment_cup_dispenser.rsi/dispenser0.png deleted file mode 100644 index c6d594488b7a9bb33c39fb1da076394b11b35c28..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 303 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}FFjoxLn2y} z6C_v{Cy4Zv9Pn6oY`6ctzwz5s^_hXdc|yN&^QInw$h3(|Gf)0v{(n9HPM1_`Z+&OFH@$BEXNAV`3j>_wVgoGPAi`AXOy;TqIb6ze10(0J+k$83{{?GyieRp|w10Z;F zv%KTs9aoPD|9^jOj!E|DXUb|0WS{V+;mZyNH)-u+oPx#`AI}UR9J=Wlub(lVHAZQYbJt1XqgLV=uZUV(jPD@mu~${E|pfU+zvQJ5(EW; zNY7wAMkyj#4Ql?(**rAiCf_HsV$K*Z(vRHx<$LQ zs{DH%N@ZjX>=F%N9H3nCQu*BFues}FDVIFsYbZX&m0IJ+(UF)dilQhAz!LM_M_b(L RAr1fl002ovPDHLkV1ibghm-&S diff --git a/Resources/Textures/_NF/Objects/Specific/Service/condiment_cup_dispenser.rsi/meta.json b/Resources/Textures/_NF/Objects/Specific/Service/condiment_cup_dispenser.rsi/meta.json deleted file mode 100644 index 6c27c69df8f..00000000000 --- a/Resources/Textures/_NF/Objects/Specific/Service/condiment_cup_dispenser.rsi/meta.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Created by dustylens", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "dispenser0" - }, - { - "name": "dispenser1" - } - ] -} diff --git a/Resources/Textures/_NF/Structures/Furniture/icebox.rsi/icebox.png b/Resources/Textures/_NF/Structures/Furniture/icebox.rsi/icebox.png deleted file mode 100644 index 0fdbd26947583c21a2ecb342a67bc210586f1182..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1623 zcmV-d2B`UoP)Px*5lKWrRCt{2nq6oVR}{y8v(9FAlB~(b+S)?tRxnC^Fa#o6sYUu^LG&eIZ7H<{ zrBG2945c9bq92Gtx}|+6LTQC!Y9DG4^r=WHB*j$vQXdqeOY}hr$t2k%vmfK$KHQ!C zh&!`uSLu;y=VRk6%gr*2$bB30Q*=GAe7u5h2p;o0wH@bc=n7^ z#;j+cx?PO)Ma0o)w1j^plsHBK5MuD`pl6-n=zvIHMD$0GaO;J&jHxXE^jHf34Eb8v zot4MwY!-md+i^|~4CMdcm@xqO^3%^iK@9%lO(*!AFDW1t#?%%zr4#g63!FP12Vkd_ zU|49Rvsp$JohF|&W11$WX#z4@LhT`GN_dhx;Nk!U0ZQppS3caxk474RX1~hSwA>F1 z4FEHh1Yj}e1ep_{y20~g;5Y>A8@EFokYOKcVpwQ2%_rCz@bUM3i)OzxqX5ZN5={%_ z6QSZ^^57By6Y+6C;lhatE~-I{DT8655mq(c_QT#*ov^Br%sp)z0WE+6ghCzpH-@z3 zO*lq?9lpm7w7^tcHqOjG&~HD0IRz_&#EO!jjrq9*-pv4RLqLH;hY#{i?Aw}t;LzcN zc-aHa^8f+c_w-5vHQ=>3-{tq8f2hgE+x?#`69>un(xXASV{Rkf{Y4|;hT;64OEI>AP;Jw#&0pzUGXJp3kfnFy7_CiP$1 zJRAVd4k!-WTF5W8DtV>K!Cg zNd#aR)A@-;lh4PfqLa>M85SBlEx8gscRWsywZNuyBJT({c-{d4EkHmE(5&l-qLekJ zwy@GC9nq9B8C7I-?D-(fkWUidlunejSq#q(0UO21O`-6;0U&9bgj;pOt#*sXPZ=<# z3@)w;A-=js_W}1P@T>zS;^P=|vp6NecP8WVptL5-`}V=qEF5UTn45Ji%6irT07I89 zvwO!YHQR85ryY>->kM7GOvbO{&zKKftEMfyZasgv{DxCA8dTz?+MW8NQ70Ro*7&%g z!g5*+o*h(FTL^XHYx!y0Tr5l^lBuNB_|%~jZ1VqvRs-afEgSxv1jsLw3o}6h#>_OD zCKn&6oZO|}k3!K zyJd+N+k=d$lB#;&LhN`}>Y6BWz?o;l1auv1g=|{PSZoz0>u<;Z|2uw!=)4`Lv)qN1 zQoEpbtdiMLZ4F`}i37ZW)8CAHYV03EABg$U?H5|1k>K)yHMX!CTv zq$=3bT|21@pu?8%QZxhx&);Olu1>BQl`E#qqD0$}kAT#Ln<&7wEpjN>@6F`^`^ysKB)mmX0n%jI`;r{{%-zZD#K(yZ#7L7ZyTt}#o)$YhVIn@xsqar=%*~eFY+forxT~AkK&-5x za94L-IsoA5&J7iLsQ~Iz&k^n_?O;n^GyeKr6J-24;jZqIwxzsOfHuYAu7mWoSSea> zSSs~h%In_bT;VNX6D=owtw-FOlv%tIuaecElK`^b;l|51a%If5Q)0%z?o&?~zjYmO z=QV!ox{QE_k-pXws^R4Wl=pgfJ9g^dzYprOLRJ;8Vq#8<-+ClpjOEI!fd(E0{srlT Vxd6d&xRn3^002ovPDHLkV1iSP4lw`# diff --git a/Resources/Textures/_NF/Structures/Furniture/icebox.rsi/icebox_fill-1.png b/Resources/Textures/_NF/Structures/Furniture/icebox.rsi/icebox_fill-1.png deleted file mode 100644 index 2cab252864c7eb49a268231eae3aee846607fde8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 585 zcmV-P0=E5$P)Kp*j1NPt9;zQR=b!qRq#{`52?Cg z36BX+EL*z6o5Ia%I=(1;EF3W8g2LC1o^bie;griC4jZvZ7`zR_O6nIUezBT1vcmFm z+OwI0`g0%WCH`b?Ix1_M%vMYyj1od&oMFNQ>19xSkS_Y@mK|mCd%p9h$V;v&UZ;q` z5-HMH1Vk-J^`xwt=t&tFicbIk_SMw-``qgO5L7Q~|9yrdj}tUG0fZnraEw)cL#K3i*@ddAuA=>Ta8NC!x(F8}}l0O)h+h2_le7p?Uh zAqAuZ0000H$5{Dp?3}s&KR(~8ABGf=4vPx%_DMuRR9J=WmQ6?$VHn4MR^XZ|x~oXpGR#IqOkyN{bl9|e5bh!SFwzc2Mqq{p zQC>7UL{J{hLq(d12Y0)O(8*g727N5-v^0zCW(c~5YrAGT9hMz;oY^glJ`Vdo{@&+( z|Nr;pd60M03dc_Yu(BLC^++3_ySp1nl8_{ce0ML=uWOu~nV}3Q z1Fl*u#Mf2FQ!5C9A;31XR7FKa00aU7 zd_JF!4LcmnS}agot1*CZ%?W(57*rH!{Qa}TM3gVUK3#3b0DixpXf#SV9LDGKAxV;s z)mSW)#^V|T61B@^NO^g>+K8fJb8g4qzs`Q@1(NFN=`pa!X>M{Y_am(7*~R`GAePC( zJb=sP0>JHd128r=rmZ>p`Tz*Ex9j$t9(@VGljBtyYdH860MDyq0E~=`7`#l!u&%By zW9nbkA3Ku`|o_CKD@WiC9eV;hxm3Mw3N1e=A?Hz|{`q1z!b1)>~4+`ET~l>OD=X^M9V zx-)+mAXTHG0to4uS+@gB)L$^L!PcXhj!z#TIRy^iAOIohjJ9Uh?EpphS^-$NJfN{1 z%{Kt}^yntAi7EJ-A0yLWGN;p-_8;zdw9!1Ptg^}~D}e95VRI(Fi#oCZ0000 Date: Mon, 30 Dec 2024 19:29:01 -0800 Subject: [PATCH 13/14] Fixing a few lingering files. --- .../Entities/Markers/Spawners/Random/Salvage/tables_loot.yml | 2 +- Resources/Prototypes/_NF/Recipes/Lathes/electronics.yml | 2 +- Resources/Prototypes/_NF/tags.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml index 102a2765e74..71eda92b8e4 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml @@ -195,7 +195,7 @@ children: # Frontier - id: BoxInflatable # Frontier - id: BoxLighttube # Frontier - - id: BoxLightbulb # Frontier + - id: BoxLightbulb # Frontier - type: entityTable id: SalvageEquipmentUncommon diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/electronics.yml b/Resources/Prototypes/_NF/Recipes/Lathes/electronics.yml index 5fccb1009fa..96cd0950d1c 100644 --- a/Resources/Prototypes/_NF/Recipes/Lathes/electronics.yml +++ b/Resources/Prototypes/_NF/Recipes/Lathes/electronics.yml @@ -105,4 +105,4 @@ result: PortableGeneratorHyperPacmanMachineCircuitboard materials: Steel: 350 - Glass: 350 + Glass: 350 \ No newline at end of file diff --git a/Resources/Prototypes/_NF/tags.yml b/Resources/Prototypes/_NF/tags.yml index dc4debdbcfd..aee1f4b7654 100644 --- a/Resources/Prototypes/_NF/tags.yml +++ b/Resources/Prototypes/_NF/tags.yml @@ -155,4 +155,4 @@ id: NFVGRoidInterior - type: Tag - id: NFFoamRPG + id: NFFoamRPG \ No newline at end of file From d59f130f9e49ef627af33baf3b41063d09738d5b Mon Sep 17 00:00:00 2001 From: dustylens Date: Thu, 2 Jan 2025 11:01:03 -0800 Subject: [PATCH 14/14] Missing pipe tweak. Some adjustments to deathtrap firelocks. --- Resources/Maps/_NF/Shuttles/nightlight.yml | 429 +++++++++------------ 1 file changed, 191 insertions(+), 238 deletions(-) diff --git a/Resources/Maps/_NF/Shuttles/nightlight.yml b/Resources/Maps/_NF/Shuttles/nightlight.yml index 64b2bc8cf7f..95cdb3ce45d 100644 --- a/Resources/Maps/_NF/Shuttles/nightlight.yml +++ b/Resources/Maps/_NF/Shuttles/nightlight.yml @@ -693,14 +693,15 @@ entities: parent: 1 - type: DeviceList devices: - - 470 - - 540 - - 529 - - 128 - - 252 - 442 - 34 + - 128 + - 252 - 304 + - 437 + - 529 + - 470 + - 301 - type: DeviceLinkSource linkedPorts: 617: @@ -726,27 +727,19 @@ entities: devices: - 453 - 456 - - 452 - - 455 - 454 - 457 + - 593 - 428 - 575 - - 593 - - 461 - - 460 - - 569 - - 571 + - 455 + - 452 - 584 - 568 - - 445 - - 446 - - 447 - - 448 - - 449 - - 450 - - 451 - - 45 + - 443 + - 245 + - 460 + - 363 - type: DeviceLinkSource linkedPorts: 308: @@ -873,6 +866,14 @@ entities: parent: 1 - proto: AirSensor entities: + - uid: 34 + components: + - type: Transform + pos: 1.5,9.5 + parent: 1 + - type: DeviceNetwork + deviceLists: + - 636 - uid: 304 components: - type: Transform @@ -893,7 +894,7 @@ entities: - 637 - proto: APCBasic entities: - - uid: 332 + - uid: 446 components: - type: Transform rot: 1.5707963267948966 rad @@ -1187,18 +1188,18 @@ entities: rot: -1.5707963267948966 rad pos: 5.5,2.75 parent: 1 - - uid: 103 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 0.5,6.75 - parent: 1 - uid: 175 components: - type: Transform rot: 3.141592653589793 rad pos: -3.25,1.5 parent: 1 + - uid: 445 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 0.5,8.25 + parent: 1 - proto: ButtonFrameJanitor entities: - uid: 156 @@ -1754,11 +1755,18 @@ entities: parent: 1 - proto: ClosetWallO2N2FilledRandom entities: - - uid: 418 + - uid: 167 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 2.5,-5.5 + rot: 1.5707963267948966 rad + pos: -7.5,3.5 + parent: 1 +- proto: ClothingBeltUtilityFilled + entities: + - uid: 359 + components: + - type: Transform + pos: -3.4765725,6.8129745 parent: 1 - proto: ClothingOuterWinterChef entities: @@ -1769,7 +1777,7 @@ entities: parent: 1 - proto: ComputerTabletopShuttle entities: - - uid: 616 + - uid: 103 components: - type: Transform pos: -0.5,10.5 @@ -1878,11 +1886,11 @@ entities: parent: 1 - proto: ExtinguisherCabinetFilled entities: - - uid: 363 + - uid: 58 components: - type: Transform rot: -1.5707963267948966 rad - pos: -7.5,3.5 + pos: -4.5,-1.5 parent: 1 - proto: FaxMachineShip entities: @@ -1893,24 +1901,6 @@ entities: parent: 1 - proto: FirelockGlass entities: - - uid: 34 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 0.5,7.5 - parent: 1 - - type: DeviceNetwork - deviceLists: - - 636 - - uid: 45 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 5.5,3.5 - parent: 1 - - type: DeviceNetwork - deviceLists: - - 637 - uid: 442 components: - type: Transform @@ -1920,75 +1910,6 @@ entities: - type: DeviceNetwork deviceLists: - 636 - - uid: 443 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -4.5,3.5 - parent: 1 - - uid: 445 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 3.5,1.5 - parent: 1 - - type: DeviceNetwork - deviceLists: - - 637 - - uid: 446 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 2.5,1.5 - parent: 1 - - type: DeviceNetwork - deviceLists: - - 637 - - uid: 447 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 1.5,1.5 - parent: 1 - - type: DeviceNetwork - deviceLists: - - 637 - - uid: 448 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 0.5,1.5 - parent: 1 - - type: DeviceNetwork - deviceLists: - - 637 - - uid: 449 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -0.5,1.5 - parent: 1 - - type: DeviceNetwork - deviceLists: - - 637 - - uid: 450 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -1.5,1.5 - parent: 1 - - type: DeviceNetwork - deviceLists: - - 637 - - uid: 451 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -2.5,1.5 - parent: 1 - - type: DeviceNetwork - deviceLists: - - 637 - proto: FloorDrain entities: - uid: 523 @@ -2078,14 +1999,14 @@ entities: parent: 1 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 213 + - uid: 418 components: - type: Transform rot: 3.141592653589793 rad - pos: -0.5,8.5 + pos: -6.5,3.5 parent: 1 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#990000FF' - uid: 539 components: - type: Transform @@ -2094,13 +2015,6 @@ entities: parent: 1 - type: AtmosPipeColor color: '#990000FF' - - uid: 573 - components: - - type: Transform - pos: -2.5,4.5 - parent: 1 - - type: AtmosPipeColor - color: '#0055CCFF' - uid: 594 components: - type: Transform @@ -2126,6 +2040,13 @@ entities: parent: 1 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 331 + components: + - type: Transform + pos: -0.5,3.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' - uid: 507 components: - type: Transform @@ -2142,22 +2063,22 @@ entities: color: '#990000FF' - proto: GasPipeStraight entities: - - uid: 127 + - uid: 45 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -5.5,7.5 + rot: 3.141592653589793 rad + pos: -0.5,9.5 parent: 1 - type: AtmosPipeColor - color: '#990000FF' - - uid: 167 + color: '#0055CCFF' + - uid: 127 components: - type: Transform - rot: 3.141592653589793 rad - pos: -0.5,9.5 + rot: -1.5707963267948966 rad + pos: -5.5,7.5 parent: 1 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#990000FF' - uid: 169 components: - type: Transform @@ -2228,14 +2149,6 @@ entities: parent: 1 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 245 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 1.5,6.5 - parent: 1 - - type: AtmosPipeColor - color: '#0055CCFF' - uid: 249 components: - type: Transform @@ -2259,6 +2172,14 @@ entities: parent: 1 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 265 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,8.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 274 components: - type: Transform @@ -2274,6 +2195,21 @@ entities: parent: 1 - type: AtmosPipeColor color: '#990000FF' + - uid: 295 + components: + - type: Transform + pos: 1.5,6.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 332 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -3.5,3.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' - uid: 346 components: - type: Transform @@ -2282,6 +2218,14 @@ entities: parent: 1 - type: AtmosPipeColor color: '#990000FF' + - uid: 357 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,8.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 462 components: - type: Transform @@ -2791,6 +2735,14 @@ entities: parent: 1 - type: AtmosPipeColor color: '#990000FF' + - uid: 213 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,8.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 214 components: - type: Transform @@ -2839,20 +2791,6 @@ entities: parent: 1 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 468 - components: - - type: Transform - pos: -2.5,8.5 - parent: 1 - - type: AtmosPipeColor - color: '#990000FF' - - uid: 530 - components: - - type: Transform - pos: -0.5,3.5 - parent: 1 - - type: AtmosPipeColor - color: '#990000FF' - uid: 533 components: - type: Transform @@ -2860,13 +2798,6 @@ entities: parent: 1 - type: AtmosPipeColor color: '#990000FF' - - uid: 538 - components: - - type: Transform - pos: -3.5,3.5 - parent: 1 - - type: AtmosPipeColor - color: '#990000FF' - uid: 551 components: - type: Transform @@ -2919,6 +2850,16 @@ entities: color: '#990000FF' - proto: GasVentPump entities: + - uid: 245 + components: + - type: Transform + pos: -2.5,4.5 + parent: 1 + - type: DeviceNetwork + deviceLists: + - 637 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 252 components: - type: Transform @@ -2929,6 +2870,27 @@ entities: - 636 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 301 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -3.5,8.5 + parent: 1 + - type: DeviceNetwork + deviceLists: + - 636 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 437 + components: + - type: Transform + pos: -0.5,10.5 + parent: 1 + - type: DeviceNetwork + deviceLists: + - 636 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 452 components: - type: Transform @@ -2981,27 +2943,6 @@ entities: - 637 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 540 - components: - - type: Transform - pos: -0.5,10.5 - parent: 1 - - type: DeviceNetwork - deviceLists: - - 636 - - type: AtmosPipeColor - color: '#0055CCFF' - - uid: 571 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -3.5,4.5 - parent: 1 - - type: DeviceNetwork - deviceLists: - - 637 - - type: AtmosPipeColor - color: '#0055CCFF' - uid: 575 components: - type: Transform @@ -3036,6 +2977,16 @@ entities: - 636 - type: AtmosPipeColor color: '#990000FF' + - uid: 363 + components: + - type: Transform + pos: -6.5,4.5 + parent: 1 + - type: DeviceNetwork + deviceLists: + - 637 + - type: AtmosPipeColor + color: '#990000FF' - uid: 428 components: - type: Transform @@ -3047,6 +2998,16 @@ entities: - 637 - type: AtmosPipeColor color: '#990000FF' + - uid: 443 + components: + - type: Transform + pos: -0.5,4.5 + parent: 1 + - type: DeviceNetwork + deviceLists: + - 637 + - type: AtmosPipeColor + color: '#990000FF' - uid: 455 components: - type: Transform @@ -3080,17 +3041,6 @@ entities: - 637 - type: AtmosPipeColor color: '#990000FF' - - uid: 461 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -6.5,3.5 - parent: 1 - - type: DeviceNetwork - deviceLists: - - 637 - - type: AtmosPipeColor - color: '#990000FF' - uid: 470 components: - type: Transform @@ -3130,17 +3080,6 @@ entities: - 637 - type: AtmosPipeColor color: '#990000FF' - - uid: 569 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -3.5,2.5 - parent: 1 - - type: DeviceNetwork - deviceLists: - - 637 - - type: AtmosPipeColor - color: '#990000FF' - proto: GravityGeneratorMini entities: - uid: 255 @@ -3484,17 +3423,11 @@ entities: - type: Transform pos: 6.5,1.5 parent: 1 - - uid: 357 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 2.5,-4.5 - parent: 1 - - uid: 438 + - uid: 426 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -1.5,-4.5 + rot: -1.5707963267948966 rad + pos: 2.5,-5.5 parent: 1 - proto: NitrogenCanister entities: @@ -3506,6 +3439,24 @@ entities: parent: 1 - type: Physics bodyType: Static +- proto: NoticeBoardNF + entities: + - uid: 448 + components: + - type: Transform + pos: -6.5,1.5 + parent: 1 + - uid: 449 + components: + - type: Transform + pos: 7.5,1.5 + parent: 1 + - uid: 450 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,-5.5 + parent: 1 - proto: OilJarCorn entities: - uid: 350 @@ -3739,6 +3690,13 @@ entities: powerLoad: 0 - type: DamageOnInteract isDamageActive: False +- proto: RagItem + entities: + - uid: 438 + components: + - type: Transform + pos: 2.78125,4.4073896 + parent: 1 - proto: SeedExtractor entities: - uid: 242 @@ -4143,11 +4101,11 @@ entities: - Pressed: Toggle 284: - Pressed: Toggle - - uid: 465 + - uid: 451 components: - type: Transform rot: 1.5707963267948966 rad - pos: 0.5,6.75 + pos: 0.5,8.25 parent: 1 - type: DeviceLinkSource linkedPorts: @@ -4449,6 +4407,12 @@ entities: rot: -1.5707963267948966 rad pos: -1.5,8.5 parent: 1 + - uid: 434 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,10.5 + parent: 1 - uid: 519 components: - type: Transform @@ -4460,11 +4424,6 @@ entities: - type: Transform pos: -1.5,10.5 parent: 1 - - uid: 614 - components: - - type: Transform - pos: -0.5,10.5 - parent: 1 - proto: TableWood entities: - uid: 79 @@ -4569,13 +4528,6 @@ entities: - type: Transform pos: -6.5,7.5 parent: 1 -- proto: ToolboxMechanicalFilled - entities: - - uid: 359 - components: - - type: Transform - pos: -3.5073605,6.8587217 - parent: 1 - proto: VendingMachineBooze entities: - uid: 432 @@ -4907,11 +4859,6 @@ entities: - type: Transform pos: -7.5,2.5 parent: 1 - - uid: 331 - components: - - type: Transform - pos: -2.5,8.5 - parent: 1 - uid: 429 components: - type: Transform @@ -4924,6 +4871,12 @@ entities: rot: 1.5707963267948966 rad pos: -4.5,9.5 parent: 1 + - uid: 447 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,8.5 + parent: 1 - uid: 576 components: - type: Transform