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

..

MappingActionsButton.xaml

Add mapping editor (#23427)

2024-08-04 13:31:45 +10:00

MappingActionsButton.xaml.cs

Add mapping editor (#23427)

2024-08-04 13:31:45 +10:00

MappingDoNotMeasure.xaml

Add mapping editor (#23427)

2024-08-04 13:31:45 +10:00

MappingDoNotMeasure.xaml.cs

Add mapping editor (#23427)

2024-08-04 13:31:45 +10:00

MappingManager.cs

Add mapping editor (#23427)

2024-08-04 13:31:45 +10:00

MappingOverlay.cs

Validate ShaderPrototype IDs (#38728)

2025-07-03 18:11:31 -07:00

MappingPrototype.cs

Add mapping editor (#23427)

2024-08-04 13:31:45 +10:00

MappingPrototypeList.xaml

Add mapping editor (#23427)

2024-08-04 13:31:45 +10:00

MappingPrototypeList.xaml.cs

Add mapping editor (#23427)

2024-08-04 13:31:45 +10:00

MappingScreen.xaml

Fix separated game screen bumping (#33046)

2024-10-29 16:07:57 +11:00

MappingScreen.xaml.cs

Fix separated game screen bumping (#33046)

2024-10-29 16:07:57 +11:00

MappingSpawnButton.xaml

Add mapping editor (#23427)

2024-08-04 13:31:45 +10:00

MappingSpawnButton.xaml.cs

Add mapping editor (#23427)

2024-08-04 13:31:45 +10:00

MappingState.cs

Kills TurfHelpers (#37939)

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

MappingSystem.cs

action refactor proper ecs edition (#27422)

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