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

Content update for UI prediction (#27214)

Browse Source 
* Content update for UI refactor

* Big update

* Sharing

* Remaining content updates

* First big update

* Prototype updates

* AUGH

* Fix UI comp ref

* Cleanup

- Fix predicted message, fix item slots, fix interaction range check.

* Fix regressions

* Make this predictive

idk why it wasn't.

* Fix slime merge

* Merge conflict

* Fix merge
This commit is contained in:
metalgearsloth
2024-04-26 18:16:24 +10:00
committed by GitHub
parent 32b81de8c5
commit 5896e68752
279 changed files with 1308 additions and 1582 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Content.Server/SurveillanceCamera/Systems/SurveillanceCameraSystem.cs
View File

@@ -196,14 +196,14 @@ public sealed class SurveillanceCameraSystem : EntitySystem
UpdateSetupInterface(uid, component);
}
private void OpenSetupInterface(EntityUid uid, EntityUid player, SurveillanceCameraComponent? camera = null, ActorComponent? actor = null)
private void OpenSetupInterface(EntityUid uid, EntityUid player, SurveillanceCameraComponent? camera = null)
{
if (!Resolve(uid, ref camera) || !Resolve(player, ref actor))
return;
if (!_userInterface.TryGetUi(uid, SurveillanceCameraSetupUiKey.Camera, out var bui))
if (!Resolve(uid, ref camera))
return;
if (!_userInterface.TryOpenUi(uid, SurveillanceCameraSetupUiKey.Camera, player))
return;
_userInterface.OpenUi(bui, actor.PlayerSession);
UpdateSetupInterface(uid, camera);
}
@@ -216,7 +216,7 @@ public sealed class SurveillanceCameraSystem : EntitySystem
if (camera.NameSet && camera.NetworkSet)
{
_userInterface.TryCloseAll(uid, SurveillanceCameraSetupUiKey.Camera);
_userInterface.CloseUi(uid, SurveillanceCameraSetupUiKey.Camera);
return;
}
@@ -228,14 +228,14 @@ public sealed class SurveillanceCameraSystem : EntitySystem
}
else if (!camera.NetworkSet)
{
_userInterface.TryCloseAll(uid, SurveillanceCameraSetupUiKey.Camera);
_userInterface.CloseUi(uid, SurveillanceCameraSetupUiKey.Camera);
return;
}
}
var state = new SurveillanceCameraSetupBoundUiState(camera.CameraId, deviceNet.ReceiveFrequency ?? 0,
camera.AvailableNetworks, camera.NameSet, camera.NetworkSet);
_userInterface.TrySetUiState(uid, SurveillanceCameraSetupUiKey.Camera, state);
_userInterface.SetUiState(uid, SurveillanceCameraSetupUiKey.Camera, state);
}
// If the camera deactivates for any reason, it must have all viewers removed,