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-upstream-sync

Browse Source 
# Conflicts:
#	Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs
This commit is contained in:
Ed
2025-04-15 00:44:29 +03:00
parent 52f31e4403 961d2cfdef
commit 5420469d62
463 changed files with 17534 additions and 10124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Content.Server/Medical/HealthAnalyzerSystem.cs
View File

@@ -63,8 +63,9 @@ public sealed class HealthAnalyzerSystem : EntitySystem
component.NextUpdate = _timing.CurTime + component.UpdateInterval;
//Get distance between health analyzer and the scanned entity
//null is infinite range
var patientCoordinates = Transform(patient).Coordinates;
if (!_transformSystem.InRange(patientCoordinates, transform.Coordinates, component.MaxScanRange))
if (component.MaxScanRange != null && !_transformSystem.InRange(patientCoordinates, transform.Coordinates, component.MaxScanRange.Value))
{
//Range too far, disable updates
StopAnalyzingEntity((uid, component), patient);