Ed 5b2020d708 Merge remote-tracking branch 'upstream/master' into ed-08-09-2024-upstream ...

# Conflicts:
#	.github/PULL_REQUEST_TEMPLATE.md
#	Content.Server/Station/Systems/StationSpawningSystem.cs
#	Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
#	Resources/Prototypes/Maps/box.yml
#	Resources/Prototypes/Maps/marathon.yml
#	Resources/Prototypes/Maps/meta.yml

2024-09-08 21:20:54 +03:00

..

Commands

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

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

Components

Merge remote-tracking branch 'upstream/master' into ed-05-08-2024-upstream

2024-08-05 15:28:42 +03:00

Consoles

Atmospheric alerts computer (#25938)

2024-09-04 21:13:17 -04:00

EntitySystems

Merge remote-tracking branch 'upstream/master' into ed-08-09-2024-upstream

2024-09-08 21:20:54 +03:00

Monitor

Atmospheric alerts computer (#25938)

2024-09-04 21:13:17 -04:00

Piping

Power stuff (#31314)

2024-08-25 22:18:42 +10: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

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

Move GasMixture to shared (#27480)

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