Merge pull request impstation#578 from Kandiyaki/impStation

updated name of inert subjuzine to reduce confusion
mqole · Oct 29, 2024 · 431c575 · 431c575
2 parents c002d8e + 58974b0
commit 431c575
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/Content.Server/EntityEffects/Effects/MakeSyndient.cs b/Content.Server/EntityEffects/Effects/MakeSyndient.cs
@@ -69,7 +69,8 @@ public override void Effect(EntityEffectBaseArgs args)
 
                 String? chosenName = null;
 
-                for(int i=0; i<dnaDataList.Count; i++)
+                //we have all the DNA in the activated subjuzine. get a random one and find the DNA's source.
+                for (int i=0; i<dnaDataList.Count; i++)
                 {
                     DnaData candidate = dnaDataList[i];
                     String? candidateName = forensicSys.GetNameFromDNA(candidate.DNA);
@@ -80,7 +81,6 @@ public override void Effect(EntityEffectBaseArgs args)
                     }
                 }
 
-                //we have all the DNA in the activated subjuzine. get a random one and find the DNA's source.
                 if (chosenName!=null)
                 {
                     //we FINALLY have the name of the injector. jesus fuck.

diff --git a/Resources/Locale/en-US/reagents/meta/medicine.ftl b/Resources/Locale/en-US/reagents/meta/medicine.ftl
@@ -97,6 +97,9 @@ reagent-desc-ethylredoxrazine = Neutralises the effects of alcohol in the blood
 reagent-name-cognizine = cognizine
 reagent-desc-cognizine = A mysterious chemical which is able to make any non-sentient creature sentient.
 
+reagent-name-inert-subjuzine = inert subjuzine
+reagent-desc-inert-subjuzine = A devious alteration of cognizine that bends the creature's will to that of whoever injected them. Mix in your blood to activate it.
+
 reagent-name-subjuzine = subjuzine
 reagent-desc-subjuzine = A devious alteration of cognizine that bends the creature's will to that of whoever injected them.
 

diff --git a/Resources/Prototypes/Reagents/medicine.yml b/Resources/Prototypes/Reagents/medicine.yml
@@ -922,8 +922,8 @@
 
 - type: reagent
   id: Subjuzine
-  name: reagent-name-subjuzine
-  desc: reagent-desc-subjuzine
+  name: reagent-name-inert-subjuzine
+  desc: reagent-desc-inert-subjuzine
   group: Medicine
   physicalDesc: reagent-physical-desc-enigmatic
   flavor: magical