Merge branch 'SyndicateStuff' of https://github.com/Citadel-Station-13/Citadel-Station-13 into SyndicateStuff

Browse Source

...

This commit is contained in:

LetterJay

2017-06-14 11:46:40 -05:00

parent 01e49188b6 74e6bc7ee2

commit b0bc3d546f

128 changed files with 300359 additions and 157401 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/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/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/lavaland/artefacts.dmi

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 17 KiB After Width:  |  Height:  |  Size: 18 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