Merge remote-tracking branch 'citadel/master' into staves

Browse Source

...

This commit is contained in:

kevinz000

2020-02-24 13:09:45 -07:00

parent c3f489dd48 4205233e45

commit 59e95555bb

599 changed files with 10675 additions and 5936 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/ammo.dmi

BIN

Binary file not shown.

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

icons/obj/barsigns.dmi

BIN

Binary file not shown.

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

icons/obj/chairs.dmi

BIN

Binary file not shown.

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

icons/obj/clothing/hats.dmi

BIN

Binary file not shown.

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

icons/obj/clothing/suits.dmi

BIN

Binary file not shown.

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

icons/obj/clothing/uniforms.dmi

BIN

Binary file not shown.

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

icons/obj/economy.dmi

BIN

Binary file not shown.

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

icons/obj/guns/projectile.dmi

BIN

Binary file not shown.

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

icons/obj/hand_of_god_structures.dmi

BIN

Binary file not shown.

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

icons/obj/improvised.dmi

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 681 B After Width:  |  Height:  |  Size: 742 B

icons/obj/items_and_weapons.dmi

BIN

Binary file not shown.

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

icons/obj/janitor.dmi

BIN

Binary file not shown.

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

icons/obj/library.dmi

BIN

Binary file not shown.

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

icons/obj/machines/pool.dmi

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.9 KiB

icons/obj/smooth_structures/table_greyscale.dmi

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 670 B

icons/obj/stack_objects.dmi

BIN

Binary file not shown.

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

icons/obj/storage.dmi

BIN

Binary file not shown.

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

icons/obj/surgery.dmi

BIN

Binary file not shown.

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

icons/obj/toy.dmi

BIN

Binary file not shown.

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