Ed d5fbdbdec0 Merge remote-tracking branch 'upstream/stable' into ed-27-05-2025-upstream-sync ...

# Conflicts:
#	.github/CODEOWNERS
#	Content.Client/Guidebook/Controls/GuideReagentReaction.xaml.cs
#	Content.IntegrationTests/Tests/Chemistry/TryAllReactionsTest.cs
#	Content.Server/Procedural/DungeonJob/DungeonJob.OreDunGen.cs
#	Resources/Prototypes/Entities/Effects/chemistry_effects.yml
#	Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
#	Resources/Prototypes/GameRules/meteorswarms.yml
#	Resources/Prototypes/Procedural/dungeon_configs.yml

2025-05-27 12:21:14 +03:00

..

Clothing

comment out slotblocker yaml (#37827)

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

Debugging

Replace noSpawn: true with categories: [ HideSpawnMenu ] (#30100)

2024-07-25 05:24:00 -07:00

Effects

Merge remote-tracking branch 'upstream/stable' into ed-27-05-2025-upstream-sync

2025-05-27 12:21:14 +03:00

Markers

Merge remote-tracking branch 'upstream/stable' into ed-27-05-2025-upstream-sync

2025-05-27 12:21:14 +03:00

Mobs

Merge remote-tracking branch 'upstream/stable' into ed-27-05-2025-upstream-sync

2025-05-27 12:21:14 +03:00

Objects

Merge remote-tracking branch 'upstream/stable' into ed-27-05-2025-upstream-sync

2025-05-27 12:21:14 +03:00

Stations

Salvage Job Board (#37549)

2025-05-18 14:02:52 +10:00

Structures

Merge remote-tracking branch 'upstream/stable' into ed-27-05-2025-upstream-sync

2025-05-27 12:21:14 +03:00

Tiles

Upstream sync (#1035)

2025-03-17 11:54:43 +03:00

Virtual

Replace noSpawn: true with categories: [ HideSpawnMenu ] (#30100)

2024-07-25 05:24:00 -07:00

World

Replace noSpawn: true with categories: [ HideSpawnMenu ] (#30100)

2024-07-25 05:24:00 -07:00

categories.yml

convert it to entity category

2025-01-29 12:22:38 +01:00

foldable.yml

Deploy foldable (#30000)

2024-08-02 17:05:12 +10:00