Revert "poisonous reagents do not ignore resistances"

This reverts commit be8917c.
Simple-Station · Oct 14, 2023 · e5b2f97 · e5b2f97
1 parent be8917c
commit e5b2f97
Show file tree

Hide file tree

Showing 17 changed files with 10 additions and 118 deletions.
diff --git a/Resources/Prototypes/Damage/modifier_sets.yml b/Resources/Prototypes/Damage/modifier_sets.yml
@@ -112,7 +112,7 @@
     Piercing: 0.5
     Cold: 1.6
     Heat: 0.4
-    Poison: -1 # TODO: Medicine doesn't get inverted?
+    Poison: -1 # Poison modifier doesn't do anything?
     Cellular: 0.2
     Asphyxiation: 0.9
     Bloodloss: 1.1

diff --git a/Resources/Prototypes/Nyanotrasen/Reagents/psionic.yml b/Resources/Prototypes/Nyanotrasen/Reagents/psionic.yml
@@ -28,13 +28,9 @@
           groups:
             Burn: -5
             Brute: -4
-          types:
-            Bloodloss: -3
-      - !type:HealthChange
-        damage:
           types:
             Poison: -3
-        ignoreResistances: false # Parkstation-compliantpoison
+            Bloodloss: -3
 
 - type: reagent
   id: SoulbreakerToxin

diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
@@ -128,7 +128,6 @@
         damage:
           types:
             Poison: 1
-        ignoreResistances: false # Parkstation-compliantpoison
       # dwarves take less toxin damage and heal a marginal amount of brute
       - !type:HealthChange
         conditions:
@@ -139,7 +138,6 @@
         damage:
           types:
             Poison: 0.2
-        ignoreResistances: false # Parkstation-compliantpoison
       - !type:HealthChange
         conditions:
         - !type:ReagentThreshold
@@ -245,7 +243,6 @@
         damage:
           types:
             Poison: 1
-        ignoreResistances: false # Parkstation-compliantpoison
 
 - type: reagent
   id: Rum
@@ -1099,7 +1096,6 @@
         damage:
           types:
             Poison: 1
-        ignoreResistances: false # Parkstation-compliantpoison
 
 - type: reagent
   id: Patron

diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
@@ -226,7 +226,6 @@
         damage:
           types:
             Poison: 1
-        ignoreResistances: false # Parkstation-compliantpoison
 
 - type: reagent
   id: SodaWater

diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/juice.yml b/Resources/Prototypes/Reagents/Consumable/Drink/juice.yml
@@ -42,7 +42,6 @@
         damage:
           types:
             Poison: 1
-        ignoreResistances: false # Parkstation-compliantpoison
 
 #TODO: restore eyesight
 #if(..())

diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml b/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml
@@ -157,7 +157,6 @@
         damage:
           types:
             Poison: 1
-        ignoreResistances: false # Parkstation-compliantpoison
 
 - type: reagent
   id: ShamblersJuice

diff --git a/Resources/Prototypes/Reagents/botany.yml b/Resources/Prototypes/Reagents/botany.yml
@@ -44,7 +44,6 @@
         damage:
           types:
             Poison: 1
-        ignoreResistances: false # Parkstation-compliantpoison
         conditions:
         - !type:OrganType
           type: Plant
@@ -69,7 +68,6 @@
         damage:
           types:
             Poison: 3
-        ignoreResistances: false # Parkstation-compliantpoison
         conditions:
         - !type:OrganType
           type: Plant
@@ -97,20 +95,13 @@
       - !type:HealthChange
         damage:
           types:
+            Poison: -4
             Blunt: 2
             Slash: 1
             Piercing: 1
         conditions:
         - !type:OrganType
           type: Plant
-      - !type:HealthChange
-        damage:
-          types:
-            Poison: -4
-        ignoreResistances: false # Parkstation-compliantpoison
-        conditions:
-        - !type:OrganType
-          type: Plant
 
 - type: reagent
   id: RobustHarvest
@@ -136,20 +127,13 @@
       - !type:HealthChange
         damage:
           types:
+            Poison: -2
             Blunt: -3
             Slash: -3
             Piercing: -3
         conditions:
         - !type:OrganType
           type: Plant
-      - !type:HealthChange
-        damage:
-          types:
-            Poison: -2
-        ignoreResistances: false # Parkstation-compliantpoison
-        conditions:
-        - !type:OrganType
-          type: Plant
 
 - type: reagent
   id: WeedKiller
@@ -171,7 +155,6 @@
         damage:
           types:
             Poison: 4
-        ignoreResistances: false # Parkstation-compliantpoison
         conditions:
         - !type:OrganType
           type: Plant

diff --git a/Resources/Prototypes/Reagents/chemicals.yml b/Resources/Prototypes/Reagents/chemicals.yml
@@ -33,7 +33,6 @@
         damage:
           types:
             Poison: -1
-        ignoreResistances: false # Parkstation-compliantpoison
       - !type:ChemCleanBloodstream
         cleanseRate: 3
 

diff --git a/Resources/Prototypes/Reagents/cleaning.yml b/Resources/Prototypes/Reagents/cleaning.yml
@@ -14,7 +14,6 @@
         damage:
           types:
             Poison: 3
-        ignoreResistances: false # Parkstation-compliantpoison
       - !type:PopupMessage
         type: Local
         visualType: MediumCaution

diff --git a/Resources/Prototypes/Reagents/elements.yml b/Resources/Prototypes/Reagents/elements.yml
@@ -149,7 +149,6 @@
         damage:
           types:
             Poison: 2
-        ignoreResistances: false # Parkstation-compliantpoison
 
 - type: reagent
   id: Potassium

diff --git a/Resources/Prototypes/Reagents/fun.yml b/Resources/Prototypes/Reagents/fun.yml
@@ -119,19 +119,11 @@
         - !type:ReagentThreshold
           min: 0.01
           reagent: Fiber
-      - !type:HealthChange
-        damage:
-          types:
-            Piercing: 2
-        conditions:
-        - !type:HasTag
-          invert: true
-          tag: Bee
       - !type:HealthChange
         damage:
           types:
             Poison: 2
-        ignoreResistances: false # Parkstation-compliantpoison
+            Piercing: 2
         conditions:
         - !type:HasTag
           invert: true

diff --git a/Resources/Prototypes/Reagents/gases.yml b/Resources/Prototypes/Reagents/gases.yml
@@ -55,7 +55,6 @@
         damage:
           types:
             Poison: 3
-        ignoreResistances: false # Parkstation-compliantpoison
       - !type:AdjustReagent
         reagent: Inaprovaline
         amount: -2.0

diff --git a/Resources/Prototypes/Reagents/medicine.yml b/Resources/Prototypes/Reagents/medicine.yml
@@ -38,7 +38,6 @@
         damage:
           types:
             Poison: -1
-        ignoreResistances: false # Parkstation-compliantpoison
     # TODO overdose: vomit, dizzy effect (drunkenness?)
   plantMetabolism:
     - !type:PlantAdjustToxins
@@ -121,14 +120,7 @@
         damage:
           types:
             Asphyxiation: 1
-      - !type:HealthChange
-        conditions:
-        - !type:ReagentThreshold
-          min: 30
-        damage:
-          types:
             Poison: 0.5
-        ignoreResistances: false # Parkstation-compliantpoison
       - !type:Jitter
         conditions:
         - !type:ReagentThreshold
@@ -262,36 +254,18 @@
         damage:
           types:
             Asphyxiation: -3
+            Poison: -0.5
           groups:
             Brute: -0.5
             Burn: -0.5
-      - !type:HealthChange
-        conditions:
-          # they gotta be in crit first
-        - !type:MobStateCondition
-          mobstate: Critical
-        - !type:ReagentThreshold
-          min: 0
-          max: 20
-        damage:
-          types:
-            Poison: -0.5
-        ignoreResistances: false # Parkstation-compliantpoison
       - !type:HealthChange
         conditions:
         - !type:ReagentThreshold
           min: 20
         damage:
           types:
             Asphyxiation: 1
-      - !type:HealthChange
-        conditions:
-        - !type:ReagentThreshold
-          min: 20
-        damage:
-          types:
             Poison: 1
-        ignoreResistances: false # Parkstation-compliantpoison
       - !type:AdjustReagent
         reagent: Lexorin
         amount: -2
@@ -455,7 +429,6 @@
         damage:
           types:
             Poison: 3
-        ignoreResistances: false # Parkstation-compliantpoison
       - !type:ChemVomit
         probability: 0.15
         conditions:
@@ -511,7 +484,6 @@
         damage:
           types:
             Poison: 0.5
-        ignoreResistances: false # Parkstation-compliantpoison
 
 - type: reagent
   id: PulpedBananaPeel
@@ -571,7 +543,6 @@
         damage:
           types:
             Poison: -4
-        ignoreResistances: false # Parkstation-compliantpoison
       - !type:AdjustReagent
         conditions:
         - !type:ReagentThreshold
@@ -595,7 +566,6 @@
         damage:
           types:
             Poison: 3
-        ignoreResistances: false # Parkstation-compliantpoison
       - !type:GenericStatusEffect
         key: Stun
         time: 3.0
@@ -647,17 +617,10 @@
           groups:
             Brute: -1
           types:
+            Poison: -0.5 ##Should be about what it was when it healed the toxin group
             Heat: -0.33
             Shock: -0.33
             Cold: -0.33
-      - !type:HealthChange
-        conditions:
-        - !type:TotalDamage
-          max: 50
-        damage:
-          types:
-            Poison: -0.5 ##Should be about what it was when it healed the toxin group
-        ignoreResistances: false # Parkstation-compliantpoison
 
 - type: reagent
   id: Lipozine
@@ -851,4 +814,4 @@
         conditions:
         - !type:ReagentThreshold
           min: 30
-        probability: 0.02
+        probability: 0.02
diff --git a/Resources/Prototypes/Reagents/narcotics.yml b/Resources/Prototypes/Reagents/narcotics.yml
@@ -15,22 +15,14 @@
         damage:
           types:
             Poison: 0.75
-        ignoreResistances: false # Parkstation-compliantpoison
-      - !type:HealthChange
-        conditions:
-        - !type:ReagentThreshold
-          min: 30
-        damage:
-          types:
-            Asphyxiation: 2
       - !type:HealthChange
         conditions:
         - !type:ReagentThreshold
           min: 30
         damage:
           types:
             Poison: 2 # this is added to the base damage of the meth.
-        ignoreResistances: false # Parkstation-compliantpoison
+            Asphyxiation: 2
     Narcotic:
       effects:
       - !type:MovespeedModifier
@@ -71,21 +63,14 @@
       - !type:MovespeedModifier
         walkSpeedModifier: 1.25
         sprintSpeedModifier: 1.25
-      - !type:HealthChange
-        conditions:
-        - !type:ReagentThreshold
-          min: 20
-        damage:
-          types:
-            Asphyxiation: 2
       - !type:HealthChange
         conditions:
         - !type:ReagentThreshold
           min: 20
         damage:
           types:
             Poison: 2 # this is added to the base damage of the meth.
-        ignoreResistances: false # Parkstation-compliantpoison
+            Asphyxiation: 2
       - !type:Jitter
       - !type:GenericStatusEffect
         key: Stun
@@ -131,7 +116,6 @@
         damage:
           types:
             Poison: 1
-        ignoreResistances: false # Parkstation-compliantpoison
       - !type:GenericStatusEffect
         key: Stun
         time: 3
@@ -207,15 +191,13 @@
         damage:
           types:
             Poison: 1 # You will be laying on the floor in crit in 100 seconds if you don't have antitoxin meds (Ideally this should deal twice as much damage but since nukies don't have access to stellbinin it would kill them)
-        ignoreResistances: false # Parkstation-compliantpoison
       - !type:HealthChange
         conditions:
         - !type:ReagentThreshold
           min: 60
         damage:
           types:
             Poison: 8 # TODO this should ideally kill your liver instead
-        ignoreResistances: false # Parkstation-compliantpoison
       # effectively negates stamcrits
       - !type:GenericStatusEffect
         conditions:
@@ -358,7 +340,6 @@
         damage:
           types:
             Poison: 1
-        ignoreResistances: false # Parkstation-compliantpoison
       - !type:GenericStatusEffect
         conditions:
         - !type:ReagentThreshold