From c8a6418b2765f7d6cb5fd75d4f40036305779bcf Mon Sep 17 00:00:00 2001 From: dustylens Date: Sun, 22 Sep 2024 14:38:15 -0700 Subject: [PATCH 1/3] Garden Directional Fan Update --- Resources/Maps/_NF/Shuttles/garden.yml | 300 ++++++++++--------------- 1 file changed, 123 insertions(+), 177 deletions(-) diff --git a/Resources/Maps/_NF/Shuttles/garden.yml b/Resources/Maps/_NF/Shuttles/garden.yml index a7783daf1cc..46323b33bba 100644 --- a/Resources/Maps/_NF/Shuttles/garden.yml +++ b/Resources/Maps/_NF/Shuttles/garden.yml @@ -57,6 +57,21 @@ entities: chunkCollection: version: 2 nodes: + - node: + color: '#FFFFFFFF' + id: Bot + decals: + 55: 3,5 + - node: + color: '#0A6AB6FF' + id: DeliveryGreyscale + decals: + 53: 2,6 + - node: + color: '#A91409FF' + id: DeliveryGreyscale + decals: + 54: 3,6 - node: color: '#FFFFFFFF' id: DirtHeavy @@ -164,48 +179,44 @@ entities: tiles: 0,0: 0: 3 - 1: 65532 + 1: 63368 + -1,0: + 0: 8 + 1: 64819 0,1: - 1: 65535 + 1: 12279 + -1,1: + 1: 36588 + 0: 4096 0,2: - 1: 55 + 1: 35 0: 64 + -1,2: + 1: 136 + 0: 64 + 0,-1: + 0: 8196 + 1: 34944 1,0: - 1: 30583 + 1: 13107 1,1: - 1: 275 0: 4132 - 0,-2: - 1: 4352 - 0,-1: - 1: 56793 - 0: 8196 1,-1: - 1: 30579 + 1: 13104 0: 4 -2,0: - 1: 52428 + 1: 34952 -2,1: 0: 132 - 1: 8 - -1,0: - 1: 65527 - 0: 8 - -1,1: - 1: 61439 - 0: 4096 - -1,2: - 1: 140 - 0: 64 -2,-1: + 1: 34944 0: 4 - 1: 52424 -1,-1: - 1: 30579 + 1: 13104 0: 32772 uniqueMixes: - volume: 2500 - temperature: 293.15 + immutable: True moles: - 0 - 0 @@ -251,8 +262,6 @@ entities: devices: - 107 - 105 - - type: AtmosDevice - joinedGrid: 1 - uid: 141 components: - type: Transform @@ -263,27 +272,11 @@ entities: devices: - 108 - 106 - - type: AtmosDevice - joinedGrid: 1 - uid: 142 components: - type: Transform pos: 0.5,7.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 -- proto: AirCanister - entities: - - uid: 139 - components: - - type: Transform - anchored: True - pos: 3.5,6.5 - parent: 1 - - type: Physics - bodyType: Static - - type: AtmosDevice - joinedGrid: 1 - proto: AirlockExternalGlass entities: - uid: 85 @@ -343,19 +336,19 @@ entities: - type: Transform pos: 5.5,4.5 parent: 1 -- proto: AtmosDeviceFanTiny +- proto: AtmosDeviceFanDirectional entities: - - uid: 255 + - uid: 103 components: - type: Transform rot: 3.141592653589793 rad - pos: -0.5,9.5 + pos: 1.5,9.5 parent: 1 - - uid: 260 + - uid: 112 components: - type: Transform rot: 3.141592653589793 rad - pos: 1.5,9.5 + pos: -0.5,9.5 parent: 1 - proto: AtmosFixBlockerMarker entities: @@ -763,11 +756,10 @@ entities: parent: 1 - proto: DefibrillatorCabinetFilled entities: - - uid: 282 + - uid: 293 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 3.5,4.5 + pos: -1.5,7.5 parent: 1 - proto: EmergencyLight entities: @@ -823,6 +815,19 @@ entities: - type: Transform pos: 1.5,7.5 parent: 1 +- proto: GasMixerOnFlipped + entities: + - uid: 211 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,5.5 + parent: 1 + - type: GasMixer + inletTwoConcentration: 0.79 + inletOneConcentration: 0.21 + - type: AtmosPipeColor + color: '#0055CCFF' - proto: GasPassiveVent entities: - uid: 110 @@ -831,8 +836,6 @@ entities: rot: 3.141592653589793 rad pos: 0.5,0.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#990000FF' - proto: GasPipeBend @@ -845,11 +848,11 @@ entities: parent: 1 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 131 + - uid: 205 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 1.5,6.5 + rot: -1.5707963267948966 rad + pos: -0.5,5.5 parent: 1 - type: AtmosPipeColor color: '#0055CCFF' @@ -860,14 +863,6 @@ entities: parent: 1 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 208 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 2.5,3.5 - parent: 1 - - type: AtmosPipeColor - color: '#0055CCFF' - uid: 209 components: - type: Transform @@ -892,18 +887,11 @@ entities: parent: 1 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 240 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -1.5,3.5 - parent: 1 - - type: AtmosPipeColor - color: '#0055CCFF' - uid: 288 components: - type: Transform - pos: 2.5,5.5 + rot: -1.5707963267948966 rad + pos: 3.5,5.5 parent: 1 - type: AtmosPipeColor color: '#0055CCFF' @@ -1031,11 +1019,11 @@ entities: parent: 1 - type: AtmosPipeColor color: '#990000FF' - - uid: 205 + - uid: 139 components: - type: Transform rot: 1.5707963267948966 rad - pos: 0.5,5.5 + pos: 0.5,3.5 parent: 1 - type: AtmosPipeColor color: '#0055CCFF' @@ -1047,6 +1035,14 @@ entities: parent: 1 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 208 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,3.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 210 components: - type: Transform @@ -1085,6 +1081,14 @@ entities: parent: 1 - type: AtmosPipeColor color: '#990000FF' + - uid: 255 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,3.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 258 components: - type: Transform @@ -1094,55 +1098,43 @@ entities: color: '#990000FF' - proto: GasPipeTJunction entities: - - uid: 112 + - uid: 143 components: - type: Transform rot: 3.141592653589793 rad - pos: -0.5,5.5 + pos: 2.5,3.5 parent: 1 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 211 + - uid: 240 components: - type: Transform rot: 3.141592653589793 rad - pos: 1.5,5.5 + pos: -1.5,3.5 parent: 1 - type: AtmosPipeColor color: '#0055CCFF' - proto: GasPort entities: - - uid: 102 + - uid: 260 components: - type: Transform - rot: -1.5707963267948966 rad pos: 3.5,6.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0055CCFF' -- proto: GasPressurePump - entities: - - uid: 103 + - uid: 261 components: - type: Transform - rot: -1.5707963267948966 rad pos: 2.5,6.5 parent: 1 - - type: GasPressurePump - targetPressure: 101.3 - - type: AtmosDevice - joinedGrid: 1 - - type: AtmosPipeColor - color: '#0055CCFF' +- proto: GasPressurePump + entities: - uid: 292 components: - type: Transform pos: 0.5,3.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#990000FF' - proto: GasVentPump @@ -1153,8 +1145,6 @@ entities: rot: 3.141592653589793 rad pos: -3.5,-1.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0055CCFF' - uid: 106 @@ -1163,8 +1153,6 @@ entities: rot: 3.141592653589793 rad pos: 4.5,-1.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0055CCFF' - uid: 130 @@ -1172,8 +1160,6 @@ entities: - type: Transform pos: -0.5,6.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0055CCFF' - proto: GasVentScrubber @@ -1184,8 +1170,6 @@ entities: rot: 1.5707963267948966 rad pos: -3.5,2.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#990000FF' - uid: 108 @@ -1194,8 +1178,6 @@ entities: rot: -1.5707963267948966 rad pos: 4.5,2.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#990000FF' - uid: 291 @@ -1203,8 +1185,6 @@ entities: - type: Transform pos: 0.5,5.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#990000FF' - proto: GravityGeneratorMini @@ -1519,12 +1499,15 @@ entities: entities: - uid: 145 components: - - type: MetaData - flags: InContainer - type: Transform parent: 144 - type: Physics canCollide: False + - uid: 294 + components: + - type: Transform + pos: 0.38441628,4.6768456 + parent: 1 - proto: LockerBotanistFilled entities: - uid: 172 @@ -1532,20 +1515,45 @@ entities: - type: Transform pos: 5.5,3.5 parent: 1 -- proto: PortableGeneratorPacman +- proto: LockerWallMaterialsFuelPlasmaFilled entities: - - uid: 143 + - uid: 131 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,4.5 + parent: 1 +- proto: NitrogenCanister + entities: + - uid: 282 + components: + - type: Transform + anchored: True + pos: 3.5,6.5 + parent: 1 + - type: Physics + bodyType: Static +- proto: OxygenCanister + entities: + - uid: 102 components: - type: Transform anchored: True + pos: 2.5,6.5 + parent: 1 + - type: Physics + bodyType: Static +- proto: PortableGeneratorPacmanShuttle + entities: + - uid: 264 + components: + - type: Transform pos: 3.5,5.5 parent: 1 - - type: MaterialStorage - storage: - Plasma: 3000 + - type: FuelGenerator + on: False - type: Physics bodyType: Static - - type: InsertingMaterialStorage - proto: PosterLegitBotanyFood entities: - uid: 257 @@ -1571,8 +1579,6 @@ entities: entities: - uid: 252 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: 0.5,2.5 @@ -1581,16 +1587,12 @@ entities: entities: - uid: 253 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -2.5,0.5 parent: 1 - uid: 254 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 1.5707963267948966 rad pos: 3.5,0.5 @@ -1857,222 +1859,166 @@ entities: entities: - uid: 3 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -1.5,7.5 parent: 1 - uid: 6 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 2.5,7.5 parent: 1 - uid: 16 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: -2.5,-3.5 parent: 1 - uid: 18 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: -4.5,-3.5 parent: 1 - uid: 19 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: 3.5,-3.5 parent: 1 - uid: 21 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: 5.5,-3.5 parent: 1 - uid: 22 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: -1.5,0.5 parent: 1 - uid: 23 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: 2.5,0.5 parent: 1 - uid: 24 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: 1.5,1.5 parent: 1 - uid: 25 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: 0.5,1.5 parent: 1 - uid: 26 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: -0.5,1.5 parent: 1 - uid: 27 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: -4.5,4.5 parent: 1 - uid: 28 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: -3.5,4.5 parent: 1 - uid: 29 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: 5.5,4.5 parent: 1 - uid: 30 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: 4.5,4.5 parent: 1 - uid: 32 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: 3.5,7.5 parent: 1 - uid: 48 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 6.5,3.5 parent: 1 - uid: 49 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 6.5,-2.5 parent: 1 - uid: 50 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -5.5,-2.5 parent: 1 - uid: 51 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -5.5,3.5 parent: 1 - uid: 83 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: 0.5,9.5 parent: 1 - uid: 84 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: 0.5,7.5 parent: 1 - uid: 92 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -2.5,4.5 parent: 1 - uid: 94 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 3.5,4.5 parent: 1 - uid: 96 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -1.5,1.5 parent: 1 - uid: 97 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 2.5,1.5 parent: 1 - uid: 98 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -2.5,2.5 parent: 1 - uid: 99 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 3.5,2.5 From c7a8ba46094d6c9f04fdb98d157b92012c35f68f Mon Sep 17 00:00:00 2001 From: dustylens Date: Sun, 22 Sep 2024 17:43:22 -0700 Subject: [PATCH 2/3] Updates garden main room air sensors --- Resources/Maps/_NF/Shuttles/garden.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/Resources/Maps/_NF/Shuttles/garden.yml b/Resources/Maps/_NF/Shuttles/garden.yml index 46323b33bba..4b24e2ac30a 100644 --- a/Resources/Maps/_NF/Shuttles/garden.yml +++ b/Resources/Maps/_NF/Shuttles/garden.yml @@ -277,6 +277,10 @@ entities: - type: Transform pos: 0.5,7.5 parent: 1 + - type: DeviceList + devices: + - 291 + - 130 - proto: AirlockExternalGlass entities: - uid: 85 @@ -1160,6 +1164,11 @@ entities: - type: Transform pos: -0.5,6.5 parent: 1 + - type: DeviceNetwork + configurators: + - invalid + deviceLists: + - 142 - type: AtmosPipeColor color: '#0055CCFF' - proto: GasVentScrubber @@ -1185,6 +1194,11 @@ entities: - type: Transform pos: 0.5,5.5 parent: 1 + - type: DeviceNetwork + configurators: + - invalid + deviceLists: + - 142 - type: AtmosPipeColor color: '#990000FF' - proto: GravityGeneratorMini From 262e32aba9e04c07b3c194ac4fcc3660e0d25286 Mon Sep 17 00:00:00 2001 From: Whatstone Date: Sun, 22 Sep 2024 20:54:22 -0400 Subject: [PATCH 3/3] Garden: remove invalid configurators --- Resources/Maps/_NF/Shuttles/garden.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Resources/Maps/_NF/Shuttles/garden.yml b/Resources/Maps/_NF/Shuttles/garden.yml index 4b24e2ac30a..090ddde1090 100644 --- a/Resources/Maps/_NF/Shuttles/garden.yml +++ b/Resources/Maps/_NF/Shuttles/garden.yml @@ -1165,8 +1165,6 @@ entities: pos: -0.5,6.5 parent: 1 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 142 - type: AtmosPipeColor @@ -1195,8 +1193,6 @@ entities: pos: 0.5,5.5 parent: 1 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 142 - type: AtmosPipeColor