Merge branch 'master' into upstream-merge-28046

Browse Source

...

This commit is contained in:

LetterJay

2017-06-14 13:10:37 -05:00

committed by GitHub

parent aba07154d0 defb7d75c1

commit c877fdb501

382 changed files with 304519 additions and 166836 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/2x2.dmi

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 6.6 KiB

icons/obj/3x3.dmi

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 12 KiB

icons/obj/biogenerator.dmi

BIN

Binary file not shown.

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

icons/obj/cardboard_cutout.dmi

BIN

Binary file not shown.

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

icons/obj/clockwork_objects.dmi

BIN

Binary file not shown.

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

icons/obj/clothing/accessories.dmi

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 6.8 KiB

icons/obj/clothing/hats.dmi

BIN

Binary file not shown.

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

icons/obj/clothing/neck.dmi

BIN

Binary file not shown.

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

icons/obj/clothing/suits.dmi

BIN

Binary file not shown.

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

icons/obj/clothing/ties.dmi

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 12 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: 38 KiB

icons/obj/device.dmi

BIN

Binary file not shown.

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

icons/obj/doors/airlocks/external/overlays.dmi

Vendored

BIN

Binary file not shown.

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

icons/obj/doors/airlocks/hatch/overlays.dmi

BIN

Binary file not shown.

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

icons/obj/doors/airlocks/station/overlays.dmi

BIN

Binary file not shown.

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

icons/obj/hydroponics/equipment.dmi

BIN

Binary file not shown.

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

icons/obj/lavaland/artefacts.dmi

BIN

Binary file not shown.

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

icons/obj/lavaland/survival_pod.dmi

BIN

Binary file not shown.

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

icons/obj/library.dmi

BIN

Binary file not shown.

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

icons/obj/machines/mining_machines.dmi

BIN

Binary file not shown.

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

icons/obj/machines/washing_machine.dmi

BIN

Binary file not shown.

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

icons/obj/modular_laptop.dmi

BIN

Binary file not shown.

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

icons/obj/objects.dmi

BIN

Binary file not shown.

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

icons/obj/smooth_structures/fancy_table_black.dmi

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.2 KiB

icons/obj/smooth_structures/glass_table.dmi

BIN

Binary file not shown.

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

icons/obj/stock_parts.dmi

BIN

Binary file not shown.

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

icons/obj/tiles.dmi

BIN

Binary file not shown.

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

icons/obj/tools.dmi

BIN

Binary file not shown.

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

icons/obj/virology.dmi

BIN

Binary file not shown.

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