Merge branch 'master' into upstream-merge-31045

Browse Source

...

This commit is contained in:

LetterJay

2017-10-01 01:17:52 -04:00

committed by GitHub

parent 6d59f3b06f 45c79ffbbe

commit f55c86edfb

260 changed files with 7134 additions and 5672 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/Cryogenic2.dmi

BIN

Binary file not shown.

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

icons/obj/chairs.dmi

BIN

Binary file not shown.

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

icons/obj/clothing/clockwork_garb.dmi

BIN

Binary file not shown.

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

icons/obj/computer.dmi

BIN

Binary file not shown.

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

icons/obj/guns/cit_guns.dmi

BIN

Binary file not shown.

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

icons/obj/radio.dmi

BIN

Binary file not shown.

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

icons/obj/tank.dmi

BIN

Binary file not shown.

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