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

..

Audio

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

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

Changelog

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

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

ConfigPresets

New MRP ruleset for server (#1334)

2025-07-06 17:37:43 +03:00

Credits

Update Credits (#38955)

2025-07-12 19:21:57 -07:00

Fonts

Sentry turrets - Part 5: Reuseable UI components (#35149)

2025-05-03 12:19:08 -05:00

IgnoredPrototypes

…

Locale

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

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

Maps

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

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

Prototypes

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

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

ServerInfo

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

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

Textures

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

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

clientCommandPerms.yml

Revert "Upstream sync (#1509)" (#1510)

2025-07-08 11:59:51 +03:00

engineCommandPerms.yml

…

keybinds.yml

New belt controls (#1298)

2025-06-03 14:39:39 +03:00

manifest.yml

…

map_attributions.txt

…

mapping_actions.yml

action refactor proper ecs edition (#27422)

2025-05-28 15:52:11 -04:00

migration.yml

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

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

toolshedEngineCommandPerms.yml

…