From 873c949eebdeff10f1c4609d3d17f1bb25a6e15f Mon Sep 17 00:00:00 2001 From: TheGrimbeeper Date: Wed, 25 Dec 2024 15:24:12 +1100 Subject: [PATCH] Ok can't do it between species That requires something way more complex --- .../Components/ScrambleDNAArtifactComponent.cs | 14 -------------- .../Effects/Systems/ScrambleDNAArtifactSystem.cs | 2 +- .../Prototypes/XenoArch/Effects/normal_effects.yml | 1 - 3 files changed, 1 insertion(+), 16 deletions(-) diff --git a/Content.Server/_Impstation/Xenoarchaeology/XenoArtifacts/Effects/Components/ScrambleDNAArtifactComponent.cs b/Content.Server/_Impstation/Xenoarchaeology/XenoArtifacts/Effects/Components/ScrambleDNAArtifactComponent.cs index 114810bf57de86..27e41e218faddc 100644 --- a/Content.Server/_Impstation/Xenoarchaeology/XenoArtifacts/Effects/Components/ScrambleDNAArtifactComponent.cs +++ b/Content.Server/_Impstation/Xenoarchaeology/XenoArtifacts/Effects/Components/ScrambleDNAArtifactComponent.cs @@ -17,18 +17,4 @@ public sealed partial class ScrambleDNAArtifactComponent : Component /// [DataField("count"), ViewVariables(VVAccess.ReadWrite)] public int Count = 1; - - /// - /// Force scrambling to respect initial species - /// - [DataField("withinSpecies"), ViewVariables(VVAccess.ReadWrite)] - public bool WithinSpecies = true; - - /// - /// if WithinSpecies is false, what species cannot be rolled - /// - [DataField("excludedSpecies"), ViewVariables(VVAccess.ReadWrite)] - public HashSet? ExcludedSpecies = null; - - } diff --git a/Content.Server/_Impstation/Xenoarchaeology/XenoArtifacts/Effects/Systems/ScrambleDNAArtifactSystem.cs b/Content.Server/_Impstation/Xenoarchaeology/XenoArtifacts/Effects/Systems/ScrambleDNAArtifactSystem.cs index 7ceee0f6303945..ccb7a6776328dc 100644 --- a/Content.Server/_Impstation/Xenoarchaeology/XenoArtifacts/Effects/Systems/ScrambleDNAArtifactSystem.cs +++ b/Content.Server/_Impstation/Xenoarchaeology/XenoArtifacts/Effects/Systems/ScrambleDNAArtifactSystem.cs @@ -59,7 +59,7 @@ private void ScrambleTargetDNA(EntityUid target, ScrambleDNAArtifactComponent co { if (TryComp(target, out var humanoid)) { - var newProfile = (component.WithinSpecies ? HumanoidCharacterProfile.RandomWithSpecies(humanoid.Species) : HumanoidCharacterProfile.Random(component.ExcludedSpecies)); + var newProfile = (HumanoidCharacterProfile.RandomWithSpecies(humanoid.Species)); _humanoidAppearance.LoadProfile(target, newProfile, humanoid); _metaData.SetEntityName(target, newProfile.Name); if (TryComp(target, out var dna)) diff --git a/Resources/Prototypes/XenoArch/Effects/normal_effects.yml b/Resources/Prototypes/XenoArch/Effects/normal_effects.yml index 60f7e32dfdd5ab..fd80261d094889 100644 --- a/Resources/Prototypes/XenoArch/Effects/normal_effects.yml +++ b/Resources/Prototypes/XenoArch/Effects/normal_effects.yml @@ -1089,7 +1089,6 @@ components: - type: ScrambleDNAArtifact range: 4 - withinSpecies: true count: 1 - type: artifactEffect