i loathe merge conflicts

Browse Source

...

This commit is contained in:

zerothebigboy

2021-03-19 14:39:40 -04:00

parent 8456b3f709

commit 153163b780

6 changed files with 0 additions and 0 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/mob/clothing/head.dmi

BIN

Binary file not shown.

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

icons/mob/clothing/mask.dmi

BIN

Binary file not shown.

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

icons/mob/clothing/suit.dmi

BIN

Binary file not shown.

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

icons/obj/clothing/hats.dmi

BIN

Binary file not shown.

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

icons/obj/clothing/masks.dmi

BIN

Binary file not shown.

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

icons/obj/clothing/suits.dmi

BIN

Binary file not shown.

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