From d0a9cce71722d123e0ded0d211afc7311e96853d Mon Sep 17 00:00:00 2001
From: LankLTE <135308300+LankLTE@users.noreply.github.com>
Date: Wed, 28 Jun 2023 10:53:56 -0700
Subject: [PATCH] Adds Lead & Zinc, nerfs Licoxide. (#17703)

* Added Lead & Zinc, Nerfed Licoxide.

* Updated physical descriptions.

* Fixed my stupid dumb error.
---
 .../Locale/en-US/reagents/meta/elements.ftl      |  3 +++
 Resources/Locale/en-US/reagents/meta/fun.ftl     |  2 +-
 Resources/Locale/en-US/reagents/meta/toxins.ftl  |  3 +++
 .../Entities/Objects/Materials/Sheets/metal.yml  | 12 ++++++++++++
 .../Entities/Objects/Power/powercells.yml        |  2 +-
 Resources/Prototypes/Reagents/elements.yml       | 11 +++++++++++
 Resources/Prototypes/Reagents/toxins.yml         | 16 ++++++++++++++++
 Resources/Prototypes/Recipes/Reactions/fun.yml   | 10 ++++++++++
 8 files changed, 57 insertions(+), 2 deletions(-)

diff --git a/Resources/Locale/en-US/reagents/meta/elements.ftl b/Resources/Locale/en-US/reagents/meta/elements.ftl
index 94b005840c..6d6439565b 100644
--- a/Resources/Locale/en-US/reagents/meta/elements.ftl
+++ b/Resources/Locale/en-US/reagents/meta/elements.ftl
@@ -63,3 +63,6 @@ reagent-desc-uranium = A grey metallic chemical element in the actinide series,
 
 reagent-name-bananium = bananium
 reagent-desc-bananium = A yellow radioactive organic solid.
+
+reagent-name-zinc = zinc
+reagent-desc-zinc = A silvery, brittle metal, often used in batteries to carry charge. 
\ No newline at end of file
diff --git a/Resources/Locale/en-US/reagents/meta/fun.ftl b/Resources/Locale/en-US/reagents/meta/fun.ftl
index 70bea264bb..c2d3fbb2a7 100644
--- a/Resources/Locale/en-US/reagents/meta/fun.ftl
+++ b/Resources/Locale/en-US/reagents/meta/fun.ftl
@@ -14,4 +14,4 @@ reagent-name-saxoite = Saxoite
 reagent-desc-saxoite = Smells like jazz.
 
 reagent-name-licoxide = Licoxide
-reagent-desc-licoxide = It looks... electrifying.
+reagent-desc-licoxide = A synthetic battery acid. It looks... electrifying.
diff --git a/Resources/Locale/en-US/reagents/meta/toxins.ftl b/Resources/Locale/en-US/reagents/meta/toxins.ftl
index 523620cd40..9c9e4bd6a8 100644
--- a/Resources/Locale/en-US/reagents/meta/toxins.ftl
+++ b/Resources/Locale/en-US/reagents/meta/toxins.ftl
@@ -57,3 +57,6 @@ reagent-desc-pax = A psychiatric drug which prevents the patient from directly h
 
 reagent-name-honk = honk
 reagent-desc-honk = A toxin found in bananium. Causes severe honking and internal bleeding, may also cause the patient to mutate.
+
+reagent-name-lead = lead
+reagent-desc-lead = A slow-acting but incredibly lethal toxin found in steel, albiet in trace amounts. Tasteless. 
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml b/Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml
index 37319b005b..b6f6c93d36 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml
@@ -57,6 +57,18 @@
   - type: FloorTile
     outputs:
     - Plating
+  - type: Extractable
+    grindableSolutionName: steel
+  - type: SolutionContainerManager
+    solutions:
+      steel:
+        reagents:
+        - ReagentId: Iron
+          Quantity: 22
+        - ReagentId: Carbon
+          Quantity: 2.5
+        - ReagentId: Lead
+          Quantity: 0.5
 
 - type: entity
   parent: SheetSteel
diff --git a/Resources/Prototypes/Entities/Objects/Power/powercells.yml b/Resources/Prototypes/Entities/Objects/Power/powercells.yml
index 945bda93da..28ebbb8d5c 100644
--- a/Resources/Prototypes/Entities/Objects/Power/powercells.yml
+++ b/Resources/Prototypes/Entities/Objects/Power/powercells.yml
@@ -23,7 +23,7 @@
   - type: Extractable
     juiceSolution:
       reagents:
-        - ReagentId: Licoxide
+        - ReagentId: Zinc
           Quantity: 5
   - type: Tag
     tags:
diff --git a/Resources/Prototypes/Reagents/elements.yml b/Resources/Prototypes/Reagents/elements.yml
index 3c5529b400..618dea7c90 100644
--- a/Resources/Prototypes/Reagents/elements.yml
+++ b/Resources/Prototypes/Reagents/elements.yml
@@ -262,3 +262,14 @@
         damage:
           types:
             Radiation: 2
+
+- type: reagent
+  id: Zinc
+  name: reagent-name-zinc
+  group: Elements
+  desc: reagent-desc-zinc
+  physicalDesc: reagent-physical-desc-shiny
+  flavor: metallic
+  color: "#bababa"
+  meltingPoint: 419.5
+  boilingPoint: 907.0
\ No newline at end of file
diff --git a/Resources/Prototypes/Reagents/toxins.yml b/Resources/Prototypes/Reagents/toxins.yml
index f4d85982cf..98eb6d2f42 100644
--- a/Resources/Prototypes/Reagents/toxins.yml
+++ b/Resources/Prototypes/Reagents/toxins.yml
@@ -483,3 +483,19 @@
         damage:
           types:
             Poison: 0.06
+
+- type: reagent
+  id: Lead
+  name: reagent-name-lead
+  group: Toxins
+  desc: reagent-desc-lead
+  physicalDesc: reagent-physical-desc-metallic
+  color: "#5C6274"
+  metabolisms:
+    Poison:
+      metabolismRate: 0.03 # Effectively once every 30 seconds.
+      effects:
+      - !type:HealthChange
+        damage:
+          types:
+            Poison: 0.6 # Makes it 20 damage per unit. 
\ No newline at end of file
diff --git a/Resources/Prototypes/Recipes/Reactions/fun.yml b/Resources/Prototypes/Recipes/Reactions/fun.yml
index 0e84604f77..9de665bbf8 100644
--- a/Resources/Prototypes/Recipes/Reactions/fun.yml
+++ b/Resources/Prototypes/Recipes/Reactions/fun.yml
@@ -81,3 +81,13 @@
       amount: 1
   products:
     SpaceGlue: 2
+
+- type: reaction
+  id: Licoxide
+  reactants:
+    Lead:
+      amount: 1
+    Zinc:
+      amount: 1
+  products:
+    Licoxide: 1
\ No newline at end of file