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

..

GuidebookError.xaml

Create In-Guidebook Errors (#28942)

2024-08-09 16:05:51 +10:00

GuidebookError.xaml.cs

Create In-Guidebook Errors (#28942)

2024-08-09 16:05:51 +10:00

GuidebookRichPrototypeLink.cs

Link to reagent ingredients on the same Guidebook page (#36700)

2025-05-09 10:06:26 +10:00

GuidebookWindow.xaml

Revert "Ed 09 06 2024 upstream (#230)"

2024-06-11 15:20:47 +03:00

GuidebookWindow.xaml.cs

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

2025-06-10 11:33:34 +03:00

GuideEntityEmbed.xaml

Guidebook Revival (#13320)

2023-01-16 02:42:22 -06:00

GuideEntityEmbed.xaml.cs

Cleanup logging in guidebook embeds (#37794)

2025-05-25 00:47:47 +02:00

GuideMicrowaveEmbed.xaml

Add microwave recipes to the guidebook (#34105)

2025-02-23 16:24:44 +01:00

GuideMicrowaveEmbed.xaml.cs

Cleanup logging in guidebook embeds (#37794)

2025-05-25 00:47:47 +02:00

GuideMicrowaveGroupEmbed.cs

Cleanup logging in guidebook embeds (#37794)

2025-05-25 00:47:47 +02:00

GuideReagentEmbed.xaml

Add plant metabolism effects to chemical guidebook (#28038)

2024-05-19 17:01:44 -06:00

GuideReagentEmbed.xaml.cs

Cleanup logging in guidebook embeds (#37794)

2025-05-25 00:47:47 +02:00

GuideReagentGroupEmbed.xaml

Chem guidebook (#17123)

2023-06-04 15:45:02 -05:00

GuideReagentGroupEmbed.xaml.cs

Cleanup logging in guidebook embeds (#37794)

2025-05-25 00:47:47 +02:00

GuideReagentReaction.xaml

Remove random reaction system (#1345)

2025-06-01 15:01:32 +03:00

GuideReagentReaction.xaml.cs

Replace ValidatePrototypeId uses with ProtoId or EntProtoId (#38814)

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

GuideTechDisciplineEmbed.xaml

technology auto guidebook (#21029)

2023-10-16 16:51:58 -05:00

GuideTechDisciplineEmbed.xaml.cs

Cleanup logging in guidebook embeds (#37794)

2025-05-25 00:47:47 +02:00

GuideTechnologyEmbed.xaml

technology auto guidebook (#21029)

2023-10-16 16:51:58 -05:00

GuideTechnologyEmbed.xaml.cs

Cleanup logging in guidebook embeds (#37794)

2025-05-25 00:47:47 +02:00

IPrototypeLinkControl.cs

Link to reagent ingredients on the same Guidebook page (#36700)

2025-05-09 10:06:26 +10:00

ISearchableControl.cs

Filtering reagents (#18211)

2023-07-26 02:05:09 -06:00