From fbc58f585ef648adb5547d04a9a0bcbdb1c92f02 Mon Sep 17 00:00:00 2001 From: dustylens Date: Sat, 28 Dec 2024 13:47:34 -0800 Subject: [PATCH] Feedback Adjustments --- Resources/Maps/_NF/Shuttles/nightlight.yml | 1171 +++++++++-------- .../_NF/Guidebook/Shipyard/Nightlight.xml | 13 +- .../shuttle_maps/128x96.rsi/nightlight.png | Bin 2064 -> 2065 bytes 3 files changed, 632 insertions(+), 552 deletions(-) diff --git a/Resources/Maps/_NF/Shuttles/nightlight.yml b/Resources/Maps/_NF/Shuttles/nightlight.yml index 5b7a5518aa8..9b84de87346 100644 --- a/Resources/Maps/_NF/Shuttles/nightlight.yml +++ b/Resources/Maps/_NF/Shuttles/nightlight.yml @@ -31,7 +31,7 @@ entities: chunks: 0,0: ind: 0,0 - tiles: CAAAAAAACAAAAAAACAAAAAAABgAAAAAABgAAAAAABQAAAAAABQAAAAAABQAAAAAABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAwAAAAAABwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAABQAAAAAABwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAwAAAAAABwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAABQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAACgAAAAAACgAAAAAACgAAAAAACgAAAAAACgAAAAAAAwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAACgAAAAAACgAAAAAACgAAAAAACgAAAAAACgAAAAAAAwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAACgAAAAAACgAAAAAACgAAAAAACgAAAAAACgAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAACgAAAAAACgAAAAAACgAAAAAAAwAAAAAAAwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAACgAAAAAACgAAAAAAAwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: CAAAAAAACAAAAAAACAAAAAAABgAAAAAABgAAAAAABQAAAAAABQAAAAAABQAAAAAABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAwAAAAAABwAAAAAABwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAABQAAAAAABwAAAAAABwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAwAAAAAABwAAAAAABwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAABQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAACgAAAAAACgAAAAAACgAAAAAACgAAAAAACgAAAAAAAwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAACgAAAAAACgAAAAAACgAAAAAACgAAAAAACgAAAAAAAwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAACgAAAAAACgAAAAAACgAAAAAACgAAAAAACgAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAACgAAAAAACgAAAAAACgAAAAAAAwAAAAAAAwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAACgAAAAAACgAAAAAAAwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 -1,0: ind: -1,0 @@ -163,7 +163,7 @@ entities: color: '#FFFFFFFF' id: BrickTileWhiteCornerNe decals: - 584: 5,4 + 630: 4,4 - node: color: '#4B709CFF' id: BrickTileWhiteCornerNw @@ -196,7 +196,7 @@ entities: id: BrickTileWhiteCornerSe decals: 407: 3,1 - 587: 5,2 + 631: 4,2 - node: color: '#4B709CFF' id: BrickTileWhiteCornerSw @@ -262,7 +262,7 @@ entities: color: '#FFFFFFFF' id: BrickTileWhiteLineE decals: - 586: 5,3 + 632: 4,3 - node: color: '#DDC3A1FF' id: BrickTileWhiteLineN @@ -358,11 +358,8 @@ entities: 367: -2,1 368: -3,1 572: 4,3 - 573: 5,3 - 574: 5,2 575: 4,2 576: 4,4 - 577: 5,4 - node: color: '#4B709C3F' id: CheckerNWSE @@ -399,11 +396,8 @@ entities: 401: -4,3 402: -4,4 578: 4,3 - 579: 5,3 - 580: 5,2 581: 4,2 582: 4,4 - 583: 5,4 - node: color: '#3C44AAFF' id: DeliveryGreyscale @@ -519,8 +513,8 @@ entities: 19: -5,0 20: -5,-1 232: -5,3 - 570: 6,3 624: 0,8 + 633: 5,3 - node: color: '#FFFFFFFF' id: WarnLineGreyscaleN @@ -544,8 +538,8 @@ entities: 5: 5,0 6: 5,-1 231: -5,3 - 571: 6,3 625: 0,8 + 634: 5,3 - node: color: '#FFFFFFFF' id: WarnLineN @@ -583,21 +577,21 @@ entities: -1,0: 0: 65519 0,1: - 0: 61071 + 0: 65167 -1,1: 0: 64783 0,2: - 0: 1775 + 0: 1774 1: 32768 -1,2: 0: 3277 1: 8448 1,0: - 0: 29455 - 2: 34816 + 0: 12559 + 2: 52224 1,1: - 0: 13059 - 2: 8 + 0: 13057 + 2: 12 1: 34816 1,2: 0: 3 @@ -687,52 +681,60 @@ entities: - type: RadiationGridResistance - proto: AirAlarm entities: - - uid: 45 + - uid: 636 components: - type: Transform rot: 3.141592653589793 rad - pos: 5.5,5.5 + pos: 4.5,5.5 parent: 1 - type: DeviceList devices: - - 461 - - 460 - - 569 - - 571 - - 326 - - 568 - - 602 - - 252 - - 529 - - 442 - - 59 + - 470 - 540 - - 276 + - 529 - 128 + - 252 + - 442 + - 34 + - 142 - type: DeviceLinkSource linkedPorts: - 143: + 617: - AirDanger: Close - 471: + 467: - AirDanger: Close - 476: + 469: - AirDanger: Close 472: - AirDanger: Close - 469: + 476: - AirDanger: Close - 467: + 471: - AirDanger: Close - 617: + 143: - AirDanger: Close - - uid: 603 + - uid: 637 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -4.5,2.5 + pos: 2.5,5.5 parent: 1 - type: DeviceList devices: + - 453 + - 456 + - 452 + - 455 + - 454 + - 457 + - 428 + - 575 + - 593 + - 461 + - 460 + - 569 + - 571 + - 584 + - 568 - 445 - 446 - 447 @@ -740,43 +742,43 @@ entities: - 449 - 450 - 451 - - 456 - - 453 - - 454 - - 457 - - 593 - - 428 - - 575 - - 455 - - 452 + - 45 - type: DeviceLinkSource linkedPorts: - 305: - - AirDanger: Close - 306: + 308: - AirDanger: Close - 307: + 309: - AirDanger: Close - 314: + 310: - AirDanger: Close - 313: + 311: - AirDanger: Close 312: - AirDanger: Close - 311: + 313: - AirDanger: Close - 308: + 314: - AirDanger: Close - 309: + 307: - AirDanger: Close - 310: + 306: + - AirDanger: Close + 305: - AirDanger: Close - proto: AirlockCommandGlass entities: - - uid: 430 + - uid: 621 components: - type: Transform - pos: 0.5,8.5 + rot: 3.141592653589793 rad + pos: 0.5,7.5 + parent: 1 +- proto: AirlockEngineering + entities: + - uid: 326 + components: + - type: Transform + pos: -2.5,7.5 parent: 1 - proto: AirlockExternalGlass entities: @@ -817,11 +819,10 @@ entities: parent: 1 - proto: AirlockFreezer entities: - - uid: 30 + - uid: 626 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 6.5,3.5 + pos: 5.5,3.5 parent: 1 - proto: AirlockGlassShuttle entities: @@ -868,31 +869,31 @@ entities: parent: 1 - proto: AirSensor entities: - - uid: 593 + - uid: 142 components: - type: Transform - rot: 3.141592653589793 rad - pos: -3.5,-2.5 + rot: -1.5707963267948966 rad + pos: -0.5,8.5 parent: 1 - type: DeviceNetwork deviceLists: - - 603 - - uid: 602 + - 636 + - uid: 593 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 2.5,8.5 + rot: 3.141592653589793 rad + pos: -3.5,-2.5 parent: 1 - type: DeviceNetwork deviceLists: - - 45 + - 637 - proto: APCBasic entities: - - uid: 348 + - uid: 332 components: - type: Transform - rot: 3.141592653589793 rad - pos: -2.5,6.5 + rot: 1.5707963267948966 rad + pos: -2.5,8.5 parent: 1 - proto: AtmosDeviceFanDirectional entities: @@ -914,12 +915,6 @@ entities: rot: -1.5707963267948966 rad pos: -7.5,-0.5 parent: 1 - - uid: 76 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 6.5,3.5 - parent: 1 - uid: 222 components: - type: Transform @@ -936,6 +931,12 @@ entities: rot: -1.5707963267948966 rad pos: -7.5,0.5 parent: 1 + - uid: 602 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 5.5,3.5 + parent: 1 - proto: AtmosFixBlockerMarker entities: - uid: 117 @@ -1050,11 +1051,21 @@ entities: parent: 1 - proto: AtmosFixFreezerMarker entities: - - uid: 215 + - uid: 59 components: - type: Transform pos: 7.5,4.5 parent: 1 + - uid: 61 + components: + - type: Transform + pos: 6.5,4.5 + parent: 1 + - uid: 191 + components: + - type: Transform + pos: 6.5,2.5 + parent: 1 - uid: 219 components: - type: Transform @@ -1065,6 +1076,11 @@ entities: - type: Transform pos: 7.5,3.5 parent: 1 + - uid: 619 + components: + - type: Transform + pos: 6.5,3.5 + parent: 1 - proto: BarSign entities: - uid: 97 @@ -1077,7 +1093,7 @@ entities: - uid: 355 components: - type: Transform - pos: 4.913182,4.684615 + pos: 2.5234096,3.7957337 parent: 1 - proto: BenchSofaCorpCorner entities: @@ -1110,88 +1126,82 @@ entities: parent: 1 - proto: Biogenerator entities: - - uid: 49 + - uid: 114 components: - type: Transform - pos: -6.5,2.5 + pos: 7.5,2.5 parent: 1 - proto: BoozeDispenser entities: - - uid: 87 + - uid: 581 components: - type: Transform - pos: 5.5,4.5 + pos: 4.5,4.5 parent: 1 - proto: BoxColoredLightBulb entities: - uid: 434 components: - type: Transform - pos: -5.196141,4.6403866 + pos: -5.269492,2.421494 parent: 1 - proto: BoxTrashbag entities: - uid: 520 components: - type: Transform - pos: -5.397615,4.5558963 + pos: -5.5611587,2.3694105 parent: 1 - proto: Bucket entities: - - uid: 229 + - uid: 566 components: - type: Transform - pos: 4.384118,8.571932 + pos: 3.2296934,8.701155 parent: 1 - proto: ButtonFrameCaution entities: - - uid: 427 + - uid: 178 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -5.5,7.75 + rot: -1.5707963267948966 rad + pos: 0.5,8.25 parent: 1 - proto: ButtonFrameCautionSecurity entities: - - uid: 120 + - uid: 547 components: - type: Transform rot: -1.5707963267948966 rad - pos: 0.5,7.75 + pos: 0.5,8.75 parent: 1 - proto: ButtonFrameGrey entities: - - uid: 62 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 4.75,1.5 - parent: 1 - - uid: 581 + - uid: 87 components: - type: Transform rot: -1.5707963267948966 rad - pos: 0.5,7.25 + pos: 5.5,2.75 parent: 1 - - uid: 582 + - uid: 103 components: - type: Transform rot: 1.5707963267948966 rad - pos: -5.5,7.25 + pos: 0.5,6.75 parent: 1 - - uid: 584 + - uid: 175 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 0.5,7.75 + rot: 3.141592653589793 rad + pos: -3.25,1.5 parent: 1 - proto: ButtonFrameJanitor entities: - - uid: 298 + - uid: 156 components: - type: Transform rot: 3.141592653589793 rad - pos: 4.25,1.5 + pos: -3.75,1.5 parent: 1 - proto: CableApcExtension entities: @@ -1215,55 +1225,60 @@ entities: - type: Transform pos: -6.5,4.5 parent: 1 - - uid: 114 + - uid: 116 components: - type: Transform - pos: 1.5,7.5 + pos: 0.5,6.5 parent: 1 - - uid: 116 + - uid: 122 components: - type: Transform - pos: 0.5,6.5 + pos: 2.5,8.5 + parent: 1 + - uid: 135 + components: + - type: Transform + pos: 5.5,7.5 parent: 1 - uid: 138 components: - type: Transform - pos: -0.5,7.5 + pos: -3.5,7.5 parent: 1 - - uid: 175 + - uid: 147 components: - type: Transform - pos: 0.5,7.5 + pos: 3.5,8.5 parent: 1 - - uid: 345 + - uid: 148 components: - type: Transform - pos: -2.5,6.5 + pos: 0.5,8.5 parent: 1 - - uid: 349 + - uid: 232 components: - type: Transform - pos: 3.5,7.5 + pos: 1.5,8.5 parent: 1 - - uid: 351 + - uid: 348 components: - type: Transform - pos: -1.5,9.5 + pos: -0.5,8.5 parent: 1 - - uid: 352 + - uid: 349 components: - type: Transform - pos: -1.5,8.5 + pos: 3.5,7.5 parent: 1 - - uid: 353 + - uid: 352 components: - type: Transform - pos: -1.5,7.5 + pos: -0.5,7.5 parent: 1 - - uid: 357 + - uid: 353 components: - type: Transform - pos: 2.5,7.5 + pos: -2.5,8.5 parent: 1 - uid: 360 components: @@ -1510,6 +1525,16 @@ entities: - type: Transform pos: 3.5,5.5 parent: 1 + - uid: 603 + components: + - type: Transform + pos: -4.5,7.5 + parent: 1 + - uid: 641 + components: + - type: Transform + pos: -1.5,7.5 + parent: 1 - proto: CableHV entities: - uid: 95 @@ -1527,11 +1552,6 @@ entities: - type: Transform pos: -4.5,6.5 parent: 1 - - uid: 580 - components: - - type: Transform - pos: -3.5,6.5 - parent: 1 - proto: CableMV entities: - uid: 74 @@ -1544,6 +1564,16 @@ entities: - type: Transform pos: -2.5,6.5 parent: 1 + - uid: 120 + components: + - type: Transform + pos: -2.5,7.5 + parent: 1 + - uid: 144 + components: + - type: Transform + pos: -2.5,8.5 + parent: 1 - uid: 464 components: - type: Transform @@ -1663,6 +1693,14 @@ entities: rot: 1.5707963267948966 rad pos: 3.5,-4.5 parent: 1 +- proto: ChairFolding + entities: + - uid: 236 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 2.5018516,10.611803 + parent: 1 - proto: ChairPilotSeat entities: - uid: 544 @@ -1710,10 +1748,10 @@ entities: parent: 1 - proto: ClosetChefFilled entities: - - uid: 303 + - uid: 629 components: - type: Transform - pos: -3.7665334,2.4967659 + pos: 6.5,2.5 parent: 1 - proto: ClosetWallO2N2FilledRandom entities: @@ -1727,18 +1765,12 @@ entities: - type: Transform pos: 7.5,1.5 parent: 1 - - uid: 604 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 2.5,-5.5 - parent: 1 - proto: ClothingOuterWinterChef entities: - - uid: 424 + - uid: 177 components: - type: Transform - pos: 7.607233,2.4791915 + pos: 6.522383,4.5488315 parent: 1 - proto: ComputerTabletopShuttle entities: @@ -1756,17 +1788,17 @@ entities: parent: 1 - proto: ComputerWallmountWithdrawBankATM entities: - - uid: 195 + - uid: 431 components: - type: Transform - pos: -3.5,1.5 + pos: 4.5,1.5 parent: 1 - proto: CrateFreezer entities: - - uid: 316 + - uid: 298 components: - type: Transform - pos: 7.5,2.5 + pos: 6.5,4.5 parent: 1 - proto: DefibrillatorCabinetFilled entities: @@ -1788,29 +1820,24 @@ entities: - uid: 620 components: - type: Transform - pos: 4.3343086,4.815199 - parent: 1 - - uid: 621 - components: - - type: Transform - pos: 4.9488916,4.794366 + pos: 2.3984098,4.066567 parent: 1 - uid: 622 components: - type: Transform - pos: 4.7301416,4.544366 + pos: 2.3671598,3.7332337 parent: 1 - uid: 623 components: - type: Transform - pos: 4.3863916,4.450616 + pos: 2.7317429,4.004067 parent: 1 - proto: DrinkShaker entities: - uid: 338 components: - type: Transform - pos: 4.5798483,4.684615 + pos: 2.5859096,3.7957337 parent: 1 - proto: EmergencyLight entities: @@ -1832,28 +1859,21 @@ entities: rot: 3.141592653589793 rad pos: 0.5,-3.5 parent: 1 - - uid: 528 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 4.5,2.5 - parent: 1 - uid: 562 components: - type: Transform rot: 1.5707963267948966 rad pos: -1.5,9.5 parent: 1 - - uid: 570 + - uid: 564 components: - type: Transform - pos: -3.5,8.5 + pos: 4.5,8.5 parent: 1 - - uid: 608 + - uid: 570 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 5.5,7.5 + pos: -3.5,8.5 parent: 1 - proto: ExtinguisherCabinetFilled entities: @@ -1876,20 +1896,24 @@ entities: parent: 1 - proto: FirelockGlass entities: - - uid: 9 + - uid: 34 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 6.5,3.5 + rot: 3.141592653589793 rad + pos: 0.5,7.5 parent: 1 - - uid: 59 + - type: DeviceNetwork + deviceLists: + - 636 + - uid: 45 components: - type: Transform - pos: 0.5,8.5 + rot: 1.5707963267948966 rad + pos: 5.5,3.5 parent: 1 - type: DeviceNetwork deviceLists: - - 45 + - 637 - uid: 442 components: - type: Transform @@ -1898,7 +1922,7 @@ entities: parent: 1 - type: DeviceNetwork deviceLists: - - 45 + - 636 - uid: 443 components: - type: Transform @@ -1913,7 +1937,7 @@ entities: parent: 1 - type: DeviceNetwork deviceLists: - - 603 + - 637 - uid: 446 components: - type: Transform @@ -1922,7 +1946,7 @@ entities: parent: 1 - type: DeviceNetwork deviceLists: - - 603 + - 637 - uid: 447 components: - type: Transform @@ -1931,7 +1955,7 @@ entities: parent: 1 - type: DeviceNetwork deviceLists: - - 603 + - 637 - uid: 448 components: - type: Transform @@ -1940,7 +1964,7 @@ entities: parent: 1 - type: DeviceNetwork deviceLists: - - 603 + - 637 - uid: 449 components: - type: Transform @@ -1949,7 +1973,7 @@ entities: parent: 1 - type: DeviceNetwork deviceLists: - - 603 + - 637 - uid: 450 components: - type: Transform @@ -1958,7 +1982,7 @@ entities: parent: 1 - type: DeviceNetwork deviceLists: - - 603 + - 637 - uid: 451 components: - type: Transform @@ -1967,7 +1991,7 @@ entities: parent: 1 - type: DeviceNetwork deviceLists: - - 603 + - 637 - proto: FloorDrain entities: - uid: 523 @@ -1983,42 +2007,43 @@ entities: - uid: 605 components: - type: Transform - pos: 0.7981141,4.6325316 + pos: -1.4738168,4.2156887 parent: 1 - proto: FoodShakerPepper entities: - uid: 256 components: - type: Transform - pos: 1.0526497,4.7931643 + pos: -1.4529834,3.6607575 parent: 1 - uid: 586 components: - type: Transform - pos: 1.9353927,4.525096 + pos: -1.3071501,3.5357575 parent: 1 - proto: FoodShakerSalt entities: - uid: 257 components: - type: Transform - pos: 0.8165386,4.7931643 + pos: -1.7446501,3.6607575 parent: 1 - uid: 587 components: - type: Transform - pos: 1.907615,4.793615 + pos: -1.6300669,3.462841 parent: 1 -- proto: GasMixerOnFlipped +- proto: GasMixerOn entities: - - uid: 173 + - uid: 229 components: - type: Transform + rot: 1.5707963267948966 rad pos: -0.5,7.5 parent: 1 - type: GasMixer - inletTwoConcentration: 0.79 - inletOneConcentration: 0.21 + inletTwoConcentration: 0.20999998 + inletOneConcentration: 0.79 - type: AtmosPipeColor color: '#0055CCFF' - proto: GasPassiveVent @@ -2056,6 +2081,14 @@ entities: parent: 1 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 213 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,8.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 539 components: - type: Transform @@ -2112,14 +2145,6 @@ entities: color: '#990000FF' - proto: GasPipeStraight entities: - - uid: 122 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 1.5,7.5 - parent: 1 - - type: AtmosPipeColor - color: '#0055CCFF' - uid: 127 components: - type: Transform @@ -2152,20 +2177,6 @@ entities: parent: 1 - type: AtmosPipeColor color: '#990000FF' - - uid: 172 - components: - - type: Transform - pos: 1.5,4.5 - parent: 1 - - type: AtmosPipeColor - color: '#0055CCFF' - - uid: 177 - components: - - type: Transform - pos: 5.5,3.5 - parent: 1 - - type: AtmosPipeColor - color: '#0055CCFF' - uid: 189 components: - type: Transform @@ -2182,6 +2193,14 @@ entities: parent: 1 - type: AtmosPipeColor color: '#990000FF' + - uid: 217 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 5.5,2.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 228 components: - type: Transform @@ -2775,11 +2794,19 @@ entities: parent: 1 - type: AtmosPipeColor color: '#990000FF' - - uid: 142 + - uid: 214 components: - type: Transform - rot: 3.141592653589793 rad - pos: 5.5,2.5 + rot: -1.5707963267948966 rad + pos: 1.5,7.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 215 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,4.5 parent: 1 - type: AtmosPipeColor color: '#0055CCFF' @@ -2859,14 +2886,6 @@ entities: parent: 1 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 619 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -0.5,8.5 - parent: 1 - - type: AtmosPipeColor - color: '#0055CCFF' - uid: 625 components: - type: Transform @@ -2910,17 +2929,7 @@ entities: parent: 1 - type: DeviceNetwork deviceLists: - - 45 - - type: AtmosPipeColor - color: '#0055CCFF' - - uid: 326 - components: - - type: Transform - pos: 5.5,4.5 - parent: 1 - - type: DeviceNetwork - deviceLists: - - 45 + - 636 - type: AtmosPipeColor color: '#0055CCFF' - uid: 452 @@ -2931,7 +2940,7 @@ entities: parent: 1 - type: DeviceNetwork deviceLists: - - 603 + - 637 - type: AtmosPipeColor color: '#0055CCFF' - uid: 453 @@ -2942,7 +2951,7 @@ entities: parent: 1 - type: DeviceNetwork deviceLists: - - 603 + - 637 - type: AtmosPipeColor color: '#0055CCFF' - uid: 454 @@ -2953,7 +2962,7 @@ entities: parent: 1 - type: DeviceNetwork deviceLists: - - 603 + - 637 - type: AtmosPipeColor color: '#0055CCFF' - uid: 459 @@ -2972,7 +2981,7 @@ entities: parent: 1 - type: DeviceNetwork deviceLists: - - 45 + - 637 - type: AtmosPipeColor color: '#0055CCFF' - uid: 540 @@ -2982,7 +2991,7 @@ entities: parent: 1 - type: DeviceNetwork deviceLists: - - 45 + - 636 - type: AtmosPipeColor color: '#0055CCFF' - uid: 571 @@ -2993,7 +3002,7 @@ entities: parent: 1 - type: DeviceNetwork deviceLists: - - 45 + - 637 - type: AtmosPipeColor color: '#0055CCFF' - uid: 575 @@ -3004,34 +3013,32 @@ entities: parent: 1 - type: DeviceNetwork deviceLists: - - 603 + - 637 - type: AtmosPipeColor color: '#0055CCFF' -- proto: GasVentScrubber - entities: - - uid: 128 + - uid: 584 components: - type: Transform - pos: 2.5,10.5 + rot: -1.5707963267948966 rad + pos: 2.5,4.5 parent: 1 - type: DeviceNetwork deviceLists: - - 45 + - 637 - type: AtmosPipeColor - color: '#990000FF' - - uid: 276 + color: '#0055CCFF' +- proto: GasVentScrubber + entities: + - uid: 128 components: - type: Transform - anchored: False - rot: 3.141592653589793 rad - pos: -3.5,6.5 + pos: 2.5,10.5 parent: 1 - type: DeviceNetwork deviceLists: - - 45 - - type: Physics - canCollide: True - bodyType: Dynamic + - 636 + - type: AtmosPipeColor + color: '#990000FF' - uid: 428 components: - type: Transform @@ -3040,7 +3047,7 @@ entities: parent: 1 - type: DeviceNetwork deviceLists: - - 603 + - 637 - type: AtmosPipeColor color: '#990000FF' - uid: 455 @@ -3051,7 +3058,7 @@ entities: parent: 1 - type: DeviceNetwork deviceLists: - - 603 + - 637 - type: AtmosPipeColor color: '#990000FF' - uid: 456 @@ -3062,7 +3069,7 @@ entities: parent: 1 - type: DeviceNetwork deviceLists: - - 603 + - 637 - type: AtmosPipeColor color: '#990000FF' - uid: 457 @@ -3073,7 +3080,7 @@ entities: parent: 1 - type: DeviceNetwork deviceLists: - - 603 + - 637 - type: AtmosPipeColor color: '#990000FF' - uid: 461 @@ -3084,7 +3091,7 @@ entities: parent: 1 - type: DeviceNetwork deviceLists: - - 45 + - 637 - type: AtmosPipeColor color: '#990000FF' - uid: 470 @@ -3093,6 +3100,9 @@ entities: rot: 3.141592653589793 rad pos: -3.5,6.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 636 - type: AtmosPipeColor color: '#990000FF' - uid: 488 @@ -3109,7 +3119,7 @@ entities: parent: 1 - type: DeviceNetwork deviceLists: - - 45 + - 636 - type: AtmosPipeColor color: '#990000FF' - uid: 568 @@ -3120,7 +3130,7 @@ entities: parent: 1 - type: DeviceNetwork deviceLists: - - 45 + - 637 - type: AtmosPipeColor color: '#990000FF' - uid: 569 @@ -3131,7 +3141,7 @@ entities: parent: 1 - type: DeviceNetwork deviceLists: - - 45 + - 637 - type: AtmosPipeColor color: '#990000FF' - proto: GravityGeneratorMini @@ -3294,12 +3304,11 @@ entities: - type: Transform pos: -3.5,8.5 parent: 1 -- proto: HospitalCurtains +- proto: HospitalCurtainsOpen entities: - - uid: 244 + - uid: 233 components: - type: Transform - rot: 1.5707963267948966 rad pos: -4.5,3.5 parent: 1 - proto: hydroponicsTrayAnchored @@ -3310,26 +3319,23 @@ entities: rot: -1.5707963267948966 rad pos: 5.5,6.5 parent: 1 - - uid: 332 - components: - - type: Transform - pos: 1.5,10.5 - parent: 1 - - uid: 341 + - uid: 358 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 5.5,7.5 + rot: 3.141592653589793 rad + pos: 1.5,8.5 parent: 1 - uid: 458 components: - type: Transform - pos: 3.5,9.5 + rot: 1.5707963267948966 rad + pos: 1.5,6.5 parent: 1 - - uid: 480 + - uid: 580 components: - type: Transform - pos: 2.5,10.5 + rot: 1.5707963267948966 rad + pos: 4.5,6.5 parent: 1 - uid: 607 components: @@ -3337,6 +3343,12 @@ entities: rot: -1.5707963267948966 rad pos: 5.5,8.5 parent: 1 + - uid: 609 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 4.5,8.5 + parent: 1 - proto: Icebox entities: - uid: 522 @@ -3345,19 +3357,19 @@ entities: rot: -1.5707963267948966 rad pos: 7.5,3.5 parent: 1 -- proto: JukeboxWallmountShip +- proto: JukeboxShip entities: - - uid: 179 + - uid: 357 components: - type: Transform - pos: 4.5,1.5 + pos: 0.5,-3.5 parent: 1 - proto: KitchenAssembler entities: - - uid: 334 + - uid: 303 components: - type: Transform - pos: 1.5,4.5 + pos: -1.5,4.5 parent: 1 - proto: KitchenDeepFryer entities: @@ -3378,21 +3390,21 @@ entities: - uid: 572 components: - type: Transform - pos: 0.375,4.5921535 + pos: 0.5762385,4.596018 parent: 1 - proto: KitchenMicrowave entities: - - uid: 181 + - uid: 296 components: - type: Transform - pos: -2.5,4.5 + pos: 1.5,4.5 parent: 1 - proto: KitchenReagentGrinder entities: - - uid: 233 + - uid: 324 components: - type: Transform - pos: -1.5,4.5 + pos: 2.5,4.5 parent: 1 - proto: KitchenSpike entities: @@ -3403,15 +3415,15 @@ entities: parent: 1 - proto: LargeBeaker entities: - - uid: 236 + - uid: 173 components: - type: Transform - pos: -1.702338,4.5433125 + pos: 2.1278298,4.6454825 parent: 1 - - uid: 444 + - uid: 316 components: - type: Transform - pos: -1.9419215,4.751646 + pos: 2.0722742,4.8468714 parent: 1 - proto: LightBulbCrystalBlue entities: @@ -3435,10 +3447,10 @@ entities: parent: 50 - type: Physics canCollide: False - - uid: 216 + - uid: 437 components: - type: Transform - parent: 242 + parent: 436 - type: Physics canCollide: False - proto: LightBulbCrystalOrange @@ -3457,33 +3469,26 @@ entities: canCollide: False - proto: LockerBotanistFilled entities: - - uid: 561 - components: - - type: Transform - pos: 1.5,7.5 - parent: 1 -- proto: LockerFreezerBase - entities: - - uid: 521 + - uid: 427 components: - type: Transform - pos: -3.2665334,2.4759326 + pos: 2.5,6.5 parent: 1 - proto: LockerWallEVAColorServiceWorkerFilled entities: - - uid: 75 + - uid: 49 components: - type: Transform rot: 1.5707963267948966 rad - pos: -2.5,8.5 + pos: -2.5,6.5 parent: 1 - proto: LockerWallMaterialsBasicFilled entities: - - uid: 350 + - uid: 325 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -4.5,4.5 + rot: 1.5707963267948966 rad + pos: -7.5,4.5 parent: 1 - proto: LockerWallMaterialsFuelUraniumFilled entities: @@ -3495,17 +3500,17 @@ entities: parent: 1 - proto: MaterialReclaimer entities: - - uid: 61 + - uid: 244 components: - type: Transform - pos: -5.5,2.5 + pos: 1.5,10.5 parent: 1 - proto: MopItem entities: - - uid: 191 + - uid: 638 components: - type: Transform - pos: 4.430993,8.650057 + pos: -5.5815744,2.4666877 parent: 1 - proto: NapkinDrum5 entities: @@ -3526,11 +3531,11 @@ entities: parent: 1 - proto: NFPosterContrabandFsbLogo entities: - - uid: 328 + - uid: 627 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -2.5,5.5 + rot: -1.5707963267948966 rad + pos: -2.5,9.5 parent: 1 - proto: NFPosterContrabandFsbNightlight entities: @@ -3549,20 +3554,6 @@ entities: - type: Transform pos: 0.5,-4.5 parent: 1 -- proto: NFSignDock - entities: - - uid: 340 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -7.5,1.5 - parent: 1 - - uid: 437 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 8.5,1.5 - parent: 1 - proto: NitrogenCanister entities: - uid: 119 @@ -3573,34 +3564,26 @@ entities: parent: 1 - type: Physics bodyType: Static -- proto: NoticeBoardNF - entities: - - uid: 432 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -2.5,9.5 - parent: 1 - proto: OilJarCorn entities: - - uid: 214 + - uid: 350 components: - type: Transform - pos: 2.6853929,4.913985 + pos: -2.7093272,4.923832 parent: 1 - proto: OilJarGhee entities: - uid: 241 components: - type: Transform - pos: 2.5187259,4.691763 + pos: -2.2926605,4.8300815 parent: 1 - proto: OilJarOlive entities: - uid: 588 components: - type: Transform - pos: 2.2965038,4.876948 + pos: -2.5947437,4.496748 parent: 1 - proto: OxygenCanister entities: @@ -3614,17 +3597,17 @@ entities: bodyType: Static - proto: PaperBin20 entities: - - uid: 356 + - uid: 9 components: - type: Transform - pos: -1.7588046,9.852005 + pos: -1.3183904,8.486803 parent: 1 - proto: Pen entities: - - uid: 144 + - uid: 276 components: - type: Transform - pos: -1.2588046,9.977005 + pos: -1.6933904,8.783678 parent: 1 - proto: PortableGeneratorSuperPacmanShuttle entities: @@ -3634,14 +3617,14 @@ entities: pos: -4.5,6.5 parent: 1 - type: FuelGenerator - targetPower: 23000 + targetPower: 25000 - proto: PosterLegitSMFires entities: - - uid: 627 + - uid: 340 components: - type: Transform - rot: 3.141592653589793 rad - pos: -4.5,5.5 + rot: 1.5707963267948966 rad + pos: -2.5,5.5 parent: 1 - proto: PosterLegitSMHardhats entities: @@ -3661,7 +3644,7 @@ entities: parent: 1 - proto: PottedPlantBioluminscent entities: - - uid: 34 + - uid: 640 components: - type: Transform pos: 0.5,-5.5 @@ -3673,17 +3656,10 @@ entities: - type: Transform pos: -5.5,-2.5 parent: 1 - - uid: 135 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -0.5,7.5 - parent: 1 - - uid: 147 + - uid: 172 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 5.5,4.5 + pos: 6.5,4.5 parent: 1 - uid: 185 components: @@ -3691,12 +3667,6 @@ entities: rot: 1.5707963267948966 rad pos: -4.5,7.5 parent: 1 - - uid: 217 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -6.5,3.5 - parent: 1 - uid: 259 components: - type: Transform @@ -3730,22 +3700,41 @@ entities: - type: Transform pos: 6.5,-2.5 parent: 1 - - uid: 336 + - uid: 334 components: - type: Transform rot: -1.5707963267948966 rad - pos: 3.5,9.5 + pos: 5.5,8.5 parent: 1 - - uid: 358 + - uid: 430 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,4.5 + parent: 1 + - uid: 480 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,-5.5 + parent: 1 + - uid: 521 components: - type: Transform rot: 1.5707963267948966 rad - pos: 7.5,2.5 + pos: -1.5,8.5 parent: 1 - - uid: 566 + - uid: 561 components: - type: Transform - pos: 4.5,8.5 + rot: 1.5707963267948966 rad + pos: 1.5,8.5 + parent: 1 + - uid: 608 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -6.5,3.5 parent: 1 - proto: PoweredlightGreen entities: @@ -3781,22 +3770,6 @@ entities: powerLoad: 0 - type: DamageOnInteract isDamageActive: False - - uid: 242 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 5.5,2.5 - parent: 1 - - type: ContainerContainer - containers: - light_bulb: !type:ContainerSlot - showEnts: False - occludes: True - ent: 216 - - type: ApcPowerReceiver - powerLoad: 0 - - type: DamageOnInteract - isDamageActive: False - uid: 263 components: - type: Transform @@ -3859,40 +3832,67 @@ entities: powerLoad: 0 - type: DamageOnInteract isDamageActive: False + - uid: 436 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 4.5,2.5 + parent: 1 + - type: ContainerContainer + containers: + light_bulb: !type:ContainerSlot + showEnts: False + occludes: True + ent: 437 + - type: ApcPowerReceiver + powerLoad: 0 + - type: DamageOnInteract + isDamageActive: False - proto: SeedExtractor entities: - - uid: 96 + - uid: 242 components: - type: Transform - pos: 2.5,6.5 + pos: 3.5,9.5 parent: 1 - proto: ServiceTechFab entities: - - uid: 325 + - uid: 604 components: - type: Transform - pos: -5.5,4.5 + pos: -6.5,4.5 parent: 1 - proto: ShelfBar entities: - - uid: 178 + - uid: 444 components: - type: Transform - pos: 4.5,5.5 + rot: -1.5707963267948966 rad + pos: 5.5,4.5 parent: 1 - proto: ShelfKitchen entities: - - uid: 239 + - uid: 75 components: - type: Transform - pos: 2.5,5.5 + rot: 1.5707963267948966 rad + pos: -4.5,4.5 parent: 1 - proto: ShelfMetal entities: - - uid: 629 + - uid: 181 components: - type: Transform - pos: 4.5,9.5 + rot: -1.5707963267948966 rad + pos: 6.5,7.5 + parent: 1 +- proto: ShelfWallFreezerWhite + entities: + - uid: 365 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -4.5,2.5 parent: 1 - proto: ShuttersNormalOpen entities: @@ -3902,7 +3902,7 @@ entities: pos: 3.5,10.5 parent: 1 - type: DeviceLinkSink - invokeCounter: 2 + invokeCounter: 5 - uid: 305 components: - type: Transform @@ -3910,7 +3910,7 @@ entities: pos: -4.5,-2.5 parent: 1 - type: DeviceLinkSink - invokeCounter: 3 + invokeCounter: 4 - uid: 306 components: - type: Transform @@ -3918,7 +3918,7 @@ entities: pos: -4.5,-3.5 parent: 1 - type: DeviceLinkSink - invokeCounter: 3 + invokeCounter: 4 - uid: 307 components: - type: Transform @@ -3926,7 +3926,7 @@ entities: pos: -4.5,-4.5 parent: 1 - type: DeviceLinkSink - invokeCounter: 3 + invokeCounter: 4 - uid: 308 components: - type: Transform @@ -3934,7 +3934,7 @@ entities: pos: 5.5,-2.5 parent: 1 - type: DeviceLinkSink - invokeCounter: 3 + invokeCounter: 4 - uid: 309 components: - type: Transform @@ -3942,7 +3942,7 @@ entities: pos: 5.5,-3.5 parent: 1 - type: DeviceLinkSink - invokeCounter: 3 + invokeCounter: 4 - uid: 310 components: - type: Transform @@ -3950,7 +3950,7 @@ entities: pos: 5.5,-4.5 parent: 1 - type: DeviceLinkSink - invokeCounter: 3 + invokeCounter: 4 - uid: 311 components: - type: Transform @@ -3958,7 +3958,7 @@ entities: pos: 4.5,-5.5 parent: 1 - type: DeviceLinkSink - invokeCounter: 3 + invokeCounter: 4 - uid: 312 components: - type: Transform @@ -3966,7 +3966,7 @@ entities: pos: 3.5,-5.5 parent: 1 - type: DeviceLinkSink - invokeCounter: 3 + invokeCounter: 4 - uid: 313 components: - type: Transform @@ -3974,7 +3974,7 @@ entities: pos: -2.5,-5.5 parent: 1 - type: DeviceLinkSink - invokeCounter: 3 + invokeCounter: 4 - uid: 314 components: - type: Transform @@ -3982,56 +3982,83 @@ entities: pos: -3.5,-5.5 parent: 1 - type: DeviceLinkSink - invokeCounter: 3 + invokeCounter: 4 + - uid: 356 + components: + - type: Transform + pos: -2.5,1.5 + parent: 1 - uid: 467 components: - type: Transform pos: -1.5,11.5 parent: 1 - type: DeviceLinkSink - invokeCounter: 1 + invokeCounter: 4 - uid: 469 components: - type: Transform - pos: -0.5,11.5 + pos: -0.5,11.5 + parent: 1 + - type: DeviceLinkSink + invokeCounter: 4 + - uid: 471 + components: + - type: Transform + pos: 2.5,11.5 + parent: 1 + - type: DeviceLinkSink + invokeCounter: 4 + - uid: 472 + components: + - type: Transform + pos: 0.5,11.5 + parent: 1 + - type: DeviceLinkSink + invokeCounter: 4 + - uid: 476 + components: + - type: Transform + pos: 1.5,11.5 + parent: 1 + - type: DeviceLinkSink + invokeCounter: 4 + - uid: 617 + components: + - type: Transform + pos: -2.5,10.5 + parent: 1 + - type: DeviceLinkSink + invokeCounter: 7 + - uid: 630 + components: + - type: Transform + pos: -1.5,1.5 parent: 1 - - type: DeviceLinkSink - invokeCounter: 1 - - uid: 471 + - uid: 631 components: - type: Transform - pos: 2.5,11.5 + pos: -0.5,1.5 parent: 1 - - type: DeviceLinkSink - invokeCounter: 1 - - uid: 472 + - uid: 632 components: - type: Transform - pos: 0.5,11.5 + pos: 1.5,1.5 parent: 1 - - type: DeviceLinkSink - invokeCounter: 1 - - uid: 476 + - uid: 633 components: - type: Transform - pos: 1.5,11.5 + pos: 2.5,1.5 parent: 1 - - type: DeviceLinkSink - invokeCounter: 1 - - uid: 617 + - uid: 634 components: - type: Transform - pos: -2.5,10.5 + pos: 3.5,1.5 parent: 1 - - type: DeviceLinkSink - invokeCounter: 1 -- proto: ShuttersRadiationOpen - entities: - - uid: 296 + - uid: 635 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -2.5,7.5 + pos: 0.5,1.5 parent: 1 - proto: ShuttleWindow entities: @@ -4181,39 +4208,11 @@ entities: parent: 1 - proto: SignalButton entities: - - uid: 103 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 4.75,1.5 - parent: 1 - - type: DeviceLinkSource - linkedPorts: - 308: - - Pressed: Toggle - 309: - - Pressed: Toggle - 310: - - Pressed: Toggle - 311: - - Pressed: Toggle - 312: - - Pressed: Toggle - 313: - - Pressed: Toggle - 314: - - Pressed: Toggle - 307: - - Pressed: Toggle - 306: - - Pressed: Toggle - 305: - - Pressed: Toggle - - uid: 134 + - uid: 96 components: - type: Transform rot: -1.5707963267948966 rad - pos: 0.5,7.75 + pos: 0.5,8.75 parent: 1 - type: DeviceLinkSource linkedPorts: @@ -4225,25 +4224,15 @@ entities: - Pressed: DoorBolt 159: - Pressed: DoorBolt - 180: - - Pressed: DoorBolt 42: - Pressed: DoorBolt - - uid: 232 + 180: + - Pressed: DoorBolt + - uid: 351 components: - type: Transform rot: -1.5707963267948966 rad - pos: 0.5,7.25 - parent: 1 - - type: DeviceLinkSource - linkedPorts: - 296: - - Pressed: Toggle - - uid: 335 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -5.5,7.75 + pos: 0.5,8.25 parent: 1 - type: DeviceLinkSource linkedPorts: @@ -4255,83 +4244,119 @@ entities: - Pressed: Toggle 136: - Pressed: Toggle + 137: + - Pressed: Toggle 254: - Pressed: Toggle 141: - Pressed: Toggle 284: - Pressed: Toggle - 137: - - Pressed: Toggle - - uid: 365 + - uid: 465 components: - type: Transform rot: 1.5707963267948966 rad - pos: -5.5,7.25 + pos: 0.5,6.75 parent: 1 - - type: SignalSwitch - state: True - type: DeviceLinkSource linkedPorts: - 296: + 617: - Pressed: Toggle - - uid: 421 + 467: + - Pressed: Toggle + 469: + - Pressed: Toggle + 472: + - Pressed: Toggle + 476: + - Pressed: Toggle + 471: + - Pressed: Toggle + 143: + - Pressed: Toggle + - uid: 528 components: - type: Transform rot: 3.141592653589793 rad - pos: 4.25,1.5 + pos: -3.25,1.5 parent: 1 - type: DeviceLinkSource linkedPorts: - 242: + 356: - Pressed: Toggle - 147: + 630: - Pressed: Toggle - 315: + 631: - Pressed: Toggle - 50: + 635: - Pressed: Toggle - 262: + 632: - Pressed: Toggle - 300: + 633: - Pressed: Toggle - 266: + 634: - Pressed: Toggle + - uid: 582 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -3.75,1.5 + parent: 1 + - type: DeviceLinkSource + linkedPorts: 261: - Pressed: Toggle - 318: - - Pressed: Toggle 81: - Pressed: Toggle - 259: + 266: - Pressed: Toggle - 263: + 315: + - Pressed: Toggle + 50: + - Pressed: Toggle + 436: + - Pressed: Toggle + 430: + - Pressed: Toggle + 300: + - Pressed: Toggle + 262: + - Pressed: Toggle + 318: - Pressed: Toggle 425: - Pressed: Toggle - 260: + 480: - Pressed: Toggle - - uid: 609 + 263: + - Pressed: Toggle + - uid: 639 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 0.5,7.75 + rot: -1.5707963267948966 rad + pos: 5.5,2.75 parent: 1 - type: DeviceLinkSource linkedPorts: - 617: + 308: - Pressed: Toggle - 467: + 309: - Pressed: Toggle - 469: + 310: - Pressed: Toggle - 472: + 311: - Pressed: Toggle - 476: + 312: - Pressed: Toggle - 471: + 313: - Pressed: Toggle - 143: + 314: + - Pressed: Toggle + 307: + - Pressed: Toggle + 306: + - Pressed: Toggle + 305: - Pressed: Toggle - proto: SignKitchen entities: @@ -4353,19 +4378,33 @@ entities: rot: 1.5707963267948966 rad pos: -7.5,-1.5 parent: 1 +- proto: SignSpace + entities: + - uid: 341 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -7.5,1.5 + parent: 1 + - uid: 345 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 8.5,1.5 + parent: 1 - proto: SinkWide entities: - - uid: 465 + - uid: 76 components: - type: Transform - rot: 3.141592653589793 rad - pos: 4.5,6.5 + rot: -1.5707963267948966 rad + pos: 5.5,7.5 parent: 1 - - uid: 626 + - uid: 328 components: - type: Transform - rot: 3.141592653589793 rad - pos: 4.5,2.5 + rot: 1.5707963267948966 rad + pos: -3.5,2.5 parent: 1 - proto: SMESBasic entities: @@ -4376,11 +4415,11 @@ entities: parent: 1 - proto: SodaDispenser entities: - - uid: 324 + - uid: 101 components: - type: Transform rot: 3.141592653589793 rad - pos: 5.5,2.5 + pos: 4.5,2.5 parent: 1 - proto: SpawnPointLatejoin entities: @@ -4439,6 +4478,13 @@ entities: rot: 3.141592653589793 rad pos: -3.5,5.5 parent: 1 +- proto: Table + entities: + - uid: 421 + components: + - type: Transform + pos: 3.5,8.5 + parent: 1 - proto: TableCarpet entities: - uid: 43 @@ -4454,11 +4500,10 @@ entities: parent: 1 - proto: TableReinforced entities: - - uid: 82 + - uid: 48 components: - type: Transform - rot: 3.141592653589793 rad - pos: 5.5,2.5 + pos: 4.5,2.5 parent: 1 - uid: 102 components: @@ -4470,6 +4515,11 @@ entities: - type: Transform pos: -1.5,9.5 parent: 1 + - uid: 134 + components: + - type: Transform + pos: -1.5,3.5 + parent: 1 - uid: 302 components: - type: Transform @@ -4485,17 +4535,28 @@ entities: - type: Transform pos: -1.5,4.5 parent: 1 + - uid: 335 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -5.5,2.5 + parent: 1 + - uid: 336 + components: + - type: Transform + pos: 2.5,3.5 + parent: 1 - uid: 347 components: - type: Transform rot: 3.141592653589793 rad pos: 2.5,4.5 parent: 1 - - uid: 436 + - uid: 424 components: - type: Transform rot: -1.5707963267948966 rad - pos: 5.5,4.5 + pos: -1.5,8.5 parent: 1 - uid: 519 components: @@ -4587,6 +4648,8 @@ entities: rot: 1.5707963267948966 rad pos: -6.5,6.5 parent: 1 + - type: ApcPowerReceiver + powerLoad: 1 - uid: 141 components: - type: Transform @@ -4624,45 +4687,45 @@ entities: parent: 1 - proto: ToyFigurineChef entities: - - uid: 547 + - uid: 30 components: - type: Transform - pos: -1.2171379,10.029089 + pos: -1.6777654,8.877428 parent: 1 - proto: VendingMachineBooze entities: - - uid: 148 + - uid: 432 components: - type: Transform - pos: -6.5,4.5 + pos: -5.5,4.5 parent: 1 - proto: VendingMachineChefvend entities: - - uid: 101 + - uid: 62 components: - type: Transform - pos: -6.5,3.5 + pos: -6.5,2.5 parent: 1 - proto: VendingMachineRestockBooze entities: - uid: 304 components: - type: Transform - pos: -5.337321,4.7195187 + pos: -5.706992,2.5881605 parent: 1 - proto: VendingMachineRestockChefvend entities: - uid: 317 components: - type: Transform - pos: -5.337321,4.834102 + pos: -5.331992,2.7235773 parent: 1 - proto: VendingMachineSeeds entities: - - uid: 431 + - uid: 239 components: - type: Transform - pos: 1.5,6.5 + pos: 1.5,9.5 parent: 1 - proto: WallShuttle entities: @@ -4784,12 +4847,6 @@ entities: rot: 1.5707963267948966 rad pos: -5.5,5.5 parent: 1 - - uid: 48 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 6.5,2.5 - parent: 1 - uid: 52 components: - type: Transform @@ -4883,11 +4940,6 @@ entities: - type: Transform pos: -3.5,9.5 parent: 1 - - uid: 156 - components: - - type: Transform - pos: 0.5,7.5 - parent: 1 - uid: 158 components: - type: Transform @@ -4911,17 +4963,29 @@ entities: rot: 3.141592653589793 rad pos: 0.5,5.5 parent: 1 - - uid: 213 + - uid: 195 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 6.5,4.5 + rot: 3.141592653589793 rad + pos: 0.5,8.5 + parent: 1 + - uid: 216 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 5.5,2.5 parent: 1 - uid: 224 components: - type: Transform pos: 0.5,-6.5 parent: 1 + - uid: 230 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 5.5,4.5 + parent: 1 - uid: 247 components: - type: Transform @@ -5069,11 +5133,11 @@ entities: parent: 1 - proto: WarningWaste entities: - - uid: 230 + - uid: 82 components: - type: Transform - rot: 3.141592653589793 rad - pos: -5.5,8.5 + rot: -1.5707963267948966 rad + pos: -5.5,7.5 parent: 1 - proto: WarpPoint entities: @@ -5082,4 +5146,11 @@ entities: - type: Transform pos: 0.5,0.5 parent: 1 +- proto: Windoor + entities: + - uid: 179 + components: + - type: Transform + pos: 3.5,1.5 + parent: 1 ... diff --git a/Resources/ServerInfo/_NF/Guidebook/Shipyard/Nightlight.xml b/Resources/ServerInfo/_NF/Guidebook/Shipyard/Nightlight.xml index d79c222dcc4..4e0902f68a9 100644 --- a/Resources/ServerInfo/_NF/Guidebook/Shipyard/Nightlight.xml +++ b/Resources/ServerInfo/_NF/Guidebook/Shipyard/Nightlight.xml @@ -3,7 +3,7 @@ - + @@ -16,7 +16,7 @@ [color=#a4885c]Power Gen Type:[/color] Uranium - [color=#a4885c]Base Power Draw:[/color] 30kw + [color=#a4885c]Base Power Draw:[/color] 25kw [color=#a4885c]Expeditions:[/color] None @@ -24,6 +24,15 @@ "The Nightlight is the Far Star Biotech's flagship biomass biorecombination research vessel. Providing top of the line hospitality and nutritional preperation accomidations for Nanotrasen standard xenotypes; the Nightlight should provide any research teams investigating new strains of recombinant nutrition with a distraction free crop of eager bioforms." + # Ship Functions + + + + + + + + # Piloting diff --git a/Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/nightlight.png b/Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/nightlight.png index 962c993cf45d2eeb809e1e4ae0f758f53ec6e80b..35af6a4c598ec167157e7ecc893821320fcb0dc0 100644 GIT binary patch delta 1163 zcmV;61a$k55Rnj&F#*f5GHC;U=9T05ssDV}hiiOC#Kw;6!OMnV^$TQW0LCwaSQ84e z6B3s2h$eAlzHS-Wm{q~2-gzSKBD9pLkuvrAkz?^r4ryN%jE8}nmQO(U?lZcwkCoi& zLQ@kE_p)(g<^sBRpP^a-JTAv=v~K1dKJ1fm`G#w&n(kqJ{U%^Nff>ht2n&#;_W$qA zo0ad$tyWy-q!DWYGL8`zfCu))v&Q9dL7OW`64nA_9IF5s$0|U^iM>U|zJ3wd_x{=a zqfr*8iM#Gw;*%daJck=UN?*SYtOdw8Rsjrz_ERpN?48q&wEM_wRsjr!oT4XJT+w9J zbbPbAt$F|!zrURK75eOd$`82l*M9$!Pk#K-eDsA1!PnnaeX{EF-2HyFsSbiH$pdI! zpDA;{krtrPyABGy>*6j(WVGse@amu-)A~j#fQA2O5kXgA(e5)+0m>)7in|DrqWV0z zo%XJ=WYG#P?n*ADl0|@QA0SOlfQk5)gqeu<)#&O3Ug|y#OHQqSSH7-I(a{x!n8 zr>Ayt_>Y@s<{mC}p9TO3G;M4uS}j1SSaEAt>(J5P5A_=pFf>|ER0l7OXj1^M@(cYP zkk99#XTfCRlpsxCzK1pi*fr4QbS!L#^4=O$t5rC8Z8o%j-#Nb}&45LoMjv4EP5O9y z_UqH@235no>m<7dx|~w6;+FT;pkrY>Y#&&xT=}ay2f5)l;YFW}muUI_H4xzJtz*H9 zi{|rb`H9MqB((MchDPh|)P}iG=`r}|F)#^@kW%=egH-|p1VlfmiXHJ02lXFpl87(Ol_E(s3Bll zk?sQowFsWvw}O=ki^OdNU;Ju{dsHtHROwD{4cB3et=e^ssOD2 z?V(-6+q~dCf5>yZQ54=Yh?X`jf9nU(0Igzig|c?_kl7JTw1XH;QM6mJQnBK`(l_Fc zjg7f}uIsvEV`J{SKU{W`rUa@RG2wmrSbO)eWS4*pBabTa@wrwlAe});^#cTH0(e`z z(b5%}{4mEL&k!l4V#OWl>r331?-9fT;3NJ*MHYZ|KQEkj4Dt*Xg0#K7M44X`NRtAj dX*g>M$p05{(1DygMu7kT002ovPDHLkV1n6HOuhgB delta 1162 zcmV;51axU1cbYf=xq$B7XQ);HkIQizt($p=4|BtDd53GOm|wpMSWjTaF~S0WB&q%Xd-G=H zdvdE4mpN&~T7ZmWgazP%eetYuxhc@*4ot>cfQ(}mAmdmC$T+dLsMyyp0{hxOyMHvw z;xuvBeM@}uBZucG-5;gzzZF;uka4U67zpjBTs+x3ryXhck=LvO7z#N>Pp-J4$*Sr2 zW_4Tj04#ogIqxg<*_9uEaO1E2{w1IM_@nvg3l)N|zpMIW)#thU{c2Mk1X+>?(7ZlV z=6)kBK%sXX6nfXiU5v&|IZ?VuE3(*XQTp@Pka@35h6wPd2l=J zU1Q0j6#D~qFywE!8%DnQ1u3XpNM_W|&aA&(C8<8M80&ep0j zh<5@#r>7v2SPPJUajXJl9IF5sM|&TjRIIowuD%7o?b#38m$gSe6^hsGi}w9%gm+I* z?c(qsH_yyHT z&qL3G$;2r^n!bDwZ3?h!pv&o4*be2rHK1M4nExy@ zJqsowpU*>op&y{Uw+5wR#oaZ~Wt)MR&^8R*zO3CD8m+r0uT4NtwF+J{U_#}m?RN+& zG+w@_4UeJ^05D?-a>xH|N#)~>D5d=XjBq@6k+v=Iwfg}s?yEr0f=QU#FgH;{z_cRW z2MB5rJh{maP_4qrYtw!JI~0r$>j%gGY#eJo3#2p(O zb6wYcb;riW+;@Mt>?TbKR5xP6`|`2&?qkU=0U1UfRpR4wty(}jgOch82+{=bws@nZ zD>C_EjzOLwQcA^&JJQ#exG&!$hy}n${Dq1v0PTKWIPVzb87u^8dwGd6zb23-1xV9y c))J8a0d(Tffpn|UTL1t607*qoM6N<$f~dPcZvX%Q