Ed 5420469d62 Merge remote-tracking branch 'upstream/stable' into ed-upstream-sync ...

# Conflicts:
#	Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs

2025-04-15 00:44:29 +03:00

..

Clothing

Change the name and description of the templar helmet. (#36258)

2025-04-02 23:03:36 -07: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-311-03-2025-upstream-2

2025-03-31 12:41:37 +03:00

Markers

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

2025-04-15 00:44:29 +03:00

Mobs

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

2025-04-15 00:44:29 +03:00

Objects

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

2025-04-15 00:44:29 +03:00

Stations

Upstream sync (#1035)

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

Structures

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

2025-04-15 00:44:29 +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