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

Browse Source

...

This commit is contained in:

Ghommie

2019-06-24 16:48:15 +02:00

parent 093b0a15ed dcd74f899a

commit 67f00fc049

637 changed files with 17918 additions and 12263 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/clockwork_objects.dmi

BIN

Binary file not shown.

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

icons/obj/clothing/belts.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/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/clothing/suits.dmi

BIN

Binary file not shown.

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

icons/obj/clothing/uniforms.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/custom.dmi

BIN

Binary file not shown.

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

icons/obj/dart.dmi

BIN

Binary file not shown.

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

icons/obj/flora/pinetrees.dmi

BIN

Binary file not shown.

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

icons/obj/food/piecake.dmi

BIN

Binary file not shown.

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

icons/obj/food/snowcones.dmi

BIN

Binary file not shown.

Side by Side 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/library.dmi

BIN

Binary file not shown.

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

icons/obj/plushes.dmi

BIN

Binary file not shown.

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

icons/obj/projectiles.dmi

BIN

Binary file not shown.

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

icons/obj/storage.dmi

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 62 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.3 KiB After Width:  |  Height:  |  Size: 4.6 KiB

icons/obj/tools.dmi

BIN

Binary file not shown.

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

icons/obj/vehicles.dmi

BIN

Binary file not shown.

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

icons/obj/vending.dmi

BIN

Binary file not shown.

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