merge conflict and job/dept discounts support.

Browse Source

...

This commit is contained in:

Ghommie

2020-05-03 02:11:05 +02:00

parent 94f014589d c1d1e4f0c0

commit a194d7dafe

308 changed files with 6846 additions and 9140 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/device.dmi

BIN

Binary file not shown.

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

icons/obj/drinks.dmi

BIN

Binary file not shown.

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

icons/obj/food/burgerbread.dmi

BIN

Binary file not shown.

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

icons/obj/guns/energy.dmi

BIN

Binary file not shown.

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

icons/obj/janitor.dmi

BIN

Binary file not shown.

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