Merge pull request #5964 from Citadel-Station-13/upstream-merge-36459

Browse Source

[MIRROR] Clown Ops

...

This commit is contained in:

deathride58

2018-03-17 23:58:15 +00:00

committed by GitHub

parent 087255b1f1 8e5d87b780

commit 082d36fa6b

30 changed files with 700 additions and 78 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/grenade.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/items_and_weapons.dmi

BIN

Binary file not shown.

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

icons/obj/machines/nuke.dmi

BIN

Binary file not shown.

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