Ed bc53ed4aa5 Merge remote-tracking branch 'upstream/master' into ed-16-02-2025-planet-light-upstream ...

# Conflicts:
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Resources/Prototypes/Maps/centcomm.yml

2025-02-16 16:39:26 +03:00

..

Clothing

Merge branch 'master' of https://github.com/space-wizards/space-station-14 into pr/34711

2025-02-17 01:16:22 +13:00

Debugging

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

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

Effects

Merge remote-tracking branch 'upstream/master' into ed-16-02-2025-planet-light-upstream

2025-02-16 11:58:47 +03:00

Markers

Merge remote-tracking branch 'upstream/master' into ed-16-02-2025-planet-light-upstream

2025-02-16 11:58:47 +03:00

Mobs

Merge remote-tracking branch 'upstream/master' into ed-16-02-2025-planet-light-upstream

2025-02-16 16:39:26 +03:00

Objects

Merge remote-tracking branch 'upstream/master' into ed-16-02-2025-planet-light-upstream

2025-02-16 16:39:26 +03:00

Stations

Upstream sync (#846)

2025-02-06 13:57:14 +03:00

Structures

Merge remote-tracking branch 'upstream/master' into ed-16-02-2025-planet-light-upstream

2025-02-16 16:39:26 +03:00

Tiles

Merge remote-tracking branch 'upstream/master' into ed-16-02-2025-planet-light-upstream

2025-02-16 11:58:47 +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