Merge branch 'walk-like-an-egyptian' into walklikeanegyptian

Browse Source

...

This commit is contained in:

Sishen

2019-08-23 14:42:35 -04:00

parent 62e931c62d 7c23b45fba

commit 3f86a92efa

9 changed files with 13 additions and 10 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/clothing/hats.dmi

BIN

Binary file not shown.

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

icons/obj/guns/magic.dmi

BIN

Binary file not shown.

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