Merge branch 'master' into 2021-07-16/windoors

Browse Source

# Conflicts:
#	Content.Server/Doors/Components/AirlockComponent.cs

...

This commit is contained in:

Kara D

2021-08-05 17:36:13 -07:00

parent fc23701fc0 8637b01277

commit 8dbd17045b

299 changed files with 6186 additions and 3919 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/Structures/Piping/Atmospherics/gasfilter.rsi/gasFilterOn.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 16 KiB After Width:  |  Height:  |  Size: 19 KiB