From 3baa638e812d23a855ad0a722b082b10add4ebd9 Mon Sep 17 00:00:00 2001 From: "steinhauer.erhard" Date: Tue, 15 Oct 2024 00:10:59 +0300 Subject: [PATCH] Lodge QoL Update --- Resources/Maps/_NF/POI/lodge.yml | 582 ++++++++++++++++--------------- 1 file changed, 295 insertions(+), 287 deletions(-) diff --git a/Resources/Maps/_NF/POI/lodge.yml b/Resources/Maps/_NF/POI/lodge.yml index a877d7a6d5f..a30e9ff9775 100644 --- a/Resources/Maps/_NF/POI/lodge.yml +++ b/Resources/Maps/_NF/POI/lodge.yml @@ -4962,7 +4962,6 @@ entities: parent: 1 - type: Physics canCollide: False - bodyType: Static - type: Fixtures fixtures: {} - uid: 1930 @@ -4973,7 +4972,6 @@ entities: parent: 1 - type: Physics canCollide: False - bodyType: Static - type: Fixtures fixtures: {} - uid: 2134 @@ -4984,7 +4982,6 @@ entities: parent: 1 - type: Physics canCollide: False - bodyType: Static - type: Fixtures fixtures: {} - uid: 2220 @@ -4995,7 +4992,6 @@ entities: parent: 1 - type: Physics canCollide: False - bodyType: Static - type: Fixtures fixtures: {} - proto: BenchSofaLeft @@ -5006,24 +5002,18 @@ entities: rot: 3.141592653589793 rad pos: 7.5,5.5 parent: 1 - - type: Physics - bodyType: Static - uid: 2133 components: - type: Transform rot: 1.5707963267948966 rad pos: -8.5,6.5 parent: 1 - - type: Physics - bodyType: Static - uid: 2221 components: - type: Transform rot: 1.5707963267948966 rad pos: -1.5,6.5 parent: 1 - - type: Physics - bodyType: Static - proto: BenchSofaMiddle entities: - uid: 369 @@ -5032,40 +5022,30 @@ entities: rot: 3.141592653589793 rad pos: 0.5,5.5 parent: 1 - - type: Physics - bodyType: Static - uid: 370 components: - type: Transform rot: 3.141592653589793 rad pos: 1.5,5.5 parent: 1 - - type: Physics - bodyType: Static - uid: 1078 components: - type: Transform rot: 3.141592653589793 rad pos: 8.5,5.5 parent: 1 - - type: Physics - bodyType: Static - uid: 2135 components: - type: Transform rot: 3.141592653589793 rad pos: -7.5,5.5 parent: 1 - - type: Physics - bodyType: Static - uid: 2219 components: - type: Transform rot: 3.141592653589793 rad pos: -0.5,5.5 parent: 1 - - type: Physics - bodyType: Static - proto: BenchSofaRight entities: - uid: 371 @@ -5074,24 +5054,18 @@ entities: rot: -1.5707963267948966 rad pos: 2.5,6.5 parent: 1 - - type: Physics - bodyType: Static - uid: 1077 components: - type: Transform rot: -1.5707963267948966 rad pos: 9.5,6.5 parent: 1 - - type: Physics - bodyType: Static - uid: 2136 components: - type: Transform rot: 3.141592653589793 rad pos: -6.5,5.5 parent: 1 - - type: Physics - bodyType: Static - proto: BenchSteelLeft entities: - uid: 884 @@ -5099,107 +5073,79 @@ entities: - type: Transform pos: 15.5,2.5 parent: 1 - - type: Physics - bodyType: Static - uid: 885 components: - type: Transform pos: -16.5,2.5 parent: 1 - - type: Physics - bodyType: Static - uid: 2059 components: - type: Transform rot: 3.141592653589793 rad pos: -11.5,19.5 parent: 1 - - type: Physics - bodyType: Static - uid: 2065 components: - type: Transform rot: 3.141592653589793 rad pos: 14.5,19.5 parent: 1 - - type: Physics - bodyType: Static - uid: 2120 components: - type: Transform pos: -8.5,3.5 parent: 1 - - type: Physics - bodyType: Static - uid: 2124 components: - type: Transform pos: 7.5,3.5 parent: 1 - - type: Physics - bodyType: Static - uid: 2523 components: - type: Transform rot: 3.141592653589793 rad pos: 1.5,20.5 parent: 1 - - type: Physics - bodyType: Static - proto: BenchSteelMiddle entities: - - uid: 868 + - uid: 886 components: - type: Transform - pos: 16.5,2.5 + pos: -15.5,2.5 parent: 1 - - type: Physics - bodyType: Static - - uid: 886 + - uid: 1891 components: - type: Transform - pos: -15.5,2.5 + pos: 16.5,2.5 parent: 1 - - type: Physics - bodyType: Static - uid: 2067 components: - type: Transform rot: 3.141592653589793 rad pos: 13.5,19.5 parent: 1 - - type: Physics - bodyType: Static - uid: 2070 components: - type: Transform rot: 3.141592653589793 rad pos: -12.5,19.5 parent: 1 - - type: Physics - bodyType: Static - uid: 2121 components: - type: Transform pos: -7.5,3.5 parent: 1 - - type: Physics - bodyType: Static - uid: 2123 components: - type: Transform pos: 8.5,3.5 parent: 1 - - type: Physics - bodyType: Static - uid: 2525 components: - type: Transform rot: 3.141592653589793 rad pos: 0.5,20.5 parent: 1 - - type: Physics - bodyType: Static - proto: BenchSteelRight entities: - uid: 883 @@ -5207,53 +5153,39 @@ entities: - type: Transform pos: 17.5,2.5 parent: 1 - - type: Physics - bodyType: Static - uid: 887 components: - type: Transform pos: -14.5,2.5 parent: 1 - - type: Physics - bodyType: Static - uid: 2066 components: - type: Transform rot: 3.141592653589793 rad pos: 12.5,19.5 parent: 1 - - type: Physics - bodyType: Static - uid: 2074 components: - type: Transform rot: 3.141592653589793 rad pos: -13.5,19.5 parent: 1 - - type: Physics - bodyType: Static - uid: 2119 components: - type: Transform pos: -6.5,3.5 parent: 1 - - type: Physics - bodyType: Static - uid: 2122 components: - type: Transform pos: 9.5,3.5 parent: 1 - - type: Physics - bodyType: Static - uid: 2524 components: - type: Transform rot: 3.141592653589793 rad pos: -0.5,20.5 parent: 1 - - type: Physics - bodyType: Static - proto: BodyBagFolded entities: - uid: 1495 @@ -7816,31 +7748,11 @@ entities: - type: Transform pos: 15.5,11.5 parent: 1 - - type: ContainerContainer - containers: - ShipyardConsole-targetId: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - board: !type:Container - showEnts: False - occludes: True - ents: [] - uid: 2164 components: - type: Transform pos: 13.5,11.5 parent: 1 - - type: ContainerContainer - containers: - ShipyardConsole-targetId: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - board: !type:Container - showEnts: False - occludes: True - ents: [] - proto: ComputerTabletopStationRecords entities: - uid: 264 @@ -7867,8 +7779,6 @@ entities: showEnts: False occludes: True ent: null - - type: Physics - canCollide: False - type: ItemSlots - uid: 2518 components: @@ -7886,8 +7796,6 @@ entities: showEnts: False occludes: True ent: null - - type: Physics - canCollide: False - type: ItemSlots - uid: 2519 components: @@ -7905,8 +7813,6 @@ entities: showEnts: False occludes: True ent: null - - type: Physics - canCollide: False - type: ItemSlots - uid: 2520 components: @@ -7924,8 +7830,6 @@ entities: showEnts: False occludes: True ent: null - - type: Physics - canCollide: False - type: ItemSlots - uid: 2521 components: @@ -7943,8 +7847,6 @@ entities: showEnts: False occludes: True ent: null - - type: Physics - canCollide: False - type: ItemSlots - uid: 2522 components: @@ -7962,8 +7864,6 @@ entities: showEnts: False occludes: True ent: null - - type: Physics - canCollide: False - type: ItemSlots - proto: ConveyorBelt entities: @@ -14303,6 +14203,13 @@ entities: - type: Transform pos: 0.5,11.5 parent: 1 +- proto: LessLethalVendingMachinePOI + entities: + - uid: 2530 + components: + - type: Transform + pos: 16.5,11.5 + parent: 1 - proto: MachineCryoSleepPod entities: - uid: 2100 @@ -14400,6 +14307,128 @@ entities: - type: Transform pos: 6.535731,10.07715 parent: 1 +- proto: NFSignDock + entities: + - uid: 360 + components: + - type: Transform + pos: 29.5,4.5 + parent: 1 + - uid: 507 + components: + - type: Transform + pos: -28.5,4.5 + parent: 1 + - uid: 508 + components: + - type: Transform + pos: -18.5,26.5 + parent: 1 + - uid: 509 + components: + - type: Transform + pos: 25.5,20.5 + parent: 1 + - uid: 510 + components: + - type: Transform + pos: -1.5,26.5 + parent: 1 + - uid: 521 + components: + - type: Transform + pos: 2.5,26.5 + parent: 1 + - uid: 522 + components: + - type: Transform + pos: -24.5,24.5 + parent: 1 + - uid: 523 + components: + - type: Transform + pos: -24.5,20.5 + parent: 1 + - uid: 524 + components: + - type: Transform + pos: -22.5,26.5 + parent: 1 + - uid: 562 + components: + - type: Transform + pos: -28.5,-3.5 + parent: 1 + - uid: 576 + components: + - type: Transform + pos: 25.5,24.5 + parent: 1 + - uid: 577 + components: + - type: Transform + pos: 29.5,-3.5 + parent: 1 + - uid: 853 + components: + - type: Transform + pos: 19.5,26.5 + parent: 1 + - uid: 855 + components: + - type: Transform + pos: 23.5,26.5 + parent: 1 + - uid: 1513 + components: + - type: Transform + pos: 33.5,4.5 + parent: 1 + - uid: 1514 + components: + - type: Transform + pos: 35.5,2.5 + parent: 1 + - uid: 1515 + components: + - type: Transform + pos: 35.5,-1.5 + parent: 1 + - uid: 1516 + components: + - type: Transform + pos: 33.5,-3.5 + parent: 1 + - uid: 1517 + components: + - type: Transform + pos: 2.5,-3.5 + parent: 1 + - uid: 1518 + components: + - type: Transform + pos: -1.5,-3.5 + parent: 1 + - uid: 1519 + components: + - type: Transform + pos: -32.5,-3.5 + parent: 1 + - uid: 1520 + components: + - type: Transform + pos: -34.5,-1.5 + parent: 1 + - uid: 1521 + components: + - type: Transform + pos: -34.5,2.5 + parent: 1 + - uid: 1522 + components: + - type: Transform + pos: -32.5,4.5 + parent: 1 - proto: NonLethalVendingMachine entities: - uid: 1768 @@ -15708,152 +15737,30 @@ entities: - type: Transform pos: -1.5,24.5 parent: 1 -- proto: NFSignDock +- proto: Sink entities: - - uid: 360 + - uid: 1001 components: - type: Transform - pos: 29.5,4.5 + rot: 1.5707963267948966 rad + pos: -17.5,17.5 parent: 1 - - uid: 507 + - uid: 1852 components: - type: Transform - pos: -28.5,4.5 + rot: -1.5707963267948966 rad + pos: -13.5,17.5 parent: 1 - - uid: 508 +- proto: SinkWide + entities: + - uid: 848 components: - type: Transform - pos: -18.5,26.5 + pos: -6.5,17.5 parent: 1 - - uid: 509 - components: - - type: Transform - pos: 25.5,20.5 - parent: 1 - - uid: 510 - components: - - type: Transform - pos: -1.5,26.5 - parent: 1 - - uid: 521 - components: - - type: Transform - pos: 2.5,26.5 - parent: 1 - - uid: 522 - components: - - type: Transform - pos: -24.5,24.5 - parent: 1 - - uid: 523 - components: - - type: Transform - pos: -24.5,20.5 - parent: 1 - - uid: 524 - components: - - type: Transform - pos: -22.5,26.5 - parent: 1 - - uid: 562 - components: - - type: Transform - pos: -28.5,-3.5 - parent: 1 - - uid: 576 - components: - - type: Transform - pos: 25.5,24.5 - parent: 1 - - uid: 577 - components: - - type: Transform - pos: 29.5,-3.5 - parent: 1 - - uid: 853 - components: - - type: Transform - pos: 19.5,26.5 - parent: 1 - - uid: 855 - components: - - type: Transform - pos: 23.5,26.5 - parent: 1 - - uid: 1513 - components: - - type: Transform - pos: 33.5,4.5 - parent: 1 - - uid: 1514 - components: - - type: Transform - pos: 35.5,2.5 - parent: 1 - - uid: 1515 - components: - - type: Transform - pos: 35.5,-1.5 - parent: 1 - - uid: 1516 - components: - - type: Transform - pos: 33.5,-3.5 - parent: 1 - - uid: 1517 - components: - - type: Transform - pos: 2.5,-3.5 - parent: 1 - - uid: 1518 - components: - - type: Transform - pos: -1.5,-3.5 - parent: 1 - - uid: 1519 - components: - - type: Transform - pos: -32.5,-3.5 - parent: 1 - - uid: 1520 - components: - - type: Transform - pos: -34.5,-1.5 - parent: 1 - - uid: 1521 - components: - - type: Transform - pos: -34.5,2.5 - parent: 1 - - uid: 1522 - components: - - type: Transform - pos: -32.5,4.5 - parent: 1 -- proto: Sink - entities: - - uid: 1001 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -17.5,17.5 - parent: 1 - - uid: 1852 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -13.5,17.5 - parent: 1 -- proto: SinkWide - entities: - - uid: 848 - components: - - type: Transform - pos: -6.5,17.5 - parent: 1 -- proto: SMESBasic - entities: - - uid: 20 +- proto: SMESBasic + entities: + - uid: 20 components: - type: Transform pos: 1.5,13.5 @@ -16005,11 +15912,6 @@ entities: parent: 1 - proto: SpawnPointLatejoin entities: - - uid: 1891 - components: - - type: Transform - pos: -13.5,17.5 - parent: 1 - uid: 2084 components: - type: Transform @@ -16020,69 +15922,174 @@ entities: - type: Transform pos: -11.5,13.5 parent: 1 - - uid: 2086 +- proto: SpawnPointMercenary + entities: + - uid: 878 components: - type: Transform - pos: -17.5,17.5 + pos: 13.5,19.5 parent: 1 -- proto: SpawnPointMercenary - entities: - - uid: 906 + - uid: 2068 components: - type: Transform - pos: 0.5,20.5 + pos: 14.5,19.5 parent: 1 - - uid: 2056 + - uid: 2557 components: - type: Transform - pos: -15.5,2.5 + pos: -8.5,10.5 parent: 1 - - uid: 2057 + - uid: 2558 components: - type: Transform - pos: 16.5,2.5 + pos: -2.5,8.5 parent: 1 - - uid: 2068 + - uid: 2559 components: - type: Transform - pos: 9.5,3.5 + pos: 3.5,8.5 parent: 1 - - uid: 2072 + - uid: 2560 + components: + - type: Transform + pos: -0.5,8.5 + parent: 1 + - uid: 2561 + components: + - type: Transform + pos: -3.5,10.5 + parent: 1 + - uid: 2568 + components: + - type: Transform + pos: 12.5,19.5 + parent: 1 + - uid: 2569 + components: + - type: Transform + pos: 1.5,20.5 + parent: 1 + - uid: 2570 + components: + - type: Transform + pos: 0.5,20.5 + parent: 1 + - uid: 2571 + components: + - type: Transform + pos: -0.5,20.5 + parent: 1 + - uid: 2572 + components: + - type: Transform + pos: -11.5,19.5 + parent: 1 + - uid: 2573 components: - type: Transform pos: -12.5,19.5 parent: 1 - - uid: 2532 + - uid: 2574 components: - type: Transform - pos: -8.5,3.5 + pos: -13.5,19.5 + parent: 1 + - uid: 2575 + components: + - type: Transform + pos: -7.5,9.5 parent: 1 - proto: SpawnPointPilot entities: - - uid: 878 + - uid: 868 components: - type: Transform - pos: 13.5,19.5 + pos: 16.5,2.5 parent: 1 - - uid: 2060 + - uid: 906 components: - type: Transform pos: -16.5,2.5 parent: 1 + - uid: 1055 + components: + - type: Transform + pos: -15.5,2.5 + parent: 1 + - uid: 1162 + components: + - type: Transform + pos: -7.5,3.5 + parent: 1 + - uid: 2056 + components: + - type: Transform + pos: 15.5,2.5 + parent: 1 + - uid: 2057 + components: + - type: Transform + pos: -14.5,2.5 + parent: 1 + - uid: 2060 + components: + - type: Transform + pos: 7.5,3.5 + parent: 1 - uid: 2061 components: - type: Transform pos: 17.5,2.5 parent: 1 - - uid: 2530 + - uid: 2072 + components: + - type: Transform + pos: -6.5,3.5 + parent: 1 + - uid: 2086 + components: + - type: Transform + pos: 9.5,3.5 + parent: 1 + - uid: 2103 components: - type: Transform pos: 8.5,3.5 parent: 1 - - uid: 2531 + - uid: 2555 components: - type: Transform - pos: -7.5,3.5 + pos: -8.5,3.5 + parent: 1 + - uid: 2562 + components: + - type: Transform + pos: -6.5,10.5 + parent: 1 + - uid: 2563 + components: + - type: Transform + pos: -3.5,9.5 + parent: 1 + - uid: 2564 + components: + - type: Transform + pos: -1.5,8.5 + parent: 1 + - uid: 2565 + components: + - type: Transform + pos: 0.5,8.5 + parent: 1 + - uid: 2566 + components: + - type: Transform + pos: 1.5,8.5 + parent: 1 + - uid: 2567 + components: + - type: Transform + pos: 2.5,8.5 parent: 1 - proto: StairDark entities: @@ -16588,11 +16595,6 @@ entities: - type: Transform pos: -10.5,4.5 parent: 1 - - uid: 2188 - components: - - type: Transform - pos: -5.5,23.5 - parent: 1 - proto: VendingMachineBooze entities: - uid: 935 @@ -16621,32 +16623,29 @@ entities: - type: Transform pos: -11.5,17.5 parent: 1 -- proto: VendingMachineExpeditionaryFlatpackVend +- proto: VendingMachineEngivendPOI entities: - - uid: 1169 + - uid: 2531 components: - type: Transform - pos: -12.5,4.5 + pos: -5.5,19.5 parent: 1 - - uid: 2103 +- proto: VendingMachineExpeditionaryFlatpackVend + entities: + - uid: 1169 components: - type: Transform - pos: -5.5,19.5 + pos: -12.5,4.5 parent: 1 - proto: VendingMachineFuelVend entities: - - uid: 2187 + - uid: 2532 components: - type: Transform - pos: 16.5,11.5 + pos: 6.5,23.5 parent: 1 - proto: VendingMachineSalvagePOI entities: - - uid: 1162 - components: - - type: Transform - pos: 6.5,19.5 - parent: 1 - uid: 2051 components: - type: Transform @@ -16659,15 +16658,24 @@ entities: - type: Transform pos: -1.5,3.5 parent: 1 - - uid: 1055 + - uid: 2146 components: - type: Transform - pos: 6.5,23.5 + pos: 2.5,3.5 parent: 1 - - uid: 2146 +- proto: VendingMachineVendomatPOI + entities: + - uid: 2188 components: - type: Transform - pos: 2.5,3.5 + pos: 6.5,19.5 + parent: 1 +- proto: VendingMachineYouToolPOI + entities: + - uid: 2187 + components: + - type: Transform + pos: -5.5,23.5 parent: 1 - proto: WallmountTelevision entities: