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

Browse Source

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

...

This commit is contained in:

Ed

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

parent 50c4fd3a58 1f03111ff8

commit dda8ea2b09

624 changed files with 43352 additions and 25174 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

Resources/Textures/Interface/Minimalist/SlotBackground.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 240 B After Width:  |  Height:  |  Size: 266 B

BIN

Resources/Textures/Interface/Minimalist/template_small.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 240 B After Width:  |  Height:  |  Size: 266 B

BIN

Resources/Textures/Interface/Nano/help.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 636 B