diff --git a/Resources/Prototypes/Damage/modifier_sets.yml b/Resources/Prototypes/Damage/modifier_sets.yml index 25e5b63edb..b7587eee4c 100644 --- 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 index 2cd86b5a99..915f9296db 100644 --- 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 index 4f3b042300..35ef2fe0c3 100644 --- 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 index adce6c920c..73726639ab 100644 --- 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 index 258bfb0ee0..6758927ad5 100644 --- 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 index ccfe56658f..0cd79f7099 100644 --- 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 index 14e135cb33..60b3d0a316 100644 --- 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 index 8b791ea624..76273de3a0 100644 --- 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 index 3c588552a0..4c98211a42 100644 --- 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 index 43d1defc5b..f510bfce74 100644 --- 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 index 1200a8e5a6..758ed5df93 100644 --- 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 index bd8cfb72e5..f0883eb3ba 100644 --- 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 index 7dc2cb4c0d..e30c99cbb9 100644 --- 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,21 +254,10 @@ 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 @@ -284,14 +265,7 @@ 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 \ No newline at end of file diff --git a/Resources/Prototypes/Reagents/narcotics.yml b/Resources/Prototypes/Reagents/narcotics.yml index 009c58e4a8..7ae8763763 100644 --- a/Resources/Prototypes/Reagents/narcotics.yml +++ b/Resources/Prototypes/Reagents/narcotics.yml @@ -15,14 +15,6 @@ 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 @@ -30,7 +22,7 @@ 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,13 +63,6 @@ - !type:MovespeedModifier walkSpeedModifier: 1.25 sprintSpeedModifier: 1.25 - - !type:HealthChange - conditions: - - !type:ReagentThreshold - min: 20 - damage: - types: - Asphyxiation: 2 - !type:HealthChange conditions: - !type:ReagentThreshold @@ -85,7 +70,7 @@ 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,7 +191,6 @@ 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 @@ -215,7 +198,6 @@ 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 diff --git a/Resources/Prototypes/Reagents/pyrotechnic.yml b/Resources/Prototypes/Reagents/pyrotechnic.yml index c7dfa01bea..33adcd27c5 100644 --- a/Resources/Prototypes/Reagents/pyrotechnic.yml +++ b/Resources/Prototypes/Reagents/pyrotechnic.yml @@ -155,7 +155,6 @@ damage: types: Poison: 1 - ignoreResistances: false # Parkstation-compliantpoison - !type:FlammableReaction multiplier: 0.4 @@ -176,7 +175,6 @@ damage: types: Poison: 1 - ignoreResistances: false # Parkstation-compliantpoison - !type:FlammableReaction multiplier: 0.4 diff --git a/Resources/Prototypes/Reagents/toxins.yml b/Resources/Prototypes/Reagents/toxins.yml index 786f7d8953..6e456c2ea3 100644 --- a/Resources/Prototypes/Reagents/toxins.yml +++ b/Resources/Prototypes/Reagents/toxins.yml @@ -18,7 +18,6 @@ damage: types: Poison: 2 - ignoreResistances: false # Parkstation-compliantpoison - type: reagent id: CarpoToxin @@ -40,7 +39,6 @@ damage: types: Poison: 4 - ignoreResistances: false # Parkstation-compliantpoison - !type:PopupMessage type: Local visualType: MediumCaution @@ -79,7 +77,6 @@ damage: types: Poison: 1.5 - ignoreResistances: false # Parkstation-compliantpoison - type: reagent id: Mold @@ -96,7 +93,6 @@ damage: types: Poison: 1 - ignoreResistances: false # Parkstation-compliantpoison - !type:ChemCauseRandomDisease conditions: - !type:ReagentThreshold @@ -386,7 +382,6 @@ damage: types: Poison: 0.4 - ignoreResistances: false # Parkstation-compliantpoison - !type:ChemVomit probability: 0.04 #Scaled for time, not metabolismrate. conditions: @@ -409,7 +404,6 @@ damage: types: Poison: 6 - ignoreResistances: false # Parkstation-compliantpoison - type: reagent id: VentCrud @@ -425,7 +419,6 @@ damage: types: Poison: 2 - ignoreResistances: false # Parkstation-compliantpoison - !type:ChemCauseDisease ##Since this mostly just comes from the event you won't ingest that much causeChance: 0.6 disease: VentCough @@ -465,7 +458,6 @@ damage: types: Poison: 2 - ignoreResistances: false # Parkstation-compliantpoison - !type:AdjustReagent conditions: - !type:OrganType @@ -493,7 +485,6 @@ damage: types: Poison: 0.06 - ignoreResistances: false # Parkstation-compliantpoison - type: reagent id: Pax diff --git a/Resources/Prototypes/SimpleStation14/Reagents/drinks.yml b/Resources/Prototypes/SimpleStation14/Reagents/drinks.yml index c3319d7ab4..0809051ba6 100644 --- a/Resources/Prototypes/SimpleStation14/Reagents/drinks.yml +++ b/Resources/Prototypes/SimpleStation14/Reagents/drinks.yml @@ -33,7 +33,6 @@ damage: types: Poison: 4 # Overuse and it will poison you hard - ignoreResistances: false # Parkstation-compliantpoison Medicine: metabolismRate: 0.375 effects: