From 8239073c1ab7aca002779a0c8006e1829da4ce7e Mon Sep 17 00:00:00 2001 From: blackknight954 <40075385+blackknight954@users.noreply.github.com> Date: Wed, 30 Oct 2024 11:41:23 -0500 Subject: [PATCH 1/8] Adjusted Distro and AME storage for compliance --- .../Maps/_NF/Shuttles/Expedition/ambition.yml | 855 ++++++++++-------- 1 file changed, 460 insertions(+), 395 deletions(-) diff --git a/Resources/Maps/_NF/Shuttles/Expedition/ambition.yml b/Resources/Maps/_NF/Shuttles/Expedition/ambition.yml index 2ae9c55c22e..d4fbc0aff57 100644 --- a/Resources/Maps/_NF/Shuttles/Expedition/ambition.yml +++ b/Resources/Maps/_NF/Shuttles/Expedition/ambition.yml @@ -123,10 +123,8 @@ entities: color: '#00FFFFFF' id: BoxGreyscale decals: - 466: 2,30 467: -5,-2 468: -4,-2 - 469: -5,-6 - node: color: '#FFFF00FF' id: BoxGreyscale @@ -404,10 +402,7 @@ entities: 437: 7,28 438: 6,27 470: -7,-6 - 471: -6,-6 - 472: -5,-6 473: -5,-7 - 474: -6,-7 475: -7,-7 504: -9,-6 566: 2,18 @@ -432,7 +427,6 @@ entities: 588: 2,-6 589: 3,-6 590: -2,30 - 591: 2,30 592: 8,32 593: 9,32 594: 9,31 @@ -477,7 +471,6 @@ entities: 643: 1,9 644: 2,9 647: -2,30 - 648: 2,30 649: -1,-13 650: 1,-13 651: -1,-12 @@ -1239,7 +1232,8 @@ entities: 0,-2: 1: 65535 0,-5: - 1: 4915 + 1: 4403 + 3: 512 2: 16384 0: 128 1,-4: @@ -1400,6 +1394,21 @@ entities: - 0 - 0 - 0 + - volume: 2500 + temperature: 293.14996 + moles: + - 20.078888 + - 75.53487 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 chunkSize: 4 - type: GasTileOverlay - type: RadiationGridResistance @@ -1667,14 +1676,6 @@ entities: parent: 1 - proto: AirCanister entities: - - uid: 2032 - components: - - type: Transform - anchored: True - pos: 2.5,30.5 - parent: 1 - - type: Physics - bodyType: Static - uid: 2117 components: - type: Transform @@ -1685,14 +1686,6 @@ entities: - type: Transform pos: -4.5,-1.5 parent: 1 - - uid: 2285 - components: - - type: Transform - anchored: True - pos: -4.5,-5.5 - parent: 1 - - type: Physics - bodyType: Static - proto: Airlock entities: - uid: 2336 @@ -1700,17 +1693,11 @@ entities: - type: Transform pos: -3.5,-9.5 parent: 1 - - type: DeviceLinkSink - links: - - 122 - uid: 2339 components: - type: Transform pos: -3.5,-12.5 parent: 1 - - type: DeviceLinkSink - links: - - 124 - uid: 2471 components: - type: Transform @@ -1810,8 +1797,6 @@ entities: parent: 1 - type: DeviceLinkSink invokeCounter: 1 - links: - - 33 - type: DeviceLinkSource linkedPorts: 33: @@ -1831,8 +1816,6 @@ entities: parent: 1 - type: DeviceLinkSink invokeCounter: 1 - links: - - 639 - type: DeviceLinkSource linkedPorts: 639: @@ -2083,11 +2066,6 @@ entities: parent: 1732 - type: Physics canCollide: False - - uid: 119 - components: - - type: Transform - pos: 1.5,-18.5 - parent: 1 - proto: AmeShielding entities: - uid: 140 @@ -2220,112 +2198,133 @@ entities: rot: 3.141592653589793 rad pos: -0.5,-13.5 parent: 1 -- proto: AtmosDeviceFanTiny +- proto: AtmosDeviceFanDirectional entities: - - uid: 134 - components: - - type: Transform - pos: 7.5,33.5 - parent: 1 - - uid: 135 + - uid: 76 components: - type: Transform - pos: 8.5,33.5 + rot: 3.141592653589793 rad + pos: -6.5,33.5 parent: 1 - - uid: 137 + - uid: 77 components: - type: Transform - pos: -0.5,34.5 + rot: 3.141592653589793 rad + pos: -7.5,33.5 parent: 1 - - uid: 170 + - uid: 86 components: - type: Transform - pos: 2.5,34.5 + rot: 3.141592653589793 rad + pos: 1.5,34.5 parent: 1 - - uid: 171 + - uid: 134 components: - type: Transform - pos: 1.5,34.5 + rot: 3.141592653589793 rad + pos: -0.5,34.5 parent: 1 - - uid: 180 + - uid: 135 components: - type: Transform + rot: -1.5707963267948966 rad pos: 3.5,2.5 parent: 1 - - uid: 194 + - uid: 137 components: - type: Transform + rot: -1.5707963267948966 rad pos: -11.5,-3.5 parent: 1 - - uid: 231 + - uid: 142 components: - type: Transform + rot: -1.5707963267948966 rad pos: -11.5,-5.5 parent: 1 - - uid: 232 + - uid: 171 components: - type: Transform + rot: 1.5707963267948966 rad pos: 12.5,-3.5 parent: 1 - - uid: 233 + - uid: 180 components: - type: Transform + rot: 1.5707963267948966 rad pos: 12.5,-5.5 parent: 1 - - uid: 261 + - uid: 194 components: - type: Transform - pos: -5.5,33.5 + rot: 3.141592653589793 rad + pos: 7.5,33.5 parent: 1 - - uid: 263 + - uid: 199 components: - type: Transform - pos: -7.5,33.5 + rot: 3.141592653589793 rad + pos: 5.5,33.5 parent: 1 - - uid: 264 + - uid: 231 components: - type: Transform - pos: -6.5,33.5 + rot: 3.141592653589793 rad + pos: 6.5,33.5 parent: 1 - - uid: 332 + - uid: 232 components: - type: Transform - pos: -0.5,-14.5 + rot: 1.5707963267948966 rad + pos: 1.5,-14.5 parent: 1 - - uid: 403 + - uid: 233 components: - type: Transform - pos: 5.5,33.5 + rot: 3.141592653589793 rad + pos: -4.5,33.5 parent: 1 - - uid: 404 + - uid: 237 components: - type: Transform - pos: -1.5,34.5 + rot: 1.5707963267948966 rad + pos: 1.5,-15.5 parent: 1 - - uid: 405 + - uid: 239 components: - type: Transform + rot: -1.5707963267948966 rad pos: -0.5,-15.5 parent: 1 - - uid: 406 + - uid: 246 components: - type: Transform - pos: 1.5,-14.5 + rot: -1.5707963267948966 rad + pos: -0.5,-14.5 parent: 1 - - uid: 407 + - uid: 248 components: - type: Transform - pos: 1.5,-15.5 + rot: 3.141592653589793 rad + pos: -5.5,33.5 parent: 1 - - uid: 580 + - uid: 261 components: - type: Transform - pos: 6.5,33.5 + rot: 3.141592653589793 rad + pos: 8.5,33.5 parent: 1 - - uid: 633 + - uid: 2089 components: - type: Transform - pos: -4.5,33.5 + rot: 3.141592653589793 rad + pos: -1.5,34.5 + parent: 1 + - uid: 2098 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,34.5 parent: 1 - proto: AtmosFixBlockerMarker entities: @@ -3400,7 +3399,6 @@ entities: parent: 1 - type: Physics canCollide: False - bodyType: Static - type: Fixtures fixtures: {} - proto: BenchSofaCorpLeft @@ -3411,8 +3409,6 @@ entities: rot: 1.5707963267948966 rad pos: 3.5,-11.5 parent: 1 - - type: Physics - bodyType: Static - proto: BenchSofaCorpMiddle entities: - uid: 649 @@ -3421,8 +3417,6 @@ entities: rot: 3.141592653589793 rad pos: 4.5,-12.5 parent: 1 - - type: Physics - bodyType: Static - proto: BenchSofaCorpRight entities: - uid: 650 @@ -3431,8 +3425,6 @@ entities: rot: 3.141592653589793 rad pos: 5.5,-12.5 parent: 1 - - type: Physics - bodyType: Static - proto: BlastDoor entities: - uid: 9 @@ -3440,146 +3432,108 @@ entities: - type: Transform pos: 6.5,-20.5 parent: 1 - - type: DeviceLinkSink - links: - - 1913 - uid: 1884 components: - type: Transform pos: -5.5,-21.5 parent: 1 - - type: DeviceLinkSink - links: - - 1913 - uid: 1885 components: - type: Transform pos: -5.5,-20.5 parent: 1 - - type: DeviceLinkSink - links: - - 1913 - uid: 1887 components: - type: Transform pos: 6.5,-21.5 parent: 1 - - type: DeviceLinkSink - links: - - 1913 - uid: 1888 components: - type: Transform pos: 0.5,3.5 parent: 1 - - type: DeviceLinkSink - links: - - 1141 - - 983 - uid: 1890 components: - type: Transform rot: -1.5707963267948966 rad pos: -7.5,33.5 parent: 1 - - type: DeviceLinkSink - links: - - 2385 - uid: 1891 components: - type: Transform rot: -1.5707963267948966 rad pos: -6.5,33.5 parent: 1 - - type: DeviceLinkSink - links: - - 2385 - uid: 1892 components: - type: Transform rot: -1.5707963267948966 rad pos: -5.5,33.5 parent: 1 - - type: DeviceLinkSink - links: - - 2385 - uid: 1893 components: - type: Transform rot: -1.5707963267948966 rad pos: -4.5,33.5 parent: 1 - - type: DeviceLinkSink - links: - - 2385 - uid: 1894 components: - type: Transform rot: 1.5707963267948966 rad pos: 5.5,33.5 parent: 1 - - type: DeviceLinkSink - links: - - 2384 - uid: 1895 components: - type: Transform rot: 1.5707963267948966 rad pos: 6.5,33.5 parent: 1 - - type: DeviceLinkSink - links: - - 2384 - uid: 1896 components: - type: Transform rot: 1.5707963267948966 rad pos: 7.5,33.5 parent: 1 - - type: DeviceLinkSink - links: - - 2384 - uid: 1897 components: - type: Transform rot: 1.5707963267948966 rad pos: 8.5,33.5 parent: 1 - - type: DeviceLinkSink - links: - - 2384 - uid: 1899 components: - type: Transform pos: -0.5,-15.5 parent: 1 - - type: DeviceLinkSink - links: - - 1913 - uid: 1900 components: - type: Transform pos: -0.5,-14.5 parent: 1 - - type: DeviceLinkSink - links: - - 1913 - uid: 1901 components: - type: Transform pos: 1.5,-14.5 parent: 1 - - type: DeviceLinkSink - links: - - 1913 - uid: 1902 components: - type: Transform pos: 1.5,-15.5 parent: 1 - - type: DeviceLinkSink - links: - - 1913 +- proto: BlastDoorExterior1 + entities: + - uid: 2104 + components: + - type: Transform + pos: -1.5,34.5 + parent: 1 +- proto: BlastDoorExterior2 + entities: + - uid: 2134 + components: + - type: Transform + pos: 2.5,34.5 + parent: 1 - proto: BookshelfFilled entities: - uid: 2238 @@ -6326,6 +6280,7 @@ entities: - uid: 1224 components: - type: Transform + rot: -1.5707963267948966 rad pos: 3.5,12.5 parent: 1 - uid: 1225 @@ -6664,11 +6619,6 @@ entities: - type: Transform pos: 1.5,31.5 parent: 1 - - uid: 2056 - components: - - type: Transform - pos: 2.5,31.5 - parent: 1 - uid: 2286 components: - type: Transform @@ -6888,22 +6838,31 @@ entities: - type: Transform pos: 5.5,-7.5 parent: 1 -- proto: ClosetWall - entities: - - uid: 1904 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 2.5,-17.5 - parent: 1 - proto: ClosetWallEmergencyFilledRandom entities: - - uid: 2358 + - uid: 569 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -2.5,33.5 + pos: -3.5,33.5 parent: 1 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14923 + moles: + - 1.7459903 + - 6.568249 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 - uid: 2359 components: - type: Transform @@ -6918,12 +6877,29 @@ entities: parent: 1 - proto: ClosetWallFireFilledRandom entities: - - uid: 2350 + - uid: 570 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 3.5,33.5 + pos: 4.5,33.5 parent: 1 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14923 + moles: + - 1.7459903 + - 6.568249 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 - proto: ClothingHandsGlovesCombat entities: - uid: 2523 @@ -7026,89 +7002,59 @@ entities: - type: Transform pos: 2.5,33.5 parent: 1 - - type: DeviceLinkSink - links: - - 1925 - uid: 1145 components: - type: Transform pos: 2.5,34.5 parent: 1 - - type: DeviceLinkSink - links: - - 1925 - uid: 1146 components: - type: Transform rot: 1.5707963267948966 rad pos: 2.5,32.5 parent: 1 - - type: DeviceLinkSink - links: - - 1925 - uid: 1147 components: - type: Transform rot: 1.5707963267948966 rad pos: 3.5,32.5 parent: 1 - - type: DeviceLinkSink - links: - - 1925 - uid: 1148 components: - type: Transform rot: 1.5707963267948966 rad pos: 4.5,32.5 parent: 1 - - type: DeviceLinkSink - links: - - 1925 - uid: 1149 components: - type: Transform rot: 1.5707963267948966 rad pos: -3.5,32.5 parent: 1 - - type: DeviceLinkSink - links: - - 1924 - uid: 1150 components: - type: Transform rot: 1.5707963267948966 rad pos: -2.5,32.5 parent: 1 - - type: DeviceLinkSink - links: - - 1924 - uid: 1151 components: - type: Transform rot: 3.141592653589793 rad pos: -1.5,32.5 parent: 1 - - type: DeviceLinkSink - links: - - 1924 - uid: 1152 components: - type: Transform rot: 3.141592653589793 rad pos: -1.5,33.5 parent: 1 - - type: DeviceLinkSink - links: - - 1924 - uid: 1153 components: - type: Transform rot: 3.141592653589793 rad pos: -1.5,34.5 parent: 1 - - type: DeviceLinkSink - links: - - 1924 - proto: CrateEmergencyInflatablewall entities: - uid: 2365 @@ -8590,6 +8536,18 @@ entities: - type: Transform pos: -4.5,19.5 parent: 1 +- proto: GasMixerOn + entities: + - uid: 2561 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 10.5,-0.5 + parent: 1 + - type: GasMixer + inletTwoConcentration: 0.79 + inletOneConcentration: 0.21 + enabled: True - proto: GasOutletInjector entities: - uid: 738 @@ -8981,6 +8939,14 @@ entities: parent: 1 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 2031 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,24.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 2051 components: - type: Transform @@ -9021,16 +8987,39 @@ entities: parent: 1 - type: AtmosPipeColor color: '#0055CCFF' -- proto: GasPipeFourway - entities: - - uid: 952 + - uid: 2558 components: - type: Transform - pos: -8.5,8.5 + rot: 1.5707963267948966 rad + pos: 3.5,24.5 parent: 1 - type: AtmosPipeColor - color: '#990000FF' - - uid: 1753 + color: '#0055CCFF' + - uid: 2559 + components: + - type: Transform + pos: 4.5,12.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 2560 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,12.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' +- proto: GasPipeFourway + entities: + - uid: 952 + components: + - type: Transform + pos: -8.5,8.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1753 components: - type: Transform pos: -5.5,-2.5 @@ -9161,6 +9150,14 @@ entities: rot: 1.5707963267948966 rad pos: 2.5,4.5 parent: 1 + - uid: 119 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,23.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 130 components: - type: Transform @@ -9506,6 +9503,14 @@ entities: - type: Transform pos: -4.5,21.5 parent: 1 + - uid: 770 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,22.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 811 components: - type: Transform @@ -10453,6 +10458,22 @@ entities: rot: 3.141592653589793 rad pos: -5.5,6.5 parent: 1 + - uid: 1879 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -4.5,-6.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 1904 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,31.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 1921 components: - type: Transform @@ -10509,6 +10530,14 @@ entities: parent: 1 - type: AtmosPipeColor color: '#990000FF' + - uid: 1978 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 4.5,11.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 1982 components: - type: Transform @@ -10693,6 +10722,14 @@ entities: parent: 1 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 2030 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 4.5,10.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 2033 components: - type: Transform @@ -10788,6 +10825,22 @@ entities: parent: 1 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 2285 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,21.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 2300 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,20.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 2306 components: - type: Transform @@ -10808,6 +10861,14 @@ entities: parent: 1 - type: AtmosPipeColor color: '#990000FF' + - uid: 2350 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,19.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 2353 components: - type: Transform @@ -10816,6 +10877,22 @@ entities: parent: 1 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 2358 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,18.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 2392 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,17.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 2426 components: - type: Transform @@ -10824,6 +10901,14 @@ entities: parent: 1 - type: AtmosPipeColor color: '#947507FF' + - uid: 2470 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,16.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 2495 components: - type: Transform @@ -10904,6 +10989,30 @@ entities: parent: 1 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 2552 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,15.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 2556 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,14.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 2557 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,13.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' - proto: GasPipeTJunction entities: - uid: 107 @@ -11096,14 +11205,6 @@ entities: parent: 1 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 1879 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -4.5,-6.5 - parent: 1 - - type: AtmosPipeColor - color: '#0055CCFF' - uid: 1968 components: - type: Transform @@ -11143,13 +11244,6 @@ entities: parent: 1 - type: AtmosPipeColor color: '#990000FF' - - uid: 2030 - components: - - type: Transform - pos: 2.5,31.5 - parent: 1 - - type: AtmosPipeColor - color: '#0055CCFF' - uid: 2035 components: - type: Transform @@ -11231,14 +11325,6 @@ entities: parent: 1 - type: AtmosPipeColor color: '#947507FF' - - uid: 2031 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 2.5,30.5 - parent: 1 - - type: AtmosPipeColor - color: '#0055CCFF' - uid: 2110 components: - type: Transform @@ -11256,13 +11342,6 @@ entities: - type: Transform pos: -4.5,-1.5 parent: 1 - - uid: 2284 - components: - - type: Transform - pos: -4.5,-5.5 - parent: 1 - - type: AtmosPipeColor - color: '#0055CCFF' - uid: 2305 components: - type: Transform @@ -11276,6 +11355,17 @@ entities: parent: 1 - type: AtmosPipeColor color: '#947507FF' + - uid: 2562 + components: + - type: Transform + pos: 10.5,0.5 + parent: 1 + - uid: 2563 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 11.5,-0.5 + parent: 1 - proto: GasPressurePump entities: - uid: 758 @@ -11326,15 +11416,6 @@ entities: rot: 1.5707963267948966 rad pos: -4.5,21.5 parent: 1 - - uid: 1479 - components: - - type: MetaData - name: distribution pump - - type: Transform - pos: 4.5,10.5 - parent: 1 - - type: AtmosPipeColor - color: '#0055CCFF' - uid: 2003 components: - type: Transform @@ -11387,16 +11468,6 @@ entities: parent: 1 - type: AtmosPipeColor color: '#990000FF' - - uid: 2552 - components: - - type: MetaData - name: distribution pump - - type: Transform - rot: 3.141592653589793 rad - pos: 4.5,24.5 - parent: 1 - - type: AtmosPipeColor - color: '#0055CCFF' - proto: GasRecyclerMachineCircuitboard entities: - uid: 2410 @@ -12224,12 +12295,6 @@ entities: rot: 1.5707963267948966 rad pos: 5.5,-19.5 parent: 1 - - uid: 2300 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 5.5,-10.5 - parent: 1 - uid: 2328 components: - type: Transform @@ -12360,6 +12425,14 @@ entities: - type: Transform pos: 9.5,27.5 parent: 1 +- proto: LockerWallMaterialsFuelAmeJarFilled + entities: + - uid: 1479 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,-17.5 + parent: 1 - proto: MachineFrameDestroyed entities: - uid: 2048 @@ -12400,7 +12473,7 @@ entities: - uid: 2554 components: - type: Transform - pos: -1.5,30.5 + pos: 2.5007179,30.555754 parent: 1 - proto: NFAshtray entities: @@ -12409,13 +12482,38 @@ entities: - type: Transform pos: 4.6353407,-0.39717972 parent: 1 +- proto: NFSignDock + entities: + - uid: 2517 + components: + - type: Transform + pos: 0.5,34.5 + parent: 1 + - uid: 2518 + components: + - type: Transform + pos: -11.5,-4.5 + parent: 1 + - uid: 2519 + components: + - type: Transform + pos: 12.5,-4.5 + parent: 1 - proto: NitrogenCanister entities: - - uid: 770 + - uid: 2056 components: - type: Transform - pos: -9.5,25.5 + pos: -3.5,30.5 parent: 1 + - uid: 2565 + components: + - type: Transform + anchored: True + pos: 10.5,0.5 + parent: 1 + - type: Physics + bodyType: Static - proto: OxygenCanister entities: - uid: 1724 @@ -12423,6 +12521,14 @@ entities: - type: Transform pos: -4.5,30.5 parent: 1 + - uid: 2564 + components: + - type: Transform + anchored: True + pos: 11.5,-0.5 + parent: 1 + - type: Physics + bodyType: Static - proto: PaintingFireaxeCabinet entities: - uid: 2351 @@ -12439,10 +12545,10 @@ entities: parent: 1 - proto: PlasmaCanister entities: - - uid: 1978 + - uid: 2170 components: - type: Transform - pos: 11.5,0.5 + pos: -9.5,25.5 parent: 1 - proto: PlasmaReinforcedWindowDirectional entities: @@ -12672,16 +12778,6 @@ entities: rot: 1.5707963267948966 rad pos: 3.5,32.5 parent: 1 - - uid: 569 - components: - - type: Transform - pos: -1.5,34.5 - parent: 1 - - uid: 570 - components: - - type: Transform - pos: 2.5,34.5 - parent: 1 - uid: 1943 components: - type: Transform @@ -13277,6 +13373,12 @@ entities: - type: Transform pos: 1.5,-7.5 parent: 1 + - uid: 2032 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,30.5 + parent: 1 - uid: 2142 components: - type: Transform @@ -13304,7 +13406,7 @@ entities: rot: 3.141592653589793 rad pos: -1.5,30.5 parent: 1 -- proto: RadioHandheld +- proto: RadioHandheldNF entities: - uid: 2320 components: @@ -14068,123 +14170,81 @@ entities: rot: 3.141592653589793 rad pos: -1.5,0.5 parent: 1 - - type: DeviceLinkSink - links: - - 2093 - uid: 698 components: - type: Transform rot: 3.141592653589793 rad pos: -0.5,0.5 parent: 1 - - type: DeviceLinkSink - links: - - 2093 - uid: 699 components: - type: Transform rot: 3.141592653589793 rad pos: 1.5,0.5 parent: 1 - - type: DeviceLinkSink - links: - - 2093 - uid: 700 components: - type: Transform rot: 3.141592653589793 rad pos: 2.5,0.5 parent: 1 - - type: DeviceLinkSink - links: - - 2093 - uid: 701 components: - type: Transform rot: 1.5707963267948966 rad pos: 2.5,-18.5 parent: 1 - - type: DeviceLinkSink - links: - - 1733 - uid: 702 components: - type: Transform rot: -1.5707963267948966 rad pos: -1.5,-18.5 parent: 1 - - type: DeviceLinkSink - links: - - 1733 - uid: 1005 components: - type: Transform rot: -1.5707963267948966 rad pos: -6.5,-9.5 parent: 1 - - type: DeviceLinkSink - links: - - 122 - uid: 1006 components: - type: Transform rot: -1.5707963267948966 rad pos: -6.5,-12.5 parent: 1 - - type: DeviceLinkSink - links: - - 124 - uid: 1007 components: - type: Transform rot: 3.141592653589793 rad pos: -6.5,-18.5 parent: 1 - - type: DeviceLinkSink - links: - - 1733 - uid: 1008 components: - type: Transform rot: 3.141592653589793 rad pos: 7.5,-18.5 parent: 1 - - type: DeviceLinkSink - links: - - 1733 - uid: 2091 components: - type: Transform rot: 3.141592653589793 rad pos: -4.5,3.5 parent: 1 - - type: DeviceLinkSink - links: - - 2287 - uid: 2120 components: - type: Transform pos: -4.5,-0.5 parent: 1 - - type: DeviceLinkSink - links: - - 2287 - uid: 2122 components: - type: Transform pos: -5.5,-0.5 parent: 1 - - type: DeviceLinkSink - links: - - 2287 - uid: 2123 components: - type: Transform pos: -3.5,-0.5 parent: 1 - - type: DeviceLinkSink - links: - - 2287 - proto: SignalButtonDirectional entities: - uid: 122 @@ -14332,6 +14392,22 @@ entities: - Pressed: Toggle 1893: - Pressed: Toggle +- proto: SignalButtonExt1 + entities: + - uid: 404 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,33.5 + parent: 1 +- proto: SignalButtonExt2 + entities: + - uid: 170 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 3.5,33.5 + parent: 1 - proto: SignAtmos entities: - uid: 2324 @@ -14394,23 +14470,6 @@ entities: - type: Transform pos: 7.5,24.5 parent: 1 -- proto: NFSignDock - entities: - - uid: 2517 - components: - - type: Transform - pos: 0.5,34.5 - parent: 1 - - uid: 2518 - components: - - type: Transform - pos: -11.5,-4.5 - parent: 1 - - uid: 2519 - components: - - type: Transform - pos: 12.5,-4.5 - parent: 1 - proto: SignSpace entities: - uid: 2446 @@ -14438,6 +14497,13 @@ entities: - type: Transform pos: 10.5,-4.5 parent: 1 +- proto: Sink + entities: + - uid: 1886 + components: + - type: Transform + pos: -5.5,-5.5 + parent: 1 - proto: SMESBasic entities: - uid: 1096 @@ -15074,10 +15140,10 @@ entities: parent: 1 - proto: TrashBakedBananaPeel entities: - - uid: 2392 + - uid: 2284 components: - type: Transform - pos: -4.5,-6.5 + pos: -4.457452,-6.413014 parent: 1 - proto: TwoWayLever entities: @@ -15242,11 +15308,6 @@ entities: - type: Transform pos: 3.5,7.5 parent: 1 - - uid: 77 - components: - - type: Transform - pos: 8.5,20.5 - parent: 1 - uid: 82 components: - type: Transform @@ -15264,11 +15325,6 @@ entities: - type: Transform pos: 10.5,17.5 parent: 1 - - uid: 86 - components: - - type: Transform - pos: 10.5,20.5 - parent: 1 - uid: 89 components: - type: Transform @@ -15366,11 +15422,6 @@ entities: - type: Transform pos: 8.5,-7.5 parent: 1 - - uid: 142 - components: - - type: Transform - pos: -7.5,20.5 - parent: 1 - uid: 145 components: - type: Transform @@ -15556,11 +15607,6 @@ entities: - type: Transform pos: 3.5,30.5 parent: 1 - - uid: 199 - components: - - type: Transform - pos: 9.5,14.5 - parent: 1 - uid: 200 components: - type: Transform @@ -15711,16 +15757,6 @@ entities: - type: Transform pos: 11.5,26.5 parent: 1 - - uid: 237 - components: - - type: Transform - pos: -6.5,20.5 - parent: 1 - - uid: 239 - components: - - type: Transform - pos: -8.5,20.5 - parent: 1 - uid: 240 components: - type: Transform @@ -15751,21 +15787,11 @@ entities: - type: Transform pos: -5.5,14.5 parent: 1 - - uid: 246 - components: - - type: Transform - pos: 7.5,20.5 - parent: 1 - uid: 247 components: - type: Transform pos: 11.5,12.5 parent: 1 - - uid: 248 - components: - - type: Transform - pos: -7.5,14.5 - parent: 1 - uid: 250 components: - type: Transform @@ -15816,6 +15842,16 @@ entities: - type: Transform pos: -6.5,10.5 parent: 1 + - uid: 263 + components: + - type: Transform + pos: -8.5,14.5 + parent: 1 + - uid: 264 + components: + - type: Transform + pos: -6.5,14.5 + parent: 1 - uid: 265 components: - type: Transform @@ -15829,12 +15865,12 @@ entities: - uid: 268 components: - type: Transform - pos: -6.5,14.5 + pos: -9.5,20.5 parent: 1 - uid: 269 components: - type: Transform - pos: 7.5,14.5 + pos: -7.5,14.5 parent: 1 - uid: 270 components: @@ -15864,7 +15900,7 @@ entities: - uid: 279 components: - type: Transform - pos: -9.5,14.5 + pos: 7.5,20.5 parent: 1 - uid: 281 components: @@ -16051,6 +16087,11 @@ entities: - type: Transform pos: 6.5,-22.5 parent: 1 + - uid: 332 + components: + - type: Transform + pos: -6.5,20.5 + parent: 1 - uid: 335 components: - type: Transform @@ -16197,16 +16238,46 @@ entities: rot: -1.5707963267948966 rad pos: -1.5,-20.5 parent: 1 + - uid: 403 + components: + - type: Transform + pos: -9.5,14.5 + parent: 1 + - uid: 406 + components: + - type: Transform + pos: -8.5,20.5 + parent: 1 + - uid: 407 + components: + - type: Transform + pos: -7.5,20.5 + parent: 1 - uid: 571 components: - type: Transform pos: 4.5,33.5 parent: 1 + - uid: 580 + components: + - type: Transform + pos: 8.5,20.5 + parent: 1 - uid: 581 components: - type: Transform pos: -2.5,2.5 parent: 1 + - uid: 600 + components: + - type: Transform + pos: 9.5,20.5 + parent: 1 + - uid: 633 + components: + - type: Transform + pos: 10.5,20.5 + parent: 1 - uid: 719 components: - type: Transform @@ -16263,6 +16334,21 @@ entities: - type: Transform pos: -0.5,3.5 parent: 1 + - uid: 1392 + components: + - type: Transform + pos: 7.5,14.5 + parent: 1 + - uid: 1393 + components: + - type: Transform + pos: 8.5,14.5 + parent: 1 + - uid: 1401 + components: + - type: Transform + pos: 9.5,14.5 + parent: 1 - uid: 1612 components: - type: Transform @@ -16287,7 +16373,7 @@ entities: - uid: 1670 components: - type: Transform - pos: 9.5,20.5 + pos: 10.5,14.5 parent: 1 - uid: 1676 components: @@ -16310,11 +16396,6 @@ entities: rot: 3.141592653589793 rad pos: 5.5,1.5 parent: 1 - - uid: 1886 - components: - - type: Transform - pos: 10.5,14.5 - parent: 1 - uid: 1911 components: - type: Transform @@ -16346,16 +16427,6 @@ entities: - type: Transform pos: 10.5,27.5 parent: 1 - - uid: 2098 - components: - - type: Transform - pos: -8.5,14.5 - parent: 1 - - uid: 2134 - components: - - type: Transform - pos: -9.5,20.5 - parent: 1 - uid: 2135 components: - type: Transform @@ -16371,11 +16442,6 @@ entities: - type: Transform pos: 10.5,23.5 parent: 1 - - uid: 2170 - components: - - type: Transform - pos: 8.5,14.5 - parent: 1 - uid: 2171 components: - type: Transform @@ -16682,6 +16748,11 @@ entities: - type: Transform pos: 10.5,-1.5 parent: 1 + - uid: 405 + components: + - type: Transform + pos: 5.5,-9.5 + parent: 1 - uid: 481 components: - type: Transform @@ -16752,12 +16823,6 @@ entities: rot: -1.5707963267948966 rad pos: 4.5,-5.5 parent: 1 - - uid: 600 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 5.5,-9.5 - parent: 1 - uid: 601 components: - type: Transform From c1af081d94aa01235ba485faf7bc19482ffffd34 Mon Sep 17 00:00:00 2001 From: blackknight954 <40075385+blackknight954@users.noreply.github.com> Date: Fri, 1 Nov 2024 18:12:26 -0500 Subject: [PATCH 2/8] Revert "Automatic Changelog (#2310)" This reverts commit ed0a313c6108eb4250f6e4f23f56505241a578d1. --- Resources/Changelog/Frontier.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index 9e85c58744f..1d1a850385c 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -4891,9 +4891,3 @@ Entries: message: The Xenoarchaeology guidebook now has a section on using artifexium. id: 5448 time: '2024-10-23T20:20:09.0000000+00:00' -- author: dvir001 - changes: - - type: Tweak - message: The syndicate started to send more faxes about smuggling now. - id: 5449 - time: '2024-10-23T21:15:47.0000000+00:00' From 1033a9bddf3dfb3905a71c9b7d7f6bb04f3403bc Mon Sep 17 00:00:00 2001 From: blackknight954 <40075385+blackknight954@users.noreply.github.com> Date: Fri, 1 Nov 2024 18:13:32 -0500 Subject: [PATCH 3/8] Reapply "Automatic Changelog (#2310)" This reverts commit c1af081d94aa01235ba485faf7bc19482ffffd34. --- Resources/Changelog/Frontier.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index 1d1a850385c..9e85c58744f 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -4891,3 +4891,9 @@ Entries: message: The Xenoarchaeology guidebook now has a section on using artifexium. id: 5448 time: '2024-10-23T20:20:09.0000000+00:00' +- author: dvir001 + changes: + - type: Tweak + message: The syndicate started to send more faxes about smuggling now. + id: 5449 + time: '2024-10-23T21:15:47.0000000+00:00' From 8212ab6fc72643b7501334d186d19058ec330b9a Mon Sep 17 00:00:00 2001 From: blackknight954 <40075385+blackknight954@users.noreply.github.com> Date: Fri, 1 Nov 2024 18:13:40 -0500 Subject: [PATCH 4/8] Revert "Adjusted Distro and AME storage for compliance" This reverts commit 8239073c1ab7aca002779a0c8006e1829da4ce7e. --- .../Maps/_NF/Shuttles/Expedition/ambition.yml | 855 ++++++++---------- 1 file changed, 395 insertions(+), 460 deletions(-) diff --git a/Resources/Maps/_NF/Shuttles/Expedition/ambition.yml b/Resources/Maps/_NF/Shuttles/Expedition/ambition.yml index d4fbc0aff57..2ae9c55c22e 100644 --- a/Resources/Maps/_NF/Shuttles/Expedition/ambition.yml +++ b/Resources/Maps/_NF/Shuttles/Expedition/ambition.yml @@ -123,8 +123,10 @@ entities: color: '#00FFFFFF' id: BoxGreyscale decals: + 466: 2,30 467: -5,-2 468: -4,-2 + 469: -5,-6 - node: color: '#FFFF00FF' id: BoxGreyscale @@ -402,7 +404,10 @@ entities: 437: 7,28 438: 6,27 470: -7,-6 + 471: -6,-6 + 472: -5,-6 473: -5,-7 + 474: -6,-7 475: -7,-7 504: -9,-6 566: 2,18 @@ -427,6 +432,7 @@ entities: 588: 2,-6 589: 3,-6 590: -2,30 + 591: 2,30 592: 8,32 593: 9,32 594: 9,31 @@ -471,6 +477,7 @@ entities: 643: 1,9 644: 2,9 647: -2,30 + 648: 2,30 649: -1,-13 650: 1,-13 651: -1,-12 @@ -1232,8 +1239,7 @@ entities: 0,-2: 1: 65535 0,-5: - 1: 4403 - 3: 512 + 1: 4915 2: 16384 0: 128 1,-4: @@ -1394,21 +1400,6 @@ entities: - 0 - 0 - 0 - - volume: 2500 - temperature: 293.14996 - moles: - - 20.078888 - - 75.53487 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 chunkSize: 4 - type: GasTileOverlay - type: RadiationGridResistance @@ -1676,6 +1667,14 @@ entities: parent: 1 - proto: AirCanister entities: + - uid: 2032 + components: + - type: Transform + anchored: True + pos: 2.5,30.5 + parent: 1 + - type: Physics + bodyType: Static - uid: 2117 components: - type: Transform @@ -1686,6 +1685,14 @@ entities: - type: Transform pos: -4.5,-1.5 parent: 1 + - uid: 2285 + components: + - type: Transform + anchored: True + pos: -4.5,-5.5 + parent: 1 + - type: Physics + bodyType: Static - proto: Airlock entities: - uid: 2336 @@ -1693,11 +1700,17 @@ entities: - type: Transform pos: -3.5,-9.5 parent: 1 + - type: DeviceLinkSink + links: + - 122 - uid: 2339 components: - type: Transform pos: -3.5,-12.5 parent: 1 + - type: DeviceLinkSink + links: + - 124 - uid: 2471 components: - type: Transform @@ -1797,6 +1810,8 @@ entities: parent: 1 - type: DeviceLinkSink invokeCounter: 1 + links: + - 33 - type: DeviceLinkSource linkedPorts: 33: @@ -1816,6 +1831,8 @@ entities: parent: 1 - type: DeviceLinkSink invokeCounter: 1 + links: + - 639 - type: DeviceLinkSource linkedPorts: 639: @@ -2066,6 +2083,11 @@ entities: parent: 1732 - type: Physics canCollide: False + - uid: 119 + components: + - type: Transform + pos: 1.5,-18.5 + parent: 1 - proto: AmeShielding entities: - uid: 140 @@ -2198,133 +2220,112 @@ entities: rot: 3.141592653589793 rad pos: -0.5,-13.5 parent: 1 -- proto: AtmosDeviceFanDirectional +- proto: AtmosDeviceFanTiny entities: - - uid: 76 + - uid: 134 components: - type: Transform - rot: 3.141592653589793 rad - pos: -6.5,33.5 + pos: 7.5,33.5 parent: 1 - - uid: 77 + - uid: 135 components: - type: Transform - rot: 3.141592653589793 rad - pos: -7.5,33.5 + pos: 8.5,33.5 parent: 1 - - uid: 86 + - uid: 137 components: - type: Transform - rot: 3.141592653589793 rad - pos: 1.5,34.5 + pos: -0.5,34.5 parent: 1 - - uid: 134 + - uid: 170 components: - type: Transform - rot: 3.141592653589793 rad - pos: -0.5,34.5 + pos: 2.5,34.5 parent: 1 - - uid: 135 + - uid: 171 + components: + - type: Transform + pos: 1.5,34.5 + parent: 1 + - uid: 180 components: - type: Transform - rot: -1.5707963267948966 rad pos: 3.5,2.5 parent: 1 - - uid: 137 + - uid: 194 components: - type: Transform - rot: -1.5707963267948966 rad pos: -11.5,-3.5 parent: 1 - - uid: 142 + - uid: 231 components: - type: Transform - rot: -1.5707963267948966 rad pos: -11.5,-5.5 parent: 1 - - uid: 171 + - uid: 232 components: - type: Transform - rot: 1.5707963267948966 rad pos: 12.5,-3.5 parent: 1 - - uid: 180 + - uid: 233 components: - type: Transform - rot: 1.5707963267948966 rad pos: 12.5,-5.5 parent: 1 - - uid: 194 + - uid: 261 components: - type: Transform - rot: 3.141592653589793 rad - pos: 7.5,33.5 + pos: -5.5,33.5 parent: 1 - - uid: 199 + - uid: 263 components: - type: Transform - rot: 3.141592653589793 rad - pos: 5.5,33.5 + pos: -7.5,33.5 parent: 1 - - uid: 231 + - uid: 264 components: - type: Transform - rot: 3.141592653589793 rad - pos: 6.5,33.5 + pos: -6.5,33.5 parent: 1 - - uid: 232 + - uid: 332 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 1.5,-14.5 + pos: -0.5,-14.5 parent: 1 - - uid: 233 + - uid: 403 components: - type: Transform - rot: 3.141592653589793 rad - pos: -4.5,33.5 + pos: 5.5,33.5 parent: 1 - - uid: 237 + - uid: 404 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 1.5,-15.5 + pos: -1.5,34.5 parent: 1 - - uid: 239 + - uid: 405 components: - type: Transform - rot: -1.5707963267948966 rad pos: -0.5,-15.5 parent: 1 - - uid: 246 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -0.5,-14.5 - parent: 1 - - uid: 248 + - uid: 406 components: - type: Transform - rot: 3.141592653589793 rad - pos: -5.5,33.5 + pos: 1.5,-14.5 parent: 1 - - uid: 261 + - uid: 407 components: - type: Transform - rot: 3.141592653589793 rad - pos: 8.5,33.5 + pos: 1.5,-15.5 parent: 1 - - uid: 2089 + - uid: 580 components: - type: Transform - rot: 3.141592653589793 rad - pos: -1.5,34.5 + pos: 6.5,33.5 parent: 1 - - uid: 2098 + - uid: 633 components: - type: Transform - rot: 3.141592653589793 rad - pos: 2.5,34.5 + pos: -4.5,33.5 parent: 1 - proto: AtmosFixBlockerMarker entities: @@ -3399,6 +3400,7 @@ entities: parent: 1 - type: Physics canCollide: False + bodyType: Static - type: Fixtures fixtures: {} - proto: BenchSofaCorpLeft @@ -3409,6 +3411,8 @@ entities: rot: 1.5707963267948966 rad pos: 3.5,-11.5 parent: 1 + - type: Physics + bodyType: Static - proto: BenchSofaCorpMiddle entities: - uid: 649 @@ -3417,6 +3421,8 @@ entities: rot: 3.141592653589793 rad pos: 4.5,-12.5 parent: 1 + - type: Physics + bodyType: Static - proto: BenchSofaCorpRight entities: - uid: 650 @@ -3425,6 +3431,8 @@ entities: rot: 3.141592653589793 rad pos: 5.5,-12.5 parent: 1 + - type: Physics + bodyType: Static - proto: BlastDoor entities: - uid: 9 @@ -3432,108 +3440,146 @@ entities: - type: Transform pos: 6.5,-20.5 parent: 1 + - type: DeviceLinkSink + links: + - 1913 - uid: 1884 components: - type: Transform pos: -5.5,-21.5 parent: 1 + - type: DeviceLinkSink + links: + - 1913 - uid: 1885 components: - type: Transform pos: -5.5,-20.5 parent: 1 + - type: DeviceLinkSink + links: + - 1913 - uid: 1887 components: - type: Transform pos: 6.5,-21.5 parent: 1 + - type: DeviceLinkSink + links: + - 1913 - uid: 1888 components: - type: Transform pos: 0.5,3.5 parent: 1 + - type: DeviceLinkSink + links: + - 1141 + - 983 - uid: 1890 components: - type: Transform rot: -1.5707963267948966 rad pos: -7.5,33.5 parent: 1 + - type: DeviceLinkSink + links: + - 2385 - uid: 1891 components: - type: Transform rot: -1.5707963267948966 rad pos: -6.5,33.5 parent: 1 + - type: DeviceLinkSink + links: + - 2385 - uid: 1892 components: - type: Transform rot: -1.5707963267948966 rad pos: -5.5,33.5 parent: 1 + - type: DeviceLinkSink + links: + - 2385 - uid: 1893 components: - type: Transform rot: -1.5707963267948966 rad pos: -4.5,33.5 parent: 1 + - type: DeviceLinkSink + links: + - 2385 - uid: 1894 components: - type: Transform rot: 1.5707963267948966 rad pos: 5.5,33.5 parent: 1 + - type: DeviceLinkSink + links: + - 2384 - uid: 1895 components: - type: Transform rot: 1.5707963267948966 rad pos: 6.5,33.5 parent: 1 + - type: DeviceLinkSink + links: + - 2384 - uid: 1896 components: - type: Transform rot: 1.5707963267948966 rad pos: 7.5,33.5 parent: 1 + - type: DeviceLinkSink + links: + - 2384 - uid: 1897 components: - type: Transform rot: 1.5707963267948966 rad pos: 8.5,33.5 parent: 1 + - type: DeviceLinkSink + links: + - 2384 - uid: 1899 components: - type: Transform pos: -0.5,-15.5 parent: 1 + - type: DeviceLinkSink + links: + - 1913 - uid: 1900 components: - type: Transform pos: -0.5,-14.5 parent: 1 + - type: DeviceLinkSink + links: + - 1913 - uid: 1901 components: - type: Transform pos: 1.5,-14.5 parent: 1 + - type: DeviceLinkSink + links: + - 1913 - uid: 1902 components: - type: Transform pos: 1.5,-15.5 parent: 1 -- proto: BlastDoorExterior1 - entities: - - uid: 2104 - components: - - type: Transform - pos: -1.5,34.5 - parent: 1 -- proto: BlastDoorExterior2 - entities: - - uid: 2134 - components: - - type: Transform - pos: 2.5,34.5 - parent: 1 + - type: DeviceLinkSink + links: + - 1913 - proto: BookshelfFilled entities: - uid: 2238 @@ -6280,7 +6326,6 @@ entities: - uid: 1224 components: - type: Transform - rot: -1.5707963267948966 rad pos: 3.5,12.5 parent: 1 - uid: 1225 @@ -6619,6 +6664,11 @@ entities: - type: Transform pos: 1.5,31.5 parent: 1 + - uid: 2056 + components: + - type: Transform + pos: 2.5,31.5 + parent: 1 - uid: 2286 components: - type: Transform @@ -6838,31 +6888,22 @@ entities: - type: Transform pos: 5.5,-7.5 parent: 1 +- proto: ClosetWall + entities: + - uid: 1904 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,-17.5 + parent: 1 - proto: ClosetWallEmergencyFilledRandom entities: - - uid: 569 + - uid: 2358 components: - type: Transform - pos: -3.5,33.5 + rot: 1.5707963267948966 rad + pos: -2.5,33.5 parent: 1 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14923 - moles: - - 1.7459903 - - 6.568249 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - uid: 2359 components: - type: Transform @@ -6877,29 +6918,12 @@ entities: parent: 1 - proto: ClosetWallFireFilledRandom entities: - - uid: 570 + - uid: 2350 components: - type: Transform - pos: 4.5,33.5 + rot: -1.5707963267948966 rad + pos: 3.5,33.5 parent: 1 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14923 - moles: - - 1.7459903 - - 6.568249 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - proto: ClothingHandsGlovesCombat entities: - uid: 2523 @@ -7002,59 +7026,89 @@ entities: - type: Transform pos: 2.5,33.5 parent: 1 + - type: DeviceLinkSink + links: + - 1925 - uid: 1145 components: - type: Transform pos: 2.5,34.5 parent: 1 + - type: DeviceLinkSink + links: + - 1925 - uid: 1146 components: - type: Transform rot: 1.5707963267948966 rad pos: 2.5,32.5 parent: 1 + - type: DeviceLinkSink + links: + - 1925 - uid: 1147 components: - type: Transform rot: 1.5707963267948966 rad pos: 3.5,32.5 parent: 1 + - type: DeviceLinkSink + links: + - 1925 - uid: 1148 components: - type: Transform rot: 1.5707963267948966 rad pos: 4.5,32.5 parent: 1 + - type: DeviceLinkSink + links: + - 1925 - uid: 1149 components: - type: Transform rot: 1.5707963267948966 rad pos: -3.5,32.5 parent: 1 + - type: DeviceLinkSink + links: + - 1924 - uid: 1150 components: - type: Transform rot: 1.5707963267948966 rad pos: -2.5,32.5 parent: 1 + - type: DeviceLinkSink + links: + - 1924 - uid: 1151 components: - type: Transform rot: 3.141592653589793 rad pos: -1.5,32.5 parent: 1 + - type: DeviceLinkSink + links: + - 1924 - uid: 1152 components: - type: Transform rot: 3.141592653589793 rad pos: -1.5,33.5 parent: 1 + - type: DeviceLinkSink + links: + - 1924 - uid: 1153 components: - type: Transform rot: 3.141592653589793 rad pos: -1.5,34.5 parent: 1 + - type: DeviceLinkSink + links: + - 1924 - proto: CrateEmergencyInflatablewall entities: - uid: 2365 @@ -8536,18 +8590,6 @@ entities: - type: Transform pos: -4.5,19.5 parent: 1 -- proto: GasMixerOn - entities: - - uid: 2561 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 10.5,-0.5 - parent: 1 - - type: GasMixer - inletTwoConcentration: 0.79 - inletOneConcentration: 0.21 - enabled: True - proto: GasOutletInjector entities: - uid: 738 @@ -8939,14 +8981,6 @@ entities: parent: 1 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 2031 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 4.5,24.5 - parent: 1 - - type: AtmosPipeColor - color: '#0055CCFF' - uid: 2051 components: - type: Transform @@ -8987,39 +9021,16 @@ entities: parent: 1 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 2558 +- proto: GasPipeFourway + entities: + - uid: 952 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 3.5,24.5 + pos: -8.5,8.5 parent: 1 - type: AtmosPipeColor - color: '#0055CCFF' - - uid: 2559 - components: - - type: Transform - pos: 4.5,12.5 - parent: 1 - - type: AtmosPipeColor - color: '#0055CCFF' - - uid: 2560 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 3.5,12.5 - parent: 1 - - type: AtmosPipeColor - color: '#0055CCFF' -- proto: GasPipeFourway - entities: - - uid: 952 - components: - - type: Transform - pos: -8.5,8.5 - parent: 1 - - type: AtmosPipeColor - color: '#990000FF' - - uid: 1753 + color: '#990000FF' + - uid: 1753 components: - type: Transform pos: -5.5,-2.5 @@ -9150,14 +9161,6 @@ entities: rot: 1.5707963267948966 rad pos: 2.5,4.5 parent: 1 - - uid: 119 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 3.5,23.5 - parent: 1 - - type: AtmosPipeColor - color: '#0055CCFF' - uid: 130 components: - type: Transform @@ -9503,14 +9506,6 @@ entities: - type: Transform pos: -4.5,21.5 parent: 1 - - uid: 770 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 3.5,22.5 - parent: 1 - - type: AtmosPipeColor - color: '#0055CCFF' - uid: 811 components: - type: Transform @@ -10458,22 +10453,6 @@ entities: rot: 3.141592653589793 rad pos: -5.5,6.5 parent: 1 - - uid: 1879 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -4.5,-6.5 - parent: 1 - - type: AtmosPipeColor - color: '#0055CCFF' - - uid: 1904 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 2.5,31.5 - parent: 1 - - type: AtmosPipeColor - color: '#0055CCFF' - uid: 1921 components: - type: Transform @@ -10530,14 +10509,6 @@ entities: parent: 1 - type: AtmosPipeColor color: '#990000FF' - - uid: 1978 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 4.5,11.5 - parent: 1 - - type: AtmosPipeColor - color: '#0055CCFF' - uid: 1982 components: - type: Transform @@ -10722,14 +10693,6 @@ entities: parent: 1 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 2030 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 4.5,10.5 - parent: 1 - - type: AtmosPipeColor - color: '#0055CCFF' - uid: 2033 components: - type: Transform @@ -10825,22 +10788,6 @@ entities: parent: 1 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 2285 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 3.5,21.5 - parent: 1 - - type: AtmosPipeColor - color: '#0055CCFF' - - uid: 2300 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 3.5,20.5 - parent: 1 - - type: AtmosPipeColor - color: '#0055CCFF' - uid: 2306 components: - type: Transform @@ -10861,14 +10808,6 @@ entities: parent: 1 - type: AtmosPipeColor color: '#990000FF' - - uid: 2350 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 3.5,19.5 - parent: 1 - - type: AtmosPipeColor - color: '#0055CCFF' - uid: 2353 components: - type: Transform @@ -10877,22 +10816,6 @@ entities: parent: 1 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 2358 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 3.5,18.5 - parent: 1 - - type: AtmosPipeColor - color: '#0055CCFF' - - uid: 2392 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 3.5,17.5 - parent: 1 - - type: AtmosPipeColor - color: '#0055CCFF' - uid: 2426 components: - type: Transform @@ -10901,14 +10824,6 @@ entities: parent: 1 - type: AtmosPipeColor color: '#947507FF' - - uid: 2470 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 3.5,16.5 - parent: 1 - - type: AtmosPipeColor - color: '#0055CCFF' - uid: 2495 components: - type: Transform @@ -10989,30 +10904,6 @@ entities: parent: 1 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 2552 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 3.5,15.5 - parent: 1 - - type: AtmosPipeColor - color: '#0055CCFF' - - uid: 2556 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 3.5,14.5 - parent: 1 - - type: AtmosPipeColor - color: '#0055CCFF' - - uid: 2557 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 3.5,13.5 - parent: 1 - - type: AtmosPipeColor - color: '#0055CCFF' - proto: GasPipeTJunction entities: - uid: 107 @@ -11205,6 +11096,14 @@ entities: parent: 1 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 1879 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -4.5,-6.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 1968 components: - type: Transform @@ -11244,6 +11143,13 @@ entities: parent: 1 - type: AtmosPipeColor color: '#990000FF' + - uid: 2030 + components: + - type: Transform + pos: 2.5,31.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 2035 components: - type: Transform @@ -11325,6 +11231,14 @@ entities: parent: 1 - type: AtmosPipeColor color: '#947507FF' + - uid: 2031 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,30.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 2110 components: - type: Transform @@ -11342,6 +11256,13 @@ entities: - type: Transform pos: -4.5,-1.5 parent: 1 + - uid: 2284 + components: + - type: Transform + pos: -4.5,-5.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 2305 components: - type: Transform @@ -11355,17 +11276,6 @@ entities: parent: 1 - type: AtmosPipeColor color: '#947507FF' - - uid: 2562 - components: - - type: Transform - pos: 10.5,0.5 - parent: 1 - - uid: 2563 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 11.5,-0.5 - parent: 1 - proto: GasPressurePump entities: - uid: 758 @@ -11416,6 +11326,15 @@ entities: rot: 1.5707963267948966 rad pos: -4.5,21.5 parent: 1 + - uid: 1479 + components: + - type: MetaData + name: distribution pump + - type: Transform + pos: 4.5,10.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 2003 components: - type: Transform @@ -11468,6 +11387,16 @@ entities: parent: 1 - type: AtmosPipeColor color: '#990000FF' + - uid: 2552 + components: + - type: MetaData + name: distribution pump + - type: Transform + rot: 3.141592653589793 rad + pos: 4.5,24.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' - proto: GasRecyclerMachineCircuitboard entities: - uid: 2410 @@ -12295,6 +12224,12 @@ entities: rot: 1.5707963267948966 rad pos: 5.5,-19.5 parent: 1 + - uid: 2300 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 5.5,-10.5 + parent: 1 - uid: 2328 components: - type: Transform @@ -12425,14 +12360,6 @@ entities: - type: Transform pos: 9.5,27.5 parent: 1 -- proto: LockerWallMaterialsFuelAmeJarFilled - entities: - - uid: 1479 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 2.5,-17.5 - parent: 1 - proto: MachineFrameDestroyed entities: - uid: 2048 @@ -12473,7 +12400,7 @@ entities: - uid: 2554 components: - type: Transform - pos: 2.5007179,30.555754 + pos: -1.5,30.5 parent: 1 - proto: NFAshtray entities: @@ -12482,38 +12409,13 @@ entities: - type: Transform pos: 4.6353407,-0.39717972 parent: 1 -- proto: NFSignDock - entities: - - uid: 2517 - components: - - type: Transform - pos: 0.5,34.5 - parent: 1 - - uid: 2518 - components: - - type: Transform - pos: -11.5,-4.5 - parent: 1 - - uid: 2519 - components: - - type: Transform - pos: 12.5,-4.5 - parent: 1 - proto: NitrogenCanister entities: - - uid: 2056 - components: - - type: Transform - pos: -3.5,30.5 - parent: 1 - - uid: 2565 + - uid: 770 components: - type: Transform - anchored: True - pos: 10.5,0.5 + pos: -9.5,25.5 parent: 1 - - type: Physics - bodyType: Static - proto: OxygenCanister entities: - uid: 1724 @@ -12521,14 +12423,6 @@ entities: - type: Transform pos: -4.5,30.5 parent: 1 - - uid: 2564 - components: - - type: Transform - anchored: True - pos: 11.5,-0.5 - parent: 1 - - type: Physics - bodyType: Static - proto: PaintingFireaxeCabinet entities: - uid: 2351 @@ -12545,10 +12439,10 @@ entities: parent: 1 - proto: PlasmaCanister entities: - - uid: 2170 + - uid: 1978 components: - type: Transform - pos: -9.5,25.5 + pos: 11.5,0.5 parent: 1 - proto: PlasmaReinforcedWindowDirectional entities: @@ -12778,6 +12672,16 @@ entities: rot: 1.5707963267948966 rad pos: 3.5,32.5 parent: 1 + - uid: 569 + components: + - type: Transform + pos: -1.5,34.5 + parent: 1 + - uid: 570 + components: + - type: Transform + pos: 2.5,34.5 + parent: 1 - uid: 1943 components: - type: Transform @@ -13373,12 +13277,6 @@ entities: - type: Transform pos: 1.5,-7.5 parent: 1 - - uid: 2032 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 2.5,30.5 - parent: 1 - uid: 2142 components: - type: Transform @@ -13406,7 +13304,7 @@ entities: rot: 3.141592653589793 rad pos: -1.5,30.5 parent: 1 -- proto: RadioHandheldNF +- proto: RadioHandheld entities: - uid: 2320 components: @@ -14170,81 +14068,123 @@ entities: rot: 3.141592653589793 rad pos: -1.5,0.5 parent: 1 + - type: DeviceLinkSink + links: + - 2093 - uid: 698 components: - type: Transform rot: 3.141592653589793 rad pos: -0.5,0.5 parent: 1 + - type: DeviceLinkSink + links: + - 2093 - uid: 699 components: - type: Transform rot: 3.141592653589793 rad pos: 1.5,0.5 parent: 1 + - type: DeviceLinkSink + links: + - 2093 - uid: 700 components: - type: Transform rot: 3.141592653589793 rad pos: 2.5,0.5 parent: 1 + - type: DeviceLinkSink + links: + - 2093 - uid: 701 components: - type: Transform rot: 1.5707963267948966 rad pos: 2.5,-18.5 parent: 1 + - type: DeviceLinkSink + links: + - 1733 - uid: 702 components: - type: Transform rot: -1.5707963267948966 rad pos: -1.5,-18.5 parent: 1 + - type: DeviceLinkSink + links: + - 1733 - uid: 1005 components: - type: Transform rot: -1.5707963267948966 rad pos: -6.5,-9.5 parent: 1 + - type: DeviceLinkSink + links: + - 122 - uid: 1006 components: - type: Transform rot: -1.5707963267948966 rad pos: -6.5,-12.5 parent: 1 + - type: DeviceLinkSink + links: + - 124 - uid: 1007 components: - type: Transform rot: 3.141592653589793 rad pos: -6.5,-18.5 parent: 1 + - type: DeviceLinkSink + links: + - 1733 - uid: 1008 components: - type: Transform rot: 3.141592653589793 rad pos: 7.5,-18.5 parent: 1 + - type: DeviceLinkSink + links: + - 1733 - uid: 2091 components: - type: Transform rot: 3.141592653589793 rad pos: -4.5,3.5 parent: 1 + - type: DeviceLinkSink + links: + - 2287 - uid: 2120 components: - type: Transform pos: -4.5,-0.5 parent: 1 + - type: DeviceLinkSink + links: + - 2287 - uid: 2122 components: - type: Transform pos: -5.5,-0.5 parent: 1 + - type: DeviceLinkSink + links: + - 2287 - uid: 2123 components: - type: Transform pos: -3.5,-0.5 parent: 1 + - type: DeviceLinkSink + links: + - 2287 - proto: SignalButtonDirectional entities: - uid: 122 @@ -14392,22 +14332,6 @@ entities: - Pressed: Toggle 1893: - Pressed: Toggle -- proto: SignalButtonExt1 - entities: - - uid: 404 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -2.5,33.5 - parent: 1 -- proto: SignalButtonExt2 - entities: - - uid: 170 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 3.5,33.5 - parent: 1 - proto: SignAtmos entities: - uid: 2324 @@ -14470,6 +14394,23 @@ entities: - type: Transform pos: 7.5,24.5 parent: 1 +- proto: NFSignDock + entities: + - uid: 2517 + components: + - type: Transform + pos: 0.5,34.5 + parent: 1 + - uid: 2518 + components: + - type: Transform + pos: -11.5,-4.5 + parent: 1 + - uid: 2519 + components: + - type: Transform + pos: 12.5,-4.5 + parent: 1 - proto: SignSpace entities: - uid: 2446 @@ -14497,13 +14438,6 @@ entities: - type: Transform pos: 10.5,-4.5 parent: 1 -- proto: Sink - entities: - - uid: 1886 - components: - - type: Transform - pos: -5.5,-5.5 - parent: 1 - proto: SMESBasic entities: - uid: 1096 @@ -15140,10 +15074,10 @@ entities: parent: 1 - proto: TrashBakedBananaPeel entities: - - uid: 2284 + - uid: 2392 components: - type: Transform - pos: -4.457452,-6.413014 + pos: -4.5,-6.5 parent: 1 - proto: TwoWayLever entities: @@ -15308,6 +15242,11 @@ entities: - type: Transform pos: 3.5,7.5 parent: 1 + - uid: 77 + components: + - type: Transform + pos: 8.5,20.5 + parent: 1 - uid: 82 components: - type: Transform @@ -15325,6 +15264,11 @@ entities: - type: Transform pos: 10.5,17.5 parent: 1 + - uid: 86 + components: + - type: Transform + pos: 10.5,20.5 + parent: 1 - uid: 89 components: - type: Transform @@ -15422,6 +15366,11 @@ entities: - type: Transform pos: 8.5,-7.5 parent: 1 + - uid: 142 + components: + - type: Transform + pos: -7.5,20.5 + parent: 1 - uid: 145 components: - type: Transform @@ -15607,6 +15556,11 @@ entities: - type: Transform pos: 3.5,30.5 parent: 1 + - uid: 199 + components: + - type: Transform + pos: 9.5,14.5 + parent: 1 - uid: 200 components: - type: Transform @@ -15757,6 +15711,16 @@ entities: - type: Transform pos: 11.5,26.5 parent: 1 + - uid: 237 + components: + - type: Transform + pos: -6.5,20.5 + parent: 1 + - uid: 239 + components: + - type: Transform + pos: -8.5,20.5 + parent: 1 - uid: 240 components: - type: Transform @@ -15787,11 +15751,21 @@ entities: - type: Transform pos: -5.5,14.5 parent: 1 + - uid: 246 + components: + - type: Transform + pos: 7.5,20.5 + parent: 1 - uid: 247 components: - type: Transform pos: 11.5,12.5 parent: 1 + - uid: 248 + components: + - type: Transform + pos: -7.5,14.5 + parent: 1 - uid: 250 components: - type: Transform @@ -15842,16 +15816,6 @@ entities: - type: Transform pos: -6.5,10.5 parent: 1 - - uid: 263 - components: - - type: Transform - pos: -8.5,14.5 - parent: 1 - - uid: 264 - components: - - type: Transform - pos: -6.5,14.5 - parent: 1 - uid: 265 components: - type: Transform @@ -15865,12 +15829,12 @@ entities: - uid: 268 components: - type: Transform - pos: -9.5,20.5 + pos: -6.5,14.5 parent: 1 - uid: 269 components: - type: Transform - pos: -7.5,14.5 + pos: 7.5,14.5 parent: 1 - uid: 270 components: @@ -15900,7 +15864,7 @@ entities: - uid: 279 components: - type: Transform - pos: 7.5,20.5 + pos: -9.5,14.5 parent: 1 - uid: 281 components: @@ -16087,11 +16051,6 @@ entities: - type: Transform pos: 6.5,-22.5 parent: 1 - - uid: 332 - components: - - type: Transform - pos: -6.5,20.5 - parent: 1 - uid: 335 components: - type: Transform @@ -16238,46 +16197,16 @@ entities: rot: -1.5707963267948966 rad pos: -1.5,-20.5 parent: 1 - - uid: 403 - components: - - type: Transform - pos: -9.5,14.5 - parent: 1 - - uid: 406 - components: - - type: Transform - pos: -8.5,20.5 - parent: 1 - - uid: 407 - components: - - type: Transform - pos: -7.5,20.5 - parent: 1 - uid: 571 components: - type: Transform pos: 4.5,33.5 parent: 1 - - uid: 580 - components: - - type: Transform - pos: 8.5,20.5 - parent: 1 - uid: 581 components: - type: Transform pos: -2.5,2.5 parent: 1 - - uid: 600 - components: - - type: Transform - pos: 9.5,20.5 - parent: 1 - - uid: 633 - components: - - type: Transform - pos: 10.5,20.5 - parent: 1 - uid: 719 components: - type: Transform @@ -16334,21 +16263,6 @@ entities: - type: Transform pos: -0.5,3.5 parent: 1 - - uid: 1392 - components: - - type: Transform - pos: 7.5,14.5 - parent: 1 - - uid: 1393 - components: - - type: Transform - pos: 8.5,14.5 - parent: 1 - - uid: 1401 - components: - - type: Transform - pos: 9.5,14.5 - parent: 1 - uid: 1612 components: - type: Transform @@ -16373,7 +16287,7 @@ entities: - uid: 1670 components: - type: Transform - pos: 10.5,14.5 + pos: 9.5,20.5 parent: 1 - uid: 1676 components: @@ -16396,6 +16310,11 @@ entities: rot: 3.141592653589793 rad pos: 5.5,1.5 parent: 1 + - uid: 1886 + components: + - type: Transform + pos: 10.5,14.5 + parent: 1 - uid: 1911 components: - type: Transform @@ -16427,6 +16346,16 @@ entities: - type: Transform pos: 10.5,27.5 parent: 1 + - uid: 2098 + components: + - type: Transform + pos: -8.5,14.5 + parent: 1 + - uid: 2134 + components: + - type: Transform + pos: -9.5,20.5 + parent: 1 - uid: 2135 components: - type: Transform @@ -16442,6 +16371,11 @@ entities: - type: Transform pos: 10.5,23.5 parent: 1 + - uid: 2170 + components: + - type: Transform + pos: 8.5,14.5 + parent: 1 - uid: 2171 components: - type: Transform @@ -16748,11 +16682,6 @@ entities: - type: Transform pos: 10.5,-1.5 parent: 1 - - uid: 405 - components: - - type: Transform - pos: 5.5,-9.5 - parent: 1 - uid: 481 components: - type: Transform @@ -16823,6 +16752,12 @@ entities: rot: -1.5707963267948966 rad pos: 4.5,-5.5 parent: 1 + - uid: 600 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 5.5,-9.5 + parent: 1 - uid: 601 components: - type: Transform From d74d939ee8fe5e0f7c04614e6610350f1e6db1ed Mon Sep 17 00:00:00 2001 From: blackknight954 <40075385+blackknight954@users.noreply.github.com> Date: Tue, 26 Nov 2024 20:23:18 -0600 Subject: [PATCH 5/8] First set of new blueprints --- .../Prototypes/Research/civilianservices.yml | 3 ++ Resources/Prototypes/Research/industrial.yml | 30 +++++++------- .../Tools/blueprints/blueprints_armory.yml | 19 +++++++++ .../blueprints/blueprints_engineering.yml | 20 ++++++++++ .../Tools/blueprints/blueprints_service.yml | 32 +++++++++++++++ .../_NF/Recipes/Lathes/blueprints.yml | 39 ++++++++++++++++++- Resources/Prototypes/_NF/Research/arsenal.yml | 2 + 7 files changed, 130 insertions(+), 15 deletions(-) diff --git a/Resources/Prototypes/Research/civilianservices.yml b/Resources/Prototypes/Research/civilianservices.yml index 3e9b15b93f1..dc802ef8d4f 100644 --- a/Resources/Prototypes/Research/civilianservices.yml +++ b/Resources/Prototypes/Research/civilianservices.yml @@ -212,6 +212,8 @@ recipeUnlocks: - WeaponSprayNozzle - ClothingBackpackWaterTank + - NFBlueprintWeaponSprayNozzle #Frontier + - NFBlueprintClothingBackpackWaterTank #Frontier # Tier 3 @@ -238,6 +240,7 @@ cost: 15000 # Frontier - 10000<15000 recipeUnlocks: - ClothingShoesBootsSpeed + - NFBlueprintClothingShoesBootsSpeed #Frontier - type: technology id: BluespaceChemistry diff --git a/Resources/Prototypes/Research/industrial.yml b/Resources/Prototypes/Research/industrial.yml index c1b61e7576e..dc2cdbf9a24 100644 --- a/Resources/Prototypes/Research/industrial.yml +++ b/Resources/Prototypes/Research/industrial.yml @@ -43,6 +43,7 @@ cost: 7500 recipeUnlocks: - PowerCellHigh + - NFBlueprintPowerCellHigh #Frontier - TurboItemRechargerCircuitboard - type: technology @@ -194,7 +195,20 @@ - NFBlueprintMiningDrillDiamond # Frontier - NFBlueprintAdvancedMineralScannerEmpty # Frontier - BorgModuleAdvancedMining # Frontier - +- type: technology + id: RapidConstruction + name: research-technology-rapid-construction + icon: + sprite: _NF/Objects/Tools/rcd.rsi + state: icon-shipyard # Frontier + discipline: Industrial + tier: 2 + cost: 10000 + recipeUnlocks: + - ShipyardRCD # Frontier + - ShipyardRCDAmmo # Frontier + - NFBlueprintShipyardRCDAmmo # Frontier + - NFBlueprintShipyardRCD #Frontier # Tier 3 - type: technology @@ -231,16 +245,4 @@ technologyPrerequisites: - AdvancedPowercells -- type: technology - id: RapidConstruction - name: research-technology-rapid-construction - icon: - sprite: _NF/Objects/Tools/rcd.rsi - state: icon-shipyard # Frontier - discipline: Industrial - tier: 2 - cost: 10000 - recipeUnlocks: - - ShipyardRCD # Frontier - - ShipyardRCDAmmo # Frontier - - NFBlueprintShipyardRCDAmmo # Frontier + diff --git a/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_armory.yml b/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_armory.yml index 183f64c64e8..eb73b599ee3 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_armory.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_armory.yml @@ -38,3 +38,22 @@ - type: Blueprint providedRecipes: - ClothingOuterHardsuitScaf + +- type: entity + parent: NFBaseBlueprintArmory + id: NFBlueprinthandcuffs + name: handcuffs blueprint + description: A blueprint with a schematic of handcuffs. It can be inserted into an autolathe or a techfab. + components: + - type: Blueprint + providedRecipes: + - handcuffs +- type: entity + parent: NFBaseBlueprintArmory + id: NFBlueprintWeaponShotgunKammererNF + name: kammerer blueprint + description: A blueprint with a schematic of a Kammerer. It can be inserted into an autolathe or a techfab. + components: + - type: Blueprint + providedRecipes: + - WeaponShotgunKammererNF diff --git a/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_engineering.yml b/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_engineering.yml index f786df26b81..815d1e61cc4 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_engineering.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_engineering.yml @@ -29,6 +29,16 @@ providedRecipes: - WelderExperimental +- type: entity + parent: NFBaseBlueprintEngineering + id: NFBlueprintShipyardRCD + name: shipyard RCD blueprint + description: A blueprint with a schematic of a shipyard RCD. It can be inserted into an autolathe or a techfab. + components: + - type: Blueprint + providedRecipes: + - ShipyardRCD + - type: entity parent: NFBaseBlueprintEngineering id: NFBlueprintShipyardRCDAmmo @@ -50,6 +60,16 @@ providedRecipes: - PowerCellMedium +- type: entity + parent: NFBaseBlueprintEngineering + id: NFBlueprintPowerCellHighPrinted + name: high-capacity power cell blueprint + description: A blueprint with a schematic of a high-capacity power cell. It can be inserted into an autolathe or a techfab. + components: + - type: Blueprint + providedRecipes: + - PowerCellHigh + - type: entity parent: NFBaseBlueprintEngineering id: NFBlueprintPowerCellMicroreactor diff --git a/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_service.yml b/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_service.yml index 821b57de609..e08fe82991a 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_service.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_service.yml @@ -28,3 +28,35 @@ - type: Blueprint providedRecipes: - PlantBagOfHolding + + +- type: entity + parent: NFBaseBlueprintService + id: NFBlueprintWeaponSprayNozzle + name: spray nozzle blueprint + description: A blueprint with a schematic of a spray nozzle. It can be inserted into an autolathe or a techfab. + components: + - type: Blueprint + providedRecipes: + - WeaponSprayNozzle + +- type: entity + parent: NFBaseBlueprintService + id: NFBlueprintClothingBackpackWaterTank + name: backpack water tank blueprint + description: A blueprint with a schematic of a backpack water tank. It can be inserted into an autolathe or a techfab. + components: + - type: Blueprint + providedRecipes: + - ClothingBackpackWaterTank + + +- type: entity + parent: NFBaseBlueprintService + id: NFBlueprintClothingShoesBootsSpeed + name: speed boots blueprint + description: A blueprint with a schematic of speed boots. It can be inserted into an autolathe or a techfab. + components: + - type: Blueprint + providedRecipes: + - ClothingShoesBootsSpeed diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/blueprints.yml b/Resources/Prototypes/_NF/Recipes/Lathes/blueprints.yml index de7cc1a26c4..87a133e7df1 100644 --- a/Resources/Prototypes/_NF/Recipes/Lathes/blueprints.yml +++ b/Resources/Prototypes/_NF/Recipes/Lathes/blueprints.yml @@ -70,7 +70,17 @@ id: NFBlueprintConstructionBagOfHolding result: NFBlueprintConstructionBagOfHolding -## Medical +- type: latheRecipe + parent: NFBaseBlueprintLatheRecipe + id: NFBlueprintShipyardRCD + result: NFBlueprintShipyardRCD + +- type: latheRecipe + parent: NFBaseBlueprintLatheRecipe + id: NFBlueprintPowerCellHigh + result: NFBlueprintPowerCellHigh + + ## Medical - type: latheRecipe parent: NFBaseBlueprintLatheRecipe @@ -153,6 +163,23 @@ id: NFBlueprintPlantBagOfHolding result: NFBlueprintPlantBagOfHolding +## Civilian + +- type: latheRecipe + parent: NFBaseBlueprintLatheRecipe + id: NFBlueprintClothingShoesBootsSpeed + result: NFBlueprintClothingShoesBootsSpeed + +- type: latheRecipe + parent: NFBaseBlueprintLatheRecipe + id: NFBlueprintWeaponSprayNozzle + result: NFBlueprintWeaponSprayNozzle + +- type: latheRecipe + parent: NFBaseBlueprintLatheRecipe + id: NFBlueprintClothingBackpackWaterTank + result: NFBlueprintClothingBackpackWaterTank + ## Armory - type: latheRecipe @@ -160,6 +187,16 @@ id: NFBlueprintWeaponAntiqueLaser result: NFBlueprintWeaponAntiqueLaser +- type: latheRecipe + parent: NFBaseBlueprintLatheRecipe + id: NFBlueprintWeaponShotgunKammererNF + result: NFBlueprintWeaponShotgunKammererNF + +- type: latheRecipe + parent: NFBaseBlueprintLatheRecipe + id: NFBlueprintHandcuffs + result: NFBlueprintHandcuffs + - type: latheRecipe parent: NFBaseBlueprintLatheRecipe id: NFBlueprintWeaponLaserSvalinn diff --git a/Resources/Prototypes/_NF/Research/arsenal.yml b/Resources/Prototypes/_NF/Research/arsenal.yml index 287333c35ed..8bde81be3e6 100644 --- a/Resources/Prototypes/_NF/Research/arsenal.yml +++ b/Resources/Prototypes/_NF/Research/arsenal.yml @@ -21,6 +21,8 @@ - WeaponShotgunKammererNF - ForensicPad - FlashlightSecliteNF + - NFBlueprintWeaponShotgunKammererNF + - NFBlueprinthandcuffs technologyPrerequisites: - AdvancedRiotControl From 90b7fe3c437fe6d78b68520e469d1961e992586d Mon Sep 17 00:00:00 2001 From: blackknight954 <40075385+blackknight954@users.noreply.github.com> Date: Thu, 28 Nov 2024 21:31:00 -0600 Subject: [PATCH 6/8] Resolved YAML failures. Inconsistent wording on some labels. --- Resources/Prototypes/Research/arsenal.yml | 1 + .../Prototypes/Research/civilianservices.yml | 2 +- .../Tools/blueprints/blueprints_armory.yml | 15 +++++++++++++-- .../Tools/blueprints/blueprints_engineering.yml | 2 +- .../Prototypes/_NF/Recipes/Lathes/blueprints.yml | 14 ++++++++++---- Resources/Prototypes/_NF/Research/arsenal.yml | 4 ++-- 6 files changed, 28 insertions(+), 10 deletions(-) diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml index fb4af9818fa..7bedf0dd46e 100644 --- a/Resources/Prototypes/Research/arsenal.yml +++ b/Resources/Prototypes/Research/arsenal.yml @@ -106,6 +106,7 @@ - TelescopicShield - HoloprojectorSecurity - WeaponDisablerSMG + - NFBlueprintTelescopicShield #Frontier - type: technology id: ExplosiveTechnology diff --git a/Resources/Prototypes/Research/civilianservices.yml b/Resources/Prototypes/Research/civilianservices.yml index d77ac5e74a1..22a789677a1 100644 --- a/Resources/Prototypes/Research/civilianservices.yml +++ b/Resources/Prototypes/Research/civilianservices.yml @@ -199,7 +199,7 @@ - HonkerPeripheralsElectronics - HonkerTargetingElectronics - MechEquipmentHorn - + - type: technology id: AdvancedSpray name: research-technology-advanced-spray diff --git a/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_armory.yml b/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_armory.yml index eb73b599ee3..25644731ca2 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_armory.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_armory.yml @@ -41,13 +41,14 @@ - type: entity parent: NFBaseBlueprintArmory - id: NFBlueprinthandcuffs + id: NFBlueprintHandcuffs name: handcuffs blueprint description: A blueprint with a schematic of handcuffs. It can be inserted into an autolathe or a techfab. components: - type: Blueprint providedRecipes: - - handcuffs + - Handcuffs + - type: entity parent: NFBaseBlueprintArmory id: NFBlueprintWeaponShotgunKammererNF @@ -57,3 +58,13 @@ - type: Blueprint providedRecipes: - WeaponShotgunKammererNF + +- type: entity + parent: NFBaseBlueprintArmory + id: NFBlueprintTelescopicShield + name: telescopic shield blueprint + description: A blueprint with a schematic of a telescopic shield. It can be inserted into an autolathe or a techfab. + components: + - type: Blueprint + providedRecipes: + - TelescopicShield diff --git a/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_engineering.yml b/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_engineering.yml index 815d1e61cc4..e5f9950e9f7 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_engineering.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Tools/blueprints/blueprints_engineering.yml @@ -62,7 +62,7 @@ - type: entity parent: NFBaseBlueprintEngineering - id: NFBlueprintPowerCellHighPrinted + id: NFBlueprintPowerCellHigh name: high-capacity power cell blueprint description: A blueprint with a schematic of a high-capacity power cell. It can be inserted into an autolathe or a techfab. components: diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/blueprints.yml b/Resources/Prototypes/_NF/Recipes/Lathes/blueprints.yml index 87a133e7df1..25de71ffaba 100644 --- a/Resources/Prototypes/_NF/Recipes/Lathes/blueprints.yml +++ b/Resources/Prototypes/_NF/Recipes/Lathes/blueprints.yml @@ -40,6 +40,11 @@ id: NFBlueprintPowerCellMediumPrinted result: NFBlueprintPowerCellMediumPrinted +- type: latheRecipe + parent: NFBaseBlueprintLatheRecipe + id: NFBlueprintPowerCellHigh + result: NFBlueprintPowerCellHigh + - type: latheRecipe parent: NFBaseBlueprintLatheRecipe id: NFBlueprintSignallerAdvanced @@ -75,10 +80,6 @@ id: NFBlueprintShipyardRCD result: NFBlueprintShipyardRCD -- type: latheRecipe - parent: NFBaseBlueprintLatheRecipe - id: NFBlueprintPowerCellHigh - result: NFBlueprintPowerCellHigh ## Medical @@ -211,3 +212,8 @@ parent: NFBaseBlueprintLatheRecipe id: BlueprintClothingOuterHardsuitScaf result: BlueprintClothingOuterHardsuitScaf + +- type: latheRecipe + parent: NFBaseBlueprintLatheRecipe + id: NFBlueprintTelescopicShield + result: NFBlueprintTelescopicShield diff --git a/Resources/Prototypes/_NF/Research/arsenal.yml b/Resources/Prototypes/_NF/Research/arsenal.yml index 8bde81be3e6..5f96c55402b 100644 --- a/Resources/Prototypes/_NF/Research/arsenal.yml +++ b/Resources/Prototypes/_NF/Research/arsenal.yml @@ -21,8 +21,8 @@ - WeaponShotgunKammererNF - ForensicPad - FlashlightSecliteNF - - NFBlueprintWeaponShotgunKammererNF - - NFBlueprinthandcuffs + - NFBlueprintWeaponShotgunKammererNF #Frontier + - NFBlueprintHandcuffs #Frontier technologyPrerequisites: - AdvancedRiotControl From 1bec1f873791e04d4ed59c991799dfd9383c5e50 Mon Sep 17 00:00:00 2001 From: blackknight954 <40075385+blackknight954@users.noreply.github.com> Date: Sun, 1 Dec 2024 16:55:14 -0600 Subject: [PATCH 7/8] Resolved integration tests. --- .../Prototypes/_NF/Entities/Structures/Machines/lathe.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml index 03c09ec39f2..c3c0737998f 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml @@ -1141,7 +1141,9 @@ - NFBlueprintPowerDrill - NFBlueprintJawsOfLife - NFBlueprintWelderExperimental + - NFBlueprintShipyardRCD - NFBlueprintShipyardRCDAmmo + - NFBlueprintPowerCellHigh - NFBlueprintPowerCellMicroreactor - NFBlueprintSignallerAdvanced - NFBlueprintClothingBackpackHolding @@ -1165,15 +1167,21 @@ - NFBlueprintPicoManipulatorStockPart - NFBlueprintSuperMatterBinStockPart - NFBlueprintClothingShoesBootsMagAdv + - NFBlueprintClothingShoesBootsSpeed # Service - NFBlueprintAdvMopItem - NFBlueprintPlantAnalyzerEmpty - NFBlueprintPlantBagOfHolding + - NFBlueprintWeaponSprayNozzle + - NFBlueprintBackpackWaterTank # Armory - NFBlueprintWeaponAntiqueLaser - NFBlueprintWeaponLaserSvalinn - NFBlueprintPortableRecharger - BlueprintClothingOuterHardsuitScaf + - NFBlueprintWeaponShotgunKammererNF + - NFBlueprintTelescopicShield + - NFBlueprintHandcuffs - type: RequireProjectileTarget - type: entity From 762d3c93e6838418a83a5c2f5d6da6cc50c6ad3e Mon Sep 17 00:00:00 2001 From: blackknight954 <40075385+blackknight954@users.noreply.github.com> Date: Sun, 1 Dec 2024 17:15:43 -0600 Subject: [PATCH 8/8] Typo fixed --- Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml index c3c0737998f..29e83b2981d 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml @@ -1173,7 +1173,7 @@ - NFBlueprintPlantAnalyzerEmpty - NFBlueprintPlantBagOfHolding - NFBlueprintWeaponSprayNozzle - - NFBlueprintBackpackWaterTank + - NFBlueprintClothingBackpackWaterTank # Armory - NFBlueprintWeaponAntiqueLaser - NFBlueprintWeaponLaserSvalinn