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

..

Construction

Remove airtight flaps from the construction menu (#27619)

2024-05-02 10:49:53 -04:00

Cooking

Rainbow Weed (#25759)

2024-04-28 21:06:27 -07:00

Crafting

Adds supplybot to crafting menu (#27827)

2024-05-08 22:54:48 -07:00

Lathes

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

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

Reactions

Red bool update (#27597)

2024-05-03 08:57:37 +02:00