Merge with upstream/master

Fixes conflicts

code/modules/library/lib_machines.dm

@@ -238,8 +238,6 @@ datum/borrowbook // Datum used to keep track of who has borrowed what when and f
 	onclose(user, "library")
 
 /obj/machinery/librarycomp/attackby(obj/item/weapon/W as obj, mob/user as mob)
-	if (src.density && istype(W, /obj/item/weapon/card/emag))
-		src.emagged = 1
 	if(istype(W, /obj/item/weapon/barcodescanner))
 		var/obj/item/weapon/barcodescanner/scanner = W
 		scanner.computer = src
@@ -248,6 +246,10 @@ datum/borrowbook // Datum used to keep track of who has borrowed what when and f
 			V.show_message("[src] lets out a low, short blip.", 2)
 	else
 		..()
+		
+/obj/machinery/librarycomp/emag_act(user as mob)
+	if (src.density)
+		src.emagged = 1
 
 /obj/machinery/librarycomp/Topic(href, href_list)
 	if(..())