Added Back Unclonable Trait - From Wizden (Sector-Umbra#262)

* added unclonable base pr with small additions * changed new files into their own name space, added new comments * renamed unclonable error in cloning-console-component.ftl * Update cloning-console-component.ftl --------- Co-authored-by: OctoRocket <[email protected]> Co-authored-by: TsjipTsjip <[email protected]>
Boaz1111 · Jan 31, 2025 · 5b53bf2 · 5b53bf2
1 parent 4574355
commit 5b53bf2
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 1 deletion.
diff --git a/Content.Server/Cloning/CloningSystem.cs b/Content.Server/Cloning/CloningSystem.cs
@@ -33,6 +33,7 @@
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
+using Content.Server.Traits.Assorted; // Umbra: Unclonable Trait
 
 namespace Content.Server.Cloning
 {
@@ -176,6 +177,16 @@ public bool TryCloning(EntityUid uid, EntityUid bodyToClone, Entity<MindComponen
             if (_configManager.GetCVar(CCVars.BiomassEasyMode))
                 cloningCost = (int) Math.Round(cloningCost * EasyModeCloningCost);
 
+            // Umbra: Check if they have the uncloneable trait
+            if (TryComp<UncloneableComponent>(bodyToClone, out _))
+            {
+                if (clonePod.ConnectedConsole != null)
+                    _chatSystem.TrySendInGameICMessage(clonePod.ConnectedConsole.Value,
+                        Loc.GetString("cloning-console-uncloneable-trait-error"),
+                        InGameICChatType.Speak, false);
+                return false;
+            }
+
             // biomass checks
             var biomassAmount = _material.GetMaterialAmount(uid, clonePod.RequiredMaterial);
 

diff --git a/Content.Server/_Umbra/Traits/Assorted/UncloneableComponent.cs b/Content.Server/_Umbra/Traits/Assorted/UncloneableComponent.cs
@@ -0,0 +1,10 @@
+namespace Content.Server.Traits.Assorted;
+
+/// <summary>
+/// This is used for the uncloneable trait.
+/// </summary>
+[RegisterComponent]
+public sealed partial class UncloneableComponent : Component
+{
+
+}
diff --git a/Resources/Locale/en-US/_Umbra/traits/traits.ftl b/Resources/Locale/en-US/_Umbra/traits/traits.ftl
@@ -1,2 +1,5 @@
 trait-illeism-name = Illeism
 trait-illeism-desc = You seem to only be able to refer to yourself by name.
+
+trait-uncloneable-name = Uncloneable
+trait-uncloneable-desc = Cannot be cloned.
diff --git a/Resources/Locale/en-US/medical/components/cloning-console-component.ftl b/Resources/Locale/en-US/medical/components/cloning-console-component.ftl
@@ -26,5 +26,6 @@ cloning-console-component-msg-no-cloner = Not Ready: No Cloner Detected
 cloning-console-component-msg-no-mind = Not Ready: No Soul Activity Detected
 
 cloning-console-chat-error = ERROR: INSUFFICIENT BIOMASS. CLONING THIS BODY REQUIRES {$units} UNITS OF BIOMASS.
-cloning-console-uncloneable-trait-error = ERROR: SOUL IS ABSENT, CLONING IS IMPOSSIBLE.
+# Umbra: cloning-console-uncloneable-trait-error modified from ERROR: SOUL IS ABSENT, CLONING IS IMPOSSIBLE.
+cloning-console-uncloneable-trait-error = ERROR: CLONING IS IMPOSSIBLE.
 cloning-console-cellular-warning = WARNING: GENEFSCK CONFIDENCE SCORE IS {$percent}%. CLONING MAY HAVE UNEXPECTED RESULTS.
diff --git a/Resources/Prototypes/_Umbra/Traits/disabilities.yml b/Resources/Prototypes/_Umbra/Traits/disabilities.yml
@@ -0,0 +1,7 @@
+- type: trait
+  id: Uncloneable
+  name: trait-uncloneable-name
+  description: trait-uncloneable-desc
+  category: Disabilities
+  components:
+  - type: Uncloneable