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

More user friendly crew monitor UI (#17328)

Browse Source
This commit is contained in:
Ahion
2023-06-15 05:29:52 +02:00
committed by GitHub
parent 4837ae03bd
commit de63c5230b
7 changed files with 75 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Server/Medical/SuitSensors/SuitSensorSystem.cs
View File

@@ -321,7 +321,7 @@ namespace Content.Server.Medical.SuitSensors
totalDamage = damageable.TotalDamage.Int();
// finally, form suit sensor status
var status = new SuitSensorStatus(userName, userJob);
var status = new SuitSensorStatus(uid, userName, userJob);
switch (sensor.Mode)
{
case SuitSensorMode.SensorBinary:
@@ -371,6 +371,7 @@ namespace Content.Server.Medical.SuitSensors
[SuitSensorConstants.NET_NAME] = status.Name,
[SuitSensorConstants.NET_JOB] = status.Job,
[SuitSensorConstants.NET_IS_ALIVE] = status.IsAlive,
[SuitSensorConstants.NET_SUIT_SENSOR_UID] = status.SuitSensorUid,
};
if (status.TotalDamage != null)
@@ -397,12 +398,13 @@ namespace Content.Server.Medical.SuitSensors
if (!payload.TryGetValue(SuitSensorConstants.NET_NAME, out string? name)) return null;
if (!payload.TryGetValue(SuitSensorConstants.NET_JOB, out string? job)) return null;
if (!payload.TryGetValue(SuitSensorConstants.NET_IS_ALIVE, out bool? isAlive)) return null;
if (!payload.TryGetValue(SuitSensorConstants.NET_SUIT_SENSOR_UID, out EntityUid suitSensorUid)) return null;
// try get total damage and cords (optionals)
payload.TryGetValue(SuitSensorConstants.NET_TOTAL_DAMAGE, out int? totalDamage);
payload.TryGetValue(SuitSensorConstants.NET_COORDINATES, out EntityCoordinates? cords);
var status = new SuitSensorStatus(name, job)
var status = new SuitSensorStatus(suitSensorUid, name, job)
{
IsAlive = isAlive.Value,
TotalDamage = totalDamage,