Merge pull request #8778 from Ghommie/Ghommie-cit97

Browse Source

Porting in 18 new drinks from the TGstation, plus tweaking and fixes.

...

This commit is contained in:

kevinz000

2019-07-03 13:47:04 -07:00

committed by GitHub

parent 63804b257c ad3b709c40

commit bce4ce31ab

23 changed files with 526 additions and 16 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/drinks.dmi

BIN

Binary file not shown.

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

icons/obj/food/containers.dmi

BIN

Binary file not shown.

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

icons/obj/food/food.dmi

BIN

Binary file not shown.

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