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

Browse Source

# Conflicts:
#	icons/mob/clothing/suit.dmi
#	icons/obj/clothing/suits.dmi

...

This commit is contained in:

zerothebigboy

2021-01-08 14:32:46 -05:00

parent d2ebbf9566 76cb637f9d

commit 82b00cd656

98 changed files with 1492 additions and 594 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/food/burgerbread.dmi

BIN

Binary file not shown.

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

icons/obj/storage.dmi

BIN

Binary file not shown.

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