Merge branch 'master' into Yeehaw

Browse Source

...

This commit is contained in:

BlackMajor

2020-01-02 22:13:52 +13:00

parent aabb39a364 34f76aa042

commit 490fb3ab61

1 changed files with 991 additions and 990 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

code/modules/mob/living/carbon/carbon.dm

+991 -990

File diff suppressed because it is too large Load Diff