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

Browse Source

...

This commit is contained in:

kevinz000

2020-02-18 02:20:58 -07:00

parent de5186026d a221280ab5

commit d7949e810e

824 changed files with 15796 additions and 11092 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/abductor.dmi

BIN

Binary file not shown.

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

icons/obj/citvending.dmi

BIN

Binary file not shown.

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

icons/obj/clothing/belts.dmi

BIN

Binary file not shown.

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

icons/obj/clothing/gloves.dmi

BIN

Binary file not shown.

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

icons/obj/device.dmi

BIN

Binary file not shown.

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

icons/obj/drinks.dmi

BIN

Binary file not shown.

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

icons/obj/food/containers.dmi

BIN

Binary file not shown.

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

icons/obj/food/food.dmi

BIN

Binary file not shown.

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

icons/obj/guns/energy.dmi

BIN

Binary file not shown.

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

icons/obj/implants.dmi

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 2.4 KiB After Width:  |  Height:  |  Size: 2.6 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: 26 KiB

icons/obj/lighting.dmi

BIN

Binary file not shown.

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

icons/obj/mining.dmi

BIN

Binary file not shown.

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

icons/obj/plushes.dmi

BIN

Binary file not shown.

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

icons/obj/power.dmi

BIN

Binary file not shown.

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

icons/obj/projectiles.dmi

BIN

Binary file not shown.

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

icons/obj/ring.dmi

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 550 B After Width:  |  Height:  |  Size: 812 B

icons/obj/storage.dmi

BIN

Binary file not shown.

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

icons/obj/vending.dmi

BIN

Binary file not shown.

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

icons/obj/vending_restock.dmi

BIN

Binary file not shown.

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