Merge branch 'master' into xantholne-christmas01

Browse Source

...

This commit is contained in:

Unknown

2019-12-14 17:15:00 -07:00

parent 825f553a5d 0921c3541a

commit 73abc2ae40

456 changed files with 3828 additions and 3209 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/clothing/accessories.dmi

BIN

Binary file not shown.

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

icons/obj/module.dmi

BIN

Binary file not shown.

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

icons/obj/projectiles.dmi

BIN

Binary file not shown.

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

icons/obj/projectiles_impact.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/projectiles_muzzle.dmi

BIN

Binary file not shown.

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

icons/obj/projectiles_tracer.dmi

BIN

Binary file not shown.

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