Merge branch 'master' into spike-loot-differentces

code/modules/library/lib_codex_gigas.dm

@@ -99,7 +99,7 @@
 									datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
-		ui = new(user, src, ui_key, "codex_gigas", name, 450, 450, master_ui, state)
+		ui = new(user, src, ui_key, "CodexGigas", name, 450, 450, master_ui, state)
 		ui.open()
 
 /obj/item/book/codex_gigas/ui_data(mob/user)

code/modules/library/lib_items.dm

@@ -112,7 +112,7 @@
 			else
 				return ..()
 
-/obj/structure/bookcase/attack_hand(mob/living/user)
+/obj/structure/bookcase/on_attack_hand(mob/living/user, act_intent = user.a_intent, unarmed_attack_flags)
 	. = ..()
 	if(. || !istype(user))
 		return

code/modules/library/lib_machines.dm

@@ -523,10 +523,7 @@ GLOBAL_LIST(cachedbooks) // List of our cached book datums
 	else
 		return ..()
 
-/obj/machinery/libraryscanner/attack_hand(mob/user)
-	. = ..()
-	if(.)
-		return
+/obj/machinery/libraryscanner/on_attack_hand(mob/user, act_intent = user.a_intent, unarmed_attack_flags)
 	usr.set_machine(src)
 	var/dat = "" // <META HTTP-EQUIV='Refresh' CONTENT='10'>
 	if(cache)

code/modules/library/soapstone.dm

@@ -209,7 +209,7 @@
 /obj/structure/chisel_message/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.always_state)
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
-		ui = new(user, src, ui_key, "engraved_message", name, 600, 300, master_ui, state)
+		ui = new(user, src, ui_key, "EngravedMessage", name, 600, 300, master_ui, state)
 		ui.open()
 
 /obj/structure/chisel_message/ui_data(mob/user)