Fixes Romerol & Corpium, Small Zombie Tweaks (#17784)

* Fixed romerol and corpium.

* Tweaked zombie values.

* Change guidebook descriptions.

* Fixed corpium, added reagent requirements.

* Readded zombie bundle to uplink.

* Edited description

Content.Server/Chemistry/ReagentEffects/CauseZombieInfection.cs

@@ -0,0 +1,23 @@
+using Content.Shared.Chemistry.Reagent;
+using Robust.Shared.Prototypes;
+
+using Robust.Shared.Configuration;
+using Content.Server.Zombies;
+
+
+namespace Content.Server.Chemistry.ReagentEffects;
+
+public sealed class CauseZombieInfection : ReagentEffect
+{
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("reagent-effect-guidebook-cause-zombie-infection", ("chance", Probability)); 
+
+    // Adds the Zombie Infection Components
+    public override void Effect(ReagentEffectArgs args)
+    {
+        var entityManager = args.EntityManager;
+        entityManager.EnsureComponent<ZombifyOnDeathComponent>(args.SolutionEntity);
+        entityManager.EnsureComponent<PendingZombieComponent>(args.SolutionEntity);
+    }
+}
+

Content.Server/Chemistry/ReagentEffects/CureZombieInfection.cs

@@ -0,0 +1,23 @@
+using Content.Shared.Chemistry.Reagent;
+using Robust.Shared.Prototypes;
+
+using Robust.Shared.Configuration;
+using Content.Server.Zombies;
+
+
+namespace Content.Server.Chemistry.ReagentEffects;
+
+public sealed class CureZombieInfection : ReagentEffect
+{
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("reagent-effect-guidebook-cure-zombie-infection", ("chance", Probability)); 
+
+    // Removes the Zombie Infection Components
+    public override void Effect(ReagentEffectArgs args)
+    {
+        var entityManager = args.EntityManager;
+        entityManager.RemoveComponent<ZombifyOnDeathComponent>(args.SolutionEntity);
+        entityManager.RemoveComponent<PendingZombieComponent>(args.SolutionEntity);
+    }
+}
+

Content.Shared/Zombies/ZombieComponent.cs

@@ -44,14 +44,14 @@ namespace Content.Shared.Zombies
         /// The baseline infection chance you have if you are completely nude
         /// </summary>
         [ViewVariables(VVAccess.ReadWrite)]
-        public float MaxZombieInfectionChance = 0.30f;
+        public float MaxZombieInfectionChance = 0.50f;
 
         /// <summary>
         /// The minimum infection chance possible. This is simply to prevent
         /// being invincible by bundling up.
         /// </summary>
         [ViewVariables(VVAccess.ReadWrite)]
-        public float MinZombieInfectionChance = 0.05f;
+        public float MinZombieInfectionChance = 0.20f;
 
         [ViewVariables(VVAccess.ReadWrite)]
         public float ZombieMovementSpeedDebuff = 0.70f;

Resources/Locale/en-US/guidebook/chemistry/effects.ftl

@@ -309,6 +309,18 @@ reagent-effect-guidebook-wash-cream-pie-reaction =
         *[other] wash
     } off cream pie from one's face
 
+reagent-effect-guidebook-cure-zombie-infection =
+    { $chance ->
+        [1] Cures
+        *[other] cure
+    } an ongoing zombie infection
+
+reagent-effect-guidebook-cause-zombie-infection =
+    { $chance ->
+        [1] Gives
+        *[other] give
+    } an individual the zombie infection
+
 reagent-effect-guidebook-missing =
     { $chance ->
         [1] Causes

Resources/Locale/en-US/reagents/meta/medicine.ftl

@@ -53,7 +53,7 @@ reagent-name-phalanximine = phalanximine
 reagent-desc-phalanximine = Used in the treatment of cancer. Causes moderate radiation poisoning.
 
 reagent-name-romerol = romerol
-reagent-desc-romerol = A difficult to procure chemical used in the reversal of the zombification process. Tastes like death.
+reagent-desc-romerol = A difficult to procure chemical that can remove a zombie infection in living organisms. Cannot save anyone who has already turned. Tastes like death.
 
 reagent-name-pulped-banana-peel = pulped banana peel
 reagent-desc-pulped-banana-peel = Pulped banana peels have some effectiveness against bleeding.

Resources/Prototypes/Catalog/uplink_catalog.yml

@@ -480,25 +480,25 @@
   categories:
   - UplinkBundles
 
-#- type: listing
+- type: listing
-#  id: UplinkZombieBundle
+  id: UplinkZombieBundle
-#  name: uplink-zombie-bundle-name
+  name: uplink-zombie-bundle-name
-#  description: uplink-zombie-bundle-desc
+  description: uplink-zombie-bundle-desc
-#  icon: { sprite: /Textures/Structures/Wallmounts/signs.rsi, state: bio }
+  icon: { sprite: /Textures/Structures/Wallmounts/signs.rsi, state: bio }
-#  productEntity: ClothingBackpackDuffelZombieBundle
+  productEntity: ClothingBackpackDuffelZombieBundle
-#  cost:
+  cost:
-#    Telecrystal: 40
+    Telecrystal: 40
-#  categories:
+  categories:
-#  - UplinkBundles
+  - UplinkBundles
-#  conditions:
+  conditions:
-#  - !type:StoreWhitelistCondition
+  - !type:StoreWhitelistCondition
-#    whitelist:
+    whitelist:
-#      tags:
+      tags:
-#      - NukeOpsUplink
+      - NukeOpsUplink
-#  - !type:BuyerWhitelistCondition
+  - !type:BuyerWhitelistCondition
-#    blacklist:
+    blacklist:
-#      components:
+      components:
-#      - SurplusBundle
+      - SurplusBundle
 
 - type: listing
   id: UplinkSurplusBundle

Resources/Prototypes/Reagents/medicine.yml

@@ -573,6 +573,10 @@
         damage:
           types:
             Poison: 0.5
+      - !type:CureZombieInfection
+          conditions:
+            - !type:ReagentThreshold
+              min: 10
 
 - type: reagent
   id: PulpedBananaPeel

Resources/Prototypes/Reagents/toxins.yml

@@ -398,6 +398,10 @@
           damage:
             types:
               Cellular: 1
+        - !type:CauseZombieInfection
+          conditions:
+            - !type:ReagentThreshold
+              min: 5
 
 - type: reagent
   id: UncookedAnimalProteins