SUPER CAMERA(OCHKO) (#501)

* SUPER CAMERA(OCHKO)

* Удобный монитор камер и портативный мониторинг для детектива. (#25)

* Улучшение мониторинга камер

* Портативный монитор камер для дека

* чейнжлог

* Revert "Удобный монитор камер и портативный мониторинг для детектива. (#25)"

This reverts commit adf35bb8f6ddd6256b18841a81b330224ebff103.

* Revert "Revert "Удобный монитор камер и портативный мониторинг для детектива. (#25)""

This reverts commit bd30fe45046b7b8508e8277f8c186d03338354cd.

* cleanups

* its so over

---------

Co-authored-by: Vigers Ray <60344369+VigersRay@users.noreply.github.com>
Co-authored-by: drdth <drdtheuser@gmail.com>

Content.Server/SurveillanceCamera/Components/SurveillanceCameraComponent.cs

@@ -1,8 +1,9 @@
 using Content.Server._White.SurveillanceCamera;
+using Content.Server.SurveillanceCamera.Systems;
 using Content.Shared.DeviceNetwork;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
 
-namespace Content.Server.SurveillanceCamera;
+namespace Content.Server.SurveillanceCamera.Components;
 
 [RegisterComponent]
 [Access(typeof(SurveillanceCameraSystem), typeof(SurveillanceBodyCameraSystem))]

Content.Server/SurveillanceCamera/Components/SurveillanceCameraMonitorComponent.cs

@@ -1,4 +1,7 @@
-namespace Content.Server.SurveillanceCamera;
+using Content.Server.SurveillanceCamera.Systems;
+using Content.Shared.SurveillanceCamera;
+
+namespace Content.Server.SurveillanceCamera.Components;
 
 [RegisterComponent]
 [Access(typeof(SurveillanceCameraMonitorSystem))]
@@ -29,14 +32,10 @@ public sealed partial class SurveillanceCameraMonitorComponent : Component
     // Set of viewers currently looking at this monitor.
     public HashSet<EntityUid> Viewers { get; } = new();
 
-    // Current active subnet.
-    [ViewVariables]
-    public string ActiveSubnet { get; set; } = default!;
-
     // Known cameras in this subnet by address with name values.
     // This is cleared when the subnet is changed.
     [ViewVariables]
-    public Dictionary<string, string> KnownCameras { get; } = new();
+    public Dictionary<NetEntity, CameraData> KnownCameras { get; } = new();
 
     [ViewVariables]
     // The subnets known by this camera monitor.

Content.Server/SurveillanceCamera/Components/SurveillanceCameraRouterComponent.cs

@@ -28,4 +28,9 @@ public sealed partial class SurveillanceCameraRouterComponent : Component
 
     [DataField("setupAvailableNetworks", customTypeSerializer:typeof(PrototypeIdListSerializer<DeviceFrequencyPrototype>))]
     public List<string> AvailableNetworks { get; private set; } = new();
+
+    // Sunrise-start
+    [DataField("subnetColor")]
+    public Color SubnetColor;
+    // Sunrise-end
 }