tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Entity Effect Scaling (Hopefully) for good and some other misc fixes (#41163)

Browse Source 
* Fix the last of the entity effects bugs

* aaa

* losing it

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
This commit is contained in:
Princess Cheeseballs
2025-11-06 13:34:53 -08:00
committed by GitHub
parent 2b196257c1
commit e5b6e4bf04
21 changed files with 21 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
View File

@@ -453,7 +453,6 @@
Gas:
effects:
- !type:HealthChange
scaling: true
ignoreResistances: true
conditions:
- !type:MetabolizerTypeCondition

1
Resources/Prototypes/Reagents/botany.yml
View File

@@ -258,7 +258,6 @@
- !type:ReagentCondition
reagent: Ammonia
min: 1
scaling: true
ignoreResistances: true
damage:
groups:

2
Resources/Prototypes/Reagents/fun.yml
View File

@@ -183,7 +183,6 @@
methods: [ Touch ]
effects:
- !type:HealthChange
scaling: true
ignoreResistances: false
damage:
types:
@@ -233,7 +232,6 @@
methods: [ Touch ]
effects:
- !type:HealthChange
scaling: true
ignoreResistances: false
damage:
types:

19
Resources/Prototypes/Reagents/gases.yml
View File

@@ -11,13 +11,11 @@
Poison:
effects:
- !type:Oxygenate
scaling: true
conditions:
- !type:MetabolizerTypeCondition
type: [ Human, Animal, Rat, Plant ]
# Convert Oxygen into CO2.
- !type:ModifyLungGas
scaling: true
conditions:
- !type:MetabolizerTypeCondition
type: [ Vox ]
@@ -29,7 +27,6 @@
conditions:
- !type:MetabolizerTypeCondition
type: [ Vox ]
scaling: true
ignoreResistances: true
damage:
types:
@@ -45,13 +42,11 @@
Gas:
effects:
- !type:Oxygenate
scaling: true
conditions:
- !type:MetabolizerTypeCondition
type: [ Human, Animal, Rat, Plant ]
# Convert Oxygen into CO2.
- !type:ModifyLungGas
scaling: true
conditions:
- !type:MetabolizerTypeCondition
type: [ Vox ]
@@ -63,7 +58,6 @@
conditions:
- !type:MetabolizerTypeCondition
type: [ Vox ]
scaling: true
ignoreResistances: true
damage:
types:
@@ -103,7 +97,6 @@
Gas:
effects:
- !type:HealthChange
scaling: true
ignoreResistances: true
damage:
types:
@@ -149,7 +142,6 @@
Gas:
effects:
- !type:HealthChange
scaling: true
ignoreResistances: true
damage:
types:
@@ -173,7 +165,6 @@
Poison:
effects:
- !type:Oxygenate
scaling: true
conditions:
- !type:MetabolizerTypeCondition
type: [ Plant ]
@@ -182,14 +173,12 @@
- !type:MetabolizerTypeCondition
type: [ Plant, Vox ]
inverted: true
scaling: true
ignoreResistances: true
damage:
types:
Poison:
0.4
- !type:Oxygenate
scaling: true
conditions:
- !type:MetabolizerTypeCondition
type: [ Plant ]
@@ -198,7 +187,6 @@
Gas:
effects:
- !type:Oxygenate
scaling: true
conditions:
- !type:MetabolizerTypeCondition
type: [ Plant ]
@@ -210,14 +198,12 @@
inverted: true
# Don't want people to get toxin damage from the gas they just
# exhaled, right?
scaling: true
ignoreResistances: true
damage:
types:
Poison:
0.8
- !type:Oxygenate # carbon dioxide displaces oxygen from the bloodstream, causing asphyxiation
scaling: true
conditions:
- !type:MetabolizerTypeCondition
type: [ Plant ]
@@ -246,13 +232,11 @@
Gas:
effects:
- !type:Oxygenate
scaling: true
conditions:
- !type:MetabolizerTypeCondition
type: [ Vox, Slime ]
# Converts Nitrogen into Ammonia
- !type:ModifyLungGas
scaling: true
conditions:
- !type:MetabolizerTypeCondition
type: [ Vox ]
@@ -260,7 +244,6 @@
Ammonia: 1.0
Nitrogen: -1.0
- !type:ModifyLungGas
scaling: true
conditions:
- !type:MetabolizerTypeCondition
type: [ Slime ]
@@ -359,7 +342,6 @@
Narcotic:
effects:
- !type:HealthChange
scaling: true
ignoreResistances: true
damage:
types:
@@ -386,7 +368,6 @@
effects:
- !type:HealthChange
minScale: 1
scaling: true
ignoreResistances: true
damage:
types:

1
Resources/Prototypes/Reagents/medicine.yml
View File

@@ -1176,7 +1176,6 @@
methods: [ Touch ]
effects:
- !type:HealthChange
scaling: true
ignoreResistances: false
damage:
types:

4
Resources/Prototypes/Reagents/toxins.yml
View File

@@ -145,7 +145,6 @@
methods: [ Touch ]
effects:
- !type:HealthChange
scaling: true
ignoreResistances: false
damage:
types:
@@ -184,7 +183,6 @@
- !type:SatiateThirst
factor: -1.5
- !type:HealthChange
scaling: true
ignoreResistances: true
damage:
types:
@@ -207,7 +205,6 @@
methods: [ Touch ]
effects:
- !type:HealthChange
scaling: true
ignoreResistances: false
damage:
types:
@@ -257,7 +254,6 @@
methods: [ Touch ]
effects:
- !type:HealthChange
scaling: true
ignoreResistances: false
damage:
types: