]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Adding intermediate industrial chems (#22614)
authorBoaz1111 <149967078+Boaz1111@users.noreply.github.com>
Sun, 24 Dec 2023 19:12:36 +0000 (20:12 +0100)
committerGitHub <noreply@github.com>
Sun, 24 Dec 2023 19:12:36 +0000 (14:12 -0500)
* added hydroxide, benzene, and changed the phenol recipe

* I forgot to commit a bunch of changes, whoopsie doopsie

* Update chemicals.yml

made an error while resolving conflicts

* Update chemicals.yml

same here

* Update flavor-profiles.ftl

* Update chemicals.yml

* Update chemicals.ftl

* Update chemicals.ftl

* Update chemicals.yml

* Update medicine.yml

* Update chemicals.yml

* Update medicine.yml

* guh

* Revert "guh"

This reverts commit a0e5dfd4182d1a407bffd21d0eaa36355023993c.

* final touches and fixes

* fixed all the issues, for realsies

* thefuck

* Revert " thefuck"

This reverts commit 22068cb73d9902ccf81d065d92d078f423c67aea.

* maybe this fix?

* Revert " maybe this fix?"

This reverts commit 4bfd534f73a956e595c809ce77e52819ed142f2b.

* Update chemicals.yml

* Update chemicals.yml

* Update chemicals.yml

Trying to figure out my issue

* Update chemicals.yml

* Update chemicals.yml

* Update chemicals.yml

* Disabled the ethanol breakdown, fixing the issue

* Revert "Update chemicals.yml"

This reverts commit 1239512c0b7df5eab106bf64ec2af38185f2f016.

* Revert "Disabled the ethanol breakdown, fixing the issue"

This reverts commit 96190c967d22b1422d144e4211579f5af7bf9a09.

* Emo suggested I'd do this

* Update chemicals.yml

* made temps needed for the uhh hydroxide and benzene

* Update chemicals.yml

* removed SugarBreakdown

Resources/Locale/en-US/flavors/flavor-profiles.ftl
Resources/Locale/en-US/reagents/meta/chemicals.ftl
Resources/Locale/en-US/reagents/meta/physical-desc.ftl
Resources/Prototypes/Reagents/chemicals.yml
Resources/Prototypes/Recipes/Reactions/chemicals.yml
Resources/Prototypes/Recipes/Reactions/food.yml
Resources/Prototypes/Recipes/Reactions/medicine.yml

index a1f1c56639406c7a1e49a965891b66adfe5aab1f..0116bd3c8cdeb5772c1d1da5fa7ff3c287b21144 100644 (file)
@@ -44,6 +44,7 @@ flavor-base-sharp = sharp
 flavor-base-syrupy = syrupy
 flavor-base-spaceshroom = mysterious
 flavor-base-clean = clean
+flavor-base-alkaline = alkaline
 flavor-base-holy = holy
 
 # lmao
index 17866c7641d76f8ce9f031df19ad5f49c5d5ee0a..1d70ff65ff14c5dc042f81889d75311a447e195c 100644 (file)
@@ -10,8 +10,21 @@ reagent-desc-sodium-carbonate = A white, odorless, water-soluble salt that yield
 reagent-name-artifexium = artifexium
 reagent-desc-artifexium = A lavender mixture of microscopic artifact fragments and a strong acid. It has the ability to activate artifacts.
 
+reagent-name-benzene = benzene
+reagent-desc-benzene = An aromatic, slightly carcinogenic, ring of carbon, forming a base for many organic compounds.
+
+reagent-name-hydroxide = hydroxide
+reagent-desc-hydroxide = A strong alkaline chemical, forming a base for many organic compounds.
+
+reagent-name-sodium-hydroxide = sodium hydroxide
+reagent-desc-sodium-hydroxide = A white, odorless, water-soluble salt that yields an strong alkaline solution in water. Causes burns and vomiting when ingested.
+
+reagent-name-fersilicite = fersilicite
+reagent-desc-fersilicite = An intermetallic compound with unusual magnetic properties at low temperatures.
+
 reagent-name-sodium-polyacrylate = sodium polyacrylate
 reagent-desc-sodium-polyacrylate = A super-absorbent polymer with assorted industrial uses.
 
 reagent-name-cellulose = cellulose fibers
 reagent-desc-cellulose = A crystaline polydextrose polymer, plants swear by this stuff.
+
index 5743f096209334dbb6f84b95815c17702a38b9c2..183fd9db03c73729a5382c703252eda91a529198 100644 (file)
@@ -90,5 +90,6 @@ reagent-physical-desc-energizing = energizing
 reagent-physical-desc-exhilarating = exhilarating
 reagent-physical-desc-vibrant = vibrant
 reagent-physical-desc-fluffy = fluffy
+reagent-physical-desc-alkaline = alkaline
 reagent-physical-desc-reflective = reflective
 reagent-physical-desc-holy = holy
index 01cffa3e994a189b0b07d62463f3c90708c21838..b2b4850c8f6ccc807191f1c08ec54dca38433d3a 100644 (file)
         - !type:ReagentThreshold
           min: 5
 
+- type: reagent
+  id: Benzene
+  name: reagent-name-benzene
+  desc: reagent-desc-benzene
+  physicalDesc: reagent-physical-desc-acidic
+  color: "#E7EA91"
+  boilingPoint: 353.2
+  meltingPoint: 278.7
+  metabolisms:
+    Poison:
+      effects:
+      - !type:HealthChange
+        damage:
+          types:
+            Cellular: 1 #it's a carcinogen, reckon this is fine
+
+- type: reagent
+  id: Hydroxide
+  name: reagent-name-hydroxide
+  desc: reagent-desc-hydroxide
+  physicalDesc: reagent-physical-desc-alkaline
+  color: "white"
+  boilingPoint: 1661.0
+  meltingPoint: 596.0
+
+- type: reagent
+  id: SodiumHydroxide
+  name: reagent-name-sodium-hydroxide
+  desc: reagent-desc-sodium-hydroxide
+  physicalDesc: reagent-physical-desc-alkaline
+  color: "white"
+  boilingPoint: 1661.0
+  meltingPoint: 596.0
+  metabolisms:
+    Poison:
+      effects:
+      - !type:HealthChange
+        damage:
+          types:
+            Heat: 1.5
+    Medicine:
+      effects:
+      - !type:ChemVomit
+        conditions:
+        - !type:ReagentThreshold
+          min: 5
+        probability: 0.1
+
+- type: reagent
+  id: Fersilicite
+  name: reagent-name-fersilicite
+  desc: reagent-desc-fersilicite
+  physicalDesc: reagent-physical-desc-crystalline
+  flavor: metallic
+  color: "#434b4d"
+  boilingPoint: 2962.0
+  meltingPoint: 1638.0
+
 - type: reagent
   id: SodiumPolyacrylate
   name: reagent-name-sodium-polyacrylate
index 54d67ebc673d7551e41cd0b6e79e289b63151f67..1fed7a2894619b94356aaa687e92bc788e6a47f9 100644 (file)
 
 - type: reaction
   id: Phenol
-  minTemp: 325
-  maxTemp: 480
   reactants:
-    Oxygen:
-      amount: 1
-    Hydrogen:
+    Hydroxide:
       amount: 1
-    Carbon:
+    Benzene:
       amount: 1
   products:
-    Phenol: 3
+    Phenol: 2
 
 - type: reaction
   id: Acetone
@@ -84,7 +80,7 @@
       amount: 1
     Sulfur:
       amount: 1
-    Oxygen:
+    Oxygen: 
       amount: 2
   products:
     SulfuricAcid: 3
   reactants:
     WeldingFuel:
       amount: 1
-    Carbon:
-      amount: 1
     Hydrogen:
       amount: 1
+    Carbon:
+      amount: 1
   products:
     Oil: 3
 
   impact: Medium
   reactants:
     Uranium:
-      amount: 2
-    Hydrogen:
       amount: 1
-    Oxygen:
+    Epinephrine:
       amount: 1
   products:
     NorepinephricAcid: 2
   products:
     SodiumCarbonate: 4
 
+- type: reaction
+  id: Benzene
+  minTemp: 310
+  reactants:
+    Hydrogen:
+      amount: 1
+    Carbon:
+      amount: 1
+  products:
+    Benzene: 1
+
+- type: reaction
+  minTemp: 310
+  id: Hydroxide
+  reactants:
+    Oxygen:
+      amount: 1
+    Hydrogen:
+      amount: 1
+  products:
+    Hydroxide: 2
+
+- type: reaction
+  id: SodiumHydroxide
+  reactants:
+    Hydroxide:
+      amount: 1
+    Sodium:
+      amount: 1
+  products:
+    SodiumHydroxide: 2
+
+- type: reaction
+  id: Fersilicite
+  reactants:
+    Iron:
+      amount: 1
+    Silicon:
+      amount: 1
+  products:
+    Fersilicite: 2
+
 - type: reaction
   id: SodiumPolyacrylate
   impact: Medium
index 97b5549c20aab20bd115c697e828a7ff935de4e7..39bf0d20014383f21d5e6bd2275f0b15c41f26f5 100644 (file)
     Sugar: 9
     Potassium: 1
 
-- type: reaction
-  id: SugarBreakdown
-  minTemp: 520
-  reactants:
-    Sugar:
-      amount: 4
-  products:
-    Carbon: 1
-    Oxygen: 1
-    Hydrogen: 2
+#- type: reaction
+#  id: SugarBreakdown
+# minTemp: 520
# reactants:
#   Sugar:
#     amount: 4
# products:
#   Carbon: 1
#   Oxygen: 1
#   Hydrogen: 2
 
index 4862f082f4902f608953f37357fb5146b3a58672..dfc3d661f0a853a6f80a12147ec5a67390df8690 100644 (file)
       amount: 1
     Acetone:
       amount: 1
-    Oxygen:
-      amount: 1
     Chlorine:
       amount: 1
-    Hydrogen:
+    Hydroxide:
       amount: 1
   products:
-    Epinephrine: 5
+    Epinephrine: 4
 
 - type: reaction
   id: Dermaline
       amount: 1
     Blood:
       amount: 1
-    Carbon:
-      amount: 1
-    Hydrogen:
-      amount: 1
+    Hydroxide:
+      amount: 2
   products:
     Oculine: 4