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

..

CargoSystem.Bounty.cs

Replace ValidatePrototypeId uses with ProtoId or EntProtoId (#38814)

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

CargoSystem.cs

Cleanup warning CS0414 (#37648)

2025-05-20 23:14:10 +02:00

CargoSystem.Funds.cs

Make funding allocation computer more configurable (#36790)

2025-04-22 08:34:53 -04:00

CargoSystem.Orders.cs

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

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

CargoSystem.Shuttle.cs

Salvage Job Board (#37549)

2025-05-18 14:02:52 +10:00

CargoSystem.Telepad.cs

Departmental Economy (#36445)

2025-04-13 15:22:36 +02:00

PriceGunSystem.cs

Salvage Job Board (#37549)

2025-05-18 14:02:52 +10:00

PricingSystem.cs

Trading request system (#1460)

2025-06-23 01:21:25 +03:00