hopefully this fixes the conflict

Browse Source

...

This commit is contained in:

ItzGabby

2021-03-19 02:55:17 -04:00

parent 68bf156091

commit 5c53b598b5

2 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/suit.dmi

BIN

Binary file not shown.

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

icons/obj/clothing/suits.dmi

BIN

Binary file not shown.

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