tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UI improvements for holopads (#34055)

Browse Source 
* Initial commit

* Minor update
This commit is contained in:
chromiumboy
2024-12-28 17:33:15 -06:00
committed by GitHub
parent 01980cb0bf
commit 6c465153ab
7 changed files with 57 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Content.Server/Telephone/TelephoneSystem.cs
View File

@@ -151,7 +151,7 @@ public sealed class TelephoneSystem : SharedTelephoneSystem
break;
// Try to hang up if their has been no recent in-call activity
// Try to hang up if there has been no recent in-call activity
case TelephoneState.InCall:
if (_timing.CurTime > telephone.StateStartTime + TimeSpan.FromSeconds(telephone.IdlingTimeout))
EndTelephoneCalls(entity);
@@ -214,7 +214,8 @@ public sealed class TelephoneSystem : SharedTelephoneSystem
source.Comp.LinkedTelephones.Add(receiver);
source.Comp.Muted = options?.MuteSource == true;
receiver.Comp.LastCallerId = GetNameAndJobOfCallingEntity(user); // This will be networked when the state changes
var callerInfo = GetNameAndJobOfCallingEntity(user);
receiver.Comp.LastCallerId = (callerInfo.Item1, callerInfo.Item2, Name(source)); // This will be networked when the state changes
receiver.Comp.LinkedTelephones.Add(source);
receiver.Comp.Muted = options?.MuteReceiver == true;