Merge remote-tracking branch 'citadel/master' into combat_rework

2020-05-05 17:38:43 -07:00
parent 3a843f6da4 56fe430a25
commit f034c7c536
1360 changed files with 51317 additions and 49624 deletions
@@ -78,6 +78,9 @@
 	if(notransform)
 		return

+	if(SEND_SIGNAL(src, COMSIG_MOB_CLICKON, A, params) & COMSIG_MOB_CANCEL_CLICKON)
+		return
+		
 	var/list/modifiers = params2list(params)
 	if(modifiers["shift"] && modifiers["middle"])
 		ShiftMiddleClickOn(A)