Merge branch 'master' into wounds-part-2

2020-08-02 18:10:31 +01:00
parent 9721025582 79590f6dc9
commit 03d01d917f
25 changed files with 169 additions and 124 deletions
@@ -21,7 +21,7 @@
 	. = ..()
 	stored = new /obj/item/blackbox(src)

-/obj/machinery/blackbox_recorder/attack_hand(mob/living/user)
+/obj/machinery/blackbox_recorder/on_attack_hand(mob/living/user, act_intent, unarmed_attack_flags)
 	. = ..()
 	if(stored)
 		to_chat(user, "<span class='notice'>You start struggling to pry the [stored] from the [src]...</span>")