Merge remote-tracking branch 'upstream/master' into bay_equipping

Browse Source

Conflicts:
	code/modules/client/preference/preferences.dm
	icons/mob/uniform.dmi

...

This commit is contained in:

Tigercat2000

2016-06-13 20:11:29 -07:00

parent 07e5957645 d9b1739b38

commit d5ae124a92

553 changed files with 13704 additions and 6739 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/client/preference/preferences.dm

+1892 -1

File diff suppressed because it is too large Load Diff