From: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
Date: Thu, 8 May 2025 16:13:33 +0000 (+0200)
Subject: Revert "Traumoxadone (#37126)"
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=9e582157ac3a333d13ec8f113d10de54f498947c;p=space-station-14.git

Revert "Traumoxadone (#37126)"

This reverts commit efc8d8600dd6a6f58db0140644373c8561a33fe5.
---

diff --git a/Resources/Locale/en-US/reagents/meta/chemicals.ftl b/Resources/Locale/en-US/reagents/meta/chemicals.ftl
index 8747a159a8..ad9d12e26f 100644
--- a/Resources/Locale/en-US/reagents/meta/chemicals.ftl
+++ b/Resources/Locale/en-US/reagents/meta/chemicals.ftl
@@ -30,6 +30,3 @@ reagent-desc-cellulose = A crystaline polydextrose polymer, plants swear by this
 
 reagent-name-rororium = rororium
 reagent-desc-rororium = A strange substance which fills the cores of the hivelords that roam the mining asteroid. Thought to be the source of their regenerative powers.
-
-reagent-name-salicylic-acid = salicylic acid
-reagent-desc-salicylic-acid = A powdery substance used for dermatological treatments.
diff --git a/Resources/Locale/en-US/reagents/meta/medicine.ftl b/Resources/Locale/en-US/reagents/meta/medicine.ftl
index 1c8e13789b..a06be2a148 100644
--- a/Resources/Locale/en-US/reagents/meta/medicine.ftl
+++ b/Resources/Locale/en-US/reagents/meta/medicine.ftl
@@ -147,6 +147,3 @@ reagent-desc-potassium-iodide = Will reduce the damaging effects of radiation by
 
 reagent-name-haloperidol = haloperidol
 reagent-desc-haloperidol = Removes most stimulating and hallucinogenic drugs. Reduces druggy effects and jitteriness. Causes drowsiness.
-
-reagent-name-traumoxadone = traumoxadone
-reagent-desc-traumoxadone = A cryogenics chemical. Used to treat severe trauma to tissues via patching them with tiny particles within the liquid. Works regardless of the patient being alive or dead.
diff --git a/Resources/Prototypes/Reagents/chemicals.yml b/Resources/Prototypes/Reagents/chemicals.yml
index 425db8aa8b..4542c97565 100644
--- a/Resources/Prototypes/Reagents/chemicals.yml
+++ b/Resources/Prototypes/Reagents/chemicals.yml
@@ -185,13 +185,3 @@
         key: Adrenaline
         component: IgnoreSlowOnDamage
         time: 120
-
-- type: reagent
-  id: SalicylicAcid
-  name: reagent-name-salicylic-acid
-  desc: reagent-desc-salicylic-acid
-  physicalDesc: reagent-physical-desc-powdery
-  flavor: bitter
-  color: "#FFFFFF"
-  boilingPoint: 55.5
-  meltingPoint: -50.0
diff --git a/Resources/Prototypes/Reagents/medicine.yml b/Resources/Prototypes/Reagents/medicine.yml
index 07a898f470..4cb134059e 100644
--- a/Resources/Prototypes/Reagents/medicine.yml
+++ b/Resources/Prototypes/Reagents/medicine.yml
@@ -1205,7 +1205,7 @@
         conditions:
         - !type:ReagentThreshold
           min: 12
-
+          
 - type: reagent
   id: Opporozidone #Name based of an altered version of the startreck chem "Opporozine"
   name: reagent-name-opporozidone
@@ -1257,7 +1257,7 @@
               Poison: -2
 
 - type: reagent
-  id: Aloxadone
+  id : Aloxadone
   name: reagent-name-aloxadone
   group: Medicine
   desc: reagent-desc-aloxadone
@@ -1278,26 +1278,6 @@
             Shock: -3.0
             Caustic: -1.0
 
-- type: reagent
-  id: Traumoxadone
-  name: reagent-name-traumoxadone
-  group: Medicine
-  desc: reagent-desc-traumoxadone
-  physicalDesc: reagent-physical-desc-cloudy
-  flavor: medicine
-  color: "#69304D"
-  worksOnTheDead: true
-  metabolisms:
-    Medicine:
-      effects:
-      - !type:HealthChange
-        conditions:
-        - !type:Temperature
-          max: 213.0
-        damage:
-          groups:
-            Brute: -6
-
 - type: reagent
   id : Mannitol # currently this is just a way to create psicodine
   name: reagent-name-mannitol
diff --git a/Resources/Prototypes/Recipes/Reactions/chemicals.yml b/Resources/Prototypes/Recipes/Reactions/chemicals.yml
index c641bb27fc..78fdfec7c9 100644
--- a/Resources/Prototypes/Recipes/Reactions/chemicals.yml
+++ b/Resources/Prototypes/Recipes/Reactions/chemicals.yml
@@ -516,16 +516,3 @@
   products:
     Tazinide: 1
 
-- type: reaction
-  id: SalicylicAcid
-  reactants:
-    Carbon:
-      amount: 1
-    Phenol:
-      amount: 1
-    Bicaridine:
-      amount: 1
-    SulfuricAcid:
-      amount: 1
-  products:
-    SalicylicAcid: 4
diff --git a/Resources/Prototypes/Recipes/Reactions/medicine.yml b/Resources/Prototypes/Recipes/Reactions/medicine.yml
index e5c2f93f70..a99015fe90 100644
--- a/Resources/Prototypes/Recipes/Reactions/medicine.yml
+++ b/Resources/Prototypes/Recipes/Reactions/medicine.yml
@@ -561,7 +561,7 @@
   id: Opporozidone
   minTemp: 400 #Maybe if a method of reducing reagent temp exists one day, this could be -50
   reactants:
-    Cognizine:
+    Cognizine: 
       amount: 1
     Plasma:
       amount: 2
@@ -662,16 +662,3 @@
       amount: 1
   products:
     Haloperidol: 5
-
-- type: reaction
-  id: Traumoxadone
-  impact: Medium
-  reactants:
-    Cryoxadone:
-      amount: 1
-    SalicylicAcid:
-      amount: 1
-    Lipozine:
-      amount: 1
-  products:
-    Traumoxadone: 2