Ed dbdb81381b Merge remote-tracking branch 'upstream/master' into ed-30-06-2024-upstream ...

# Conflicts:
#	Resources/Prototypes/Maps/box.yml
#	Resources/Prototypes/Maps/meta.yml
#	Resources/Prototypes/Maps/oasis.yml
#	Resources/Prototypes/Maps/origin.yml
#	Resources/Prototypes/lobbyscreens.yml

2024-06-30 11:18:30 +03:00

..

Clothing

Revert "Make wearing an Ushanka also apply accent to your name" (#29524)

2024-06-28 10:08:09 +10:00

Debugging

Fix prying speed & log (#29210)

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

Effects

Cleans up some entity-related spawnmenu stuff (#28234)

2024-05-27 17:59:10 -04:00

Markers

Fix dragon ghost role rules (#29474)

2024-06-26 11:20:45 +10:00

Mobs

Merge remote-tracking branch 'upstream/master' into ed-30-06-2024-upstream

2024-06-30 11:18:30 +03:00

Objects

Merge remote-tracking branch 'upstream/master' into ed-30-06-2024-upstream

2024-06-30 11:18:30 +03:00

Stations

Replace StationRandomTransform (#29149)

2024-06-18 23:27:34 +10:00

Structures

Merge remote-tracking branch 'upstream/master' into ed-30-06-2024-upstream

2024-06-30 11:18:30 +03:00

Tiles

Merge remote-tracking branch 'upstream/master' into ed-30-06-2024-upstream

2024-06-30 11:18:30 +03:00

Virtual

Atmos device performance improvements (#26493)

2024-03-30 15:17:53 +11:00

World

Adds minable salt "ore" (#25324)

2024-02-26 16:34:15 -07: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