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

..

CargoSystem.Bounty.cs

Salvage Job Board (#37549)

2025-05-18 14:02:52 +10: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

Allow cargo request computers to send orders to the primary account (#37943)

2025-06-09 11:11:19 -04: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