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

Merge remote-tracking branch 'upstream/stable' into ed-08-07-2025-upstream

Browse Source 
# Conflicts:
#	Content.Server/Audio/ContentAudioSystem.cs
#	Content.Server/Medical/HealthAnalyzerSystem.cs
#	Content.Server/Shuttles/Systems/ShuttleSystem.cs
#	Resources/Locale/en-US/navmap-beacons/station-beacons.ftl
This commit is contained in:
Ed
2025-07-08 00:40:30 +03:00
parent e7b73354ab 2181585030
commit 7a8326d41e
920 changed files with 19950 additions and 9262 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Content.Server/Physics/Controllers/ConveyorController.cs
View File

@@ -19,6 +19,7 @@ public sealed class ConveyorController : SharedConveyorController
[Dependency] private readonly DeviceLinkSystem _signalSystem = default!;
[Dependency] private readonly MaterialReclaimerSystem _materialReclaimer = default!;
[Dependency] private readonly SharedAppearanceSystem _appearance = default!;
[Dependency] private readonly TurfSystem _turf = default!;
public override void Initialize()
{
@@ -123,7 +124,7 @@ public sealed class ConveyorController : SharedConveyorController
var xform = ent.Comp;
var beltTileRef = xform.Coordinates.GetTileRef(EntityManager, MapManager);
var beltTileRef = _turf.GetTileRef(xform.Coordinates);
if (beltTileRef != null)
{

6
Content.Server/Physics/Controllers/RandomWalkController.cs
View File

@@ -43,9 +43,9 @@ internal sealed class RandomWalkController : VirtualController
var query = EntityQueryEnumerator<RandomWalkComponent, PhysicsComponent>();
while (query.MoveNext(out var uid, out var randomWalk, out var physics))
{
if (EntityManager.HasComponent<ActorComponent>(uid)
|| EntityManager.HasComponent<ThrownItemComponent>(uid)
|| EntityManager.HasComponent<FollowerComponent>(uid))
if (HasComp<ActorComponent>(uid)
|| HasComp<ThrownItemComponent>(uid)
|| HasComp<FollowerComponent>(uid))
continue;
var curTime = _timing.CurTime;