Ed f59de85047 Merge remote-tracking branch 'upstream/stable' into ed-21-07-2025-upstream-sync ...

# Conflicts:
#	Content.Client/Overlays/StencilOverlay.Weather.cs
#	Content.IntegrationTests/Tests/Atmos/AlarmThresholdTest.cs
#	Content.IntegrationTests/Tests/VendingMachineRestockTest.cs
#	Content.Server/Chat/Systems/ChatSystem.cs
#	Content.Server/Fluids/EntitySystems/PuddleSystem.cs
#	Content.Shared/Damage/Systems/SharedStaminaSystem.cs
#	Content.Shared/Fluids/Components/EvaporationComponent.cs
#	Content.Shared/GameTicking/SharedGameTicker.cs

2025-07-21 11:27:53 +03:00

..

ArrivalsSystem.cs

Revert biome rework (#38724)

2025-07-03 20:48:04 +02:00

DockingSignalControlSystem.cs

Dock device link port (#27646)

2024-05-06 13:59:01 +10:00

DockingSystem.cs

Clean up all missing EntitySystem proxy method uses (#38353)

2025-06-26 16:50:49 -07:00

DockingSystem.Shuttle.cs

Fix shuttle arrival visualizer (#35772)

2025-04-15 00:34:18 +10:00

EmergencyShuttleSystem.Console.cs

Replace ValidatePrototypeId uses with ProtoId or EntProtoId (#38814)

2025-07-07 21:57:05 +02:00

EmergencyShuttleSystem.cs

Replace ValidatePrototypeId uses with ProtoId or EntProtoId (#38814)

2025-07-07 21:57:05 +02:00

RadarConsoleSystem.cs

fix and buff the handheld mass scanner (#31284)

2024-08-21 12:33:01 -06:00

ShuttleConsoleSystem.cs

Clean up all missing EntitySystem proxy method uses (#38353)

2025-06-26 16:50:49 -07:00

ShuttleConsoleSystem.Drone.cs

Fix replayghost spawning location (#30252)

2024-07-22 20:32:30 +01:00

ShuttleConsoleSystem.FTL.cs

Two additional checks to prevent FTLing stations (#32558)

2024-10-04 12:55:36 +10:00

ShuttleSystem.cs

Revert biome rework (#38724)

2025-07-03 20:48:04 +02:00

ShuttleSystem.FasterThanLight.cs

ADAPTATION

2025-07-08 11:46:35 +03:00

ShuttleSystem.GridFill.cs

CompFactory updates (#37559)

2025-05-20 01:08:55 -04:00

ShuttleSystem.IFF.cs

Fix VGRoid grid spam (#29946)

2024-07-27 11:54:38 +10:00

ShuttleSystem.Impact.cs

Kills TurfHelpers (#37939)

2025-06-21 11:23:19 -04:00

SpaceGarbageSystem.cs

Upstream sync (#1035)

2025-03-17 11:54:43 +03:00

StationAnchorSystem.cs

Station Anchor (#26098)

2024-08-31 10:40:28 -04:00

ThrusterSystem.cs

Clean up all missing EntitySystem proxy method uses (#38353)

2025-06-26 16:50:49 -07:00