juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into ed-27-09-2024-upstream

Browse Source 
# Conflicts:
#	Content.Server/Explosion/EntitySystems/TriggerSystem.cs
This commit is contained in:
Ed
2024-09-27 10:22:05 +03:00
parent c2704165d3 0d26bb0320
commit 1df3ed177b
373 changed files with 47135 additions and 26244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs
View File

@@ -416,7 +416,8 @@ public sealed partial class ShuttleSystem
new EntityCoordinates(fromMapUid.Value, _mapSystem.GetGridPosition(entity.Owner)), true, startupAudio.Params);
_audio.SetPlaybackPosition(clippedAudio, entity.Comp1.StartupTime);
clippedAudio.Value.Component.Flags |= AudioFlags.NoOcclusion;
if (clippedAudio != null)
clippedAudio.Value.Component.Flags |= AudioFlags.NoOcclusion;
}
// Offset the start by buffer range just to avoid overlap.