Merge branch 'lib-sucks-no-homo' of https://github.com/MrStonedOne/-tg-station into lib-sucks-no-homo

Conflicts:
	code/modules/library/lib_machines.dm
This commit is contained in:
MrStonedOne
2015-02-18 18:26:39 -08:00

View File

@@ -2,8 +2,8 @@
*
* Contains:
* Borrowbook datum
* Cachedbook datum
* Library Public Computer
* Cachedbook datum
* Library Computer
* Library Scanner
* Book Binder
@@ -182,7 +182,6 @@ var/global/list/datum/cachedbook/cachedbooks // List of our cached book datums
for(var/datum/cachedbook/C in cachedbooks)
libcomp_menu += "<tr><td>[C.author]</td><td>[C.title]</td><td>[C.category]</td><td><A href='?src=\ref[src];targetid=[C.id]'>\[Order\]</A></td></tr>\n"
/obj/machinery/computer/libraryconsole/bookmanagement/New()
..()
if(circuit)