diff --git a/Content.Server/NPC/Pathfinding/PathfindingSystem.Grid.cs b/Content.Server/NPC/Pathfinding/PathfindingSystem.Grid.cs index 323bb4ea6b..b80513fd78 100644 --- a/Content.Server/NPC/Pathfinding/PathfindingSystem.Grid.cs +++ b/Content.Server/NPC/Pathfinding/PathfindingSystem.Grid.cs @@ -100,11 +100,12 @@ public sealed partial class PathfindingSystem // Still run even when paused. var query = AllEntityQuery(); - while (query.MoveNext(out var comp)) + while (query.MoveNext(out var uid, out var comp)) { + // TODO: Dump all this shit and just do it live it's probably fast enough. if (comp.DirtyChunks.Count == 0 || curTime < comp.NextUpdate || - !TryComp(comp.Owner, out var mapGridComp)) + !TryComp(uid, out var mapGridComp)) { continue; } @@ -119,7 +120,7 @@ public sealed partial class PathfindingSystem foreach (var origin in comp.DirtyChunks) { - var chunk = GetChunk(origin, comp.Owner, comp); + var chunk = GetChunk(origin, uid, comp); dirt[idx] = chunk; idx++; } @@ -352,7 +353,7 @@ public sealed partial class PathfindingSystem var currentTime = _timing.CurTime; - if (comp.NextUpdate < currentTime) + if (comp.NextUpdate < currentTime && !MetaData(gridUid).EntityPaused) comp.NextUpdate = currentTime + UpdateCooldown; var chunks = comp.DirtyChunks; diff --git a/Resources/Maps/Dungeon/Templates/17x17.yml b/Resources/Maps/Dungeon/Templates/17x17.yml index 8d639ce09d..aa7dad94b3 100644 --- a/Resources/Maps/Dungeon/Templates/17x17.yml +++ b/Resources/Maps/Dungeon/Templates/17x17.yml @@ -36,8 +36,6 @@ entities: - type: OccluderTree - type: Shuttle - - nextUpdate: 56.3512981 - type: GridPathfinding - gravityShakeSound: !type:SoundPathSpecifier path: /Audio/Effects/alert.ogg type: Gravity diff --git a/Resources/Maps/Dungeon/Templates/17x5.yml b/Resources/Maps/Dungeon/Templates/17x5.yml index fb6733edb5..a04325c4d0 100644 --- a/Resources/Maps/Dungeon/Templates/17x5.yml +++ b/Resources/Maps/Dungeon/Templates/17x5.yml @@ -30,8 +30,6 @@ entities: - type: OccluderTree - type: Shuttle - - nextUpdate: 56.3512981 - type: GridPathfinding - gravityShakeSound: !type:SoundPathSpecifier path: /Audio/Effects/alert.ogg type: Gravity diff --git a/Resources/Maps/Dungeon/Templates/3x5.yml b/Resources/Maps/Dungeon/Templates/3x5.yml index 8326898f9d..b5df97b6db 100644 --- a/Resources/Maps/Dungeon/Templates/3x5.yml +++ b/Resources/Maps/Dungeon/Templates/3x5.yml @@ -27,8 +27,6 @@ entities: - type: OccluderTree - type: Shuttle - - nextUpdate: 0.45 - type: GridPathfinding - gravityShakeSound: !type:SoundPathSpecifier path: /Audio/Effects/alert.ogg type: Gravity diff --git a/Resources/Maps/Dungeon/Templates/3x7.yml b/Resources/Maps/Dungeon/Templates/3x7.yml index 8326898f9d..b5df97b6db 100644 --- a/Resources/Maps/Dungeon/Templates/3x7.yml +++ b/Resources/Maps/Dungeon/Templates/3x7.yml @@ -27,8 +27,6 @@ entities: - type: OccluderTree - type: Shuttle - - nextUpdate: 0.45 - type: GridPathfinding - gravityShakeSound: !type:SoundPathSpecifier path: /Audio/Effects/alert.ogg type: Gravity diff --git a/Resources/Maps/Dungeon/Templates/5x11.yml b/Resources/Maps/Dungeon/Templates/5x11.yml index 18e8cf12c0..efc2c53f6b 100644 --- a/Resources/Maps/Dungeon/Templates/5x11.yml +++ b/Resources/Maps/Dungeon/Templates/5x11.yml @@ -36,8 +36,6 @@ entities: - type: OccluderTree - type: Shuttle - - nextUpdate: 27.154826 - type: GridPathfinding - gravityShakeSound: !type:SoundPathSpecifier path: /Audio/Effects/alert.ogg type: Gravity diff --git a/Resources/Maps/Dungeon/Templates/5x17.yml b/Resources/Maps/Dungeon/Templates/5x17.yml index 3dc1f2db23..8e70eed026 100644 --- a/Resources/Maps/Dungeon/Templates/5x17.yml +++ b/Resources/Maps/Dungeon/Templates/5x17.yml @@ -30,8 +30,6 @@ entities: - type: OccluderTree - type: Shuttle - - nextUpdate: 78.7387785 - type: GridPathfinding - gravityShakeSound: !type:SoundPathSpecifier path: /Audio/Effects/alert.ogg type: Gravity diff --git a/Resources/Maps/Dungeon/Templates/5x5.yml b/Resources/Maps/Dungeon/Templates/5x5.yml index 7cad818426..fbd8511ecc 100644 --- a/Resources/Maps/Dungeon/Templates/5x5.yml +++ b/Resources/Maps/Dungeon/Templates/5x5.yml @@ -27,8 +27,6 @@ entities: - type: OccluderTree - type: Shuttle - - nextUpdate: 207.9113983 - type: GridPathfinding - gravityShakeSound: !type:SoundPathSpecifier path: /Audio/Effects/alert.ogg type: Gravity diff --git a/Resources/Maps/Dungeon/Templates/LargeArea2.yml b/Resources/Maps/Dungeon/Templates/LargeArea2.yml index 57d60d5b06..314b3e6f96 100644 --- a/Resources/Maps/Dungeon/Templates/LargeArea2.yml +++ b/Resources/Maps/Dungeon/Templates/LargeArea2.yml @@ -37,8 +37,6 @@ entities: - type: OccluderTree - type: Shuttle - - nextUpdate: 56.3512981 - type: GridPathfinding - gravityShakeSound: !type:SoundPathSpecifier path: /Audio/Effects/alert.ogg type: Gravity diff --git a/Resources/Maps/Dungeon/Templates/LargeArea3.yml b/Resources/Maps/Dungeon/Templates/LargeArea3.yml index 26ceff0593..f214f02d95 100644 --- a/Resources/Maps/Dungeon/Templates/LargeArea3.yml +++ b/Resources/Maps/Dungeon/Templates/LargeArea3.yml @@ -37,8 +37,6 @@ entities: - type: OccluderTree - type: Shuttle - - nextUpdate: 56.3512981 - type: GridPathfinding - gravityShakeSound: !type:SoundPathSpecifier path: /Audio/Effects/alert.ogg type: Gravity diff --git a/Resources/Maps/Dungeon/Templates/LargeArea4.yml b/Resources/Maps/Dungeon/Templates/LargeArea4.yml index 6ac31c42bd..b45f3e5725 100644 --- a/Resources/Maps/Dungeon/Templates/LargeArea4.yml +++ b/Resources/Maps/Dungeon/Templates/LargeArea4.yml @@ -37,8 +37,6 @@ entities: - type: OccluderTree - type: Shuttle - - nextUpdate: 56.3512981 - type: GridPathfinding - gravityShakeSound: !type:SoundPathSpecifier path: /Audio/Effects/alert.ogg type: Gravity diff --git a/Resources/Maps/Dungeon/Templates/MediumArea2.yml b/Resources/Maps/Dungeon/Templates/MediumArea2.yml index a7a0fe39a5..281e8d8fd7 100644 --- a/Resources/Maps/Dungeon/Templates/MediumArea2.yml +++ b/Resources/Maps/Dungeon/Templates/MediumArea2.yml @@ -31,8 +31,6 @@ entities: - type: OccluderTree - type: Shuttle - - nextUpdate: 78.7387785 - type: GridPathfinding - gravityShakeSound: !type:SoundPathSpecifier path: /Audio/Effects/alert.ogg type: Gravity diff --git a/Resources/Maps/Dungeon/Templates/MediumArea3.yml b/Resources/Maps/Dungeon/Templates/MediumArea3.yml index 6d3aa7fc57..213910fd9f 100644 --- a/Resources/Maps/Dungeon/Templates/MediumArea3.yml +++ b/Resources/Maps/Dungeon/Templates/MediumArea3.yml @@ -31,8 +31,6 @@ entities: - type: OccluderTree - type: Shuttle - - nextUpdate: 78.7387785 - type: GridPathfinding - gravityShakeSound: !type:SoundPathSpecifier path: /Audio/Effects/alert.ogg type: Gravity diff --git a/Resources/Maps/Dungeon/Templates/MediumArea4.yml b/Resources/Maps/Dungeon/Templates/MediumArea4.yml index 2ef980d5c9..e447e156d8 100644 --- a/Resources/Maps/Dungeon/Templates/MediumArea4.yml +++ b/Resources/Maps/Dungeon/Templates/MediumArea4.yml @@ -31,8 +31,6 @@ entities: - type: OccluderTree - type: Shuttle - - nextUpdate: 78.7387785 - type: GridPathfinding - gravityShakeSound: !type:SoundPathSpecifier path: /Audio/Effects/alert.ogg type: Gravity diff --git a/Resources/Maps/Dungeon/experiment.yml b/Resources/Maps/Dungeon/experiment.yml index b1b6daf69c..7e9d8f9b4a 100644 --- a/Resources/Maps/Dungeon/experiment.yml +++ b/Resources/Maps/Dungeon/experiment.yml @@ -116,8 +116,6 @@ entities: ind: 2,1 tiles: FgAAABYAAABeAAAARAAAAUQAAAFRAAAAUQAAAD4AAABEAAADRAAAAl4AAABEAAABXgAAAEQAAAFEAAACPgAAAD4AAAA+AAAAPgAAAD4AAAA+AAAAPgAAAD4AAAA+AAAAPgAAAD4AAAA+AAAAPgAAAD4AAAA+AAAAPgAAAD4AAABRAAACUQAAAFEAAAM+AAAAPgAAAD4AAAA+AAAAPgAAAD4AAAA+AAAAPgAAAD4AAAA+AAAAPgAAAD4AAAA+AAAAUQAAAFEAAAJRAAACPgAAAD4AAAA+AAAAPgAAAD4AAAA+AAAAPgAAAD4AAAA+AAAAPgAAAD4AAAA+AAAAPgAAAFEAAANRAAACUQAAAz4AAAA+AAAAPgAAAD4AAAA+AAAAPgAAAD4AAAA+AAAAPgAAAD4AAAA+AAAAPgAAAD4AAABRAAACOgAAADoAAAA+AAAAPgAAAD4AAAA+AAAAPgAAAD4AAAA+AAAAPgAAAD4AAAA+AAAAPgAAAD4AAAA+AAAAUQAAADoAAAA6AAAAPgAAAD4AAAA+AAAAPgAAAD4AAAA+AAAAPgAAAD4AAAA+AAAAPgAAAD4AAAA+AAAAPgAAAD4AAAA+AAAAPgAAAD4AAAA+AAAAPgAAAD4AAAA+AAAAPgAAAD4AAAA+AAAAPgAAAD4AAAA+AAAAPgAAAD4AAAA+AAAAPgAAAD4AAAA+AAAAPgAAAD4AAAA+AAAAPgAAAD4AAAA+AAAAPgAAAD4AAAA+AAAAPgAAAD4AAAA+AAAAPgAAAD4AAAA+AAAAPgAAAD4AAAA+AAAAPgAAAD4AAAA+AAAAPgAAAD4AAAA+AAAAPgAAAD4AAAA+AAAAPgAAAD4AAAA+AAAAPgAAAD4AAAA+AAAAPgAAAD4AAAA+AAAAPgAAAD4AAAA+AAAAPgAAAD4AAAA+AAAAPgAAAD4AAAA+AAAAPgAAAD4AAAA+AAAAPgAAAD4AAAA+AAAAPgAAAD4AAAA+AAAAPgAAAD4AAAA+AAAAPgAAAD4AAAA+AAAAPgAAAD4AAAA+AAAAPgAAAD4AAAA+AAAAPgAAAD4AAAA+AAAAPgAAAD4AAAA+AAAAPgAAAD4AAAA+AAAAPgAAAD4AAAA+AAAAPgAAAD4AAAA+AAAAPgAAAD4AAAA+AAAAPgAAAD4AAAA+AAAAPgAAAD4AAAA+AAAAPgAAAD4AAAAWAAADFgAAABYAAAAWAAACFgAAABYAAAIWAAADFgAAAxYAAAE+AAAAPgAAAD4AAAA+AAAAPgAAAD4AAAA+AAAAFgAAAxYAAAEWAAABFgAAAxYAAAEWAAABFgAAARYAAAAWAAABPgAAAD4AAAA+AAAAPgAAAD4AAAA+AAAAPgAAAA== type: MapGrid - - nextUpdate: 14529.6397815 - type: GridPathfinding - gravityShakeSound: !type:SoundPathSpecifier path: /Audio/Effects/alert.ogg type: Gravity diff --git a/Resources/Maps/Dungeon/lava_brig.yml b/Resources/Maps/Dungeon/lava_brig.yml index b767df5ae1..5b4c409dec 100644 --- a/Resources/Maps/Dungeon/lava_brig.yml +++ b/Resources/Maps/Dungeon/lava_brig.yml @@ -93,8 +93,6 @@ entities: ind: 2,3 tiles: PgAAAD4AAAA+AAAAPgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD4AAAA+AAAAPgAAAD4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA== type: MapGrid - - nextUpdate: 45513.2014368 - type: GridPathfinding - gravityShakeSound: !type:SoundPathSpecifier path: /Audio/Effects/alert.ogg type: Gravity diff --git a/Resources/Maps/Dungeon/template.yml b/Resources/Maps/Dungeon/template.yml index 358b3a4048..6f7bb6ee45 100644 --- a/Resources/Maps/Dungeon/template.yml +++ b/Resources/Maps/Dungeon/template.yml @@ -63,8 +63,6 @@ entities: ind: 1,3 tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA== type: MapGrid - - nextUpdate: 171.4322096 - type: GridPathfinding - gravityShakeSound: !type:SoundPathSpecifier path: /Audio/Effects/alert.ogg type: Gravity diff --git a/Resources/Maps/Misc/terminal.yml b/Resources/Maps/Misc/terminal.yml index 637d63aade..6c2ccb5d3e 100644 --- a/Resources/Maps/Misc/terminal.yml +++ b/Resources/Maps/Misc/terminal.yml @@ -61,8 +61,6 @@ entities: type: BecomesStation - type: OccluderTree - type: Shuttle - - nextUpdate: 5103.5217478 - type: GridPathfinding - gravityShakeSound: !type:SoundPathSpecifier path: /Audio/Effects/alert.ogg type: Gravity diff --git a/Resources/Maps/Salvage/asteroid-base.yml b/Resources/Maps/Salvage/asteroid-base.yml index 1677520882..c2b83a97ce 100644 --- a/Resources/Maps/Salvage/asteroid-base.yml +++ b/Resources/Maps/Salvage/asteroid-base.yml @@ -370,8 +370,6 @@ entities: type: GridAtmosphere - type: OccluderTree - type: Shuttle - - nextUpdate: 964.6959636 - type: GridPathfinding - type: RadiationGridResistance - type: GasTileOverlay - type: SpreaderGrid diff --git a/Resources/Maps/Salvage/cargo-1.yml b/Resources/Maps/Salvage/cargo-1.yml index b72f5c8af0..b39209669f 100644 --- a/Resources/Maps/Salvage/cargo-1.yml +++ b/Resources/Maps/Salvage/cargo-1.yml @@ -173,8 +173,6 @@ entities: type: GridAtmosphere - type: OccluderTree - type: Shuttle - - nextUpdate: 473.3523396 - type: GridPathfinding - type: RadiationGridResistance - type: GasTileOverlay - type: SpreaderGrid diff --git a/Resources/Maps/Salvage/medium-1.yml b/Resources/Maps/Salvage/medium-1.yml index 6b5be65908..2512a5c841 100644 --- a/Resources/Maps/Salvage/medium-1.yml +++ b/Resources/Maps/Salvage/medium-1.yml @@ -134,8 +134,6 @@ entities: type: GridAtmosphere - type: OccluderTree - type: Shuttle - - nextUpdate: 737.3128624 - type: GridPathfinding - chunkCollection: version: 2 nodes: diff --git a/Resources/Maps/Salvage/medium-crashed-shuttle.yml b/Resources/Maps/Salvage/medium-crashed-shuttle.yml index b65f3b0d96..992be3e4d7 100644 --- a/Resources/Maps/Salvage/medium-crashed-shuttle.yml +++ b/Resources/Maps/Salvage/medium-crashed-shuttle.yml @@ -268,8 +268,6 @@ entities: type: GridAtmosphere - type: OccluderTree - type: Shuttle - - nextUpdate: 746.2662117 - type: GridPathfinding - type: RadiationGridResistance - type: GasTileOverlay - type: SpreaderGrid diff --git a/Resources/Maps/Salvage/medium-dock.yml b/Resources/Maps/Salvage/medium-dock.yml index 07ba2c4949..7900df87e6 100644 --- a/Resources/Maps/Salvage/medium-dock.yml +++ b/Resources/Maps/Salvage/medium-dock.yml @@ -159,8 +159,6 @@ entities: type: GridAtmosphere - type: OccluderTree - type: Shuttle - - nextUpdate: 606.4818471 - type: GridPathfinding - type: RadiationGridResistance - type: GasTileOverlay - type: SpreaderGrid diff --git a/Resources/Maps/Salvage/medium-library.yml b/Resources/Maps/Salvage/medium-library.yml index 09bd0518d9..6c4bdeddb1 100644 --- a/Resources/Maps/Salvage/medium-library.yml +++ b/Resources/Maps/Salvage/medium-library.yml @@ -165,8 +165,6 @@ entities: type: DecalGrid - type: OccluderTree - type: Shuttle - - nextUpdate: 3237.1863067 - type: GridPathfinding - type: RadiationGridResistance - type: SpreaderGrid - proto: AlwaysPoweredLightLED diff --git a/Resources/Maps/Salvage/medium-pet-hospital.yml b/Resources/Maps/Salvage/medium-pet-hospital.yml index 01ee156237..406cd8b49f 100644 --- a/Resources/Maps/Salvage/medium-pet-hospital.yml +++ b/Resources/Maps/Salvage/medium-pet-hospital.yml @@ -349,8 +349,6 @@ entities: type: GridAtmosphere - type: OccluderTree - type: Shuttle - - nextUpdate: 1079.6224832 - type: GridPathfinding - type: RadiationGridResistance - type: GasTileOverlay - type: SpreaderGrid diff --git a/Resources/Maps/Salvage/medium-ruined-emergency-shuttle.yml b/Resources/Maps/Salvage/medium-ruined-emergency-shuttle.yml index c45bbe050c..dc79316307 100644 --- a/Resources/Maps/Salvage/medium-ruined-emergency-shuttle.yml +++ b/Resources/Maps/Salvage/medium-ruined-emergency-shuttle.yml @@ -48,8 +48,6 @@ entities: type: DecalGrid - type: OccluderTree - type: Shuttle - - nextUpdate: 332.1826128 - type: GridPathfinding - type: RadiationGridResistance - type: SpreaderGrid - proto: AirlockGlass diff --git a/Resources/Maps/Salvage/medium-silent-orchestra.yml b/Resources/Maps/Salvage/medium-silent-orchestra.yml index 299b878151..f7136472e9 100644 --- a/Resources/Maps/Salvage/medium-silent-orchestra.yml +++ b/Resources/Maps/Salvage/medium-silent-orchestra.yml @@ -104,8 +104,6 @@ entities: type: DecalGrid - type: OccluderTree - type: Shuttle - - nextUpdate: 688.3296285 - type: GridPathfinding - type: RadiationGridResistance - type: SpreaderGrid - proto: AccordionInstrument diff --git a/Resources/Maps/Salvage/medium-vault-1.yml b/Resources/Maps/Salvage/medium-vault-1.yml index f0671a43ab..fa3a37713d 100644 --- a/Resources/Maps/Salvage/medium-vault-1.yml +++ b/Resources/Maps/Salvage/medium-vault-1.yml @@ -179,8 +179,6 @@ entities: type: DecalGrid - type: OccluderTree - type: Shuttle - - nextUpdate: 1384.2053934 - type: GridPathfinding - type: RadiationGridResistance - version: 2 data: diff --git a/Resources/Maps/Salvage/ruin-cargo-salvage.yml b/Resources/Maps/Salvage/ruin-cargo-salvage.yml index 637912ccdb..bff445bff9 100644 --- a/Resources/Maps/Salvage/ruin-cargo-salvage.yml +++ b/Resources/Maps/Salvage/ruin-cargo-salvage.yml @@ -632,8 +632,6 @@ entities: type: GridAtmosphere - type: OccluderTree - type: Shuttle - - nextUpdate: 3546.4070314 - type: GridPathfinding - type: RadiationGridResistance - type: GasTileOverlay - type: SpreaderGrid diff --git a/Resources/Maps/Salvage/small-1.yml b/Resources/Maps/Salvage/small-1.yml index 8e27aed5b3..d84f6ef2be 100644 --- a/Resources/Maps/Salvage/small-1.yml +++ b/Resources/Maps/Salvage/small-1.yml @@ -41,8 +41,6 @@ entities: type: Gravity - type: OccluderTree - type: Shuttle - - nextUpdate: 600.983382 - type: GridPathfinding - chunkCollection: version: 2 nodes: diff --git a/Resources/Maps/Salvage/small-2.yml b/Resources/Maps/Salvage/small-2.yml index fcb5fd20d3..a7463d8165 100644 --- a/Resources/Maps/Salvage/small-2.yml +++ b/Resources/Maps/Salvage/small-2.yml @@ -42,8 +42,6 @@ entities: type: Gravity - type: OccluderTree - type: Shuttle - - nextUpdate: 298.7280431 - type: GridPathfinding - chunkCollection: version: 2 nodes: [] diff --git a/Resources/Maps/Salvage/small-3.yml b/Resources/Maps/Salvage/small-3.yml index c6fecd3b77..014c8e625b 100644 --- a/Resources/Maps/Salvage/small-3.yml +++ b/Resources/Maps/Salvage/small-3.yml @@ -45,8 +45,6 @@ entities: type: DecalGrid - type: OccluderTree - type: Shuttle - - nextUpdate: 74.0335825 - type: GridPathfinding - type: RadiationGridResistance - version: 2 data: diff --git a/Resources/Maps/Salvage/small-a-1.yml b/Resources/Maps/Salvage/small-a-1.yml index ddc3ac187a..02602f67bf 100644 --- a/Resources/Maps/Salvage/small-a-1.yml +++ b/Resources/Maps/Salvage/small-a-1.yml @@ -109,8 +109,6 @@ entities: type: DecalGrid - type: OccluderTree - type: Shuttle - - nextUpdate: 141.4743149 - type: GridPathfinding - type: GasTileOverlay - type: SpreaderGrid - proto: AsteroidRockMining diff --git a/Resources/Maps/Salvage/small-ship-1.yml b/Resources/Maps/Salvage/small-ship-1.yml index e140b0793d..58dace1542 100644 --- a/Resources/Maps/Salvage/small-ship-1.yml +++ b/Resources/Maps/Salvage/small-ship-1.yml @@ -72,8 +72,6 @@ entities: type: GridAtmosphere - type: OccluderTree - type: Shuttle - - nextUpdate: 119.6593293 - type: GridPathfinding - type: GasTileOverlay - type: SpreaderGrid - proto: CapacitorStockPart diff --git a/Resources/Maps/Salvage/tick-colony.yml b/Resources/Maps/Salvage/tick-colony.yml index 37d66bb84b..3e1285a024 100644 --- a/Resources/Maps/Salvage/tick-colony.yml +++ b/Resources/Maps/Salvage/tick-colony.yml @@ -296,8 +296,6 @@ entities: type: GridAtmosphere - type: OccluderTree - type: Shuttle - - nextUpdate: 739.7009161 - type: GridPathfinding - type: GasTileOverlay - type: RadiationGridResistance - type: SpreaderGrid diff --git a/Resources/Maps/Salvage/wh-salvage.yml b/Resources/Maps/Salvage/wh-salvage.yml index 2eaedfa3b1..845f1c46ed 100644 --- a/Resources/Maps/Salvage/wh-salvage.yml +++ b/Resources/Maps/Salvage/wh-salvage.yml @@ -392,8 +392,6 @@ entities: type: GridAtmosphere - type: OccluderTree - type: Shuttle - - nextUpdate: 1345.3379186 - type: GridPathfinding - type: RadiationGridResistance - type: GasTileOverlay - type: SpreaderGrid diff --git a/Resources/Maps/Shuttles/arrivals.yml b/Resources/Maps/Shuttles/arrivals.yml index 77fd551b69..8fde7db9e8 100644 --- a/Resources/Maps/Shuttles/arrivals.yml +++ b/Resources/Maps/Shuttles/arrivals.yml @@ -42,8 +42,6 @@ entities: type: BecomesStation - type: OccluderTree - type: Shuttle - - nextUpdate: 763.4245734 - type: GridPathfinding - gravityShakeSound: !type:SoundPathSpecifier path: /Audio/Effects/alert.ogg type: Gravity diff --git a/Resources/Maps/Shuttles/emergency.yml b/Resources/Maps/Shuttles/emergency.yml index 9a0784a052..86feeef51d 100644 --- a/Resources/Maps/Shuttles/emergency.yml +++ b/Resources/Maps/Shuttles/emergency.yml @@ -520,8 +520,6 @@ entities: type: GridAtmosphere - type: OccluderTree - type: Shuttle - - nextUpdate: 255.7997092 - type: GridPathfinding - type: RadiationGridResistance - shakeTimes: 10 type: GravityShake diff --git a/Resources/Maps/Shuttles/emergency_box.yml b/Resources/Maps/Shuttles/emergency_box.yml index 2ef77e3e71..2a7e68bffc 100644 --- a/Resources/Maps/Shuttles/emergency_box.yml +++ b/Resources/Maps/Shuttles/emergency_box.yml @@ -652,8 +652,6 @@ entities: type: GridAtmosphere - type: OccluderTree - type: Shuttle - - nextUpdate: 4601.3489489 - type: GridPathfinding - type: RadiationGridResistance - shakeTimes: 10 type: GravityShake diff --git a/Resources/Maps/Shuttles/emergency_courser.yml b/Resources/Maps/Shuttles/emergency_courser.yml index e011a50e65..515083128b 100644 --- a/Resources/Maps/Shuttles/emergency_courser.yml +++ b/Resources/Maps/Shuttles/emergency_courser.yml @@ -49,8 +49,6 @@ entities: - type: OccluderTree - type: Shuttle - - nextUpdate: 68.8656601 - type: GridPathfinding - gravityShakeSound: !type:SoundPathSpecifier path: /Audio/Effects/alert.ogg type: Gravity diff --git a/Resources/Maps/Shuttles/emergency_lox.yml b/Resources/Maps/Shuttles/emergency_lox.yml index ae83bb90e0..4a78b5d98d 100644 --- a/Resources/Maps/Shuttles/emergency_lox.yml +++ b/Resources/Maps/Shuttles/emergency_lox.yml @@ -669,8 +669,6 @@ entities: type: GridAtmosphere - type: OccluderTree - type: Shuttle - - nextUpdate: 6334.3237167 - type: GridPathfinding - type: RadiationGridResistance - shakeTimes: 10 type: GravityShake diff --git a/Resources/Maps/Shuttles/emergency_raven.yml b/Resources/Maps/Shuttles/emergency_raven.yml index 8c06735b63..fa24dfb066 100644 --- a/Resources/Maps/Shuttles/emergency_raven.yml +++ b/Resources/Maps/Shuttles/emergency_raven.yml @@ -57,8 +57,6 @@ entities: type: Fixtures - type: OccluderTree - type: Shuttle - - nextUpdate: 4321.2844759 - type: GridPathfinding - gravityShakeSound: !type:SoundPathSpecifier path: /Audio/Effects/alert.ogg type: Gravity diff --git a/Resources/Maps/Shuttles/emergency_transit.yml b/Resources/Maps/Shuttles/emergency_transit.yml index 3a8b0cbd57..93feb563c9 100644 --- a/Resources/Maps/Shuttles/emergency_transit.yml +++ b/Resources/Maps/Shuttles/emergency_transit.yml @@ -49,8 +49,6 @@ entities: - nextUpdate: -307.6002253 type: SpreaderGrid - type: Shuttle - - nextUpdate: 6051.0947718 - type: GridPathfinding - gravityShakeSound: !type:SoundPathSpecifier path: /Audio/Effects/alert.ogg type: Gravity diff --git a/Resources/Maps/Shuttles/escape_pod_small.yml b/Resources/Maps/Shuttles/escape_pod_small.yml index 9113378034..d6d9fbdae6 100644 --- a/Resources/Maps/Shuttles/escape_pod_small.yml +++ b/Resources/Maps/Shuttles/escape_pod_small.yml @@ -42,8 +42,6 @@ entities: type: BecomesStation - type: OccluderTree - type: Shuttle - - nextUpdate: 88.8784752 - type: GridPathfinding - gravityShakeSound: !type:SoundPathSpecifier path: /Audio/Effects/alert.ogg type: Gravity diff --git a/Resources/Maps/Shuttles/mining.yml b/Resources/Maps/Shuttles/mining.yml index 135e138cb4..9e24956fe0 100644 --- a/Resources/Maps/Shuttles/mining.yml +++ b/Resources/Maps/Shuttles/mining.yml @@ -512,8 +512,6 @@ entities: type: GridAtmosphere - type: OccluderTree - type: Shuttle - - nextUpdate: 2733.1896172 - type: GridPathfinding - type: RadiationGridResistance - type: SpreaderGrid - shakeTimes: 10 diff --git a/Resources/Maps/Shuttles/pirate.yml b/Resources/Maps/Shuttles/pirate.yml index 4c9f374579..3f7882feeb 100644 --- a/Resources/Maps/Shuttles/pirate.yml +++ b/Resources/Maps/Shuttles/pirate.yml @@ -340,8 +340,6 @@ entities: type: GridAtmosphere - type: OccluderTree - type: Shuttle - - nextUpdate: 1678.8452663 - type: GridPathfinding - type: RadiationGridResistance - nextShake: -4201.5220081 shakeTimes: 10 diff --git a/Resources/Maps/Shuttles/striker.yml b/Resources/Maps/Shuttles/striker.yml index 38b8cf7441..e603abeb35 100644 --- a/Resources/Maps/Shuttles/striker.yml +++ b/Resources/Maps/Shuttles/striker.yml @@ -43,8 +43,6 @@ entities: type: Fixtures - type: OccluderTree - type: Shuttle - - nextUpdate: 4665.7478885 - type: GridPathfinding - gravityShakeSound: !type:SoundPathSpecifier path: /Audio/Effects/alert.ogg type: Gravity diff --git a/Resources/Maps/Shuttles/wizard.yml b/Resources/Maps/Shuttles/wizard.yml index 43e4bc4972..1db92011d1 100644 --- a/Resources/Maps/Shuttles/wizard.yml +++ b/Resources/Maps/Shuttles/wizard.yml @@ -59,8 +59,6 @@ entities: type: Fixtures - type: OccluderTree - type: Shuttle - - nextUpdate: 8309.0552128 - type: GridPathfinding - gravityShakeSound: !type:SoundPathSpecifier path: /Audio/Effects/alert.ogg type: Gravity diff --git a/Resources/Maps/Test/dev_map.yml b/Resources/Maps/Test/dev_map.yml index 75eaa906fe..8c2bb6bfb9 100644 --- a/Resources/Maps/Test/dev_map.yml +++ b/Resources/Maps/Test/dev_map.yml @@ -77,8 +77,6 @@ entities: type: DecalGrid - type: OccluderTree - type: Shuttle - - nextUpdate: 3888.4058032 - type: GridPathfinding - type: RadiationGridResistance - nextShake: 0 shakeTimes: 10 diff --git a/Resources/Maps/aspid.yml b/Resources/Maps/aspid.yml index 4286fa64b8..07a35467eb 100644 --- a/Resources/Maps/aspid.yml +++ b/Resources/Maps/aspid.yml @@ -260,8 +260,6 @@ entities: type: Fixtures - type: OccluderTree - type: Shuttle - - nextUpdate: 132705.6201203 - type: GridPathfinding - gravityShakeSound: !type:SoundPathSpecifier path: /Audio/Effects/alert.ogg type: Gravity @@ -8638,8 +8636,6 @@ entities: type: Fixtures - type: OccluderTree - type: Shuttle - - nextUpdate: 97465.7475215 - type: GridPathfinding - gravityShakeSound: !type:SoundPathSpecifier path: /Audio/Effects/alert.ogg type: Gravity diff --git a/Resources/Maps/bagel.yml b/Resources/Maps/bagel.yml index a48b18272b..b2a2ae46da 100644 --- a/Resources/Maps/bagel.yml +++ b/Resources/Maps/bagel.yml @@ -8771,8 +8771,6 @@ entities: type: GridAtmosphere - type: OccluderTree - type: Shuttle - - nextUpdate: 2145.1086759 - type: GridPathfinding - nextUpdate: 1 type: SpreaderGrid - type: RadiationGridResistance @@ -8819,8 +8817,6 @@ entities: type: Fixtures - type: OccluderTree - type: Shuttle - - nextUpdate: 0.45 - type: GridPathfinding - nextUpdate: 1 type: SpreaderGrid - gravityShakeSound: !type:SoundPathSpecifier diff --git a/Resources/Maps/barratry.yml b/Resources/Maps/barratry.yml index 571a89d3b2..2ac564284e 100644 --- a/Resources/Maps/barratry.yml +++ b/Resources/Maps/barratry.yml @@ -238,8 +238,6 @@ entities: type: Fixtures - type: OccluderTree - type: Shuttle - - nextUpdate: 15801.3235625 - type: GridPathfinding - gravityShakeSound: !type:SoundPathSpecifier path: /Audio/Effects/alert.ogg type: Gravity @@ -10649,8 +10647,6 @@ entities: - nextUpdate: 0 type: SpreaderGrid - type: Shuttle - - nextUpdate: 1770.7593829 - type: GridPathfinding - gravityShakeSound: !type:SoundPathSpecifier path: /Audio/Effects/alert.ogg type: Gravity diff --git a/Resources/Maps/box.yml b/Resources/Maps/box.yml index 581a3077f1..d09b974e35 100644 --- a/Resources/Maps/box.yml +++ b/Resources/Maps/box.yml @@ -7529,8 +7529,6 @@ entities: type: Joint - type: OccluderTree - type: Shuttle - - nextUpdate: 5417.8279988 - type: GridPathfinding - type: RadiationGridResistance - nextShake: 0 shakeTimes: 10 @@ -7583,8 +7581,6 @@ entities: type: Joint - type: OccluderTree - type: Shuttle - - nextUpdate: 47.0665638 - type: GridPathfinding - type: RadiationGridResistance - nextUpdate: 0 type: SpreaderGrid diff --git a/Resources/Maps/centcomm.yml b/Resources/Maps/centcomm.yml index a1826e5364..169ea5f0ad 100644 --- a/Resources/Maps/centcomm.yml +++ b/Resources/Maps/centcomm.yml @@ -2619,8 +2619,6 @@ entities: type: GridAtmosphere - type: OccluderTree - type: Shuttle - - nextUpdate: 539.6480757 - type: GridPathfinding - type: RadiationGridResistance - nextShake: 0 shakeTimes: 10 diff --git a/Resources/Maps/cluster.yml b/Resources/Maps/cluster.yml index 9f82ab6a60..dbe683207a 100644 --- a/Resources/Maps/cluster.yml +++ b/Resources/Maps/cluster.yml @@ -193,8 +193,6 @@ entities: type: Fixtures - type: OccluderTree - type: Shuttle - - nextUpdate: 15845.118538 - type: GridPathfinding - gravityShakeSound: !type:SoundPathSpecifier path: /Audio/Effects/alert.ogg type: Gravity diff --git a/Resources/Maps/fland.yml b/Resources/Maps/fland.yml index 3cae154c01..82ccec973f 100644 --- a/Resources/Maps/fland.yml +++ b/Resources/Maps/fland.yml @@ -465,8 +465,6 @@ entities: type: BecomesStation - type: OccluderTree - type: Shuttle - - nextUpdate: 27256.4729399 - type: GridPathfinding - gravityShakeSound: !type:SoundPathSpecifier path: /Audio/Effects/alert.ogg type: Gravity diff --git a/Resources/Maps/infiltrator.yml b/Resources/Maps/infiltrator.yml index 9344a6d77d..aaf706212a 100644 --- a/Resources/Maps/infiltrator.yml +++ b/Resources/Maps/infiltrator.yml @@ -446,8 +446,6 @@ entities: type: IFF - type: OccluderTree - type: Shuttle - - nextUpdate: 2319.9379624 - type: GridPathfinding - type: RadiationGridResistance - nextShake: 0 shakeTimes: 10 diff --git a/Resources/Maps/marathon.yml b/Resources/Maps/marathon.yml index 06377c177f..af96358760 100644 --- a/Resources/Maps/marathon.yml +++ b/Resources/Maps/marathon.yml @@ -7673,8 +7673,6 @@ entities: type: BecomesStation - type: OccluderTree - type: Shuttle - - nextUpdate: 4567.2250735 - type: GridPathfinding - type: RadiationGridResistance - nextShake: 0 shakeTimes: 10 diff --git a/Resources/Maps/meta.yml b/Resources/Maps/meta.yml index d8be98d67c..c678a618ac 100644 --- a/Resources/Maps/meta.yml +++ b/Resources/Maps/meta.yml @@ -7642,8 +7642,6 @@ entities: type: BecomesStation - type: OccluderTree - type: Shuttle - - nextUpdate: 7724.1283525 - type: GridPathfinding - type: GasTileOverlay - type: RadiationGridResistance - nextUpdate: 0 diff --git a/Resources/Maps/moose.yml b/Resources/Maps/moose.yml index 0bed731589..6afbc5de0e 100644 --- a/Resources/Maps/moose.yml +++ b/Resources/Maps/moose.yml @@ -266,8 +266,6 @@ entities: - type: OccluderTree - type: Shuttle - - nextUpdate: 3754.1875118 - type: GridPathfinding - gravityShakeSound: !type:SoundPathSpecifier path: /Audio/Effects/alert.ogg type: Gravity @@ -5579,8 +5577,6 @@ entities: - type: OccluderTree - type: Shuttle - - nextUpdate: 0.45 - type: GridPathfinding - gravityShakeSound: !type:SoundPathSpecifier path: /Audio/Effects/alert.ogg type: Gravity @@ -5687,8 +5683,6 @@ entities: - type: OccluderTree - type: Shuttle - - nextUpdate: 0.45 - type: GridPathfinding - gravityShakeSound: !type:SoundPathSpecifier path: /Audio/Effects/alert.ogg type: Gravity diff --git a/Resources/Maps/nukieplanet.yml b/Resources/Maps/nukieplanet.yml index 3da0686768..7d13aa0966 100644 --- a/Resources/Maps/nukieplanet.yml +++ b/Resources/Maps/nukieplanet.yml @@ -1530,8 +1530,6 @@ entities: - type: RadiationGridResistance - type: OccluderTree - type: Shuttle - - nextUpdate: 4156.5052092 - type: GridPathfinding - shakeTimes: 10 type: GravityShake - type: GasTileOverlay diff --git a/Resources/Maps/omega.yml b/Resources/Maps/omega.yml index 28147477fa..e52625f867 100644 --- a/Resources/Maps/omega.yml +++ b/Resources/Maps/omega.yml @@ -4018,8 +4018,6 @@ entities: type: BecomesStation - type: OccluderTree - type: Shuttle - - nextUpdate: 7616.8355992 - type: GridPathfinding - type: RadiationGridResistance - nextShake: 0 shakeTimes: 10 diff --git a/Resources/Maps/origin.yml b/Resources/Maps/origin.yml index d4202c1cfa..929537e46f 100644 --- a/Resources/Maps/origin.yml +++ b/Resources/Maps/origin.yml @@ -9504,8 +9504,6 @@ entities: type: BecomesStation - type: OccluderTree - type: Shuttle - - nextUpdate: 6223.0410787 - type: GridPathfinding - type: RadiationGridResistance - nextShake: 0 shakeTimes: 10