]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Move DnaComponent to shared (#35012)
authorZachary Higgs <compgeek223@gmail.com>
Mon, 10 Feb 2025 03:36:01 +0000 (23:36 -0400)
committerGitHub <noreply@github.com>
Mon, 10 Feb 2025 03:36:01 +0000 (04:36 +0100)
* Move DnaComponent to shared

- Add Using statements to AdminSystem and StationRecordsSystem to point
to Content.Shared.Forensics

* Proper namespacing

* Revert an un-intended change

* Add Networking to DNA Component

* CR - Remove ("dna")

* CR - add back ("dna") tag

Content.Server/Administration/Systems/AdminSystem.cs
Content.Server/Body/Systems/BloodstreamSystem.cs
Content.Server/Forensics/Components/DnaComponent.cs [deleted file]
Content.Server/Forensics/Systems/ForensicsSystem.cs
Content.Server/Implants/SubdermalImplantSystem.cs
Content.Server/StationRecords/Systems/StationRecordsSystem.cs
Content.Shared/Forensics/Components/DnaComponent.cs [new file with mode: 0644]

index eb29617f4974e9a5f512e4d95fb5b38ffc7853c2..c1b08437deb99c09d46c96477ddb82f81d3559ba 100644 (file)
@@ -11,6 +11,7 @@ using Content.Server.StationRecords.Systems;
 using Content.Shared.Administration;
 using Content.Shared.Administration.Events;
 using Content.Shared.CCVar;
+using Content.Shared.Forensics.Components;
 using Content.Shared.GameTicking;
 using Content.Shared.Hands.Components;
 using Content.Shared.IdentityManagement;
index 198123cc5fd578b0d3b9079c2bc7d10cc2d08826..d04a993226753dced59794b977766145ce1e7816 100644 (file)
@@ -13,6 +13,7 @@ using Content.Shared.Damage.Prototypes;
 using Content.Shared.Drunk;
 using Content.Shared.FixedPoint;
 using Content.Shared.Forensics;
+using Content.Shared.Forensics.Components;
 using Content.Shared.HealthExaminable;
 using Content.Shared.Mobs.Systems;
 using Content.Shared.Popups;
diff --git a/Content.Server/Forensics/Components/DnaComponent.cs b/Content.Server/Forensics/Components/DnaComponent.cs
deleted file mode 100644 (file)
index 78857f9..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-namespace Content.Server.Forensics;
-
-/// <summary>
-/// This component is for mobs that have DNA.
-/// </summary>
-[RegisterComponent]
-public sealed partial class DnaComponent : Component
-{
-    [DataField("dna"), ViewVariables(VVAccess.ReadWrite)]
-    public string DNA = String.Empty;
-}
index 34529aba4a2f7d2a5f083e016d9a9d4e42512e4f..c1595dd0c13b0b0944810140d418fefcbd74aa9f 100644 (file)
@@ -10,6 +10,7 @@ using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Chemistry.Components.SolutionManager;
 using Content.Shared.DoAfter;
 using Content.Shared.Forensics;
+using Content.Shared.Forensics.Components;
 using Content.Shared.Interaction;
 using Content.Shared.Interaction.Events;
 using Content.Shared.Inventory;
index cb41e55ba55138dd9b9ae7bf40c29e814b33becd..15b1d76b0d19d98d87aedd2ba3461e9730126797 100644 (file)
@@ -6,6 +6,7 @@ using Content.Server.Store.Components;
 using Content.Server.Store.Systems;
 using Content.Shared.Cuffs.Components;
 using Content.Shared.Forensics;
+using Content.Shared.Forensics.Components;
 using Content.Shared.Humanoid;
 using Content.Shared.Implants;
 using Content.Shared.Implants.Components;
index 6dbc58f4d3874f580476ed7673daf040cdf19a92..d4f0aa1f285d860dac93a7c750556bb2418b279f 100644 (file)
@@ -2,6 +2,7 @@ using System.Diagnostics.CodeAnalysis;
 using Content.Server.Access.Systems;
 using Content.Server.Forensics;
 using Content.Shared.Access.Components;
+using Content.Shared.Forensics.Components;
 using Content.Shared.GameTicking;
 using Content.Shared.Inventory;
 using Content.Shared.PDA;
diff --git a/Content.Shared/Forensics/Components/DnaComponent.cs b/Content.Shared/Forensics/Components/DnaComponent.cs
new file mode 100644 (file)
index 0000000..0dfa921
--- /dev/null
@@ -0,0 +1,13 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Forensics.Components;
+
+/// <summary>
+/// This component is for mobs that have DNA.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class DnaComponent : Component
+{
+    [DataField("dna"), AutoNetworkedField]
+    public string DNA = String.Empty;
+}