Merge branch 'master' into CC-shuttles

Signed-off-by: Field Command <159087063+FieldCommand@users.noreply.github.com>

Author: FieldCommand

Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml.cs

@@ -287,7 +287,18 @@ public void Populate(HealthAnalyzerScannedUserMessage msg)
                 return;
             }
 
+            TriageControls.Visible = true;
             _triageControls[records.Status].Pressed = true;
+
+            // Update claim button based on claimed status
+            if (records.ClaimedName != null)
+            {
+                ClaimButton.Text = Loc.GetString("health-analyzer-window-triage-unclaim", ("claimedBy", records.ClaimedName));
+            }
+            else
+            {
+                ClaimButton.Text = Loc.GetString("health-analyzer-window-triage-claim");
+            }
             // End DeltaV - Medical Records
         }
         // Shitmed Change End

Content.Client/_DV/Overlays/ShowTriageIconsSystem.cs

@@ -12,9 +12,9 @@ namespace Content.Client._DV.Overlays;
 
 public sealed class ShowTriageIconsSystem : EquipmentHudSystem<ShowTriageIconsComponent>
 {
-    [Dependency] private readonly SharedIdCardSystem _idCard = default!;
     [Dependency] private readonly IPrototypeManager _prototype = default!;
     [Dependency] private readonly IPlayerManager _player = default!;
+    [Dependency] private readonly SharedIdCardSystem _idCard = default!;
 
     private static readonly ProtoId<HealthIconPrototype> Minor = "TriageStatusMinor";
     private static readonly ProtoId<HealthIconPrototype> Delayed = "TriageStatusDelayed";
@@ -47,10 +47,8 @@ private void OnGetStatusIconsEvent(Entity<MedicalRecordComponent> ent, ref GetSt
             _ => null,
         };
 
-        if (triageStatusIcon is not { } statusPrototype)
-            return;
-
-        ev.StatusIcons.Add(statusPrototype);
+        if (triageStatusIcon is { } statusPrototype)
+            ev.StatusIcons.Add(statusPrototype);
 
         if (ent.Comp.Record.ClaimedName is not { } claimedName)
         {

Content.Server/_DV/MedicalRecords/MedicalRecordsSystem.cs

@@ -1,14 +1,21 @@
 using Content.Shared._DV.MedicalRecords;
 using Content.Shared.Access.Systems;
+using Content.Shared.IdentityManagement;
 using Content.Shared.StationRecords;
 using Content.Server.StationRecords.Systems;
+using Content.Server.Access.Systems;
+using Content.Shared.Access.Components;
+using Robust.Shared.Timing;
 
 namespace Content.Server._DV.MedicalRecords;
 
 public sealed class MedicalRecordsSystem : SharedMedicalRecordsSystem
 {
+    [Dependency] private readonly IGameTiming _timing = default!;
     [Dependency] private readonly StationRecordsSystem _records = default!;
     [Dependency] private readonly AccessReaderSystem _access = default!;
+    [Dependency] private readonly IdCardSystem _idCard = default!;
+    private static readonly TimeSpan ExpirationTime = TimeSpan.FromMinutes(5);
 
     public override void Initialize()
     {
@@ -26,7 +33,7 @@ private void OnGeneralRecordCreated(AfterGeneralRecordCreatedEvent evt)
     public void SetStatus(StationRecordKey key, MedicalRecord record)
     {
         var name = _records.RecordName(key);
-        if (name != string.Empty)
+        if (!string.IsNullOrEmpty(name))
             UpdateMedicalRecords(name, record);
 
         _records.AddRecordEntry(key, record);
@@ -39,7 +46,15 @@ public void SetStatus(StationRecordKey key, MedicalRecord record)
         foreach (var key in keys)
         {
             if (_records.TryGetRecord<MedicalRecord>(key, out var record))
+            {
+                // Check if expired when accessed
+                if (record.LastUpdated != null && (_timing.CurTime - record.LastUpdated.Value) >= ExpirationTime)
+                {
+                    record = record with { Status = TriageStatus.None, ClaimedName = null, LastUpdated = null };
+                    SetStatus(key, record);
+                }
                 return record;
+            }
         }
         foreach (var key in keys)
         {
@@ -70,7 +85,7 @@ public void SetPatientStatus(StationRecordKey patient, TriageStatus status)
     {
         if (_records.TryGetRecord<MedicalRecord>(patient, out var record) && status != TriageStatus.None)
         {
-            SetStatus(patient, record with { Status = status });
+            SetStatus(patient, record with { Status = status, LastUpdated = _timing.CurTime });
         }
         else
         {
@@ -80,18 +95,26 @@ public void SetPatientStatus(StationRecordKey patient, TriageStatus status)
 
     public void ClaimPatient(StationRecordKey patient, EntityUid claimer)
     {
-        _access.FindStationRecordKeys(claimer, out var keys);
-        foreach (var key in keys)
-        {
-            var name = _records.RecordName(key);
-            if (name == string.Empty)
-                continue;
+        // Require ID card with medical access to claim patient
+        if (!_idCard.TryFindIdCard(claimer, out var idCard))
+            return;
 
-            if (!_records.TryGetRecord<MedicalRecord>(patient, out var record) || record.ClaimedName == name)
-                continue;
+        // Check if ID card has medical access
+        if (!TryComp<AccessComponent>(idCard.Owner, out var access) ||
+            !access.Tags.Contains("Medical"))
+            return;
 
-            SetStatus(patient, record with { ClaimedName = name });
-            break;
-        }
+        var claimerName = idCard.Comp.FullName;
+        if (string.IsNullOrEmpty(claimerName))
+            return;
+
+        if (!_records.TryGetRecord<MedicalRecord>(patient, out var record))
+            return;
+
+        // Makes claim patient toggleable
+        var newClaim = record.ClaimedName == claimerName ? null : claimerName;
+        var newTime = newClaim != null ? (TimeSpan?)_timing.CurTime : null;
+
+        SetStatus(patient, record with { ClaimedName = newClaim, LastUpdated = newTime });
     }
 }

Content.Shared/_DV/MedicalRecords/MedicalRecord.cs

@@ -35,4 +35,9 @@ public sealed partial record MedicalRecord
     /// The name of the doctor who has claimed care of this patient
     /// </summary>
     public string? ClaimedName;
+
+    /// <summary>
+    /// The time when this record was last updated (for expiration tracking)
+    /// </summary>
+    public TimeSpan? LastUpdated;
 }

Content.Shared/_DV/MedicalRecords/SharedMedicalRecordsSystem.cs

@@ -14,7 +14,8 @@ public void UpdateMedicalRecords(string name, MedicalRecord status)
             if (!Identity.Name(uid, EntityManager).Equals(name))
                 continue;
 
-            if (status.Status == TriageStatus.None)
+            // Only remove the component if both status is None AND patient is unclaimed
+            if (status is { Status: TriageStatus.None, ClaimedName: null })
             {
                 RemComp<MedicalRecordComponent>(uid);
             }