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
@@ -64,10 +64,7 @@
 				return
 			M.put_in_hand(src, H.held_index)

-/obj/item/modular_computer/laptop/attack_hand(mob/user, act_intent = user.a_intent, unarmed_attack_flags)
-	. = ..()
-	if(.)
-		return
+/obj/item/modular_computer/laptop/on_attack_hand(mob/user, act_intent = user.a_intent, unarmed_attack_flags)
 	if(screen_on && isturf(loc))
 		return attack_self(user)

@@ -100,7 +100,6 @@
 	if(cpu)
 		return cpu.AltClick(user)

-//ATTACK HAND IGNORING PARENT RETURN VALUE
 // On-click handling. Turns on the computer if it's off and opens the GUI.
 /obj/machinery/modular_computer/interact(mob/user)
 	if(cpu)