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

Browse Source

# Conflicts:
#	code/modules/uplink/uplink_items/uplink_badass.dm

...

This commit is contained in:

ZeroMan

2020-03-21 02:17:13 -04:00

parent 2978014a64 9c40389e4f

commit 93b1ade0bc

85 changed files with 151865 additions and 1683 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/clothing/belt_overlays.dmi

BIN

Binary file not shown.

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

icons/obj/clothing/belts.dmi

BIN

Binary file not shown.

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

icons/obj/guns/energy.dmi

BIN

Binary file not shown.

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

icons/obj/items_and_weapons.dmi

BIN

Binary file not shown.

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