Merge branch 'master' of https://github.com/Regalis11/Barotrauma.git into Regalis11-master

Browse Source

...

This commit is contained in:

Evil Factory

2021-12-15 14:45:31 -03:00

parent 72f770d83b 7d43cb1e91

commit bb1631a21c

388 changed files with 12646 additions and 8136 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

Barotrauma/BarotraumaShared/SharedSource/Characters/Health/CharacterHealth.cs

+296 -350

File diff suppressed because it is too large Load Diff