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

Browse Source

...

This commit is contained in:

SandPoot

2023-01-28 01:20:26 -03:00

parent a56247f828 2d5e163916

commit 44913d5fff

171 changed files with 863 additions and 7090 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/hats.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/clothing/modsuit/mod_clothing.dmi

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 76 KiB

icons/obj/clothing/modsuit/mod_construction.dmi

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 5.5 KiB

icons/obj/clothing/modsuit/mod_modules.dmi

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 52 KiB

icons/obj/defibrillators.dmi

BIN

Binary file not shown.

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

icons/obj/drinks.dmi

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 118 KiB After Width:  |  Height:  |  Size: 160 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: 72 KiB