From 985cefc450f684d4a4eefbbd4350e31ca8b7b2fa Mon Sep 17 00:00:00 2001 From: "Alice \"Arimah\" Heurlin" <30327355+arimah@users.noreply.github.com> Date: Wed, 7 Aug 2024 00:27:53 +0200 Subject: [PATCH] Fix Frontier Outpost atmos issues (#1799) Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> --- Resources/Maps/_NF/Outpost/frontier.yml | 312 +++++++++++++++--------- 1 file changed, 194 insertions(+), 118 deletions(-) diff --git a/Resources/Maps/_NF/Outpost/frontier.yml b/Resources/Maps/_NF/Outpost/frontier.yml index 3753e56326f..e3491ea2ade 100644 --- a/Resources/Maps/_NF/Outpost/frontier.yml +++ b/Resources/Maps/_NF/Outpost/frontier.yml @@ -3000,20 +3000,20 @@ entities: color: '#52B4E996' id: WarnFullGreyscale decals: - 2445: -34,6 - 2446: -33,6 + 2469: -36,6 + 2470: -35,6 - node: color: '#D4D4D496' id: WarnFullGreyscale decals: - 2441: -38,6 - 2442: -37,6 + 2471: -34,6 + 2472: -33,6 - node: color: '#DE3A3A96' id: WarnFullGreyscale decals: - 2443: -36,6 - 2444: -35,6 + 2467: -38,6 + 2468: -37,6 - node: color: '#FFFFFFFF' id: WarnLineE @@ -3981,15 +3981,15 @@ entities: - 5589 - proto: AirCanister entities: - - uid: 932 + - uid: 706 components: - type: Transform - pos: -36.5,6.5 + pos: -33.5,6.5 parent: 2173 - - uid: 1024 + - uid: 707 components: - type: Transform - pos: -37.5,6.5 + pos: -32.5,6.5 parent: 2173 - proto: Airlock entities: @@ -13654,6 +13654,16 @@ entities: rot: 3.141592653589793 rad pos: -32.5,10.5 parent: 2173 + - uid: 2049 + components: + - type: Transform + pos: -36.5,9.5 + parent: 2173 + - uid: 2052 + components: + - type: Transform + pos: -34.5,9.5 + parent: 2173 - uid: 2147 components: - type: Transform @@ -18362,26 +18372,6 @@ entities: - type: Physics canCollide: False - type: InsideEntityStorage -- proto: GasFilterNitrogenOn - entities: - - uid: 1137 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -34.5,9.5 - parent: 2173 - - type: AtmosPipeColor - color: '#0055CCFF' -- proto: GasFilterOxygenOn - entities: - - uid: 1151 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -32.5,9.5 - parent: 2173 - - type: AtmosPipeColor - color: '#0055CCFF' - proto: GasMinerNitrogenStation entities: - uid: 1703 @@ -18400,26 +18390,30 @@ entities: parent: 2173 - proto: GasMixerOn entities: - - uid: 706 + - uid: 1124 components: - type: Transform - pos: -31.5,14.5 + pos: -31.5,15.5 parent: 2173 - type: GasMixer inletTwoConcentration: 0.20999998 inletOneConcentration: 0.79 + targetPressure: 4500 - type: AtmosPipeColor color: '#0055CCFF' -- proto: GasPassiveVent - entities: - - uid: 908 + - uid: 2050 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -34.5,14.5 + pos: -32.5,9.5 parent: 2173 + - type: GasMixer + inletTwoConcentration: 0.20999998 + inletOneConcentration: 0.79 + targetPressure: 4500 - type: AtmosPipeColor color: '#0055CCFF' +- proto: GasPassiveVent + entities: - uid: 915 components: - type: Transform @@ -18427,14 +18421,36 @@ entities: parent: 2173 - type: AtmosPipeColor color: '#990000FF' - - uid: 1602 + - uid: 923 components: - type: Transform - rot: 1.5707963267948966 rad pos: -36.5,14.5 parent: 2173 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 1052 + components: + - type: Transform + pos: -34.5,14.5 + parent: 2173 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 2044 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -36.5,15.5 + parent: 2173 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 2045 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -34.5,15.5 + parent: 2173 + - type: AtmosPipeColor + color: '#0055CCFF' - proto: GasPipeBend entities: - uid: 464 @@ -18460,19 +18476,19 @@ entities: parent: 2173 - type: AtmosPipeColor color: '#990000FF' - - uid: 923 + - uid: 990 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -31.5,9.5 + rot: 1.5707963267948966 rad + pos: -37.5,7.5 parent: 2173 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 990 + - uid: 1028 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -37.5,7.5 + rot: -1.5707963267948966 rad + pos: -35.5,15.5 parent: 2173 - type: AtmosPipeColor color: '#0055CCFF' @@ -18530,14 +18546,6 @@ entities: parent: 2173 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 1946 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -35.5,14.5 - parent: 2173 - - type: AtmosPipeColor - color: '#0055CCFF' - uid: 1954 components: - type: Transform @@ -18554,6 +18562,13 @@ entities: parent: 2173 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 2051 + components: + - type: Transform + pos: -32.5,10.5 + parent: 2173 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 2840 components: - type: Transform @@ -18871,13 +18886,6 @@ entities: color: '#0055CCFF' - proto: GasPipeFourway entities: - - uid: 1135 - components: - - type: Transform - pos: -31.5,11.5 - parent: 2173 - - type: AtmosPipeColor - color: '#0055CCFF' - uid: 4548 components: - type: Transform @@ -19040,10 +19048,19 @@ entities: parent: 2173 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 908 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -34.5,10.5 + parent: 2173 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 909 components: - type: Transform - pos: -35.5,15.5 + rot: -1.5707963267948966 rad + pos: -36.5,11.5 parent: 2173 - type: AtmosPipeColor color: '#0055CCFF' @@ -19054,6 +19071,14 @@ entities: parent: 2173 - type: AtmosPipeColor color: '#990000FF' + - uid: 932 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -36.5,13.5 + parent: 2173 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 961 components: - type: Transform @@ -19062,6 +19087,14 @@ entities: parent: 2173 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 987 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -33.5,15.5 + parent: 2173 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 995 components: - type: Transform @@ -19076,19 +19109,35 @@ entities: parent: 2173 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 1024 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -36.5,11.5 + parent: 2173 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 1051 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -34.5,10.5 + parent: 2173 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 1089 components: - type: Transform rot: 3.141592653589793 rad - pos: -31.5,10.5 + pos: -34.5,11.5 parent: 2173 - type: AtmosPipeColor color: '#0055CCFF' - uid: 1092 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -35.5,9.5 + rot: -1.5707963267948966 rad + pos: -35.5,10.5 parent: 2173 - type: AtmosPipeColor color: '#0055CCFF' @@ -19106,13 +19155,6 @@ entities: parent: 2173 - type: AtmosPipeColor color: '#990000FF' - - uid: 1124 - components: - - type: Transform - pos: -31.5,15.5 - parent: 2173 - - type: AtmosPipeColor - color: '#0055CCFF' - uid: 1125 components: - type: Transform @@ -19177,18 +19219,18 @@ entities: parent: 2173 - type: AtmosPipeColor color: '#990000FF' - - uid: 1134 + - uid: 1145 components: - type: Transform - pos: -36.5,10.5 + rot: 1.5707963267948966 rad + pos: -32.5,11.5 parent: 2173 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 1145 + - uid: 1151 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -32.5,11.5 + pos: -36.5,9.5 parent: 2173 - type: AtmosPipeColor color: '#0055CCFF' @@ -19316,6 +19358,14 @@ entities: parent: 2173 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 1602 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -33.5,9.5 + parent: 2173 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 1751 components: - type: Transform @@ -19336,7 +19386,14 @@ entities: components: - type: Transform rot: -1.5707963267948966 rad - pos: -33.5,14.5 + pos: -33.5,10.5 + parent: 2173 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 1918 + components: + - type: Transform + pos: -31.5,14.5 parent: 2173 - type: AtmosPipeColor color: '#0055CCFF' @@ -19377,10 +19434,35 @@ entities: parent: 2173 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 2037 + - uid: 2046 components: - type: Transform - pos: -33.5,10.5 + rot: 3.141592653589793 rad + pos: -34.5,13.5 + parent: 2173 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 2047 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -36.5,12.5 + parent: 2173 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 2048 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -34.5,12.5 + parent: 2173 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 2053 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -33.5,11.5 parent: 2173 - type: AtmosPipeColor color: '#0055CCFF' @@ -24014,6 +24096,22 @@ entities: parent: 2173 - type: AtmosPipeColor color: '#990000FF' + - uid: 1134 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -36.5,10.5 + parent: 2173 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 1137 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -31.5,11.5 + parent: 2173 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 1147 components: - type: Transform @@ -24049,7 +24147,7 @@ entities: components: - type: Transform rot: 1.5707963267948966 rad - pos: -36.5,9.5 + pos: -34.5,9.5 parent: 2173 - type: AtmosPipeColor color: '#0055CCFF' @@ -24069,21 +24167,6 @@ entities: parent: 2173 - type: AtmosPipeColor color: '#990000FF' - - uid: 1918 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -33.5,9.5 - parent: 2173 - - type: AtmosPipeColor - color: '#0055CCFF' - - uid: 1938 - components: - - type: Transform - pos: -36.5,11.5 - parent: 2173 - - type: AtmosPipeColor - color: '#0055CCFF' - uid: 1988 components: - type: Transform @@ -24092,13 +24175,6 @@ entities: parent: 2173 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 2015 - components: - - type: Transform - pos: -33.5,11.5 - parent: 2173 - - type: AtmosPipeColor - color: '#0055CCFF' - uid: 2516 components: - type: Transform @@ -24734,19 +24810,19 @@ entities: color: '#0055CCFF' - proto: GasPressurePumpOn entities: - - uid: 707 + - uid: 910 components: - type: Transform rot: 1.5707963267948966 rad - pos: -32.5,14.5 + pos: -32.5,16.5 parent: 2173 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 910 + - uid: 1135 components: - type: Transform rot: 1.5707963267948966 rad - pos: -32.5,16.5 + pos: -32.5,15.5 parent: 2173 - type: AtmosPipeColor color: '#0055CCFF' @@ -27927,20 +28003,20 @@ entities: parent: 2173 - proto: NitrogenCanister entities: - - uid: 1051 + - uid: 1077 components: - type: Transform - pos: -35.5,6.5 + pos: -36.5,15.5 parent: 2173 - - uid: 1052 + - uid: 2015 components: - type: Transform - pos: -34.5,6.5 + pos: -37.5,6.5 parent: 2173 - - uid: 1077 + - uid: 2037 components: - type: Transform - pos: -36.5,15.5 + pos: -36.5,6.5 parent: 2173 - proto: NoticeBoardNF entities: @@ -27966,20 +28042,20 @@ entities: parent: 2173 - proto: OxygenCanister entities: - - uid: 987 + - uid: 1080 components: - type: Transform - pos: -32.5,6.5 + pos: -34.5,15.5 parent: 2173 - - uid: 1028 + - uid: 1938 components: - type: Transform - pos: -33.5,6.5 + pos: -34.5,6.5 parent: 2173 - - uid: 1080 + - uid: 1946 components: - type: Transform - pos: -34.5,15.5 + pos: -35.5,6.5 parent: 2173 - proto: Paper entities: