Merge branch 'master' into donoritemmodularization

Browse Source

...

This commit is contained in:

deathride58

2017-12-04 20:17:02 -05:00

parent 2f313bb92f e7da4615d6

commit f57e02ce95

569 changed files with 8426 additions and 5523 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 After Width:  |  Height:  |  Size: 21 KiB

icons/obj/assemblies/electronic_misc.dmi

BIN

Binary file not shown.

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

icons/obj/assemblies/electronic_setups.dmi

BIN

Binary file not shown.

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

icons/obj/assemblies/electronic_tools.dmi

BIN

Binary file not shown.

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

icons/obj/atmospherics/pipes/large.dmi

BIN

Binary file not shown.

icons/obj/atmospherics/pipes/meter.dmi

BIN

Binary file not shown.

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

icons/obj/atmospherics/pipes/simple.dmi

BIN

Binary file not shown.

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

icons/obj/biomass.dmi

BIN

Binary file not shown.

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

icons/obj/custom.dmi

BIN

Binary file not shown.

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

icons/obj/electronic_assemblies.dmi

BIN

Binary file not shown.

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

icons/obj/electronic_assemblies2.dmi

BIN

Binary file not shown.

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

icons/obj/food/food.dmi

BIN

Binary file not shown.

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

icons/obj/lighting.dmi

BIN

Binary file not shown.

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

icons/obj/machineprototype.dmi

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 418 B

icons/obj/meter.dmi

BIN

Binary file not shown.

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

icons/obj/module.dmi

BIN

Binary file not shown.

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

icons/obj/stock_parts.dmi

BIN

Binary file not shown.

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

icons/obj/tubing.dmi

BIN

Binary file not shown.

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

icons/obj/virology.dmi

BIN

Binary file not shown.

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

icons/obj/wizard.dmi

BIN

Binary file not shown.

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