Ed 5b2020d708 Merge remote-tracking branch 'upstream/master' into ed-08-09-2024-upstream ...

# Conflicts:
#	.github/PULL_REQUEST_TEMPLATE.md
#	Content.Server/Station/Systems/StationSpawningSystem.cs
#	Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
#	Resources/Prototypes/Maps/box.yml
#	Resources/Prototypes/Maps/marathon.yml
#	Resources/Prototypes/Maps/meta.yml

2024-09-08 21:20:54 +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

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/master' into ed-29-08-2024

2024-08-29 14:32:09 +03:00

GuideEntityEmbed.xaml

Guidebook Revival (#13320)

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

GuideEntityEmbed.xaml.cs

Remove 700 usages of Component.Owner (#21100)

2023-10-19 12:34:31 -07:00

GuideReagentEmbed.xaml

Add plant metabolism effects to chemical guidebook (#28038)

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

GuideReagentEmbed.xaml.cs

Remove calls to FormattedMessage obsolete methods (#31706)

2024-09-01 13:00:53 +02:00

GuideReagentGroupEmbed.xaml

Chem guidebook (#17123)

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

GuideReagentGroupEmbed.xaml.cs

Chem guidebook (#17123)

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

GuideReagentReaction.xaml

Add reaction randomization. (#308)

2024-08-19 18:04:12 +03:00

GuideReagentReaction.xaml.cs

Merge remote-tracking branch 'upstream/master' into ed-08-09-2024-upstream

2024-09-08 21:20:54 +03:00

GuideTechDisciplineEmbed.xaml

technology auto guidebook (#21029)

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

GuideTechDisciplineEmbed.xaml.cs

technology auto guidebook (#21029)

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

GuideTechnologyEmbed.xaml

technology auto guidebook (#21029)

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

GuideTechnologyEmbed.xaml.cs

technology auto guidebook (#21029)

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

ISearchableControl.cs

Filtering reagents (#18211)

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