Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into donoritemmodularization

Browse Source

# Conflicts:
#	code/citadel/custom_loadout/custom_items.dm
#	code/datums/components/riding.dm
#	code/game/objects/items/implants/implantuplink.dm
#	icons/mob/neck.dmi
#	icons/obj/clothing/cloaks.dmi

...

This commit is contained in:

deathride58

2017-12-08 19:58:41 -05:00

parent 0fc1837c3a 99283df12b

commit 742d50b5e7

182 changed files with 2740 additions and 736 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/assemblies/electronic_components.dmi

BIN

Binary file not shown.

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

icons/obj/atmospherics/components/thermomachine.dmi

BIN

Binary file not shown.

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

icons/obj/chemical.dmi

BIN

Binary file not shown.

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

icons/obj/clockwork_objects.dmi

BIN

Binary file not shown.

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

icons/obj/guns/bayonets.dmi

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 268 B After Width:  |  Height:  |  Size: 263 B

icons/obj/items_and_weapons.dmi

BIN

Binary file not shown.

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

icons/obj/machines/camera.dmi

BIN

Binary file not shown.

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

icons/obj/machines/cloning.dmi

BIN

Binary file not shown.

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

icons/obj/machines/sleeper.dmi

BIN

Binary file not shown.

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

icons/obj/monitors.dmi

BIN

Binary file not shown.

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

icons/obj/pet_carrier.dmi

BIN

Binary file not shown.

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

icons/obj/vending.dmi

BIN

Binary file not shown.

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

icons/obj/vending_restock.dmi

BIN

Binary file not shown.

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