From 41c8c47e5b77aafaf118792061ab2abb8e9ad27a Mon Sep 17 00:00:00 2001 From: Eagle0600 Date: Mon, 23 Sep 2024 14:38:53 +1000 Subject: [PATCH 1/6] Sprinter directional fans update Replaced tiny fans with directional fans. Named O2 and N2 ports and added decals. Replaced medical doctor's locker with wallmount. Added dirt where the locker used to be. --- .../Maps/_NF/Shuttles/Expedition/sprinter.yml | 137 +++++++++++------- 1 file changed, 86 insertions(+), 51 deletions(-) diff --git a/Resources/Maps/_NF/Shuttles/Expedition/sprinter.yml b/Resources/Maps/_NF/Shuttles/Expedition/sprinter.yml index 248d35cfcf8..1afa0c89bc9 100644 --- a/Resources/Maps/_NF/Shuttles/Expedition/sprinter.yml +++ b/Resources/Maps/_NF/Shuttles/Expedition/sprinter.yml @@ -110,6 +110,16 @@ entities: id: Caution decals: 1: 11,-4 + - node: + color: '#3AB3DAFF' + id: DeliveryGreyscale + decals: + 503: -2,-12 + - node: + color: '#F9801DFF' + id: DeliveryGreyscale + decals: + 502: -1,-12 - node: cleanable: True color: '#C7621F47' @@ -458,6 +468,8 @@ entities: 486: -8,-5 488: 6,-4 489: 7,-4 + 512: 2,-8 + 513: 2,-8 - node: cleanable: True color: '#FF0000FF' @@ -988,9 +1000,9 @@ entities: - type: Transform pos: -3.5,-2.5 parent: 1 - - type: DeviceLinkSink - links: - - 412 + + + - proto: AirlockMercenaryLocked entities: - uid: 21 @@ -1103,52 +1115,59 @@ entities: rot: 1.5707963267948966 rad pos: -2.5,-0.5 parent: 1 -- proto: AtmosDeviceFanTiny +- proto: AtmosDeviceFanDirectional entities: - - uid: 40 - components: - - type: Transform - pos: 12.5,-5.5 - parent: 1 + + + + + - uid: 41 components: - type: Transform + rot: -1.5707963267948966 rad pos: -12.5,-5.5 parent: 1 - uid: 42 components: - type: Transform - pos: -12.5,-3.5 + rot: 1.5707963267948966 rad + pos: 12.5,-5.5 parent: 1 - uid: 43 components: - type: Transform + rot: 1.5707963267948966 rad pos: 12.5,-3.5 parent: 1 - uid: 44 components: - type: Transform - pos: -5.5,-7.5 + rot: -1.5707963267948966 rad + pos: -12.5,-3.5 parent: 1 - uid: 45 components: - type: Transform + rot: -1.5707963267948966 rad pos: -5.5,-9.5 parent: 1 - uid: 46 components: - type: Transform - pos: -5.5,-8.5 + rot: -1.5707963267948966 rad + pos: -5.5,-7.5 parent: 1 - uid: 47 components: - type: Transform - pos: -10.5,-1.5 + rot: -1.5707963267948966 rad + pos: -5.5,-8.5 parent: 1 - uid: 48 components: - type: Transform - pos: -10.5,-6.5 + pos: 10.5,-1.5 parent: 1 - uid: 49 components: @@ -1158,7 +1177,12 @@ entities: - uid: 50 components: - type: Transform - pos: 10.5,-1.5 + pos: -10.5,-6.5 + parent: 1 + - uid: 101 + components: + - type: Transform + pos: -10.5,-1.5 parent: 1 - proto: AtmosFixBlockerMarker entities: @@ -1610,25 +1634,25 @@ entities: - type: Transform pos: -5.5,-9.5 parent: 1 - - type: DeviceLinkSink - links: - - 36 + + + - uid: 65 components: - type: Transform pos: -5.5,-7.5 parent: 1 - - type: DeviceLinkSink - links: - - 36 + + + - uid: 66 components: - type: Transform pos: -5.5,-8.5 parent: 1 - - type: DeviceLinkSink - links: - - 36 + + + - proto: BookRandomStory entities: - uid: 590 @@ -3350,6 +3374,8 @@ entities: entities: - uid: 152 components: + - type: MetaData + name: O2 connector port - type: Transform rot: 3.141592653589793 rad pos: -1.5,-11.5 @@ -3358,6 +3384,8 @@ entities: color: '#0055CCFF' - uid: 180 components: + - type: MetaData + name: N2 connector port - type: Transform rot: 3.141592653589793 rad pos: -0.5,-11.5 @@ -3789,13 +3817,13 @@ entities: - type: Transform pos: -1.5,-1.5 parent: 1 -- proto: LockerMedicalFilled - entities: - - uid: 176 - components: - - type: Transform - pos: 2.5,-7.5 - parent: 1 + + + + + + + - proto: LockerMercenaryFilled entities: - uid: 147 @@ -3810,6 +3838,13 @@ entities: - type: Transform pos: -3.5,-6.5 parent: 1 +- proto: LockerWallMedicalDoctorFilled + entities: + - uid: 176 + components: + - type: Transform + pos: 2.5,-5.5 + parent: 1 - proto: Mirror entities: - uid: 369 @@ -4177,49 +4212,49 @@ entities: - type: Transform pos: -1.5,12.5 parent: 1 - - type: DeviceLinkSink - links: - - 693 + + + - uid: 217 components: - type: Transform pos: -2.5,11.5 parent: 1 - - type: DeviceLinkSink - links: - - 693 + + + - uid: 687 components: - type: Transform pos: 0.5,12.5 parent: 1 - - type: DeviceLinkSink - links: - - 693 + + + - uid: 688 components: - type: Transform pos: -0.5,12.5 parent: 1 - - type: DeviceLinkSink - links: - - 693 + + + - uid: 691 components: - type: Transform pos: 1.5,12.5 parent: 1 - - type: DeviceLinkSink - links: - - 693 + + + - uid: 692 components: - type: Transform pos: 2.5,11.5 parent: 1 - - type: DeviceLinkSink - links: - - 693 + + + - proto: SignalButton entities: - uid: 412 @@ -4461,8 +4496,8 @@ entities: rot: 1.5707963267948966 rad pos: -5.5,-0.5 parent: 1 - - type: Physics - canCollide: False + + - proto: TableCarpet entities: - uid: 58 From 111cf9aa2a00255a50a7989476ce09c7c6602a45 Mon Sep 17 00:00:00 2001 From: Eagle0600 Date: Mon, 23 Sep 2024 14:50:53 +1000 Subject: [PATCH 2/6] Fixed uid conflict Fixed conflicting uids that prevented the map from loading. Fixed rotation on two directional fans. --- .../Maps/_NF/Shuttles/Expedition/sprinter.yml | 29 +++++++++---------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/Resources/Maps/_NF/Shuttles/Expedition/sprinter.yml b/Resources/Maps/_NF/Shuttles/Expedition/sprinter.yml index 1afa0c89bc9..71f1c6ea01b 100644 --- a/Resources/Maps/_NF/Shuttles/Expedition/sprinter.yml +++ b/Resources/Maps/_NF/Shuttles/Expedition/sprinter.yml @@ -1117,71 +1117,68 @@ entities: parent: 1 - proto: AtmosDeviceFanDirectional entities: - - - - - - - uid: 41 + - uid: 40 components: - type: Transform rot: -1.5707963267948966 rad pos: -12.5,-5.5 parent: 1 - - uid: 42 + - uid: 41 components: - type: Transform rot: 1.5707963267948966 rad pos: 12.5,-5.5 parent: 1 - - uid: 43 + - uid: 42 components: - type: Transform rot: 1.5707963267948966 rad pos: 12.5,-3.5 parent: 1 - - uid: 44 + - uid: 43 components: - type: Transform rot: -1.5707963267948966 rad pos: -12.5,-3.5 parent: 1 - - uid: 45 + - uid: 44 components: - type: Transform rot: -1.5707963267948966 rad pos: -5.5,-9.5 parent: 1 - - uid: 46 + - uid: 45 components: - type: Transform rot: -1.5707963267948966 rad pos: -5.5,-7.5 parent: 1 - - uid: 47 + - uid: 46 components: - type: Transform rot: -1.5707963267948966 rad pos: -5.5,-8.5 parent: 1 - - uid: 48 + - uid: 47 components: - type: Transform + rot: 3.141592653589793 rad pos: 10.5,-1.5 parent: 1 - - uid: 49 + - uid: 48 components: - type: Transform pos: 10.5,-6.5 parent: 1 - - uid: 50 + - uid: 49 components: - type: Transform pos: -10.5,-6.5 parent: 1 - - uid: 101 + - uid: 50 components: - type: Transform + rot: 3.141592653589793 rad pos: -10.5,-1.5 parent: 1 - proto: AtmosFixBlockerMarker From d7e133e4bd0791e6b38ba4cfedc7a00f683531c8 Mon Sep 17 00:00:00 2001 From: Eagle0600 Date: Mon, 23 Sep 2024 14:53:20 +1000 Subject: [PATCH 3/6] Removed redundant whitespace --- .../Maps/_NF/Shuttles/Expedition/sprinter.yml | 39 ------------------- 1 file changed, 39 deletions(-) diff --git a/Resources/Maps/_NF/Shuttles/Expedition/sprinter.yml b/Resources/Maps/_NF/Shuttles/Expedition/sprinter.yml index 71f1c6ea01b..1415b84e7ed 100644 --- a/Resources/Maps/_NF/Shuttles/Expedition/sprinter.yml +++ b/Resources/Maps/_NF/Shuttles/Expedition/sprinter.yml @@ -1000,9 +1000,6 @@ entities: - type: Transform pos: -3.5,-2.5 parent: 1 - - - - proto: AirlockMercenaryLocked entities: - uid: 21 @@ -1631,25 +1628,16 @@ entities: - type: Transform pos: -5.5,-9.5 parent: 1 - - - - uid: 65 components: - type: Transform pos: -5.5,-7.5 parent: 1 - - - - uid: 66 components: - type: Transform pos: -5.5,-8.5 parent: 1 - - - - proto: BookRandomStory entities: - uid: 590 @@ -3814,13 +3802,6 @@ entities: - type: Transform pos: -1.5,-1.5 parent: 1 - - - - - - - - proto: LockerMercenaryFilled entities: - uid: 147 @@ -4209,49 +4190,31 @@ entities: - type: Transform pos: -1.5,12.5 parent: 1 - - - - uid: 217 components: - type: Transform pos: -2.5,11.5 parent: 1 - - - - uid: 687 components: - type: Transform pos: 0.5,12.5 parent: 1 - - - - uid: 688 components: - type: Transform pos: -0.5,12.5 parent: 1 - - - - uid: 691 components: - type: Transform pos: 1.5,12.5 parent: 1 - - - - uid: 692 components: - type: Transform pos: 2.5,11.5 parent: 1 - - - - proto: SignalButton entities: - uid: 412 @@ -4493,8 +4456,6 @@ entities: rot: 1.5707963267948966 rad pos: -5.5,-0.5 parent: 1 - - - proto: TableCarpet entities: - uid: 58 From 578d886dd01fcb480299d4297c366e8e57a7da51 Mon Sep 17 00:00:00 2001 From: Eagle0600 Date: Mon, 23 Sep 2024 15:07:08 +1000 Subject: [PATCH 4/6] Replaced AME fuel rack with wall locker. Moved gyroscope into engineering, using the space vacated by the fuel rack. --- .../Maps/_NF/Shuttles/Expedition/sprinter.yml | 60 +++---------------- 1 file changed, 9 insertions(+), 51 deletions(-) diff --git a/Resources/Maps/_NF/Shuttles/Expedition/sprinter.yml b/Resources/Maps/_NF/Shuttles/Expedition/sprinter.yml index 1415b84e7ed..7f5595eb236 100644 --- a/Resources/Maps/_NF/Shuttles/Expedition/sprinter.yml +++ b/Resources/Maps/_NF/Shuttles/Expedition/sprinter.yml @@ -1024,22 +1024,12 @@ entities: ent: 33 - proto: AmeJar entities: - - uid: 25 - components: - - type: Transform - pos: 0.6948629,7.6918755 - parent: 1 - uid: 33 components: - type: Transform parent: 32 - type: Physics canCollide: False - - uid: 415 - components: - - type: Transform - pos: 0.3256532,7.6657753 - parent: 1 - proto: AmeShielding entities: - uid: 24 @@ -1749,46 +1739,11 @@ entities: - type: Transform pos: -10.5,-0.5 parent: 1 - - uid: 126 - components: - - type: Transform - pos: 10.5,-7.5 - parent: 1 - - uid: 127 - components: - - type: Transform - pos: 10.5,-6.5 - parent: 1 - - uid: 128 - components: - - type: Transform - pos: 10.5,-5.5 - parent: 1 - uid: 129 components: - type: Transform pos: 10.5,-4.5 parent: 1 - - uid: 130 - components: - - type: Transform - pos: 10.5,-3.5 - parent: 1 - - uid: 131 - components: - - type: Transform - pos: 10.5,-2.5 - parent: 1 - - uid: 132 - components: - - type: Transform - pos: 10.5,-1.5 - parent: 1 - - uid: 133 - components: - - type: Transform - pos: 10.5,-0.5 - parent: 1 - uid: 134 components: - type: Transform @@ -3734,7 +3689,7 @@ entities: components: - type: Transform rot: 1.5707963267948966 rad - pos: 9.5,-0.5 + pos: 0.5,7.5 parent: 1 - proto: HospitalCurtainsOpen entities: @@ -3816,6 +3771,14 @@ entities: - type: Transform pos: -3.5,-6.5 parent: 1 +- proto: LockerWallMaterialsFuelAmeJarFilled + entities: + - uid: 126 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,6.5 + parent: 1 - proto: LockerWallMedicalDoctorFilled entities: - uid: 176 @@ -3985,11 +3948,6 @@ entities: - type: Transform pos: 3.5,4.5 parent: 1 - - uid: 627 - components: - - type: Transform - pos: 0.5,7.5 - parent: 1 - proto: RagItem entities: - uid: 628 From 51408a395eb6c94a7f0a89e48c5bc6c8cd45c94b Mon Sep 17 00:00:00 2001 From: Eagle0600 Date: Mon, 23 Sep 2024 15:46:55 +1000 Subject: [PATCH 5/6] Revert gyroscope change I missed the matching gyroscope on the other side, and the fact that the LV cables were required for the thrusters, not just the gyroscope. --- .../Maps/_NF/Shuttles/Expedition/sprinter.yml | 44 ++++++++++++++++--- 1 file changed, 38 insertions(+), 6 deletions(-) diff --git a/Resources/Maps/_NF/Shuttles/Expedition/sprinter.yml b/Resources/Maps/_NF/Shuttles/Expedition/sprinter.yml index 7f5595eb236..13217b8f087 100644 --- a/Resources/Maps/_NF/Shuttles/Expedition/sprinter.yml +++ b/Resources/Maps/_NF/Shuttles/Expedition/sprinter.yml @@ -20,9 +20,6 @@ entities: components: - type: MetaData name: Sprinter - - type: Transform - pos: -1.3749695,4.533844 - parent: invalid - type: MapGrid chunks: 0,0: @@ -1739,11 +1736,46 @@ entities: - type: Transform pos: -10.5,-0.5 parent: 1 + - uid: 126 + components: + - type: Transform + pos: 10.5,-7.5 + parent: 1 + - uid: 127 + components: + - type: Transform + pos: 10.5,-6.5 + parent: 1 + - uid: 128 + components: + - type: Transform + pos: 10.5,-5.5 + parent: 1 - uid: 129 components: - type: Transform pos: 10.5,-4.5 parent: 1 + - uid: 130 + components: + - type: Transform + pos: 10.5,-3.5 + parent: 1 + - uid: 131 + components: + - type: Transform + pos: 10.5,-2.5 + parent: 1 + - uid: 132 + components: + - type: Transform + pos: 10.5,-1.5 + parent: 1 + - uid: 133 + components: + - type: Transform + pos: 10.5,-0.5 + parent: 1 - uid: 134 components: - type: Transform @@ -3544,7 +3576,7 @@ entities: - uid: 437 components: - type: Transform - pos: 0.5,6.5 + pos: 0.5,7.5 parent: 1 - proto: Grille entities: @@ -3689,7 +3721,7 @@ entities: components: - type: Transform rot: 1.5707963267948966 rad - pos: 0.5,7.5 + pos: 9.5,-0.5 parent: 1 - proto: HospitalCurtainsOpen entities: @@ -3773,7 +3805,7 @@ entities: parent: 1 - proto: LockerWallMaterialsFuelAmeJarFilled entities: - - uid: 126 + - uid: 238 components: - type: Transform rot: -1.5707963267948966 rad From 6e9964a09dd40e67f6f53c97ed455969078d04cf Mon Sep 17 00:00:00 2001 From: Eagle0600 Date: Mon, 23 Sep 2024 20:48:15 +1000 Subject: [PATCH 6/6] Requested changes Removed custom named from connector ports. Removed mapped coat. --- Resources/Maps/_NF/Shuttles/Expedition/sprinter.yml | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/Resources/Maps/_NF/Shuttles/Expedition/sprinter.yml b/Resources/Maps/_NF/Shuttles/Expedition/sprinter.yml index 13217b8f087..28b3b9d3b19 100644 --- a/Resources/Maps/_NF/Shuttles/Expedition/sprinter.yml +++ b/Resources/Maps/_NF/Shuttles/Expedition/sprinter.yml @@ -2322,13 +2322,6 @@ entities: - type: Transform pos: -2.4529943,1.6674619 parent: 1 -- proto: ClothingOuterWinterPara - entities: - - uid: 395 - components: - - type: Transform - pos: 2.53125,-6.401108 - parent: 1 - proto: ComputerPowerMonitoring entities: - uid: 224 @@ -3346,8 +3339,6 @@ entities: entities: - uid: 152 components: - - type: MetaData - name: O2 connector port - type: Transform rot: 3.141592653589793 rad pos: -1.5,-11.5 @@ -3356,8 +3347,6 @@ entities: color: '#0055CCFF' - uid: 180 components: - - type: MetaData - name: N2 connector port - type: Transform rot: 3.141592653589793 rad pos: -0.5,-11.5