Merge pull request #2679 from Citadel-Station-13/upstream-merge-30531

Browse Source

[MIRROR] Adds Donksoft Toy Vendor (Machine Board) to the Circuit Imprinter

...

This commit is contained in:

LetterJay

2017-09-12 02:35:17 -05:00

committed by GitHub

parent caca1d1794 b5c007ffdf

commit 01b0e754c2

8 changed files with 1195 additions and 1126 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

code/game/machinery/vending.dm

+1067 -1040

File diff suppressed because it is too large Load Diff