Merge branch 'master' into Blind-quirk-without-anger

Browse Source

...

This commit is contained in:

Fermi

2019-10-01 08:41:12 +01:00

parent 8820fde62c 0301683ae1

commit 4b6d996416

478 changed files with 14372 additions and 9131 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/bloodpack.dmi

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 950 B After Width:  |  Height:  |  Size: 1.2 KiB

icons/obj/chemical.dmi

BIN

Binary file not shown.

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

icons/obj/clothing/accessories.dmi

BIN

Binary file not shown.

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

icons/obj/clothing/belt_overlays.dmi

BIN

Binary file not shown.

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

icons/obj/clothing/hats.dmi

BIN

Binary file not shown.

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

icons/obj/clothing/shoes.dmi

BIN

Binary file not shown.

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

icons/obj/clothing/uniforms.dmi

BIN

Binary file not shown.

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

icons/obj/drinks.dmi

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 83 KiB After Width:  |  Height:  |  Size: 86 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: 61 KiB After Width:  |  Height:  |  Size: 62 KiB

icons/obj/food/piecake.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/food/snowcones.dmi

BIN

Binary file not shown.

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

icons/obj/guns/projectile.dmi

BIN

Binary file not shown.

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

icons/obj/hydroponics/growing_flowers.dmi

BIN

Binary file not shown.

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

icons/obj/hydroponics/harvest.dmi

BIN

Binary file not shown.

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

icons/obj/hydroponics/seeds.dmi

BIN

Binary file not shown.

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

icons/obj/janitor.dmi

BIN

Binary file not shown.

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

icons/obj/machines/harvester.dmi

BIN

Binary file not shown.

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

icons/obj/machines/sleeper.dmi

BIN

Binary file not shown.

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

icons/obj/plushes.dmi

BIN

Binary file not shown.

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

icons/obj/storage.dmi

BIN

Binary file not shown.

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

icons/obj/syringe.dmi

BIN

Binary file not shown.

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

icons/obj/tools.dmi

BIN

Binary file not shown.

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