Ed ca843bd84a Merge remote-tracking branch 'upstream/master' into ed-19-07-2024-upstream-walls ...

# Conflicts:
#	Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs

2024-07-19 11:23:38 +03:00

..

Clothing

make scarves eatable again (#29959)

2024-07-15 01:12:25 +10:00

Debugging

Fix prying speed & log (#29210)

2024-06-21 00:19:22 +10:00

Effects

Nerf & standardised slip times (#27879)

2024-07-17 09:26:02 +10:00

Markers

Merge remote-tracking branch 'upstream/master' into ed-15-07-2024-upstream

2024-07-15 12:58:23 +03:00

Mobs

Merge remote-tracking branch 'upstream/master' into ed-19-07-2024-upstream-walls

2024-07-19 11:23:38 +03:00

Objects

Merge remote-tracking branch 'upstream/master' into ed-17-07-2024-upstream

2024-07-17 23:25:31 +03:00

Stations

Don't treat vgroid as station grid (#29811)

2024-07-08 12:05:01 -06:00

Structures

Merge remote-tracking branch 'upstream/master' into ed-19-07-2024-upstream-walls

2024-07-19 11:23:38 +03:00

Tiles

Merge remote-tracking branch 'upstream/master' into ed-17-07-2024-upstream

2024-07-17 23:25:31 +03:00

Virtual

Prevent virtual item storage and popups (#30020)

2024-07-15 00:08:39 +10:00

World

Shiny Diamonds (#25750)

2024-07-13 15:15:57 +03:00

categories.yml

make objectives use entityCategory (#28269)

2024-06-03 09:23:52 -04:00

foldable.yml

Resolves FoldableVisualizer is Obsolete (#13913)

2023-02-06 15:53:07 -04:00