Move FingerprintComponent and FingerprintMaskComponent to shared (#35451)

* init

* review

* whoopsie

diff --git a/Content.Server/Forensics/Components/FingerprintComponent.cs b/Content.Server/Forensics/Components/FingerprintComponent.cs
deleted file mode 100644 (file)
index 97d1381..0000000
--- a/Content.Server/Forensics/Components/FingerprintComponent.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-namespace Content.Server.Forensics
-{
-    /// <summary>
-    /// This component is for mobs that leave fingerprints.
-    /// </summary>
-    [RegisterComponent]
-    public sealed partial class FingerprintComponent : Component
-    {
-        [DataField("fingerprint"), ViewVariables(VVAccess.ReadWrite)]
-        public string? Fingerprint;
-    }
-}

diff --git a/Content.Server/Forensics/Components/FingerprintMaskComponent.cs b/Content.Server/Forensics/Components/FingerprintMaskComponent.cs
deleted file mode 100644 (file)
index 7371097..0000000
--- a/Content.Server/Forensics/Components/FingerprintMaskComponent.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace Content.Server.Forensics
-{
-    /// <summary>
-    /// This component stops the entity from leaving finger prints,
-    /// usually so fibres can be left instead.
-    /// </summary>
-    [RegisterComponent]
-    public sealed partial class FingerprintMaskComponent : Component
-    {}
-}

diff --git a/Content.Server/Forensics/Systems/ForensicPadSystem.cs b/Content.Server/Forensics/Systems/ForensicPadSystem.cs
index 71bbcfb44a0a206d2f9654572c2b62d3502b9a4a..846d72a9fabf1408cd58f529f3db9e39eceee6c5 100644 (file)
--- a/Content.Server/Forensics/Systems/ForensicPadSystem.cs
+++ b/Content.Server/Forensics/Systems/ForensicPadSystem.cs
@@ -3,6 +3,7 @@ using Content.Server.Popups;
 using Content.Shared.DoAfter;
 using Content.Shared.Examine;
 using Content.Shared.Forensics;
+using Content.Shared.Forensics.Components;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Interaction;
 using Content.Shared.Inventory;

diff --git a/Content.Server/Forensics/Systems/ForensicsSystem.cs b/Content.Server/Forensics/Systems/ForensicsSystem.cs
index c1595dd0c13b0b0944810140d418fefcbd74aa9f..f811bede7b65718e2c6132d2e6fc2a859cd5101e 100644 (file)
--- a/Content.Server/Forensics/Systems/ForensicsSystem.cs
+++ b/Content.Server/Forensics/Systems/ForensicsSystem.cs
@@ -63,9 +63,10 @@ namespace Content.Server.Forensics
             ApplyEvidence(uid, args.Other);
         }
 
-        private void OnFingerprintInit(EntityUid uid, FingerprintComponent component, MapInitEvent args)
+        private void OnFingerprintInit(Entity<FingerprintComponent> ent, ref MapInitEvent args)
         {
-            component.Fingerprint = GenerateFingerprint();
+            ent.Comp.Fingerprint = GenerateFingerprint();
+            Dirty(ent);
         }
 
         private void OnDNAInit(EntityUid uid, DnaComponent component, MapInitEvent args)

diff --git a/Content.Shared/Forensics/Components/FingerprintComponent.cs b/Content.Shared/Forensics/Components/FingerprintComponent.cs
new file mode 100644 (file)
index 0000000..573bdb6
--- /dev/null
+++ b/Content.Shared/Forensics/Components/FingerprintComponent.cs
@@ -0,0 +1,13 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Forensics.Components;
+
+/// <summary>
+/// This component is for mobs that leave fingerprints.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class FingerprintComponent : Component
+{
+    [DataField, AutoNetworkedField]
+    public string? Fingerprint;
+}

diff --git a/Content.Shared/Forensics/Components/FingerprintMaskComponent.cs b/Content.Shared/Forensics/Components/FingerprintMaskComponent.cs
new file mode 100644 (file)
index 0000000..78ceac4
--- /dev/null
+++ b/Content.Shared/Forensics/Components/FingerprintMaskComponent.cs
@@ -0,0 +1,11 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Forensics.Components;
+
+/// <summary>
+/// This component stops the entity from leaving fingerprints,
+/// usually so fibres can be left instead.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+public sealed partial class FingerprintMaskComponent : Component;
+