Merge pull request #4225 from Citadel-Station-13/upstream-merge-33124

Browse Source

[MIRROR] Moves some machine sprites into /machines/ folder

...

This commit is contained in:

deathride58

2017-12-05 20:37:30 +00:00

committed by GitHub

parent 24d205f9c9 14ceab7ce2

commit a6aa181161

26 changed files with 37 additions and 39 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/Cryogenic2.dmi

BIN

Binary file not shown.

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

icons/obj/atmospherics/components/thermomachine.dmi

BIN

Binary file not shown.

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

icons/obj/cloning.dmi

BIN

Binary file not shown.

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

icons/obj/biogenerator.dmi → icons/obj/machines/biogenerator.dmi

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 2.1 KiB After Width:  |  Height:  |  Size: 2.1 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/suitstorage.dmi → icons/obj/machines/suit_storage.dmi

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