Ed dda8ea2b09 Merge remote-tracking branch 'refs/remotes/upstream/master' into ed-13-05-2024-upstream ...

# Conflicts:
#	Content.Shared/Lock/LockSystem.cs
#	Resources/Prototypes/Maps/oasis.yml

2024-05-13 18:32:59 +03:00

..

Clothing

Magic Refactor + Wizard Grimoire (#22568)

2024-05-11 19:06:49 -04:00

Debugging

add noSpawn: true to tippy (#27538)

2024-05-01 01:07:30 +03:00

Effects

Small tomato killer tweak (#27265)

2024-04-27 20:35:13 +10:00

Markers

New event: Approaching unknown shuttle (#24490)

2024-05-10 04:35:59 -07:00

Mobs

Merge remote-tracking branch 'refs/remotes/upstream/master' into ed-13-05-2024-upstream

2024-05-13 18:32:59 +03:00

Objects

Magic Refactor + Wizard Grimoire (#22568)

2024-05-11 19:06:49 -04:00

Stations

New event: Approaching unknown shuttle (#24490)

2024-05-10 04:35:59 -07:00

Structures

Merge remote-tracking branch 'refs/remotes/upstream/master' into ed-13-05-2024-upstream

2024-05-13 18:32:59 +03:00

Tiles

change shadowstone desc. (#27900)

2024-05-10 13:44:27 -07: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

foldable.yml

Resolves FoldableVisualizer is Obsolete (#13913)

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