diff --git a/Resources/Maps/SS220/Shuttles/cargo.yml b/Resources/Maps/SS220/Shuttles/cargo.yml index e4a9542af9e245..a46d1a8bfbe7e7 100644 --- a/Resources/Maps/SS220/Shuttles/cargo.yml +++ b/Resources/Maps/SS220/Shuttles/cargo.yml @@ -18,6 +18,7 @@ entities: name: NT-CV "Mule" - type: Transform pos: 2.2710133,-2.4148211 + parent: invalid - type: MapGrid chunks: -1,0: @@ -173,6 +174,7 @@ entities: chunkSize: 4 - type: OccluderTree - type: Shuttle + fTLCooldown: 300 - type: GridPathfinding - type: RadiationGridResistance - type: SpreaderGrid @@ -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 @@ -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 diff --git a/Resources/Maps/SS220/Shuttles/ss220-DonutsGuardian.yml b/Resources/Maps/SS220/Shuttles/ss220-DonutsGuardian.yml index 792ce2144b2b35..a3d7696bccfa22 100644 --- a/Resources/Maps/SS220/Shuttles/ss220-DonutsGuardian.yml +++ b/Resources/Maps/SS220/Shuttles/ss220-DonutsGuardian.yml @@ -171,6 +171,7 @@ entities: - type: OccluderTree - type: SpreaderGrid - type: Shuttle + fTLCooldown: 90 - type: GridPathfinding - type: Gravity gravityShakeSound: !type:SoundPathSpecifier diff --git a/Resources/Maps/SS220/Shuttles/ss220-ntguardian.yml b/Resources/Maps/SS220/Shuttles/ss220-ntguardian.yml index ed859a7659dfb9..df15bbb90661b4 100644 --- a/Resources/Maps/SS220/Shuttles/ss220-ntguardian.yml +++ b/Resources/Maps/SS220/Shuttles/ss220-ntguardian.yml @@ -18,6 +18,7 @@ entities: name: NT-SPPOD "Guardian" - type: Transform pos: -0.4375,-0.671875 + parent: invalid - type: MapGrid chunks: 0,0: @@ -48,6 +49,7 @@ entities: - type: OccluderTree - type: SpreaderGrid - type: Shuttle + fTLCooldown: 90 - type: GridPathfinding - type: Gravity gravityShakeSound: !type:SoundPathSpecifier @@ -185,8 +187,6 @@ entities: - type: Apc hasAccess: True enabled: False - lastExternalState: Good - lastChargeState: Full - type: PowerNetworkBattery canDischarge: False - proto: AtmosDeviceFanTiny @@ -702,8 +702,6 @@ entities: parent: 2 - type: DeviceLinkSink invokeCounter: 1 - links: - - 120 - uid: 54 components: - type: Transform @@ -712,8 +710,6 @@ entities: parent: 2 - type: DeviceLinkSink invokeCounter: 1 - links: - - 120 - proto: PoweredSmallLight entities: - uid: 67 @@ -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 diff --git a/Resources/Maps/SS220/Shuttles/ss220-nukeshuttle.yml b/Resources/Maps/SS220/Shuttles/ss220-nukeshuttle.yml index 4b88bf4c1c85be..d1a1bec44db141 100644 --- a/Resources/Maps/SS220/Shuttles/ss220-nukeshuttle.yml +++ b/Resources/Maps/SS220/Shuttles/ss220-nukeshuttle.yml @@ -683,6 +683,7 @@ entities: flags: Hide - type: OccluderTree - type: Shuttle + fTLCooldown: 150 - type: RadiationGridResistance - type: GravityShake shakeTimes: 10 diff --git a/Resources/Maps/SS220/admin-shuttles/ss220_NT_CBURN.yml b/Resources/Maps/SS220/admin-shuttles/ss220_NT_CBURN.yml index e8520b48492bd3..507ff45159611d 100644 --- a/Resources/Maps/SS220/admin-shuttles/ss220_NT_CBURN.yml +++ b/Resources/Maps/SS220/admin-shuttles/ss220_NT_CBURN.yml @@ -63,6 +63,7 @@ entities: - type: OccluderTree - type: SpreaderGrid - type: Shuttle + fTLCooldown: 15 - type: GridPathfinding - type: Gravity gravityShakeSound: !type:SoundPathSpecifier diff --git a/Resources/Maps/SS220/admin-shuttles/ss220_NT_CENT.yml b/Resources/Maps/SS220/admin-shuttles/ss220_NT_CENT.yml index b097508f3213a0..d907e19528e31e 100644 --- a/Resources/Maps/SS220/admin-shuttles/ss220_NT_CENT.yml +++ b/Resources/Maps/SS220/admin-shuttles/ss220_NT_CENT.yml @@ -56,6 +56,7 @@ entities: - type: OccluderTree - type: SpreaderGrid - type: Shuttle + fTLCooldown: 30 - type: GridPathfinding - type: Gravity gravityShakeSound: !type:SoundPathSpecifier diff --git a/Resources/Maps/SS220/admin-shuttles/ss220_NT_DS.yml b/Resources/Maps/SS220/admin-shuttles/ss220_NT_DS.yml index f99e07161e299a..39d077ee92177f 100644 --- a/Resources/Maps/SS220/admin-shuttles/ss220_NT_DS.yml +++ b/Resources/Maps/SS220/admin-shuttles/ss220_NT_DS.yml @@ -56,6 +56,7 @@ entities: - type: OccluderTree - type: SpreaderGrid - type: Shuttle + fTLCooldown: 5 - type: GridPathfinding - type: Gravity gravityShakeSound: !type:SoundPathSpecifier diff --git a/Resources/Maps/SS220/admin-shuttles/ss220_NT_OBR.yml b/Resources/Maps/SS220/admin-shuttles/ss220_NT_OBR.yml index 69f7d3b06ea062..0b7d1478677e15 100644 --- a/Resources/Maps/SS220/admin-shuttles/ss220_NT_OBR.yml +++ b/Resources/Maps/SS220/admin-shuttles/ss220_NT_OBR.yml @@ -57,6 +57,7 @@ entities: - type: OccluderTree - type: SpreaderGrid - type: Shuttle + fTLCooldown: 15 - type: GridPathfinding - type: Gravity gravityShakeSound: !type:SoundPathSpecifier diff --git a/Resources/Maps/SS220/admin-shuttles/ss220_NT_OSO.yml b/Resources/Maps/SS220/admin-shuttles/ss220_NT_OSO.yml index 0061ca30368a06..f15be341c0e00e 100644 --- a/Resources/Maps/SS220/admin-shuttles/ss220_NT_OSO.yml +++ b/Resources/Maps/SS220/admin-shuttles/ss220_NT_OSO.yml @@ -57,6 +57,7 @@ entities: - type: OccluderTree - type: SpreaderGrid - type: Shuttle + fTLCooldown: 30 - type: GridPathfinding - type: Gravity gravityShakeSound: !type:SoundPathSpecifier diff --git a/Resources/Maps/Shuttles/mining.yml b/Resources/Maps/Shuttles/mining.yml index 1cbdf031c577ed..38881478df1f10 100644 --- a/Resources/Maps/Shuttles/mining.yml +++ b/Resources/Maps/Shuttles/mining.yml @@ -524,6 +524,7 @@ entities: type: GridAtmosphere - type: OccluderTree - type: Shuttle + fTLCooldown: 180 # SS220 FTL COOLDOWN UPDATE - type: RadiationGridResistance - type: SpreaderGrid - shakeTimes: 10