Merge remote-tracking branch 'origin/master' into TGUI-4

2020-07-30 14:43:52 +08:00
parent 894ea242b4 0711e45d18
commit b376a6b6c4
662 changed files with 13844 additions and 6845 deletions
@@ -35,10 +35,7 @@
 		ui_interact(user)
 	. = ..()

-/obj/structure/ore_box/attack_hand(mob/user)
-	. = ..()
-	if(.)
-		return
+/obj/structure/ore_box/on_attack_hand(mob/user, act_intent = user.a_intent, unarmed_attack_flags)
 	if(Adjacent(user))
 		ui_interact(user)