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

Browse Source

...

This commit is contained in:

zerothebigboy

2021-06-13 18:19:01 -04:00

parent 1122135c17 3170d60919

commit bae89fcaba

50 changed files with 477 additions and 117 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/computer.dmi

BIN

Binary file not shown.

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

icons/obj/items_and_weapons.dmi

BIN

Binary file not shown.

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

icons/obj/kitchen.dmi

BIN

Binary file not shown.

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

icons/obj/meteor.dmi

BIN

Binary file not shown.

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

icons/obj/vending.dmi

BIN

Binary file not shown.

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