Ed 04d29b6268 Merge remote-tracking branch 'upstream/master' into ed-17-06-2024-upstream ...

# Conflicts:
#	Resources/Prototypes/Maps/oasis.yml

2024-06-17 14:20:38 +03:00

..

AirFilterComponent.cs

mech nitrogen filtering 2 (#19868)

2023-11-05 20:15:13 -07:00

AirIntakeComponent.cs

mech nitrogen filtering 2 (#19868)

2023-11-05 20:15:13 -07:00

AirtightComponent.cs

Fix atmos NaN error (#26441)

2024-03-26 15:44:56 +11:00

AtmosExposedComponent.cs

Refactor serialization copying to use source generators (#19412)

2023-08-22 18:14:33 -07:00

AtmosFixMarkerComponent.cs

Refactor serialization copying to use source generators (#19412)

2023-08-22 18:14:33 -07:00

AtmosPlaqueComponent.cs

Resolve 'EntitySystem.Get<T>()' is obsolete in content (#27936)

2024-05-12 20:34:52 -04:00

BarotraumaComponent.cs

Remove AlertType and AlertCategory (#27933)

2024-05-23 22:43:04 -04:00

BreathToolComponent.cs

Space Ninjas auto-toggle internals after spawning (#25083)

2024-05-03 11:24:21 +10:00

FlammableComponent.cs

Merge remote-tracking branch 'space-station-14/master' into ed-25-05-2024-upstream

2024-05-25 18:49:49 +03:00

GasAnalyzerComponent.cs

Refactor serialization copying to use source generators (#19412)

2023-08-22 18:14:33 -07:00

GasMixtureHolderComponent.cs

Move GasMixture to shared (#27480)

2024-04-30 14:31:05 -07:00

GasTankComponent.cs

Unrevert audio (#21330)

2023-11-27 22:12:34 +11:00

GridAtmosphereComponent.cs

Partial atmos refactor (#22521)

2024-03-24 03:34:56 +11:00

HeatExchangerComponent.cs

Rebalance radiator cooling and material cost (#18823)

2023-08-24 09:36:16 -08:00

IgniteOnCollideComponent.cs

Incendiary projectiles and lava firestack reduction (#23479)

2024-01-08 00:41:42 -05:00

IgniteOnMeleeHitComponent.cs

Rebalance fireaxe (#22731)

2023-12-18 21:41:33 -05:00

MapAtmosphereComponent.cs

Move GasMixture to shared (#27480)

2024-04-30 14:31:05 -07:00

PipeRestrictOverlapComponent.cs

Prevent stacking pipes (#28308)

2024-05-27 16:37:27 -06:00

PressureImmunityComponent.cs

Refactor serialization copying to use source generators (#19412)

2023-08-22 18:14:33 -07:00

PressureProtectionComponent.cs

Add events for TemperatureProtection and PressureProtection (#25165)

2024-02-13 23:44:47 -08:00

TemperatureProtectionComponent.cs

Add events for TemperatureProtection and PressureProtection (#25165)

2024-02-13 23:44:47 -08:00