Xenoborg camera monitor now shows xenoborgs names (#42205)

* update camera id

* revert code changes in SharedSurveillanceCameraSystem

* why change camera id if you can just send the entity name

diff --git a/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraSystem.cs b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraSystem.cs
index 70d9c8ae9387526d1fa7ea4a3c41666d2bedeab9..06fba6638d9aedd067b4d645f0ee15e4de1d92bb 100644 (file)
--- a/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraSystem.cs
+++ b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraSystem.cs
@@ -81,7 +81,7 @@ public sealed class SurveillanceCameraSystem : SharedSurveillanceCameraSystem
             {
                 { DeviceNetworkConstants.Command, string.Empty },
                 { CameraAddressData, deviceNet.Address },
-                { CameraNameData, component.CameraId },
+                { CameraNameData, component.UseEntityNameAsCameraId ? MetaData(uid).EntityName : component.CameraId },
                 { CameraSubnetData, string.Empty }
             };
 
@@ -215,7 +215,8 @@ public sealed class SurveillanceCameraSystem : SharedSurveillanceCameraSystem
             }
         }
 
-        var state = new SurveillanceCameraSetupBoundUiState(camera.CameraId, deviceNet.ReceiveFrequency ?? 0,
+        var name = camera.UseEntityNameAsCameraId ? MetaData(uid).EntityName : camera.CameraId;
+        var state = new SurveillanceCameraSetupBoundUiState(name, deviceNet.ReceiveFrequency ?? 0,
             camera.AvailableNetworks, camera.NameSet, camera.NetworkSet);
         _userInterface.SetUiState(uid, SurveillanceCameraSetupUiKey.Camera, state);
     }

diff --git a/Content.Shared/SurveillanceCamera/Components/SurveillanceCameraComponent.cs b/Content.Shared/SurveillanceCamera/Components/SurveillanceCameraComponent.cs
index 1c5ba8ad17bccd71df34d70d8a45dcbda2094412..21381e753f94d301f0bf6cec201cbed990b2d970 100644 (file)
--- a/Content.Shared/SurveillanceCamera/Components/SurveillanceCameraComponent.cs
+++ b/Content.Shared/SurveillanceCamera/Components/SurveillanceCameraComponent.cs
@@ -34,6 +34,12 @@ public sealed partial class SurveillanceCameraComponent : Component
     [DataField("id")]
     public string CameraId = "camera";
 
+    /// <summary>
+    /// If true, instead of showing the camera id it will show the entity name
+    /// </summary>
+    [DataField]
+    public bool UseEntityNameAsCameraId = false;
+
     [DataField, AutoNetworkedField]
     public bool NameSet;
 

diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
index adbfd560b445ab9fdd96fe1088e48b77b59bd99f..681cb86796eb7459e77df869d49eae9b29fe89fa 100644 (file)
--- a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
+++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
@@ -297,6 +297,7 @@
     networkSet: true
     nameSet: True
     id: Xenoborg
+    useEntityNameAsCameraId: true
   - type: Explosive
     explosionType: Minibomb
     deleteAfterExplosion: false # let damage threshold gib the borg