Ed 6174713383 Merge remote-tracking branch 'refs/remotes/upstream/master' into ed-27-04-2024-displacement-upstream ...

# Conflicts:
#	Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml

2024-04-27 10:45:35 +03:00

..

Commands

Partial atmos refactor (#22521)

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

Components

Merge remote-tracking branch 'space-station-14/master' into ed-26-04-2024-upstream

2024-04-26 00:33:04 +03:00

EntitySystems

Merge remote-tracking branch 'refs/remotes/upstream/master' into ed-27-04-2024-displacement-upstream

2024-04-27 10:45:35 +03:00

Monitor

Content update for UI prediction (#27214)

2024-04-26 18:16:24 +10:00

Piping

Content update for UI prediction (#27214)

2024-04-26 18:16:24 +10:00

Portable

Content update for UI prediction (#27214)

2024-04-26 18:16:24 +10:00

Reactions

Remove atmos method events (#26402)

2024-03-28 13:22:19 +11:00

Rotting

Use new ComponentPauseGenerator (#25183)

2024-02-26 14:36:19 +11:00

Serialization

Fix empty atmos deserialization (#26540)

2024-03-30 10:58:12 +11:00

ExcitedGroup.cs

Cleanup the namespaces (#8132)

2022-05-13 17:59:03 +10:00

GasMixture.cs

Fix atmos NaN error (#26441)

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

GasMixtureStringRepresentation.cs

Add cryopod logs (#16854)

2023-05-28 18:59:27 +10:00

Hotspot.cs

Cleanup the namespaces (#8132)

2022-05-13 17:59:03 +10:00

IGasMixtureHolder.cs

Cleanup the namespaces (#8132)

2022-05-13 17:59:03 +10:00

IGasReactionEffect.cs

Atmos scaling cvar changes (#22501)

2023-12-15 14:02:21 -08:00

MonstermosInfo.cs

Cleanup the namespaces (#8132)

2022-05-13 17:59:03 +10:00

PressureEvent.cs

Rejig pressure protection (#7560)

2022-04-15 15:41:47 -07:00

TileAtmosphere.cs

Fix atmos NaN error (#26441)

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

TileFireEvent.cs

Minor atmos optimisations (#6625)

2022-02-20 17:43:20 +11:00

TileMixtureEnumerator.cs

Remove atmos method events (#26402)

2024-03-28 13:22:19 +11:00