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

Browse Source

...

This commit is contained in:

Detective Google

2020-05-08 01:13:12 -05:00

parent 504b1762f4 43dc1319d9

commit 4e84b92e2e

203 changed files with 2188 additions and 1331 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/UI_Icons/chat/chat_icons.dmi

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 237 B

icons/mob/blob.dmi

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.2 MiB After Width:  |  Height:  |  Size: 1.2 MiB

icons/mob/clothing/alpha_masks.dmi

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 429 B

icons/mob/clothing/back.dmi

BIN

Binary file not shown.

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

icons/mob/clothing/feet.dmi

BIN

Binary file not shown.

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

icons/mob/clothing/feet_digi.dmi

BIN

Binary file not shown.

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

icons/mob/clothing/head.dmi

BIN

Binary file not shown.

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

icons/mob/clothing/taur_hooved.dmi

BIN

Binary file not shown.

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

icons/mob/clothing/uniform.dmi

BIN

Binary file not shown.

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

icons/mob/mutant_bodyparts.dmi

BIN

Binary file not shown.

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

icons/mob/screen_alert.dmi

BIN

Binary file not shown.

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

icons/mob/screen_ghost.dmi

BIN

Binary file not shown.

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

icons/obj/advancedtools.dmi

BIN

Binary file not shown.

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

icons/obj/items_cyborg.dmi

BIN

Binary file not shown.

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