From 4f07ac9b5eba55f2c68143c0b8126c724e931c72 Mon Sep 17 00:00:00 2001 From: PeccNeck <74548962+PeccNeck@users.noreply.github.com> Date: Tue, 10 Sep 2024 12:18:55 -0400 Subject: [PATCH 1/3] parcel will no longer suffocate you --- Resources/Maps/_NF/Shuttles/Sr/parcel.yml | 71 +++++++++-------------- 1 file changed, 29 insertions(+), 42 deletions(-) diff --git a/Resources/Maps/_NF/Shuttles/Sr/parcel.yml b/Resources/Maps/_NF/Shuttles/Sr/parcel.yml index 4f03fabd5ee..dbf4fa747c2 100644 --- a/Resources/Maps/_NF/Shuttles/Sr/parcel.yml +++ b/Resources/Maps/_NF/Shuttles/Sr/parcel.yml @@ -228,9 +228,6 @@ entities: rot: -1.5707963267948966 rad pos: 4.5,3.5 parent: 1 - - type: DeviceLinkSink - links: - - 222 - uid: 10 components: - type: Transform @@ -278,7 +275,7 @@ entities: rot: -1.5707963267948966 rad pos: 7.5,-0.5 parent: 1 -- proto: AtmosDeviceFanTiny +- proto: AtmosDeviceFanDirectional entities: - uid: 7 components: @@ -301,6 +298,11 @@ entities: - type: Transform pos: -0.5,-3.5 parent: 1 + - uid: 225 + components: + - type: Transform + pos: 5.5,-3.5 + parent: 1 - proto: AtmosFixBlockerMarker entities: - uid: 20 @@ -826,13 +828,18 @@ entities: rot: -1.5707963267948966 rad pos: 7.5,-3.5 parent: 1 - - type: Physics - canCollide: False - type: ContainerContainer containers: board: !type:Container + showEnts: False + occludes: True ents: [] - bank-ATM-cashSlot: !type:ContainerSlot {} + bank-ATM-cashSlot: !type:ContainerSlot + showEnts: False + occludes: True + ent: null + - type: Physics + canCollide: False - type: ItemSlots - uid: 26 components: @@ -840,13 +847,18 @@ entities: rot: -1.5707963267948966 rad pos: 1.5,-3.5 parent: 1 - - type: Physics - canCollide: False - type: ContainerContainer containers: board: !type:Container + showEnts: False + occludes: True ents: [] - bank-ATM-cashSlot: !type:ContainerSlot {} + bank-ATM-cashSlot: !type:ContainerSlot + showEnts: False + occludes: True + ent: null + - type: Physics + canCollide: False - type: ItemSlots - proto: DefibrillatorCabinetFilled entities: @@ -1117,8 +1129,6 @@ entities: rot: 3.141592653589793 rad pos: 3.5,-2.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - proto: LockableButtonMailCarrier entities: - uid: 153 @@ -1150,6 +1160,13 @@ entities: linkedPorts: 223: - Pressed: Toggle +- proto: LockerWallEVAColorMailFilled + entities: + - uid: 73 + components: + - type: Transform + pos: 4.5,2.5 + parent: 1 - proto: NitrogenCanister entities: - uid: 100 @@ -1424,25 +1441,16 @@ entities: - type: Transform pos: 0.5,-3.5 parent: 1 - - type: DeviceLinkSink - links: - - 153 - uid: 123 components: - type: Transform pos: 6.5,-3.5 parent: 1 - - type: DeviceLinkSink - links: - - 159 - uid: 223 components: - type: Transform pos: 4.5,3.5 parent: 1 - - type: DeviceLinkSink - links: - - 222 - proto: SignMail entities: - uid: 101 @@ -1478,16 +1486,12 @@ entities: rot: 1.5707963267948966 rad pos: -2.5,-2.5 parent: 1 - - type: Thruster - originalPowerLoad: 500 - uid: 178 components: - type: Transform rot: -1.5707963267948966 rad pos: 7.5,3.5 parent: 1 - - type: Thruster - originalPowerLoad: 500 - proto: SpawnPointLatejoin entities: - uid: 90 @@ -1504,15 +1508,6 @@ entities: rot: -1.5707963267948966 rad pos: 7.5,1.5 parent: 1 -- proto: LockerWallEVAColorMailFilled - entities: - - uid: 73 - components: - - type: Transform - pos: 4.5,2.5 - parent: 1 - - type: Physics - canCollide: False - proto: Table entities: - uid: 13 @@ -1574,31 +1569,23 @@ entities: rot: 3.141592653589793 rad pos: 2.5,-3.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 122 components: - type: Transform rot: 3.141592653589793 rad pos: 3.5,-3.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 161 components: - type: Transform pos: 7.5,4.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 162 components: - type: Transform rot: 3.141592653589793 rad pos: -2.5,-3.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - proto: ToolboxMechanicalFilled entities: - uid: 154 From afad96a9656e4af821c92feff161d217410e7929 Mon Sep 17 00:00:00 2001 From: PeccNeck <74548962+PeccNeck@users.noreply.github.com> Date: Tue, 10 Sep 2024 12:19:06 -0400 Subject: [PATCH 2/3] menace will also no longer suffocate you --- .../Maps/_NF/Shuttles/BlackMarket/menace.yml | 46 ++++--------------- 1 file changed, 10 insertions(+), 36 deletions(-) diff --git a/Resources/Maps/_NF/Shuttles/BlackMarket/menace.yml b/Resources/Maps/_NF/Shuttles/BlackMarket/menace.yml index 5a9bfb23277..7f52af4444b 100644 --- a/Resources/Maps/_NF/Shuttles/BlackMarket/menace.yml +++ b/Resources/Maps/_NF/Shuttles/BlackMarket/menace.yml @@ -268,25 +268,30 @@ entities: rot: -1.5707963267948966 rad pos: 7.5,-0.5 parent: 1 -- proto: AtmosDeviceFanTiny +- proto: AtmosDeviceFanDirectional entities: - - uid: 7 + - uid: 4 components: - type: Transform pos: 6.5,-3.5 parent: 1 - - uid: 24 + - uid: 7 components: - type: Transform rot: -1.5707963267948966 rad pos: 4.5,3.5 parent: 1 + - uid: 24 + components: + - type: Transform + pos: 5.5,-3.5 + parent: 1 - uid: 151 components: - type: Transform pos: 0.5,-3.5 parent: 1 - - uid: 163 + - uid: 242 components: - type: Transform pos: -0.5,-3.5 @@ -1087,8 +1092,6 @@ entities: rot: 3.141592653589793 rad pos: 3.5,-2.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - proto: NetworkConfigurator entities: - uid: 182 @@ -1135,7 +1138,7 @@ entities: parent: 1 - proto: PlasticFlapsAirtightClear entities: - - uid: 4 + - uid: 163 components: - type: Transform pos: 5.5,-3.5 @@ -1357,25 +1360,16 @@ entities: - type: Transform pos: 0.5,-3.5 parent: 1 - - type: DeviceLinkSink - links: - - 157 - uid: 123 components: - type: Transform pos: 6.5,-3.5 parent: 1 - - type: DeviceLinkSink - links: - - 37 - uid: 223 components: - type: Transform pos: 4.5,3.5 parent: 1 - - type: DeviceLinkSink - links: - - 26 - proto: ShuttleGunPirateCannon entities: - uid: 61 @@ -1384,18 +1378,12 @@ entities: rot: 3.141592653589793 rad pos: -0.5,4.5 parent: 1 - - type: DeviceLinkSink - links: - - 240 - uid: 222 components: - type: Transform rot: 3.141592653589793 rad pos: 2.5,4.5 parent: 1 - - type: DeviceLinkSink - links: - - 241 - proto: SignalButtonDirectional entities: - uid: 26 @@ -1497,8 +1485,6 @@ entities: - type: Transform pos: 4.5,2.5 parent: 1 - - type: Physics - canCollide: False - proto: Table entities: - uid: 13 @@ -1560,47 +1546,35 @@ entities: rot: 3.141592653589793 rad pos: 2.5,-3.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 122 components: - type: Transform rot: 3.141592653589793 rad pos: 3.5,-3.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 161 components: - type: Transform pos: 7.5,4.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 162 components: - type: Transform rot: 3.141592653589793 rad pos: -2.5,-3.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 180 components: - type: Transform rot: 1.5707963267948966 rad pos: -2.5,-2.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 202 components: - type: Transform rot: -1.5707963267948966 rad pos: 7.5,3.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - proto: ToolboxMechanicalFilled entities: - uid: 154 From 33eaa289d0da9835431093123799fad7c0792959 Mon Sep 17 00:00:00 2001 From: Dvir Date: Sun, 15 Sep 2024 00:53:24 +0300 Subject: [PATCH 3/3] Fix ships + mailpod --- .../Maps/_NF/Shuttles/BlackMarket/menace.yml | 24 +- Resources/Maps/_NF/Shuttles/Sr/mailpod.yml | 237 ++++-------------- Resources/Maps/_NF/Shuttles/Sr/parcel.yml | 99 ++------ 3 files changed, 77 insertions(+), 283 deletions(-) diff --git a/Resources/Maps/_NF/Shuttles/BlackMarket/menace.yml b/Resources/Maps/_NF/Shuttles/BlackMarket/menace.yml index 7f52af4444b..b75161fa2fd 100644 --- a/Resources/Maps/_NF/Shuttles/BlackMarket/menace.yml +++ b/Resources/Maps/_NF/Shuttles/BlackMarket/menace.yml @@ -1092,6 +1092,13 @@ entities: rot: 3.141592653589793 rad pos: 3.5,-2.5 parent: 1 +- proto: LockerWallMaterialsFuelPlasmaFilled + entities: + - uid: 77 + components: + - type: Transform + pos: 6.5,2.5 + parent: 1 - proto: NetworkConfigurator entities: - uid: 182 @@ -1157,6 +1164,8 @@ entities: parent: 1 - type: FuelGenerator on: False + - type: MaterialStorageMagnetPickup + magnetEnabled: True - type: Physics bodyType: Static - proto: Poweredlight @@ -1346,13 +1355,6 @@ entities: - type: Transform pos: 3.160936,4.206492 parent: 1 -- proto: SheetPlasma - entities: - - uid: 146 - components: - - type: Transform - pos: 6.544826,1.53125 - parent: 1 - proto: ShuttersNormalOpen entities: - uid: 3 @@ -1441,14 +1443,6 @@ entities: 222: - Pressed: Toggle - Pressed: Trigger -- proto: SignSpace - entities: - - uid: 77 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 6.5,2.5 - parent: 1 - proto: SpawnPointPirate entities: - uid: 93 diff --git a/Resources/Maps/_NF/Shuttles/Sr/mailpod.yml b/Resources/Maps/_NF/Shuttles/Sr/mailpod.yml index 01585bb32ae..995836b1a5c 100644 --- a/Resources/Maps/_NF/Shuttles/Sr/mailpod.yml +++ b/Resources/Maps/_NF/Shuttles/Sr/mailpod.yml @@ -118,36 +118,19 @@ entities: data: tiles: 0,0: - 0: 1 - 1: 4402 - 2: 17408 + 0: 4403 + 1: 17408 0,-1: - 1: 12594 - 0: 512 + 0: 13106 -1,0: - 1: 34944 + 0: 34944 0,1: - 2: 4 + 1: 4 -1,-1: - 2: 17476 + 1: 17476 -1,1: - 2: 4 + 1: 4 uniqueMixes: - - volume: 2500 - temperature: 293.15 - moles: - - 21.6852 - - 81.57766 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - volume: 2500 temperature: 293.15 moles: @@ -196,7 +179,7 @@ entities: rot: -1.5707963267948966 rad pos: 1.5,2.5 parent: 1 -- proto: AtmosDeviceFanTiny +- proto: AtmosDeviceFanDirectional entities: - uid: 29 components: @@ -250,31 +233,6 @@ entities: - type: Transform pos: 2.5,2.5 parent: 1 -- proto: BoxMailCapsulePrimed - entities: - - uid: 37 - components: - - type: Transform - parent: 72 - - type: Physics - canCollide: False - - type: InsideEntityStorage - - uid: 105 - components: - - type: Transform - parent: 72 - - type: Physics - canCollide: False - - type: InsideEntityStorage -- proto: BoxPaperOffice - entities: - - uid: 89 - components: - - type: Transform - parent: 99 - - type: Physics - canCollide: False - - type: InsideEntityStorage - proto: CableApcExtension entities: - uid: 63 @@ -359,76 +317,6 @@ entities: rot: 3.141592653589793 rad pos: 0.5,2.5 parent: 1 -- proto: ClosetWall - entities: - - uid: 72 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 2.5,-1.5 - parent: 1 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14923 - moles: - - 1.8856695 - - 7.0937095 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - type: ContainerContainer - containers: - entity_storage: !type:Container - showEnts: False - occludes: True - ents: - - 9 - - 37 - - 105 - - uid: 99 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -0.5,0.5 - parent: 1 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14923 - moles: - - 1.8856695 - - 7.0937095 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - type: ContainerContainer - containers: - entity_storage: !type:Container - showEnts: False - occludes: True - ents: - - 89 - - 92 - - 91 - - 16 - - 93 - proto: ComputerTabletopShuttle entities: - uid: 50 @@ -452,13 +340,18 @@ entities: rot: -1.5707963267948966 rad pos: 2.5,-3.5 parent: 1 - - type: Physics - canCollide: False - type: ContainerContainer containers: board: !type:Container + showEnts: False + occludes: True ents: [] - bank-ATM-cashSlot: !type:ContainerSlot {} + bank-ATM-cashSlot: !type:ContainerSlot + showEnts: False + occludes: True + ent: null + - type: Physics + canCollide: False - type: ItemSlots - proto: DefibrillatorCabinetFilled entities: @@ -657,6 +550,30 @@ entities: - type: Transform pos: -1.5,4.5 parent: 1 +- proto: LockerWallEVAColorMailFilled + entities: + - uid: 95 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,-2.5 + parent: 1 +- proto: LockerWallMaterialsBasic10Filled + entities: + - uid: 9 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,-1.5 + parent: 1 +- proto: LockerWallMaterialsFuelPlasmaFilled + entities: + - uid: 37 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,0.5 + parent: 1 - proto: NitrogenCanister entities: - uid: 109 @@ -677,6 +594,13 @@ entities: parent: 1 - type: Physics bodyType: Static +- proto: PaperOffice + entities: + - uid: 72 + components: + - type: Transform + pos: -0.49241737,3.2409117 + parent: 1 - proto: PlasticFlapsAirtightClear entities: - uid: 27 @@ -693,6 +617,8 @@ entities: parent: 1 - type: FuelGenerator on: False + - type: MaterialStorageMagnetPickup + magnetEnabled: True - type: Physics bodyType: Static - proto: PowerCellRecharger @@ -777,40 +703,6 @@ entities: - type: Transform pos: 1.5,-0.5 parent: 1 -- proto: SheetGlass - entities: - - uid: 93 - components: - - type: Transform - parent: 99 - - type: Physics - canCollide: False - - type: InsideEntityStorage -- proto: SheetPlasma - entities: - - uid: 86 - components: - - type: Transform - pos: -0.5,1.5 - parent: 1 -- proto: SheetPlastic - entities: - - uid: 92 - components: - - type: Transform - parent: 99 - - type: Physics - canCollide: False - - type: InsideEntityStorage -- proto: SheetSteel - entities: - - uid: 91 - components: - - type: Transform - parent: 99 - - type: Physics - canCollide: False - - type: InsideEntityStorage - proto: ShuttersNormalOpen entities: - uid: 79 @@ -818,9 +710,6 @@ entities: - type: Transform pos: 1.5,-3.5 parent: 1 - - type: DeviceLinkSink - links: - - 88 - proto: SignalButtonDirectional entities: - uid: 88 @@ -866,16 +755,6 @@ entities: - type: Transform pos: 2.5,1.5 parent: 1 -- proto: LockerWallEVAColorMailFilled - entities: - - uid: 95 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -0.5,-2.5 - parent: 1 - - type: Physics - canCollide: False - proto: Table entities: - uid: 17 @@ -934,10 +813,8 @@ entities: - uid: 16 components: - type: Transform - parent: 99 - - type: Physics - canCollide: False - - type: InsideEntityStorage + pos: -0.4848204,1.8352823 + parent: 1 - proto: WallReinforced entities: - uid: 2 @@ -1014,15 +891,6 @@ entities: - type: Transform pos: 0.5,2.5 parent: 1 -- proto: WeaponMailLake - entities: - - uid: 9 - components: - - type: Transform - parent: 72 - - type: Physics - canCollide: False - - type: InsideEntityStorage - proto: WindoorSecureMailLocked entities: - uid: 41 @@ -1030,9 +898,6 @@ entities: - type: Transform pos: 1.5,-2.5 parent: 1 - - type: DeviceLinkSink - links: - - 88 - uid: 77 components: - type: Transform diff --git a/Resources/Maps/_NF/Shuttles/Sr/parcel.yml b/Resources/Maps/_NF/Shuttles/Sr/parcel.yml index dbf4fa747c2..efcb2e00f8c 100644 --- a/Resources/Maps/_NF/Shuttles/Sr/parcel.yml +++ b/Resources/Maps/_NF/Shuttles/Sr/parcel.yml @@ -763,41 +763,6 @@ entities: rot: 3.141592653589793 rad pos: 0.5537621,0.6666666 parent: 1 -- proto: ClosetWall - entities: - - uid: 166 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 7.5,0.5 - parent: 1 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14923 - moles: - - 1.7459903 - - 6.568249 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - type: ContainerContainer - containers: - entity_storage: !type:Container - showEnts: False - occludes: True - ents: - - 91 - - 93 - - 92 - proto: ClothingBackpackMessengerMailCarrier entities: - uid: 83 @@ -1167,6 +1132,21 @@ entities: - type: Transform pos: 4.5,2.5 parent: 1 +- proto: LockerWallMaterialsBasic10Filled + entities: + - uid: 36 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 7.5,0.5 + parent: 1 +- proto: LockerWallMaterialsFuelPlasmaFilled + entities: + - uid: 77 + components: + - type: Transform + pos: 6.5,2.5 + parent: 1 - proto: NitrogenCanister entities: - uid: 100 @@ -1208,6 +1188,8 @@ entities: parent: 1 - type: FuelGenerator on: False + - type: MaterialStorageMagnetPickup + magnetEnabled: True - type: Physics bodyType: Static - proto: PowerCellRecharger @@ -1400,40 +1382,6 @@ entities: - type: Transform pos: 6.5,0.5 parent: 1 -- proto: SheetGlass - entities: - - uid: 93 - components: - - type: Transform - parent: 166 - - type: Physics - canCollide: False - - type: InsideEntityStorage -- proto: SheetPlasma - entities: - - uid: 146 - components: - - type: Transform - pos: 6.491864,1.5018094 - parent: 1 -- proto: SheetPlastic - entities: - - uid: 92 - components: - - type: Transform - parent: 166 - - type: Physics - canCollide: False - - type: InsideEntityStorage -- proto: SheetSteel - entities: - - uid: 91 - components: - - type: Transform - parent: 166 - - type: Physics - canCollide: False - - type: InsideEntityStorage - proto: ShuttersNormalOpen entities: - uid: 3 @@ -1470,14 +1418,6 @@ entities: rot: 3.141592653589793 rad pos: 4.5,4.5 parent: 1 -- proto: SignSpace - entities: - - uid: 77 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 6.5,2.5 - parent: 1 - proto: SmallThruster entities: - uid: 61 @@ -1528,11 +1468,6 @@ entities: rot: 1.5707963267948966 rad pos: -0.5,1.5 parent: 1 - - uid: 36 - components: - - type: Transform - pos: 4.5,1.5 - parent: 1 - uid: 53 components: - type: Transform