Ed b581f5d132 Merge remote-tracking branch 'upstream/stable' into ed-23-06-2025-upstream-sync ...

# Conflicts:
#	.github/workflows/check-trailing-whitespace.yml
#	Content.IntegrationTests/Tests/Access/AccessReaderTest.cs
#	Content.IntegrationTests/Tests/Chameleon/ChameleonJobLoadoutTest.cs
#	Content.IntegrationTests/Tests/GameRules/NukeOpsTest.cs
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs
#	Content.Shared/Light/Components/SunShadowCycleComponent.cs
#	Resources/Prototypes/Damage/modifier_sets.yml
#	Resources/Prototypes/Maps/Pools/default.yml

2025-06-23 16:37:22 +03:00

..

BUI

Salvage Job Board (#37549)

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

Components

Merge remote-tracking branch 'upstream/stable' into ed-23-06-2025-upstream-sync

2025-06-23 16:37:22 +03:00

Events

expedition rewards (#16972)

2023-06-16 15:19:02 +10:00

Prototypes

Salvage Job Board (#37549)

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

CargoBountyData.cs

Chill bounties + fixes (#23411)

2024-01-03 17:34:47 -07:00

CargoBountyHistoryData.cs

Add history tab to bounty console (#33932)

2025-01-30 09:27:36 -08:00

CargoOrderData.cs

Make departmental orders consoles print slips (#36944)

2025-05-06 15:04:18 -04:00

PriceCalculationEvent.cs

Move PriceCalculationEvent and EstimatedPriceCalculationEvent to shared (#37782)

2025-05-24 19:36:38 +02:00

SharedCargoSystem.cs

Cargo Funds Exception (#36694)

2025-04-19 08:21:01 +10:00

SharedPriceGunSystem.cs

Added pricegun sound (#34119)

2025-01-02 17:46:13 +01:00