Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FTL ALL SHUTTLE UPD #2062

Merged
merged 5 commits into from
Oct 13, 2024
Merged

FTL ALL SHUTTLE UPD #2062

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
db09a8e
FTL ALL SHUTTLE UPD
UrPrice Oct 13, 2024
8b01cdb
nukie fix
UrPrice Oct 13, 2024
d29d050
Central Command Shuttles Fix
UrPrice Oct 13, 2024
b1ba47f
Again
UrPrice Oct 13, 2024
70c5e07
Nukie Fix 2
UrPrice Oct 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 2 additions & 48 deletions Resources/Maps/SS220/Shuttles/cargo.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ entities:
name: NT-CV "Mule"
- type: Transform
pos: 2.2710133,-2.4148211
parent: invalid
- type: MapGrid
chunks:
-1,0:
Expand Down Expand Up @@ -173,6 +174,7 @@ entities:
chunkSize: 4
- type: OccluderTree
- type: Shuttle
fTLCooldown: 300
- type: GridPathfinding
- type: RadiationGridResistance
- type: SpreaderGrid
Expand Down Expand Up @@ -249,36 +251,24 @@ entities:
rot: -1.5707963267948966 rad
pos: 0.5,4.5
parent: 173
- type: DeviceLinkSink
links:
- 25
- uid: 6
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: 0.5,0.5
parent: 173
- type: DeviceLinkSink
links:
- 4
- uid: 21
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -5.5,4.5
parent: 173
- type: DeviceLinkSink
links:
- 27
- uid: 22
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -5.5,0.5
parent: 173
- type: DeviceLinkSink
links:
- 20
- proto: CableApcExtension
entities:
- uid: 100
Expand Down Expand Up @@ -643,108 +633,72 @@ entities:
rot: 1.5707963267948966 rad
pos: 0.5,4.5
parent: 173
- type: DeviceLinkSink
links:
- 36
- uid: 39
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -0.5,4.5
parent: 173
- type: DeviceLinkSink
links:
- 36
- uid: 40
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -1.5,4.5
parent: 173
- type: DeviceLinkSink
links:
- 36
- uid: 41
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -5.5,0.5
parent: 173
- type: DeviceLinkSink
links:
- 34
- uid: 42
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -4.5,0.5
parent: 173
- type: DeviceLinkSink
links:
- 34
- uid: 43
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -3.5,0.5
parent: 173
- type: DeviceLinkSink
links:
- 34
- uid: 46
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: -0.5,0.5
parent: 173
- type: DeviceLinkSink
links:
- 35
- uid: 47
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: -3.5,4.5
parent: 173
- type: DeviceLinkSink
links:
- 37
- uid: 48
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: -4.5,4.5
parent: 173
- type: DeviceLinkSink
links:
- 37
- uid: 49
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: -5.5,4.5
parent: 173
- type: DeviceLinkSink
links:
- 37
- uid: 51
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: -1.5,0.5
parent: 173
- type: DeviceLinkSink
links:
- 35
- uid: 167
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: 0.5,0.5
parent: 173
- type: DeviceLinkSink
links:
- 35
- proto: GasPipeStraight
entities:
- uid: 69
Expand Down
1 change: 1 addition & 0 deletions Resources/Maps/SS220/Shuttles/ss220-DonutsGuardian.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,7 @@ entities:
- type: OccluderTree
- type: SpreaderGrid
- type: Shuttle
fTLCooldown: 90
- type: GridPathfinding
- type: Gravity
gravityShakeSound: !type:SoundPathSpecifier
Expand Down
14 changes: 2 additions & 12 deletions Resources/Maps/SS220/Shuttles/ss220-ntguardian.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ entities:
name: NT-SPPOD "Guardian"
- type: Transform
pos: -0.4375,-0.671875
parent: invalid
- type: MapGrid
chunks:
0,0:
Expand Down Expand Up @@ -48,6 +49,7 @@ entities:
- type: OccluderTree
- type: SpreaderGrid
- type: Shuttle
fTLCooldown: 90
- type: GridPathfinding
- type: Gravity
gravityShakeSound: !type:SoundPathSpecifier
Expand Down Expand Up @@ -185,8 +187,6 @@ entities:
- type: Apc
hasAccess: True
enabled: False
lastExternalState: Good
lastChargeState: Full
- type: PowerNetworkBattery
canDischarge: False
- proto: AtmosDeviceFanTiny
Expand Down Expand Up @@ -702,8 +702,6 @@ entities:
parent: 2
- type: DeviceLinkSink
invokeCounter: 1
links:
- 120
- uid: 54
components:
- type: Transform
Expand All @@ -712,8 +710,6 @@ entities:
parent: 2
- type: DeviceLinkSink
invokeCounter: 1
links:
- 120
- proto: PoweredSmallLight
entities:
- uid: 67
Expand Down Expand Up @@ -771,18 +767,12 @@ entities:
rot: 3.141592653589793 rad
pos: 0.5,2.5
parent: 2
- type: DeviceLinkSink
links:
- 121
- uid: 44
components:
- type: Transform
rot: 3.141592653589793 rad
pos: 2.5,2.5
parent: 2
- type: DeviceLinkSink
links:
- 121
- proto: ShuttleWindow
entities:
- uid: 7
Expand Down
1 change: 1 addition & 0 deletions Resources/Maps/SS220/Shuttles/ss220-nukeshuttle.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -683,6 +683,7 @@ entities:
flags: Hide
- type: OccluderTree
- type: Shuttle
fTLCooldown: 150
- type: RadiationGridResistance
- type: GravityShake
shakeTimes: 10
Expand Down
1 change: 1 addition & 0 deletions Resources/Maps/SS220/admin-shuttles/ss220_NT_CBURN.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ entities:
- type: OccluderTree
- type: SpreaderGrid
- type: Shuttle
fTLCooldown: 15
- type: GridPathfinding
- type: Gravity
gravityShakeSound: !type:SoundPathSpecifier
Expand Down
1 change: 1 addition & 0 deletions Resources/Maps/SS220/admin-shuttles/ss220_NT_CENT.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ entities:
- type: OccluderTree
- type: SpreaderGrid
- type: Shuttle
fTLCooldown: 30
- type: GridPathfinding
- type: Gravity
gravityShakeSound: !type:SoundPathSpecifier
Expand Down
1 change: 1 addition & 0 deletions Resources/Maps/SS220/admin-shuttles/ss220_NT_DS.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ entities:
- type: OccluderTree
- type: SpreaderGrid
- type: Shuttle
fTLCooldown: 5
- type: GridPathfinding
- type: Gravity
gravityShakeSound: !type:SoundPathSpecifier
Expand Down
1 change: 1 addition & 0 deletions Resources/Maps/SS220/admin-shuttles/ss220_NT_OBR.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ entities:
- type: OccluderTree
- type: SpreaderGrid
- type: Shuttle
fTLCooldown: 15
- type: GridPathfinding
- type: Gravity
gravityShakeSound: !type:SoundPathSpecifier
Expand Down
1 change: 1 addition & 0 deletions Resources/Maps/SS220/admin-shuttles/ss220_NT_OSO.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ entities:
- type: OccluderTree
- type: SpreaderGrid
- type: Shuttle
fTLCooldown: 30
- type: GridPathfinding
- type: Gravity
gravityShakeSound: !type:SoundPathSpecifier
Expand Down
1 change: 1 addition & 0 deletions Resources/Maps/Shuttles/mining.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -524,6 +524,7 @@ entities:
type: GridAtmosphere
- type: OccluderTree
- type: Shuttle
fTLCooldown: 180 # SS220 FTL COOLDOWN UPDATE
- type: RadiationGridResistance
- type: SpreaderGrid
- shakeTimes: 10
Expand Down
Loading