Ed 4173d96d83 Merge remote-tracking branch 'upstream/staging' into ed-22-12-2024-upstream ...

# Conflicts:
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.IntegrationTests/Tests/ResearchTest.cs
#	Resources/Prototypes/Entities/Objects/Decoration/flora.yml
#	Resources/Prototypes/Entities/Objects/Misc/spaceshroom.yml
#	Resources/Prototypes/Maps/Pools/default.yml

2024-12-22 15:48:30 +03:00

..

Commands

Fix setmapatmos temperature argument

2024-09-13 14:49:27 -08:00

Components

Balance tweaks (#604)

2024-11-22 14:14:22 +03:00

Consoles

Atmospheric network monitor (#32294)

2024-12-17 04:53:17 +01:00

EntitySystems

New Comoss island map (#618)

2024-11-30 01:08:44 +03:00

Monitor

Predicted gas pumps (#33717)

2024-12-07 14:39:52 +11:00

Piping

Atmospheric network monitor (#32294)

2024-12-17 04:53:17 +01:00

Portable

Power stuff (#31314)

2024-08-25 22:18:42 +10:00

Reactions

Move GasMixture to shared (#27480)

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

Rotting

replace all uses of TryGetContainingContainer with non-obsolete overload (#30583)

2024-08-04 15:38:53 +10:00

Serialization

Move GasMixture to shared (#27480)

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

ExcitedGroup.cs

Cleanup the namespaces (#8132)

2022-05-13 17:59:03 +10: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

Move GasMixture to shared (#27480)

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

IGasReactionEffect.cs

Move GasMixture to shared (#27480)

2024-04-30 14:31:05 -07: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

Use archived gas mixture in gas exchange comparison (#32088)

2024-09-29 22:14:07 -07:00

TileFireEvent.cs

Minor atmos optimisations (#6625)

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

TileMixtureEnumerator.cs

Move GasMixture to shared (#27480)

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