diff --git a/Content.Client/SurveillanceCamera/UI/SurveillanceCameraMonitorBoundUi.cs b/Content.Client/SurveillanceCamera/UI/SurveillanceCameraMonitorBoundUi.cs index e3646c00cc..561744cf62 100644 --- a/Content.Client/SurveillanceCamera/UI/SurveillanceCameraMonitorBoundUi.cs +++ b/Content.Client/SurveillanceCamera/UI/SurveillanceCameraMonitorBoundUi.cs @@ -34,11 +34,17 @@ public sealed class SurveillanceCameraMonitorBoundUserInterface : BoundUserInter _window.SubnetRefresh += OnSubnetRefresh; _window.CameraSwitchTimer += OnCameraSwitchTimer; _window.CameraDisconnect += OnCameraDisconnect; + + var xform = EntMan.GetComponent(Owner); + var gridUid = xform.GridUid ?? xform.MapUid; + + if (gridUid is not null) + _window?.SetMap(gridUid.Value); } - private void OnCameraSelected(string address) + private void OnCameraSelected(string address, string? subnet) { - SendMessage(new SurveillanceCameraMonitorSwitchMessage(address)); + SendMessage(new SurveillanceCameraMonitorSwitchMessage(address, subnet)); } private void OnSubnetRequest(string subnet) diff --git a/Content.Client/SurveillanceCamera/UI/SurveillanceCameraMonitorWindow.xaml b/Content.Client/SurveillanceCamera/UI/SurveillanceCameraMonitorWindow.xaml index 8f996b8171..855a20b17c 100644 --- a/Content.Client/SurveillanceCamera/UI/SurveillanceCameraMonitorWindow.xaml +++ b/Content.Client/SurveillanceCamera/UI/SurveillanceCameraMonitorWindow.xaml @@ -1,25 +1,71 @@ - - - - -