From 8572122b30064f390ba14026fc4e41886f6c110b Mon Sep 17 00:00:00 2001 From: dustylens Date: Mon, 23 Sep 2024 22:08:29 -0700 Subject: [PATCH 1/3] Update barge.yml --- Resources/Maps/_NF/Shuttles/barge.yml | 690 ++++++++------------------ 1 file changed, 201 insertions(+), 489 deletions(-) diff --git a/Resources/Maps/_NF/Shuttles/barge.yml b/Resources/Maps/_NF/Shuttles/barge.yml index c14ee153a17..ce88c7e6661 100644 --- a/Resources/Maps/_NF/Shuttles/barge.yml +++ b/Resources/Maps/_NF/Shuttles/barge.yml @@ -42,11 +42,11 @@ entities: version: 6 -1,-2: ind: -1,-2 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAegAAAAAAegAAAAAAaQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAegAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAegAAAAAAaQAAAAAAaQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAegAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAA version: 6 0,-2: ind: 0,-2 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaQAAAAAAaQAAAAAAegAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaQAAAAAAegAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaQAAAAAAaQAAAAAAegAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 - type: Broadphase - type: Physics @@ -224,6 +224,16 @@ entities: 118: 0,3 119: 0,2 120: 0,1 + - node: + color: '#3C44AAFF' + id: DeliveryGreyscale + decals: + 169: 0,-20 + - node: + color: '#B02E26FF' + id: DeliveryGreyscale + decals: + 168: -2,-20 - node: color: '#79150096' id: DiagonalCheckerBOverlay @@ -355,91 +365,80 @@ entities: version: 2 data: tiles: - -2,-1: - 0: 52462 - 1: 8704 - -1,-1: - 0: 65535 - 0,-1: - 0: 65535 - 1,-1: - 0: 13107 - -2,0: - 1: 26214 - 0: 34952 - -1,0: - 0: 65535 - 0,0: - 0: 65535 - 1,0: - 0: 13107 -2,-4: - 1: 26146 - 0: 34816 + 0: 26146 + -2,-5: + 0: 26342 -2,-3: - 0: 52872 - 1: 8260 + 0: 8260 + 1: 32768 -2,-2: - 0: 61166 + 1: 52424 + -2,-1: + 1: 2188 + 0: 8704 + -2,0: + 0: 26214 -1,-4: - 0: 65535 + 1: 65102 -1,-3: - 0: 65535 + 1: 65311 -1,-2: - 0: 65535 + 1: 65535 + -1,-1: + 1: 20479 + -1,0: + 1: 65535 + -1,-5: + 1: 61124 + 0: 1 0,-4: - 0: 65399 + 1: 29459 0,-3: - 0: 65535 + 1: 63303 + 0,-5: + 1: 13073 + 0: 132 0,-2: - 0: 65535 + 1: 61156 + 0,-1: + 1: 60942 + 0,0: + 1: 61166 1,-4: - 1: 13090 + 0: 13090 1,-3: - 1: 8209 - 0: 4864 + 0: 8209 1,-2: + 1: 4368 + 1,-1: + 1: 4353 + 1,0: + 1: 4883 + 1,-5: 0: 13107 -2,1: - 0: 35470 - 1: 17504 + 0: 17504 -1,1: - 0: 65535 + 1: 53236 -1,2: - 1: 1 - 0: 14 + 0: 1 0,1: - 0: 65535 + 1: 6094 0,2: - 0: 3 - 1: 4 + 0: 4 1,1: - 0: 787 - 1: 4128 + 0: 4128 -2,-6: - 1: 25668 - -2,-5: - 1: 26342 - -1,-5: - 1: 1 - 0: 65534 - -1,-6: - 0: 57344 - 0,-6: - 0: 12288 - 0,-5: - 0: 30579 - 1: 132 + 0: 25668 1,-6: - 1: 12561 - 1,-5: - 1: 13107 + 0: 12561 uniqueMixes: - volume: 2500 - temperature: 293.15 + immutable: True moles: - - 21.824879 - - 82.10312 + - 0 + - 0 - 0 - 0 - 0 @@ -453,8 +452,8 @@ entities: - volume: 2500 temperature: 293.15 moles: - - 0 - - 0 + - 21.824879 + - 82.10312 - 0 - 0 - 0 @@ -485,8 +484,6 @@ entities: devices: - 550 - 543 - - type: AtmosDevice - joinedGrid: 70 - uid: 742 components: - type: Transform @@ -501,8 +498,6 @@ entities: - 664 - 662 - 55 - - type: AtmosDevice - joinedGrid: 70 - uid: 743 components: - type: Transform @@ -517,20 +512,6 @@ entities: - 623 - 304 - 647 - - type: AtmosDevice - joinedGrid: 70 -- proto: AirCanister - entities: - - uid: 514 - components: - - type: Transform - anchored: True - pos: 1.5,-15.5 - parent: 70 - - type: Physics - bodyType: Static - - type: AtmosDevice - joinedGrid: 70 - proto: AirlockCargoGlass entities: - uid: 570 @@ -621,42 +602,48 @@ entities: - type: Transform pos: -3.4585743,-3.7488751 parent: 70 -- proto: AtmosDeviceFanTiny +- proto: AtmosDeviceFanDirectional entities: - - uid: 46 + - uid: 43 components: - type: Transform - pos: -4.5,3.5 + rot: 1.5707963267948966 rad + pos: 5.5,3.5 parent: 70 - uid: 52 components: - type: Transform + rot: 1.5707963267948966 rad pos: 5.5,-0.5 parent: 70 - uid: 81 components: - type: Transform rot: 1.5707963267948966 rad - pos: 5.5,0.5 + pos: 5.5,2.5 parent: 70 - uid: 149 components: - type: Transform + rot: -1.5707963267948966 rad pos: -4.5,2.5 parent: 70 - - uid: 519 + - uid: 222 components: - type: Transform - pos: 5.5,3.5 + rot: -1.5707963267948966 rad + pos: -4.5,3.5 parent: 70 - - uid: 520 + - uid: 274 components: - type: Transform - pos: 5.5,2.5 + rot: 1.5707963267948966 rad + pos: 5.5,0.5 parent: 70 - - uid: 740 + - uid: 601 components: - type: Transform + rot: -1.5707963267948966 rad pos: -4.5,1.5 parent: 70 - proto: AtmosFixBlockerMarker @@ -1069,54 +1056,29 @@ entities: entities: - uid: 83 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 5.5,-0.5 parent: 70 - - type: DeviceLinkSink - links: - - 529 - uid: 85 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 5.5,3.5 parent: 70 - - type: DeviceLinkSink - links: - - 529 - uid: 285 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -4.5,3.5 parent: 70 - - type: DeviceLinkSink - links: - - 521 - uid: 287 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -4.5,2.5 parent: 70 - - type: DeviceLinkSink - links: - - 521 - uid: 307 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -4.5,1.5 parent: 70 - - type: DeviceLinkSink - links: - - 521 - proto: CableApcExtension entities: - uid: 10 @@ -2103,6 +2065,18 @@ entities: - type: Transform pos: 1.5,-16.5 parent: 70 + - uid: 520 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,-18.5 + parent: 70 + - uid: 600 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,-18.5 + parent: 70 - proto: ChairPilotSeat entities: - uid: 312 @@ -2171,139 +2145,90 @@ entities: rot: 1.5707963267948966 rad pos: -5.5,1.5 parent: 70 - - type: DeviceLinkSink - links: - - 361 - - 313 - uid: 78 components: - type: Transform rot: 1.5707963267948966 rad pos: -4.5,1.5 parent: 70 - - type: DeviceLinkSink - links: - - 361 - - 313 - uid: 169 components: - type: Transform rot: 1.5707963267948966 rad pos: -3.5,1.5 parent: 70 - - type: DeviceLinkSink - links: - - 361 - - 313 - uid: 172 components: - type: Transform rot: 1.5707963267948966 rad pos: -2.5,1.5 parent: 70 - - type: DeviceLinkSink - links: - - 361 - - 313 - uid: 204 components: - type: Transform rot: 3.141592653589793 rad pos: 1.5,-3.5 parent: 70 - - type: DeviceLinkSink - links: - - 577 - uid: 216 components: - type: Transform rot: 3.141592653589793 rad pos: 1.5,-2.5 parent: 70 - - type: DeviceLinkSink - links: - - 577 - uid: 217 components: - type: Transform rot: 3.141592653589793 rad pos: 1.5,-1.5 parent: 70 - - type: DeviceLinkSink - links: - - 577 - uid: 218 components: - type: Transform rot: -1.5707963267948966 rad pos: 4.5,-0.5 parent: 70 - - type: DeviceLinkSink - links: - - 362 - uid: 220 components: - type: Transform rot: -1.5707963267948966 rad pos: 5.5,-0.5 parent: 70 - - type: DeviceLinkSink - links: - - 362 - uid: 221 components: - type: Transform rot: -1.5707963267948966 rad pos: 4.5,3.5 parent: 70 - - type: DeviceLinkSink - links: - - 362 - uid: 230 components: - type: Transform rot: -1.5707963267948966 rad pos: 5.5,3.5 parent: 70 - - type: DeviceLinkSink - links: - - 362 - uid: 247 components: - type: Transform rot: -1.5707963267948966 rad pos: 3.5,3.5 parent: 70 - - type: DeviceLinkSink - links: - - 362 - uid: 248 components: - type: Transform rot: -1.5707963267948966 rad pos: 3.5,-0.5 parent: 70 - - type: DeviceLinkSink - links: - - 362 - uid: 249 components: - type: Transform rot: 3.141592653589793 rad pos: 1.5,-4.5 parent: 70 - - type: DeviceLinkSink - links: - - 577 - uid: 250 components: - type: Transform rot: 3.141592653589793 rad pos: 1.5,-5.5 parent: 70 - - type: DeviceLinkSink - links: - - 577 - proto: DefibrillatorCabinetFilled entities: - uid: 609 @@ -2411,8 +2336,6 @@ entities: - 584 - 342 - 140 - - type: AtmosDevice - joinedGrid: 70 - uid: 574 components: - type: Transform @@ -2426,8 +2349,6 @@ entities: - 283 - 168 - 140 - - type: AtmosDevice - joinedGrid: 70 - uid: 576 components: - type: Transform @@ -2442,8 +2363,6 @@ entities: - 266 - 318 - 328 - - type: AtmosDevice - joinedGrid: 70 - proto: Firelock entities: - uid: 584 @@ -2515,17 +2434,18 @@ entities: rot: 1.5707963267948966 rad pos: 2.5,-10.5 parent: 70 -- proto: GasMixerFlipped +- proto: GasMixerOnFlipped entities: - - uid: 274 + - uid: 282 components: - type: Transform pos: 0.5,-18.5 parent: 70 - - type: AtmosDevice - joinedGrid: 70 + - type: GasMixer + inletTwoConcentration: 0.79 + inletOneConcentration: 0.21 - type: AtmosPipeColor - color: '#0000CCFF' + color: '#0055CCFF' - proto: GasPassiveVent entities: - uid: 737 @@ -2534,8 +2454,6 @@ entities: rot: 1.5707963267948966 rad pos: -6.5,3.5 parent: 70 - - type: AtmosDevice - joinedGrid: 70 - type: AtmosPipeColor color: '#990000FF' - proto: GasPipeBend @@ -2547,21 +2465,15 @@ entities: pos: 2.5,-12.5 parent: 70 - type: AtmosPipeColor - color: '#0000CCFF' + color: '#0055CCFF' - uid: 264 components: - type: Transform rot: 1.5707963267948966 rad pos: -1.5,-18.5 parent: 70 - - uid: 282 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 1.5,-16.5 - parent: 70 - type: AtmosPipeColor - color: '#0000CCFF' + color: '#0055CCFF' - uid: 552 components: - type: Transform @@ -2632,14 +2544,7 @@ entities: pos: -0.5,-1.5 parent: 70 - type: AtmosPipeColor - color: '#0000CCFF' - - uid: 222 - components: - - type: Transform - pos: 0.5,-16.5 - parent: 70 - - type: AtmosPipeColor - color: '#0000CCFF' + color: '#0055CCFF' - uid: 628 components: - type: Transform @@ -2663,28 +2568,28 @@ entities: pos: 1.5,-8.5 parent: 70 - type: AtmosPipeColor - color: '#0000CCFF' + color: '#0055CCFF' - uid: 17 components: - type: Transform pos: -0.5,-7.5 parent: 70 - type: AtmosPipeColor - color: '#0000CCFF' + color: '#0055CCFF' - uid: 19 components: - type: Transform pos: -0.5,0.5 parent: 70 - type: AtmosPipeColor - color: '#0000CCFF' + color: '#0055CCFF' - uid: 47 components: - type: Transform pos: 0.5,-14.5 parent: 70 - type: AtmosPipeColor - color: '#0000CCFF' + color: '#0055CCFF' - uid: 49 components: - type: Transform @@ -2692,21 +2597,21 @@ entities: pos: 2.5,-10.5 parent: 70 - type: AtmosPipeColor - color: '#0000CCFF' + color: '#0055CCFF' - uid: 50 components: - type: Transform pos: -0.5,-5.5 parent: 70 - type: AtmosPipeColor - color: '#0000CCFF' + color: '#0055CCFF' - uid: 51 components: - type: Transform pos: -0.5,-3.5 parent: 70 - type: AtmosPipeColor - color: '#0000CCFF' + color: '#0055CCFF' - uid: 53 components: - type: Transform @@ -2714,7 +2619,7 @@ entities: pos: -2.5,-1.5 parent: 70 - type: AtmosPipeColor - color: '#0000CCFF' + color: '#0055CCFF' - uid: 54 components: - type: Transform @@ -2722,27 +2627,29 @@ entities: pos: 1.5,-1.5 parent: 70 - type: AtmosPipeColor - color: '#0000CCFF' + color: '#0055CCFF' - uid: 215 components: - type: Transform rot: 1.5707963267948966 rad pos: -0.5,-18.5 parent: 70 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 223 components: - type: Transform pos: 0.5,-17.5 parent: 70 - type: AtmosPipeColor - color: '#0000CCFF' + color: '#0055CCFF' - uid: 288 components: - type: Transform pos: 0.5,-13.5 parent: 70 - type: AtmosPipeColor - color: '#0000CCFF' + color: '#0055CCFF' - uid: 289 components: - type: Transform @@ -2750,7 +2657,7 @@ entities: pos: 1.5,-12.5 parent: 70 - type: AtmosPipeColor - color: '#0000CCFF' + color: '#0055CCFF' - uid: 290 components: - type: Transform @@ -2758,7 +2665,7 @@ entities: pos: 2.5,-11.5 parent: 70 - type: AtmosPipeColor - color: '#0000CCFF' + color: '#0055CCFF' - uid: 291 components: - type: Transform @@ -2766,7 +2673,7 @@ entities: pos: 2.5,-9.5 parent: 70 - type: AtmosPipeColor - color: '#0000CCFF' + color: '#0055CCFF' - uid: 293 components: - type: Transform @@ -2774,42 +2681,42 @@ entities: pos: 0.5,-8.5 parent: 70 - type: AtmosPipeColor - color: '#0000CCFF' + color: '#0055CCFF' - uid: 294 components: - type: Transform pos: -0.5,-6.5 parent: 70 - type: AtmosPipeColor - color: '#0000CCFF' + color: '#0055CCFF' - uid: 295 components: - type: Transform pos: -0.5,-4.5 parent: 70 - type: AtmosPipeColor - color: '#0000CCFF' + color: '#0055CCFF' - uid: 296 components: - type: Transform pos: -0.5,-2.5 parent: 70 - type: AtmosPipeColor - color: '#0000CCFF' + color: '#0055CCFF' - uid: 297 components: - type: Transform pos: -0.5,-0.5 parent: 70 - type: AtmosPipeColor - color: '#0000CCFF' + color: '#0055CCFF' - uid: 298 components: - type: Transform pos: -0.5,1.5 parent: 70 - type: AtmosPipeColor - color: '#0000CCFF' + color: '#0055CCFF' - uid: 300 components: - type: Transform @@ -2817,7 +2724,7 @@ entities: pos: -1.5,-1.5 parent: 70 - type: AtmosPipeColor - color: '#0000CCFF' + color: '#0055CCFF' - uid: 301 components: - type: Transform @@ -2825,7 +2732,7 @@ entities: pos: -3.5,-1.5 parent: 70 - type: AtmosPipeColor - color: '#0000CCFF' + color: '#0055CCFF' - uid: 302 components: - type: Transform @@ -2833,7 +2740,7 @@ entities: pos: 0.5,-1.5 parent: 70 - type: AtmosPipeColor - color: '#0000CCFF' + color: '#0055CCFF' - uid: 303 components: - type: Transform @@ -2841,21 +2748,29 @@ entities: pos: 2.5,-1.5 parent: 70 - type: AtmosPipeColor - color: '#0000CCFF' + color: '#0055CCFF' + - uid: 514 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,-15.5 + parent: 70 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 532 components: - type: Transform pos: -0.5,4.5 parent: 70 - type: AtmosPipeColor - color: '#0000CCFF' + color: '#0055CCFF' - uid: 533 components: - type: Transform pos: -0.5,5.5 parent: 70 - type: AtmosPipeColor - color: '#0000CCFF' + color: '#0055CCFF' - uid: 562 components: - type: Transform @@ -3001,7 +2916,7 @@ entities: pos: 2.5,-7.5 parent: 70 - type: AtmosPipeColor - color: '#0000CCFF' + color: '#0055CCFF' - uid: 642 components: - type: Transform @@ -3049,7 +2964,7 @@ entities: pos: -0.5,3.5 parent: 70 - type: AtmosPipeColor - color: '#0000CCFF' + color: '#0055CCFF' - uid: 653 components: - type: Transform @@ -3113,7 +3028,7 @@ entities: pos: -1.5,2.5 parent: 70 - type: AtmosPipeColor - color: '#0000CCFF' + color: '#0055CCFF' - proto: GasPipeTJunction entities: - uid: 14 @@ -3122,7 +3037,7 @@ entities: pos: 0.5,-12.5 parent: 70 - type: AtmosPipeColor - color: '#0000CCFF' + color: '#0055CCFF' - uid: 15 components: - type: Transform @@ -3130,7 +3045,7 @@ entities: pos: 2.5,-8.5 parent: 70 - type: AtmosPipeColor - color: '#0000CCFF' + color: '#0055CCFF' - uid: 292 components: - type: Transform @@ -3138,7 +3053,7 @@ entities: pos: -0.5,-8.5 parent: 70 - type: AtmosPipeColor - color: '#0000CCFF' + color: '#0055CCFF' - uid: 299 components: - type: Transform @@ -3147,6 +3062,14 @@ entities: parent: 70 - type: AtmosPipeColor color: '#990000FF' + - uid: 519 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,-16.5 + parent: 70 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 586 components: - type: Transform @@ -3170,54 +3093,31 @@ entities: pos: -0.5,2.5 parent: 70 - type: AtmosPipeColor - color: '#0000CCFF' + color: '#0055CCFF' - proto: GasPort entities: - - uid: 42 - components: - - type: Transform - pos: 1.5,-15.5 - parent: 70 - - type: AtmosDevice - joinedGrid: 70 - - type: AtmosPipeColor - color: '#0000CCFF' - uid: 219 components: - type: Transform rot: 3.141592653589793 rad pos: -1.5,-19.5 parent: 70 - - type: AtmosDevice - joinedGrid: 70 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 265 components: - type: Transform rot: 3.141592653589793 rad pos: 0.5,-19.5 parent: 70 - - type: AtmosDevice - joinedGrid: 70 - proto: GasPressurePump entities: - - uid: 43 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 0.5,-15.5 - parent: 70 - - type: AtmosDevice - joinedGrid: 70 - - type: AtmosPipeColor - color: '#0000CCFF' - uid: 306 components: - type: Transform rot: -1.5707963267948966 rad pos: -3.5,3.5 parent: 70 - - type: AtmosDevice - joinedGrid: 70 - type: AtmosPipeColor color: '#990000FF' - proto: GasVentPump @@ -3228,78 +3128,62 @@ entities: rot: -1.5707963267948966 rad pos: 3.5,-1.5 parent: 70 - - type: AtmosDevice - joinedGrid: 70 - type: AtmosPipeColor - color: '#0000CCFF' + color: '#0055CCFF' - uid: 57 components: - type: Transform rot: 1.5707963267948966 rad pos: -0.5,-12.5 parent: 70 - - type: AtmosDevice - joinedGrid: 70 - type: AtmosPipeColor - color: '#0000CCFF' + color: '#0055CCFF' - uid: 304 components: - type: Transform rot: 1.5707963267948966 rad pos: -4.5,-1.5 parent: 70 - - type: AtmosDevice - joinedGrid: 70 - type: AtmosPipeColor - color: '#0000CCFF' + color: '#0055CCFF' - uid: 305 components: - type: Transform rot: 3.141592653589793 rad pos: -0.5,-9.5 parent: 70 - - type: AtmosDevice - joinedGrid: 70 - type: AtmosPipeColor - color: '#0000CCFF' + color: '#0055CCFF' - uid: 534 components: - type: Transform pos: -0.5,6.5 parent: 70 - - type: AtmosDevice - joinedGrid: 70 - type: AtmosPipeColor - color: '#0000CCFF' + color: '#0055CCFF' - uid: 543 components: - type: Transform rot: 1.5707963267948966 rad pos: -0.5,-16.5 parent: 70 - - type: AtmosDevice - joinedGrid: 70 - type: AtmosPipeColor - color: '#0000CCFF' + color: '#0055CCFF' - uid: 636 components: - type: Transform rot: 1.5707963267948966 rad pos: -2.5,2.5 parent: 70 - - type: AtmosDevice - joinedGrid: 70 - type: AtmosPipeColor - color: '#0000CCFF' + color: '#0055CCFF' - uid: 641 components: - type: Transform pos: 2.5,-6.5 parent: 70 - - type: AtmosDevice - joinedGrid: 70 - type: AtmosPipeColor - color: '#0000CCFF' + color: '#0055CCFF' - proto: GasVentScrubber entities: - uid: 550 @@ -3308,8 +3192,6 @@ entities: rot: -1.5707963267948966 rad pos: -0.5,-17.5 parent: 70 - - type: AtmosDevice - joinedGrid: 70 - type: AtmosPipeColor color: '#990000FF' - uid: 594 @@ -3318,8 +3200,6 @@ entities: rot: -1.5707963267948966 rad pos: -0.5,-13.5 parent: 70 - - type: AtmosDevice - joinedGrid: 70 - type: AtmosPipeColor color: '#990000FF' - uid: 623 @@ -3328,8 +3208,6 @@ entities: rot: 3.141592653589793 rad pos: -1.5,-9.5 parent: 70 - - type: AtmosDevice - joinedGrid: 70 - type: AtmosPipeColor color: '#990000FF' - uid: 639 @@ -3337,8 +3215,6 @@ entities: - type: Transform pos: -1.5,6.5 parent: 70 - - type: AtmosDevice - joinedGrid: 70 - type: AtmosPipeColor color: '#990000FF' - uid: 646 @@ -3346,8 +3222,6 @@ entities: - type: Transform pos: 2.5,-3.5 parent: 70 - - type: AtmosDevice - joinedGrid: 70 - type: AtmosPipeColor color: '#990000FF' - uid: 647 @@ -3356,8 +3230,6 @@ entities: rot: 1.5707963267948966 rad pos: -5.5,-3.5 parent: 70 - - type: AtmosDevice - joinedGrid: 70 - type: AtmosPipeColor color: '#990000FF' - uid: 662 @@ -3365,8 +3237,6 @@ entities: - type: Transform pos: 3.5,4.5 parent: 70 - - type: AtmosDevice - joinedGrid: 70 - type: AtmosPipeColor color: '#990000FF' - uid: 664 @@ -3375,8 +3245,6 @@ entities: rot: 1.5707963267948966 rad pos: -2.5,0.5 parent: 70 - - type: AtmosDevice - joinedGrid: 70 - type: AtmosPipeColor color: '#990000FF' - proto: GravityGeneratorMini @@ -3708,6 +3576,24 @@ entities: - type: Transform pos: -3.5,-1.5 parent: 70 +- proto: LockerWallMaterialsFuelPlasmaFilled + entities: + - uid: 602 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,-15.5 + parent: 70 +- proto: NitrogenCanister + entities: + - uid: 46 + components: + - type: Transform + anchored: True + pos: -1.5,-19.5 + parent: 70 + - type: Physics + bodyType: Static - proto: OreProcessor entities: - uid: 604 @@ -3715,6 +3601,16 @@ entities: - type: Transform pos: -0.5,0.5 parent: 70 +- proto: OxygenCanister + entities: + - uid: 42 + components: + - type: Transform + anchored: True + pos: 0.5,-19.5 + parent: 70 + - type: Physics + bodyType: Static - proto: Paper entities: - uid: 567 @@ -3734,6 +3630,16 @@ entities: - type: Transform pos: -4.5,1.5 parent: 70 + - uid: 603 + components: + - type: Transform + pos: 5.5,3.5 + parent: 70 + - uid: 605 + components: + - type: Transform + pos: 5.5,-0.5 + parent: 70 - proto: PortableGeneratorPacman entities: - uid: 276 @@ -3759,8 +3665,6 @@ entities: entities: - uid: 245 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: -0.5,-18.5 @@ -3769,8 +3673,6 @@ entities: powerLoad: 0 - uid: 535 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -3.5,8.5 @@ -3779,8 +3681,6 @@ entities: powerLoad: 0 - uid: 537 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 1.5707963267948966 rad pos: 2.5,8.5 @@ -3789,8 +3689,6 @@ entities: powerLoad: 0 - uid: 538 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -2.5,6.5 parent: 70 @@ -3798,8 +3696,6 @@ entities: powerLoad: 0 - uid: 545 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -0.5,-2.5 @@ -3808,8 +3704,6 @@ entities: powerLoad: 0 - uid: 547 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 1.5707963267948966 rad pos: 1.5,-3.5 @@ -3818,8 +3712,6 @@ entities: powerLoad: 0 - uid: 551 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 1.5707963267948966 rad pos: 1.5,0.5 @@ -3828,8 +3720,6 @@ entities: powerLoad: 0 - uid: 553 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -0.5,0.5 @@ -3838,8 +3728,6 @@ entities: powerLoad: 0 - uid: 554 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 1.5707963267948966 rad pos: 3.5,-18.5 @@ -3848,8 +3736,6 @@ entities: powerLoad: 0 - uid: 555 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -4.5,-18.5 @@ -3858,8 +3744,6 @@ entities: powerLoad: 0 - uid: 558 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: -0.5,-13.5 @@ -3868,8 +3752,6 @@ entities: powerLoad: 0 - uid: 559 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 1.5707963267948966 rad pos: -3.5,-9.5 @@ -3878,8 +3760,6 @@ entities: powerLoad: 0 - uid: 560 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 2.5,-9.5 @@ -3890,8 +3770,6 @@ entities: entities: - uid: 556 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -6.5,3.5 parent: 70 @@ -3954,71 +3832,33 @@ entities: - type: Transform pos: -0.5,-14.5 parent: 70 -- proto: SheetPlasma - entities: - - uid: 605 - components: - - type: Transform - pos: 1.358752,-16.485178 - parent: 70 - - type: Stack - count: 15 - - type: Item - size: 15 - proto: ShuttersNormal entities: - uid: 251 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 0.5,1.5 parent: 70 - - type: DeviceLinkSink - links: - - 544 - uid: 252 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 0.5,2.5 parent: 70 - - type: DeviceLinkSink - links: - - 544 - uid: 253 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 0.5,3.5 parent: 70 - - type: DeviceLinkSink - links: - - 544 - uid: 261 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 1.5,-2.5 parent: 70 - - type: DeviceLinkSink - links: - - 528 - - 539 - uid: 263 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 2.5,-2.5 parent: 70 - - type: DeviceLinkSink - links: - - 528 - - 539 - proto: ShuttleWindow entities: - uid: 5 @@ -4260,7 +4100,7 @@ entities: - type: Transform pos: 1.5,-14.5 parent: 70 -- proto: SignMinerDock +- proto: SignShipDock entities: - uid: 610 components: @@ -4279,7 +4119,7 @@ entities: - type: Transform pos: -2.5,-17.5 parent: 70 -- proto: soda_dispenser +- proto: SodaDispenser entities: - uid: 596 components: @@ -4773,8 +4613,6 @@ entities: entities: - uid: 137 components: - - type: MetaData - flags: SessionSpecific - type: Transform pos: -5.5,-4.5 parent: 70 @@ -4782,8 +4620,6 @@ entities: entities: - uid: 111 components: - - type: MetaData - flags: SessionSpecific - type: Transform pos: 3.5,5.5 parent: 70 @@ -4791,8 +4627,6 @@ entities: entities: - uid: 389 components: - - type: MetaData - flags: SessionSpecific - type: Transform pos: -4.5,-1.5 parent: 70 @@ -4800,428 +4634,306 @@ entities: entities: - uid: 6 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 4.5,4.5 parent: 70 - uid: 7 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -5.5,-0.5 parent: 70 - uid: 39 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 2.5,-15.5 parent: 70 - uid: 40 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -0.5,-19.5 parent: 70 - uid: 60 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 0.5,0.5 parent: 70 - uid: 69 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 5.5,-1.5 parent: 70 - uid: 72 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 0.5,-2.5 parent: 70 - uid: 73 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 0.5,4.5 parent: 70 - uid: 76 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 0.5,-6.5 parent: 70 - uid: 80 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -2.5,8.5 parent: 70 - uid: 86 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -0.5,4.5 parent: 70 - uid: 87 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -5.5,-2.5 parent: 70 - uid: 88 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 5.5,-2.5 parent: 70 - uid: 90 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -4.5,-9.5 parent: 70 - uid: 91 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -6.5,4.5 parent: 70 - uid: 93 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -4.5,7.5 parent: 70 - uid: 94 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -4.5,6.5 parent: 70 - uid: 95 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 0.5,-7.5 parent: 70 - uid: 98 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 1.5,8.5 parent: 70 - uid: 99 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 1.5,7.5 parent: 70 - uid: 100 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 3.5,6.5 parent: 70 - uid: 101 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 3.5,7.5 parent: 70 - uid: 103 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 4.5,6.5 parent: 70 - uid: 113 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -6.5,-2.5 parent: 70 - uid: 119 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -4.5,-0.5 parent: 70 - uid: 120 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 1.5,-7.5 parent: 70 - uid: 121 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 0.5,5.5 parent: 70 - uid: 125 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 4.5,-7.5 parent: 70 - uid: 127 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 0.5,-0.5 parent: 70 - uid: 136 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -6.5,-7.5 parent: 70 - uid: 141 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -5.5,-7.5 parent: 70 - uid: 144 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -5.5,-9.5 parent: 70 - uid: 151 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 1.5,-19.5 parent: 70 - uid: 152 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 4.5,-9.5 parent: 70 - uid: 153 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 3.5,-9.5 parent: 70 - uid: 154 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 3.5,-10.5 parent: 70 - uid: 163 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -0.5,-0.5 parent: 70 - uid: 164 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 1.5,5.5 parent: 70 - uid: 181 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -2.5,-20.5 parent: 70 - uid: 187 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 1.5,-20.5 parent: 70 - uid: 188 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -3.5,-15.5 parent: 70 - uid: 192 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -2.5,-14.5 parent: 70 - uid: 193 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 1.5,-18.5 parent: 70 - uid: 194 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 2.5,-18.5 parent: 70 - uid: 195 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -2.5,-19.5 parent: 70 - uid: 196 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -5.5,4.5 parent: 70 - uid: 197 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -3.5,-18.5 parent: 70 - uid: 200 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 5.5,4.5 parent: 70 - uid: 201 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 5.5,-7.5 parent: 70 - uid: 212 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 1.5,-14.5 parent: 70 - uid: 213 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 2.5,-14.5 parent: 70 - uid: 214 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 2.5,-13.5 parent: 70 - uid: 238 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -4.5,-13.5 parent: 70 - uid: 239 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -3.5,-13.5 parent: 70 - uid: 240 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 3.5,-13.5 parent: 70 - uid: 241 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -3.5,-14.5 parent: 70 - uid: 242 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -2.5,-18.5 parent: 70 - uid: 243 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -2.5,7.5 parent: 70 - uid: 244 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 0.5,-3.5 parent: 70 - uid: 286 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -4.5,-10.5 parent: 70 - uid: 353 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -4.5,4.5 parent: 70 From e89c5f20ec7509db0db507e1a682b2ab3701c0c8 Mon Sep 17 00:00:00 2001 From: dustylens Date: Fri, 27 Sep 2024 16:07:13 -0700 Subject: [PATCH 2/3] Updates waste pump and pacman to ship "on" versions --- Resources/Maps/_NF/Shuttles/barge.yml | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/Resources/Maps/_NF/Shuttles/barge.yml b/Resources/Maps/_NF/Shuttles/barge.yml index ce88c7e6661..e5052ba37f1 100644 --- a/Resources/Maps/_NF/Shuttles/barge.yml +++ b/Resources/Maps/_NF/Shuttles/barge.yml @@ -3110,9 +3110,9 @@ entities: rot: 3.141592653589793 rad pos: 0.5,-19.5 parent: 70 -- proto: GasPressurePump +- proto: GasPressurePumpOnMax entities: - - uid: 306 + - uid: 276 components: - type: Transform rot: -1.5707963267948966 rad @@ -3640,20 +3640,17 @@ entities: - type: Transform pos: 5.5,-0.5 parent: 70 -- proto: PortableGeneratorPacman +- proto: PortableGeneratorPacmanShuttle entities: - - uid: 276 + - uid: 306 components: - type: Transform - anchored: True pos: 1.5,-17.5 parent: 70 - - type: MaterialStorage - storage: - Plasma: 1500 + - type: FuelGenerator + on: False - type: Physics bodyType: Static - - type: InsertingMaterialStorage - proto: PowerCellRecharger entities: - uid: 126 From 3655e15d0833ba4219fe14566460d66822380268 Mon Sep 17 00:00:00 2001 From: Whatstone Date: Fri, 11 Oct 2024 15:44:58 -0400 Subject: [PATCH 3/3] Barge price to 47k, ~10% margin --- Resources/Prototypes/_NF/Shipyard/barge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_NF/Shipyard/barge.yml b/Resources/Prototypes/_NF/Shipyard/barge.yml index 7ae441af9ad..9494e3ab19f 100644 --- a/Resources/Prototypes/_NF/Shipyard/barge.yml +++ b/Resources/Prototypes/_NF/Shipyard/barge.yml @@ -12,7 +12,7 @@ id: Barge name: NC Barge description: A medium shipping vessel repurposed into a salvage bar. - price: 45000 # Appraises for 42046, margin of ~5% - TODO: fix these values, getting tests to pass - Whatstone + price: 47000 # Appraises for 42901, margin of ~10% - TODO: fix these values, getting tests to pass - Whatstone category: Medium group: Shipyard shuttlePath: /Maps/_NF/Shuttles/barge.yml