Jack Edge 58efb041a6 Merge branch 'library-of-brass-or-blood' of github.com:coiax/-tg-station into library-of-brass-or-blood ...

Conflicts:
	code/modules/library/lib_machines.dm

2016-12-23 16:14:21 +00:00

..

lib_codex_gigas.dm

Reminds the user that reading a book or writing a book while blind is stupid (#21117)

2016-10-24 22:52:40 +13:00

lib_items.dm

Abductor tools and tool sound refactor. (#22125)

2016-12-14 18:09:41 +13:00

lib_machines.dm

Merge branch 'library-of-brass-or-blood' of github.com:coiax/-tg-station into library-of-brass-or-blood

2016-12-23 16:14:21 +00:00

lib_readme.dm

…

random_books.dm

…