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

Browse Source

...

This commit is contained in:

Detective Google

2020-03-17 16:29:13 -05:00

parent 1b72357925 fcf51a285d

commit 6b392e09c2

58 changed files with 476 additions and 562 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

icons/obj/items_and_weapons.dmi

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 130 KiB After Width:  |  Height:  |  Size: 129 KiB

icons/obj/storage.dmi

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 70 KiB After Width:  |  Height:  |  Size: 71 KiB